Merge branch 'release/2.0' of http://git.yoho.cn/fe/yoho-shop-manage into release/2.0

@@ -81,6 +81,9 @@ export default {
                         name: 'repository.invoice.edit',
                         params: {
                             id: result.data
+                        },
+                        query: {
+                            brandId: this.brandId
                         }
                     });
                 }

@@ -44,6 +44,7 @@
         },
         created() {
             this.invoiceService = new InvoiceService();
+            this.brandId = this.brandId || this.$route.query.brandId;
             this.search();
         },
         methods: {

@@ -142,7 +142,7 @@ let infoCols = function() {
             align: 'center',
             render: (h, params) => {
                 return (
-                    <div>{params.row.goodsName} / {params.row.factoryGoodsName}</div>
+                    <div>{params.row.colorName || '-'} / {params.row.factoryGoodsName || '-'}</div>
                 );
             }
         },
@@ -151,7 +151,7 @@ let infoCols = function() {
             align: 'center',
             render: (h, params) => {
                 return (
-                    <div>{params.row.genderName} / {params.row.sizeName}</div>
+                    <div>{params.row.genderName || '-'} / {params.row.sizeName || '-'}</div>
                 );
             }
         },
@@ -160,7 +160,7 @@ let infoCols = function() {
             align: 'center',
             render: (h, params) => {
                 return (
-                    <div>{params.row.retailPrice} / {params.row.salesPrice}</div>
+                    <div>{params.row.retailPrice || '-'} / {params.row.salesPrice || '-'}</div>
                 );
             }
         },
@@ -176,8 +176,8 @@ let infoCols = function() {
             render: function(h, params) {
                 let percent = 0;
 
-                if (params.row.inStoreNum && params.row.totalNum) {
-                    percent = params.row.inStoreNum / params.row.totalNum;
+                if (params.row.inStoreNum && params.row.buyingNums) {
+                    percent = params.row.inStoreNum / params.row.buyingNums;
 
                     if (percent > 1) {
                         percent = 100;
@@ -190,7 +190,7 @@ let infoCols = function() {
                     <div>
                         <div><i-progress percent={ percent }
                                          hide-info={true}></i-progress></div>
-                        <div>{ params.row.inStoreNum || 0} / {params.row.totalNum || 0}</div>
+                        <div>{ params.row.inStoreNum || 0} / {params.row.buyingNums || 0}</div>
                     </div>
                 );
             },

@@ -96,7 +96,7 @@ const domains = {
 
 if (global.env.Test) {
     domains.erp = 'http://192.168.103.82:9098';
-    domains.platform = 'http://192.168.102.210:8088/platform';
+    domains.platform = 'http://192.168.102.202:8088/platform';
     domains.shop = 'http://192.168.102.211:30016';
 }