【修改】bug

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

@@ -766,8 +766,12 @@ export default {
       if(this.goodsList[index].customerWalletId) {
         let obj = this.goodsList[index].wallets.find(o => o.customerWalletId == this.goodsList[index].customerWalletId);
         this.goodsList[index].customerWalletName = obj.customerWalletName;
+        this.goodsList[index].serviceId = obj.serviceId;
+        this.goodsList[index].serviceName = obj.serviceName;
       }else {
         this.goodsList[index].customerWalletName = '';
+        this.goodsList[index].serviceId = '';
+        this.goodsList[index].serviceName = '';
       }
     },
 
@@ -860,7 +864,7 @@ export default {
             remark: this.mainForm.remark || '',
             fileNo: this.mainForm.fileNum || '',
             serviceId: this.mainForm.salesMan,
-            serviceName: saleManItem.nickName,
+            serviceName: saleManItem ? saleManItem.nickName : goodsList[0].serviceName,
             powerCategory: this.mainForm.power,
             items: goodsList,
           }

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

@@ -852,8 +852,12 @@ export default {
       if(this.goodsList[index].customerWalletId) {
         let obj = this.goodsList[index].wallets.find(o => o.customerWalletId == this.goodsList[index].customerWalletId);
         this.goodsList[index].customerWalletName = obj.customerWalletName;
+        this.goodsList[index].serviceId = obj.serviceId;
+        this.goodsList[index].serviceName = obj.serviceName;
       }else {
         this.goodsList[index].customerWalletName = '';
+        this.goodsList[index].serviceId = '';
+        this.goodsList[index].serviceName = '';
       }
     },
 
@@ -1136,7 +1140,7 @@ export default {
             remark: this.mainForm.remark || '',
             fileNo: this.mainForm.fileNum || '',
             serviceId: this.mainForm.salesMan,
-            serviceName: saleManItem.nickName,
+            serviceName: saleManItem ? saleManItem.nickName : goodsList[0].serviceName,
             refProjectNote: this.mainForm.projectRemark,
             refProjectType: this.mainForm.projectType,
             items: goodsList,

src/views/supply/reserve/reserve_list.vue

@@ -157,8 +157,8 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="原预留数量" prop="oldNum" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="预留数量" prop="reservedNum" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="预约数量" prop="oldNum" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="可发货数量" prop="reservedNum" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="开单数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="预留仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>