财务-报告修改

src/views/modules/cw/reportManagement/ReportManagementAddForm.vue

@@ -630,10 +630,10 @@
           this.inputForm.projectMasterId1 !== value &&
           this.inputForm.projectMasterId2 !== value &&
           this.commonJS.isNotEmpty(value)) {
-          // console.log('this.inputForm.projectMasterId1', this.inputForm.projectMasterId1)
-          // console.log('this.inputForm.projectMasterId2', this.inputForm.projectMasterId2)
-          // console.log('this.inputForm.signatureAnnotator2', this.inputForm.signatureAnnotator2)
-          // console.log('this.inputForm.signatureAnnotator1', value)
+          console.log('项目经理1', this.inputForm.projectMasterId1)
+          console.log('项目经理2', this.inputForm.projectMasterId2)
+          console.log('签字注师2', this.inputForm.signatureAnnotator2)
+          console.log('签字注师1', value)
           this.$message.warning('签字注师1和签字注师2至少有一个与项目经理相同')
           this.$nextTick(() => {
             this.inputForm.signatureAnnotator1 = ''
@@ -659,6 +659,10 @@
           this.inputForm.projectMasterId2 !== this.inputForm.signatureAnnotator1 &&
           this.inputForm.projectMasterId1 !== value && this.commonJS.isNotEmpty(value) &&
           this.inputForm.projectMasterId2 !== value) {
+          console.log('项目经理1', this.inputForm.projectMasterId1)
+          console.log('项目经理2', this.inputForm.projectMasterId2)
+          console.log('签字注师1', this.inputForm.signatureAnnotator1)
+          console.log('签字注师2', value)
           this.$message.warning('签字注师1和签字注师2至少有一个与项目经理相同')
           this.$nextTick(() => {
             this.inputForm.signatureAnnotator2 = ''
@@ -779,7 +783,7 @@
         this.inputForm.projectId = row.id // 项目id
         this.inputForm.projectNumber = row.projectNumber // 项目编号
         this.inputForm.projectMasterName = row.projectMasterName // 项目经理
-        this.inputForm.projectMasterId = row.projectMasterId // 项目经理1id
+        this.inputForm.projectMasterId1 = row.projectMasterId // 项目经理1id
         this.inputForm.projectMasterId2 = row.realHeader // 项目经理2id
         this.clearClientList()
         this.$forceUpdate()

src/views/modules/cw/reportManagement/reportReview/ReportReviewForm.vue

@@ -510,20 +510,19 @@
                 <el-form-item label="关注或修改的事项" prop="needUpdate2"
                               :rules="[
                    ]">
-                  <el-input size="medium" type="textarea" v-model="inputForm.needUpdate2" placeholder="请填写二级复核需提请关注或修改的事项"></el-input>
+                  <el-input size="medium" :disabled="inputForm.taskName === '三级复核'" type="textarea" v-model="inputForm.needUpdate2" placeholder="请填写二级复核需提请关注或修改的事项"></el-input>
                 </el-form-item>
               </el-col>
               <el-col>
                 <el-form-item label="备注" prop="remark2"
                               :rules="[
                    ]">
-                  <el-input size="medium" type="textarea" v-model="inputForm.remark2" placeholder="请填写二级复核备注"></el-input>
+                  <el-input size="medium" :disabled="inputForm.taskName === '三级复核'"  type="textarea" v-model="inputForm.remark2" placeholder="请填写二级复核备注"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
-          <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''" v-if="this.inputForm.taskName === '三级复核'  || this.inputForm.reviewStatus === '5'
-                    || this.inputForm.taskName === '一级复核' || this.inputForm.reviewStatus === '4'"
+          <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''" v-if="this.inputForm.taskName === '三级复核'  || this.inputForm.reviewStatus === '5'"
                    label-width="135px" @submit.native.prevent>
             <el-divider content-position="left"><i class="el-icon-document"></i>三级复核</el-divider>
             <el-row :gutter="15" >