Merge tag 'Hotfix-mo-107' into develop

Finish Hotfix-mo-107

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

@@ -25,6 +25,18 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="业务员" prop="salesMan">
+            <el-select v-model="mainForm.salesMan" placeholder="选择业务员" size="small" filterable clearable style="width: 100%">
+              <el-option
+                v-for="item in salesmanList"
+                :key="item.adminUserId"
+                :label="item.nickName"
+                :value="item.adminUserId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <!-- <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="产品大类" prop="type">
             <el-select v-model="mainForm.type" placeholder="选择产品大类" style="width: 100%" disabled>
@@ -73,15 +85,8 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="业务员" prop="salesMan">
-            <el-select v-model="mainForm.salesMan" placeholder="选择业务员" size="small" filterable clearable style="width: 100%">
-              <el-option
-                v-for="item in salesmanList"
-                :key="item.adminUserId"
-                :label="item.nickName"
-                :value="item.adminUserId">
-              </el-option>
-            </el-select>
+          <el-form-item label="工程编号" prop="enginNum">
+            <el-input v-model="mainForm.enginNum" placeholder="请输入工程编号"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
@@ -388,6 +393,7 @@ export default {
         loginType: '',
         factoryNum: '',
         company: '',
+        enginNum: '',
         contactMan: '',
         tel: '',
         phone: '',
@@ -405,13 +411,14 @@ export default {
         jxsNum: [{ required: true, message: '请输入经销商编码', trigger: 'blur' }],
         jxsName: [{ required: true, message: '请输入经销商名称', trigger: 'blur' }],
         enginNum: [{ required: true, message: '请输入工程登录编号', trigger: 'blur' }],
-        enginName: [{ required: true, message: '请输入项目类别', trigger: 'blur' }],
-        loginType: [{ required: true, message: '请输入行业类别', trigger: 'blur' }],
+        // enginName: [{ required: true, message: '请输入项目类别', trigger: 'blur' }],
+        // loginType: [{ required: true, message: '请输入行业类别', trigger: 'blur' }],
         company: [{ required: true, message: '请输入使用单位', trigger: 'blur' }],
         // contactMan: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
         // tel: [{ required: true, message: '请输入固定电话', trigger: 'blur' }],
         // phone: [{ required: true, message: '请输入移动电话', trigger: 'blur' }],
         address: [{ required: true, message: '请输入安装地址', trigger: 'blur' }],
+        enginNum: [{ required: true, message: '请输入工程编号', trigger: 'blur' }],
       },
       // typeList: [],
       stockList: [],
@@ -572,6 +579,7 @@ export default {
         this.mainForm.loginType = data.refTradeCategory;
         this.mainForm.factoryNum = data.refFactoryNo;
         this.mainForm.company = data.refUseUnit;
+        this.mainForm.enginNum = data.projectNo;
         this.mainForm.saleType = data.saleTypeId;
         this.mainForm.contactMan = data.refLinkman;
         this.mainForm.tel = data.refTel;
@@ -656,6 +664,7 @@ export default {
         this.mainForm.enginName = data.projectName;
         this.mainForm.loginType = data.tradeCategory;
         this.mainForm.company = data.useUnit;
+        this.mainForm.enginNum = data.projectNo;
         this.mainForm.contactMan = data.linkman;
         this.mainForm.tel = data.tel;
         this.mainForm.phone = data.phone;
@@ -813,6 +822,7 @@ export default {
             refTradeCategory: this.mainForm.loginType || '',
             refFactoryNo: this.mainForm.factoryNum || '',
             refUseUnit: this.mainForm.company || '',
+            projectNo: this.mainForm.enginNum || '',
             refLinkman: this.mainForm.contactMan || '',
             refTel: this.mainForm.tel || '',
             refPhone: this.mainForm.phone || '',

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

@@ -49,8 +49,8 @@
           <div class="value">{{detailData.enginFactoryNo}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程登录类型</div>
-          <div class="value">{{detailData.enginSignType}}</div>
+          <div class="label">行业类别</div>
+          <div class="value">{{detailData.tradeCategory}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">联系人</div>

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

@@ -346,6 +346,7 @@ export default {
         jxsName: [{ required: true, message: '请输入经销商名称', trigger: 'blur' }],
         company: [{ required: true, message: '请输入使用单位', trigger: 'blur' }],
         address: [{ required: true, message: '请输入安装地址', trigger: 'blur' }],
+        enginNum: [{ required: true, message: '请输入工程编号', trigger: 'blur' }],
         loginType: [{ required: true, message: '请输入工程登录类型', trigger: 'blur' }],
       },
       loginTypeList: [
@@ -639,10 +640,6 @@ export default {
               this.$errorMsg('请选择产品');
               return;
             }
-            if(!this.goodsList[i].qty) {
-              this.$errorMsg('请输入数量');
-              return;
-            }
           }
 
           let goodsList = JSON.parse(JSON.stringify(this.goodsList));