Merge tag 'Hotfix-mo-83' into develop

Finish Hotfix-mo-83

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

@@ -42,7 +42,7 @@
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">行业类别</div>
-              <div class="value">{{detailData.refPromiseStatus}}</div>
+              <div class="value">{{detailData.refTradeCategory}}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">跨区厂编号</div>
@@ -58,15 +58,19 @@
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">联系人</div>
-              <div class="value">{{detailData.aaa}}</div>
+              <div class="value">{{detailData.refLinkman}}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">固定电话</div>
-              <div class="value">{{detailData.aaa}}</div>
+              <div class="value">{{detailData.refTel}}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">移动电话</div>
-              <div class="value">{{detailData.aaa}}</div>
+              <div class="value">{{detailData.refPhone}}</div>
+            </el-col>
+            <el-col :span="24" class="item">
+              <div class="label">安装地址</div>
+              <div class="value">{{detailData.refInstallAddress}}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">不扣押金</div>

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

@@ -38,7 +38,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">行业类别</div>
-          <div class="value">{{detailData.refPromiseStatus}}</div>
+          <div class="value">{{detailData.refTradeCategory}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">跨区厂编号</div>
@@ -54,15 +54,19 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">联系人</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refLinkman}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">固定电话</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refTel}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">移动电话</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refPhone}}</div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">安装地址</div>
+          <div class="value">{{detailData.refInstallAddress}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">不扣押金</div>

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

@@ -398,7 +398,6 @@ export default {
         createDate: '',
         fileNum: '',
         salesMan: '',
-        tradeCategory: ''
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -568,7 +567,7 @@ export default {
         this.mainForm.jxsName = data.customerName;
         this.mainForm.enginNum = data.refEnginRecordNo;
         this.mainForm.enginName = data.refProjectName;
-        this.mainForm.loginType = data.refPromiseStatus;
+        this.mainForm.loginType = data.refTradeCategory;
         this.mainForm.factoryNum = data.refFactoryNo;
         this.mainForm.company = data.refUseUnit;
         this.mainForm.saleType = data.saleTypeId;
@@ -653,14 +652,13 @@ export default {
         // this.mainForm.type = data.mainId;
         this.mainForm.enginNum = data.enginInfoNo;
         this.mainForm.enginName = data.projectName;
-        this.mainForm.loginType = data.enginSignType;
+        this.mainForm.loginType = data.tradeCategory;
         this.mainForm.company = data.useUnit;
         this.mainForm.contactMan = data.linkman;
         this.mainForm.tel = data.tel;
         this.mainForm.phone = data.phone;
         this.mainForm.address = data.installAddress;
         this.mainForm.salesMan = data.serviceId;
-        this.mainForm.tradeCategory = data.tradeCategory;
 
         this.goodsList = data.items.map(item => {
           return {
@@ -799,9 +797,8 @@ export default {
             // mainId: this.mainForm.type || '',
             refEnginRecordNo: this.mainForm.enginNum || '',
             refProjectName: this.mainForm.enginName || '',
-            refPromiseStatus: this.mainForm.loginType || '',
+            refTradeCategory: this.mainForm.loginType || '',
             refFactoryNo: this.mainForm.factoryNum || '',
-            refTradeCategory: this.mainForm.tradeCategory || '',
             refUseUnit: this.mainForm.company || '',
             refLinkman: this.mainForm.contactMan || '',
             refTel: this.mainForm.tel || '',

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

@@ -38,7 +38,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">行业类别</div>
-          <div class="value">{{detailData.refPromiseStatus}}</div>
+          <div class="value">{{detailData.refTradeCategory}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">跨区厂编号</div>
@@ -54,15 +54,15 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">联系人</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refLinkman}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">固定电话</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refTel}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">移动电话</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refPhone}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">不扣押金</div>

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

@@ -42,7 +42,7 @@
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">行业类别</div>
-              <div class="value">{{detailData.refPromiseStatus}}</div>
+              <div class="value">{{detailData.refTradeCategory}}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">跨区厂编号</div>
@@ -58,15 +58,19 @@
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">联系人</div>
-              <div class="value">{{detailData.aaa}}</div>
+              <div class="value">{{detailData.refLinkman}}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">固定电话</div>
-              <div class="value">{{detailData.aaa}}</div>
+              <div class="value">{{detailData.refTel}}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">移动电话</div>
-              <div class="value">{{detailData.aaa}}</div>
+              <div class="value">{{detailData.refPhone}}</div>
+            </el-col>
+            <el-col :span="24" class="item">
+              <div class="label">安装地址</div>
+              <div class="value">{{detailData.refInstallAddress}}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">不扣押金</div>

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

@@ -38,7 +38,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">行业类别</div>
-          <div class="value">{{detailData.refPromiseStatus}}</div>
+          <div class="value">{{detailData.refTradeCategory}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">跨区厂编号</div>
@@ -58,15 +58,19 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">联系人</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refLinkman}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">固定电话</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refTel}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">移动电话</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refPhone}}</div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">安装地址</div>
+          <div class="value">{{detailData.refInstallAddress}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">不扣押金</div>

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

@@ -488,6 +488,7 @@ export default {
         loginNum: '',
         enginName: '',
         loginType: '',
+        promiseStatus: '',
         factoryNum: '',
         company: '',
         saleType: '',
@@ -506,7 +507,6 @@ export default {
         salesMan: '',
         projectRemark: '',
         projectType: '',
-        tradeCategory: ''
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -758,7 +758,8 @@ export default {
         // this.mainForm.saleType = '';
         this.mainForm.loginNum = data.recordNo;
         this.mainForm.enginName = data.projectName;
-        this.mainForm.loginType = data.promiseStatus;
+        this.mainForm.loginType = data.tradeCategory;
+        this.mainForm.promiseStatus = data.promiseStatus;
         this.mainForm.company = data.useUnit;
         this.mainForm.contactMan = data.buyUnitCallMen;
         this.mainForm.tel = data.buyUnitTel;
@@ -767,7 +768,6 @@ export default {
         this.mainForm.declareNo = data.declareNo;
         this.mainForm.projectRemark = data.buChonShuoMing;
         this.mainForm.projectType = data.govBuyType;
-        this.mainForm.tradeCategory = data.tradeCategory;
 
         let saleTypeItem = this.salesTypeList.find(o => o.id == this.mainForm.saleType);
 
@@ -863,7 +863,8 @@ export default {
         this.mainForm.jxsName = data.customerName;
         this.mainForm.loginNum = data.refEnginRecordNo;
         this.mainForm.enginName = data.refProjectName;
-        this.mainForm.loginType = data.refPromiseStatus;
+        this.mainForm.loginType = data.refTradeCategory;
+        this.mainForm.promiseStatus = data.refPromiseStatus;
         this.mainForm.factoryNum = data.refFactoryNo;
         this.mainForm.company = data.refUseUnit;
         this.mainForm.saleType = data.saleTypeId;
@@ -1109,7 +1110,8 @@ export default {
             loginUserId: this.mainForm.loginUserId,
             refEnginRecordNo: this.mainForm.loginNum || '',
             refProjectName: this.mainForm.enginName || '',
-            refPromiseStatus: this.mainForm.loginType || '',
+            refTradeCategory: this.mainForm.loginType || '',
+            refPromiseStatus: this.mainForm.promiseStatus || '',
             refFactoryNo: this.mainForm.factoryNum || '',
             refUseUnit: this.mainForm.company || '',
             refLinkman: this.mainForm.contactMan || '',
@@ -1128,7 +1130,6 @@ export default {
             serviceName: saleManItem.nickName,
             refProjectNote: this.mainForm.projectRemark,
             refProjectType: this.mainForm.projectType,
-            refTradeCategory: this.mainForm.tradeCategory,
             items: goodsList,
           }
 

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

@@ -38,7 +38,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">行业类别</div>
-          <div class="value">{{detailData.refPromiseStatus}}</div>
+          <div class="value">{{detailData.refTradeCategory}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">跨区厂编号</div>
@@ -54,15 +54,15 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">联系人</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refLinkman}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">固定电话</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refTel}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">移动电话</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refPhone}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">不扣押金</div>

src/views/supply/engin/home_list.vue

@@ -120,7 +120,6 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="工程编码" prop="refProjectNo" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="工程登录单号" prop="refEnginRecordNo" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="订单类型" prop="enginOrderType" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">

src/views/supply/pickup/check.vue

@@ -85,7 +85,11 @@
                 {{ scope.row.pickStatus == '1' ? '上午':'下午' }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="200" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.orderType == 'HOME' ? scope.row.mainOrderId : scope.row.enginOrderNo }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="发货申请单号" prop="invoiceId" min-width="180" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="120" show-overflow-tooltip></el-table-column>
             <!-- <el-table-column align="center" label="产品大类" prop="mainName" min-width="120" show-overflow-tooltip></el-table-column> -->