Merge tag 'Hotfix-mo-38' into develop

Finish Hotfix-mo-38

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

@@ -37,15 +37,15 @@
               <div class="value">{{detailData.refEnginRecordNo}}</div>
             </el-col>
             <el-col :span="8" class="item">
-              <div class="label">工程项目名称</div>
+              <div class="label">项目类别</div>
               <div class="value">{{detailData.refProjectName}}</div>
             </el-col>
             <el-col :span="8" class="item">
-              <div class="label">工程登录类型</div>
+              <div class="label">行业类别</div>
               <div class="value">{{detailData.refPromiseStatus}}</div>
             </el-col>
             <el-col :span="8" class="item">
-              <div class="label">厂工程编码</div>
+              <div class="label">跨区厂编号</div>
               <div class="value">{{detailData.refFactoryNo}}</div>
             </el-col>
             <el-col :span="8" class="item">

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

@@ -33,15 +33,15 @@
           <div class="value">{{detailData.refEnginRecordNo}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程项目名称</div>
+          <div class="label">项目类别</div>
           <div class="value">{{detailData.refProjectName}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程登录类型</div>
+          <div class="label">行业类别</div>
           <div class="value">{{detailData.refPromiseStatus}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">厂工程编码</div>
+          <div class="label">跨区厂编号</div>
           <div class="value">{{detailData.refFactoryNo}}</div>
         </el-col>
         <el-col :span="8" class="item">

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

@@ -53,18 +53,18 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="工程项目名称" prop="enginName">
-            <el-input v-model="mainForm.enginName" placeholder="请输入工程项目名称" disabled></el-input>
+          <el-form-item label="项目类别" prop="enginName">
+            <el-input v-model="mainForm.enginName" placeholder="请输入项目类别" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="工程登录类型" prop="loginType">
-            <el-input v-model="mainForm.loginType" placeholder="请输入工程登录类型" disabled></el-input>
+          <el-form-item label="行业类别" prop="loginType">
+            <el-input v-model="mainForm.loginType" placeholder="请输入行业类别" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="厂工程编码" prop="factoryNum">
-            <el-input v-model="mainForm.factoryNum" placeholder="请输入厂工程编码"></el-input>
+          <el-form-item label="跨区厂编号" prop="factoryNum">
+            <el-input v-model="mainForm.factoryNum" placeholder="请输入跨区厂编号"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
@@ -403,8 +403,8 @@ 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' }],

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

@@ -33,15 +33,15 @@
           <div class="value">{{detailData.refEnginRecordNo}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程项目名称</div>
+          <div class="label">项目类别</div>
           <div class="value">{{detailData.refProjectName}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程登录类型</div>
+          <div class="label">行业类别</div>
           <div class="value">{{detailData.refPromiseStatus}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">厂工程编码</div>
+          <div class="label">跨区厂编号</div>
           <div class="value">{{detailData.refFactoryNo}}</div>
         </el-col>
         <el-col :span="8" class="item">

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

@@ -37,15 +37,15 @@
               <div class="value">{{detailData.refEnginRecordNo}}</div>
             </el-col>
             <el-col :span="8" class="item">
-              <div class="label">工程项目名称</div>
+              <div class="label">项目类别</div>
               <div class="value">{{detailData.refProjectName}}</div>
             </el-col>
             <el-col :span="8" class="item">
-              <div class="label">工程登录类型</div>
+              <div class="label">行业类别</div>
               <div class="value">{{detailData.refPromiseStatus}}</div>
             </el-col>
             <el-col :span="8" class="item">
-              <div class="label">厂工程编码</div>
+              <div class="label">跨区厂编号</div>
               <div class="value">{{detailData.refFactoryNo}}</div>
             </el-col>
             <el-col :span="8" class="item">
@@ -88,10 +88,14 @@
               <div class="label">格力内部备注</div>
               <div class="value">{{detailData.note2}}</div>
             </el-col> -->
-            <el-col :span="24" class="item">
+            <el-col :span="16" class="item">
               <div class="label">备注</div>
               <div class="value">{{detailData.remark}}</div>
             </el-col>
+            <el-col :span="8" class="item">
+              <div class="label">第几次申报</div>
+              <div class="value">{{detailData.refDeclareNo}}</div>
+            </el-col>
             <el-col :span="6" class="item">
               <div class="label">制单人</div>
               <div class="value">{{detailData.createName}}</div>

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

@@ -33,15 +33,15 @@
           <div class="value">{{detailData.refEnginRecordNo}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程项目名称</div>
+          <div class="label">项目类别</div>
           <div class="value">{{detailData.refProjectName}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程登录类型</div>
+          <div class="label">行业类别</div>
           <div class="value">{{detailData.refPromiseStatus}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">厂工程编码</div>
+          <div class="label">跨区厂编号</div>
           <div class="value">{{detailData.refFactoryNo}}</div>
         </el-col>
         <el-col :span="8" class="item">
@@ -94,10 +94,14 @@
             <el-input v-model="detailData.note2" placeholder="请输入格力内部备注"></el-input>
           </div>
         </el-col> -->
-        <el-col :span="24" class="item">
+        <el-col :span="16" class="item">
           <div class="label">备注</div>
           <div class="value">{{detailData.remark}}</div>
         </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">第几次申报</div>
+          <div class="value">{{detailData.refDeclareNo}}</div>
+        </el-col>
         <el-col :span="6" class="item">
           <div class="label">制单人</div>
           <div class="value">{{detailData.createName}}</div>

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

@@ -59,18 +59,18 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="工程项目名称" prop="enginName">
-            <el-input v-model="mainForm.enginName" placeholder="请输入工程项目名称" disabled></el-input>
+          <el-form-item label="项目类别" prop="enginName">
+            <el-input v-model="mainForm.enginName" placeholder="请输入项目类别" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="工程登录类型" prop="loginType">
-            <el-input v-model="mainForm.loginType" placeholder="请输入工程登录类型" disabled></el-input>
+          <el-form-item label="行业类别" prop="loginType">
+            <el-input v-model="mainForm.loginType" placeholder="请输入行业类别" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="厂工程编码" prop="factoryNum">
-            <el-input v-model="mainForm.factoryNum" placeholder="请输入厂工程编码"></el-input>
+          <el-form-item label="跨区厂编号" prop="factoryNum">
+            <el-input v-model="mainForm.factoryNum" placeholder="请输入跨区厂编号"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
@@ -105,11 +105,16 @@
             <el-input v-model="mainForm.phone" placeholder="请输入移动电话" disabled></el-input>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="24" :lg="24">
+        <el-col :xs="24" :sm="12" :lg="16">
           <el-form-item label="安装地址" prop="address">
             <el-input v-model="mainForm.address" placeholder="请输入安装地址" disabled></el-input>
           </el-form-item>
         </el-col>
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="第几次申报" prop="declareNo">
+            <el-input v-model="mainForm.declareNo" placeholder="请输入第几次申报"></el-input>
+          </el-form-item>
+        </el-col>
         <!-- <el-col :xs="24" :sm="24" :lg="24">
           <el-form-item label="格力内部备注" prop="greeRemark">
             <el-input v-model="mainForm.greeRemark" placeholder="请输入格力内部备注"></el-input>
@@ -481,6 +486,7 @@ export default {
         tel: '',
         phone: '',
         address: '',
+        declareNo: '',
         greeRemark: '',
         greeReply: '',
         remark: '',
@@ -495,8 +501,8 @@ export default {
         jxsNum: [{ required: true, message: '请输入经销商编码', trigger: 'blur' }],
         jxsName: [{ required: true, message: '请输入经销商名称', trigger: 'blur' }],
         loginNum: [{ 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' }],
         saleType: [{ required: true, message: '请选择销售类型', trigger: 'change' }],
         // contactMan: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
@@ -726,6 +732,7 @@ export default {
         this.mainForm.tel = data.buyUnitTel;
         this.mainForm.phone = data.buyUnitPhone;
         this.mainForm.address = data.installAddress;
+        this.mainForm.declareNo = data.declareNo;
 
         let saleTypeItem = this.salesTypeList.find(o => o.id == this.mainForm.saleType);
 
@@ -827,6 +834,7 @@ export default {
         this.mainForm.tel = data.refTel;
         this.mainForm.phone = data.refPhone;
         this.mainForm.address = data.refInstallAddress;
+        this.mainForm.declareNo = data.refDeclareNo;
         this.mainForm.greeRemark = data.note2;
         this.mainForm.greeReply = data.note1;
         this.mainForm.remark = data.remark;
@@ -1068,6 +1076,7 @@ export default {
             refTel: this.mainForm.tel || '',
             refPhone: this.mainForm.phone || '',
             refInstallAddress: this.mainForm.address || '',
+            refDeclareNo: this.mainForm.declareNo || '',
             saleTypeId: this.mainForm.saleType,
             saleTypeCode: saleTypeItem.saleCode,
             saleTypeName: saleTypeItem.saleName,

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

@@ -33,15 +33,15 @@
           <div class="value">{{detailData.refEnginRecordNo}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程项目名称</div>
+          <div class="label">项目类别</div>
           <div class="value">{{detailData.refProjectName}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程登录类型</div>
+          <div class="label">行业类别</div>
           <div class="value">{{detailData.refPromiseStatus}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">厂工程编码</div>
+          <div class="label">跨区厂编号</div>
           <div class="value">{{detailData.refFactoryNo}}</div>
         </el-col>
         <el-col :span="8" class="item">
@@ -76,18 +76,22 @@
           <div class="label">业务员</div>
           <div class="value">{{detailData.serviceName}}</div>
         </el-col>
-        <el-col :span="24" class="item">
+        <!-- <el-col :span="24" class="item">
           <div class="label">格力回复</div>
           <div class="value">{{detailData.note1}}</div>
         </el-col>
-        <!-- <el-col :span="24" class="item">
+        <el-col :span="24" class="item">
           <div class="label">格力内部备注</div>
           <div class="value">{{detailData.note2}}</div>
-        </el-col>
-        <el-col :span="24" class="item">
+        </el-col> -->
+        <el-col :span="16" class="item">
           <div class="label">备注</div>
           <div class="value">{{detailData.remark}}</div>
-        </el-col> -->
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">第几次申报</div>
+          <div class="value">{{detailData.refDeclareNo}}</div>
+        </el-col>
         <el-col :span="6" class="item">
           <div class="label">制单人</div>
           <div class="value">{{detailData.createName}}</div>