Merge tag 'Hotfix-mo-49' into develop

Finish Hotfix-mo-49

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

@@ -115,12 +115,22 @@
             <el-input v-model="mainForm.declareNo" placeholder="请输入第几次申报"></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="projectRemark">
+            <el-input v-model="mainForm.projectRemark" placeholder="请输入项目说明"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="项目类型" prop="projectType">
+            <el-input v-model="mainForm.projectType" placeholder="请输入项目类型"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="24" v-if="!isDealer">
           <el-form-item label="格力内部备注" prop="greeRemark">
             <el-input v-model="mainForm.greeRemark" placeholder="请输入格力内部备注"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="24" :lg="24">
+        <!-- <el-col :xs="24" :sm="24" :lg="24">
           <el-form-item label="格力回复" prop="greeReply">
             <el-input v-model="mainForm.greeReply" placeholder="请输入格力回复"></el-input>
           </el-form-item>
@@ -495,6 +505,8 @@ export default {
         fileNum: '',
         loginUserId: '',
         salesMan: '',
+        projectRemark: '',
+        projectType: '',
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -733,6 +745,8 @@ export default {
         this.mainForm.phone = data.buyUnitPhone;
         this.mainForm.address = data.installAddress;
         this.mainForm.declareNo = data.declareNo;
+        this.mainForm.projectRemark = data.buChonShuoMing;
+        this.mainForm.projectType = data.govBuyType;
 
         let saleTypeItem = this.salesTypeList.find(o => o.id == this.mainForm.saleType);
 
@@ -837,13 +851,15 @@ export default {
         this.mainForm.phone = data.refPhone;
         this.mainForm.address = data.refInstallAddress;
         this.mainForm.declareNo = data.refDeclareNo;
-        this.mainForm.greeRemark = data.note2;
+        this.mainForm.greeRemark = data.geLiInerNote;
         this.mainForm.greeReply = data.note1;
         this.mainForm.remark = data.remark;
         this.mainForm.createMan = data.createName;
         this.mainForm.createDate = data.createTime;
         this.mainForm.fileNum = data.fileNo;
         this.mainForm.salesMan = data.serviceId;
+        this.mainForm.projectRemark = data.refProjectNote;
+        this.mainForm.projectType = data.refProjectType;
 
         data.items.forEach(item => {
           item.status1 = '';
@@ -1083,12 +1099,14 @@ export default {
             saleTypeId: this.mainForm.saleType,
             saleTypeCode: saleTypeItem.saleCode,
             saleTypeName: saleTypeItem.saleName,
-            note2: this.mainForm.greeRemark || '',
+            geLiInerNote: this.mainForm.greeRemark || '',
             note1: this.mainForm.greeReply || '',
             remark: this.mainForm.remark || '',
             fileNo: this.mainForm.fileNum || '',
             serviceId: this.mainForm.salesMan,
             serviceName: saleManItem.nickName,
+            refProjectNote: this.mainForm.projectRemark,
+            refProjectType: this.mainForm.projectType,
             items: goodsList,
           }
 

src/views/supply/return/components/return_form.vue

@@ -394,7 +394,9 @@ export default {
             return {
               invoiceOrderId: item.invoiceOrderId,
               num: item.num,
-              remark: item.remark
+              remark: item.remark,
+              correspondId: item.correspondId,
+              correspondName: item.correspondName,
             }
           })
           let params = {