Merge tag 'Hotfix-mo-32' into develop

Finish Hotfix-mo-32

src/views/supply/engin/components/commerce_form.vue

@@ -430,7 +430,7 @@ export default {
       warehouseList: [],
       warehouseValue: '',
 
-      isFirst: true,
+      isFirst: false,
       salesmanList: [],
     }
   },
@@ -445,8 +445,11 @@ export default {
       if(this.goodsList && this.goodsList.length) {
         this.goodsList.forEach(item => {
           if(item.serviceId) {
-            let obj = this.salesmanList.find(o => o.adminUserId == item.serviceId);
-            list.push(obj);
+            let hasItem = findElem(list, 'adminUserId', item.serviceId);
+            if(hasItem < 0) {
+              let obj = this.salesmanList.find(o => o.adminUserId == item.serviceId);
+              list.push(obj);
+            }
           }
         })
         if(this.isFirst) {
@@ -469,6 +472,7 @@ export default {
     this.getWarehouseList();
 
     if(this.listItem) {
+      this.isFirst = true;
       this.editId = this.listItem.parentId;
       this.getDetail();
     }else {
@@ -668,6 +672,9 @@ export default {
             }),
           }
         })
+        this.goodsList.forEach(item => {
+          item.customerWalletId = (item.wallets && item.wallets.length) ? item.wallets[0].customerWalletId : '';
+        })
       })
     },
 

src/views/supply/engin/components/home_form.vue

@@ -441,6 +441,7 @@
 <script>
 import { getOrderDetail, getHomeLoginList, getHomeLoginDetail, getWarehouseList, addHome, editHome, submitHome, checkStock, getRetailProductList } from "@/api/supply/engin";
 import { getDictList, getTypeList, getSalesmanList } from '@/api/common'
+import { findElem } from '@/utils/util'
 
 let that
 export default {
@@ -542,7 +543,7 @@ export default {
 
       formLoading: false,
 
-      isFirst: true,
+      isFirst: false,
       salesmanList: [],
     }
   },
@@ -557,8 +558,11 @@ export default {
       if(this.goodsList && this.goodsList.length) {
         this.goodsList.forEach(item => {
           if(item.serviceId) {
-            let obj = this.salesmanList.find(o => o.adminUserId == item.serviceId);
-            list.push(obj);
+            let hasItem = findElem(list, 'adminUserId', item.serviceId);
+            if(hasItem < 0) {
+              let obj = this.salesmanList.find(o => o.adminUserId == item.serviceId);
+              list.push(obj);
+            }
           }
         })
         if(this.isFirst) {
@@ -582,6 +586,7 @@ export default {
     this.getWarehouseList();
 
     if(this.listItem) {
+      this.isFirst = true;
       this.editId = this.listItem.parentId;
       this.getDetail();
     }else {
@@ -759,6 +764,9 @@ export default {
             }),
           }
         })
+        this.goodsList.forEach(item => {
+          item.customerWalletId = (item.wallets && item.wallets.length) ? item.wallets[0].customerWalletId : '';
+        })
       })
     },
 
@@ -879,6 +887,7 @@ export default {
           item.rebateAmount = '';
           item.rebateRate = '';
           item.productPriceId = item.id;
+          item.customerWalletId = (item.wallets && item.wallets.length) ? item.wallets[0].customerWalletId : '';
         });
         this.leftGoodsList = res.data.records;
         this.listTotal = res.data.total;

src/views/supply/reserve/components/reserve_detail.vue

@@ -44,7 +44,7 @@
           show-summary
           :summary-method="$getSummaries">
           <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-          <el-table-column align="center" label="销售订单号" prop="orderId" min-width="180" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="180" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="订单日期" prop="orderTime" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">
               {{scope.row.orderTime | dateToDayFilter}}

src/views/supply/retail/components/retail_form.vue

@@ -290,6 +290,7 @@
 <script>
 import { getDetail, addData, editData, getSalesTypeList, getGoodsList, getWarehouseList, checkStock } from "@/api/supply/retail";
 import { getDictList, getSalesmanList } from '@/api/common'
+import { findElem } from '@/utils/util'
 
 let that
 export default {
@@ -355,7 +356,7 @@ export default {
       leftSelection: [],
       rightSelection: [],
 
-      isFirst: true,
+      isFirst: false,
       salesmanList: [],
     }
   },
@@ -370,8 +371,11 @@ export default {
       if(this.goodsList && this.goodsList.length) {
         this.goodsList.forEach(item => {
           if(item.serviceId) {
-            let obj = this.salesmanList.find(o => o.adminUserId == item.serviceId);
-            list.push(obj);
+            let hasItem = findElem(list, 'adminUserId', item.serviceId);
+            if(hasItem < 0) {
+              let obj = this.salesmanList.find(o => o.adminUserId == item.serviceId);
+              list.push(obj);
+            }
           }
         })
         if(this.isFirst) {
@@ -393,6 +397,7 @@ export default {
     this.getDictList();
     this.getWarehouseList();
     if(this.listItem) {
+      this.isFirst = true;
       this.getDetail();
     }else {
       this.mainForm.jxsNum = JSON.parse(localStorage.getItem("supply_user")).customerNumber;
@@ -502,6 +507,7 @@ export default {
           item.rebateAmount = '';
           item.rebateRate = '';
           item.productPriceId = item.id;
+          item.customerWalletId = (item.wallets && item.wallets.length) ? item.wallets[0].customerWalletId : '';
         });
         this.leftGoodsList = res.data.records;
         this.listTotal = res.data.total;