增加进销存报表，商品看板增加字段

@@ -85,7 +85,6 @@ export default {
         login(username, password, captcha) {
             this.$Loading.start();
             Vue.passport.local(username, password, captcha).then((ret) => {
-              console.log(ret);
                 if (ret.needUpdate) {
                     this.$Message.error('你的密码过于简单，请务必修改密码');
                     this.$router.push('/user/password.html');
@@ -97,7 +96,6 @@ export default {
                 }
                 this.$Loading.finish();
             }, (error) => {
-                this.$router.push('/');
                 this.$Loading.error();
                 this.$Message.error(error.message);
                 this.failNum++;

@@ -110,6 +110,7 @@
             },
             getBrandList() {
               return this.productService.queryBrandsByShopId().then(result => {
+                console.log(result);
                 this.brandList = result.data;
               })
             },
@@ -127,6 +128,7 @@
                     }
                     return this.productService.getShopOverview(filter);
                 }).then(result => {
+                    console.log(result);
                     if (!result.data) {
                         result.data = {
                             pageNo: 1,
@@ -154,7 +156,7 @@
                     param.brandId = this.brandId;
                 }
 
-                const href = '/Api/platform/exportProductInvoicingOverview?queryConf=' +
+                const href = '/Api/platform/exportOneShopProductOverview?queryConf=' +
                     JSON.stringify(param);
 
                 window.open(href, '_blank');