Finish Hotfix-mo-130

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

@@ -122,6 +122,11 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
+        <el-col :xs="24" :sm="24" :lg="24" v-if="mainForm.examineRemark">
+          <el-form-item label="审批说明" prop="examineRemark">
+            <el-input v-model="mainForm.examineRemark" placeholder="请输入审批说明" disabled></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
 
@@ -331,6 +336,7 @@ export default {
         remark: '',
         createMan: '',
         createDate: '',
+        examineRemark: '',
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -417,7 +423,7 @@ export default {
         this.mainForm.orderDate = data.orderTime.slice(0, 10);
         this.mainForm.jxsNum = data.customerNumber;
         this.mainForm.jxsName = data.customerName;
-        this.mainForm.loginNum = data.enginOrderNo;
+        this.mainForm.loginNum = data.refEnginRecordNo;
         this.mainForm.enginName = data.refProjectName;
         this.mainForm.loginType = data.enginOrderType;
         this.mainForm.factoryNum = data.refFactoryNo;
@@ -430,6 +436,7 @@ export default {
         this.mainForm.createMan = data.createBy;
         this.mainForm.createDate = data.createTime;
         this.mainForm.remark = data.remark;
+        this.mainForm.examineRemark = data.approvalRemark;
         this.screenForm.warehouse = data.correspondId;
         this.fileList = data.fileUrl ? [{
           url: data.fileUrl,

src/views/supply/apply/engin_list.vue

@@ -85,8 +85,18 @@
                 <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单号"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="工程登录编号" prop="refEnginRecordNo">
+                <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入工程登录编号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="使用单位" prop="refUseUnit">
+                <el-input v-model="screenForm.refUseUnit" placeholder="请输入使用单位"></el-input>
+              </el-form-item>
+            </el-col>
             
-            <el-col :xs="24" :sm="24" :lg="12" class="tr">
+            <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -352,6 +362,8 @@ export default {
         salesMan: '',
         orderType: '',
         mainOrderId: '',
+        refEnginRecordNo: '',
+        refUseUnit: '',
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -397,6 +409,8 @@ export default {
         serviceId: this.screenForm.salesMan,
         type: this.screenForm.orderType,
         mainOrderId: this.screenForm.mainOrderId,
+        refEnginRecordNo: this.screenForm.refEnginRecordNo,
+        refUseUnit: this.screenForm.refUseUnit,
       }
     },
   },
@@ -442,6 +456,8 @@ export default {
         serviceId: this.screenForm.salesMan,
         type: this.screenForm.orderType,
         mainOrderId: this.screenForm.mainOrderId,
+        refEnginRecordNo: this.screenForm.refEnginRecordNo,
+        refUseUnit: this.screenForm.refUseUnit,
       };
       getEnginList(params).then((res) => {
         res.data.records.forEach(item => {