Finish Hotfix-mo-116

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/pickup/components/pickup_print.vue

@@ -1,13 +1,14 @@
 <template>
   <div class="detail-container">
-    <div class="top-container">
+    <!-- <div class="top-container">
       <el-radio-group v-model="currentType" size="medium" @change="changeType()">
         <el-radio-button v-for="(item, index) in typeList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
       </el-radio-group>
-    </div>
+    </div> -->
 
     <div id="printMe">
       
+      <PrintCommon :detailData="detailData" :company="company" v-if="currentType === 0" />
       <PrintFoshan :detailData="detailData" :company="company" v-if="currentType === 1" />
       <PrintGuangzhou :detailData="detailData" :company="company" v-if="currentType === 2" />
       <PrintShaoguan :detailData="detailData" :company="company" v-if="currentType === 3" />
@@ -28,6 +29,7 @@
 import print from 'vue-print-nb'
 import { getDetail, addPrint } from "@/api/supply/pickup";
 import { getCompanyList } from "@/api/user";
+import PrintCommon from "@/components/Common/print-common";
 import PrintFoshan from "@/components/Common/print-foshan";
 import PrintGuangzhou from "@/components/Common/print-guangzhou";
 import PrintShaoguan from "@/components/Common/print-shaoguan";
@@ -40,14 +42,16 @@ export default {
     PrintFoshan,
     PrintGuangzhou,
     PrintShaoguan,
+    PrintCommon,
   },
   directives: {
     print
   },
   data() {
     return {
-      currentType: 1,
+      currentType: 0,
       typeList: [
+        { label: '通用', value: 0 },
         { label: '佛山', value: 1 },
         { label: '广州', value: 2 },
         { label: '韶关', value: 3 },

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>