签章调整为允许修改签字注师

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

@@ -104,36 +104,44 @@
           <el-col v-if="inputForm.signatureType === '1'||inputForm.signatureType === '3' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
             <el-form-item label="签字注师1" prop="signatureAnnotator1"
                           :rules="[
+                          {required: true, message: '签字注师1不能为空', trigger: 'change'},
+                          {required: true, message: '签字注师1不能为空', trigger: 'blur'}
                    ]">
               <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-              <UserSelect size="medium" ref="userSelect1" :disabled="true" :readonly="true" :limit='1' :value="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
+              <UserSelect size="medium" ref="userSelect1"  :readonly="true" :limit='1' :value="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
             </el-form-item>
           </el-col>
 
           <el-col v-if="inputForm.signatureType === '1'||inputForm.signatureType === '3' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
             <el-form-item label="签字注师2" prop="signatureAnnotator2"
                           :rules="[
+                          {required: true, message: '签字注师2不能为空', trigger: 'change'},
+                          {required: true, message: '签字注师2不能为空', trigger: 'blur'}
                    ]">
               <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-              <UserSelect size="medium" ref="userSelect2" :disabled="true" :readonly="true" :limit='1' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+              <UserSelect size="medium" ref="userSelect2"  :readonly="true" :limit='1' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
             </el-form-item>
           </el-col>
 
           <el-col v-if="inputForm.signatureType === '2'" :span="12">
             <el-form-item label="签字注师1" prop="signatureAnnotator1"
                           :rules="[
+                          {required: true, message: '签字注师1不能为空', trigger: 'change'},
+                          {required: true, message: '签字注师1不能为空', trigger: 'blur'}
                    ]">
               <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-              <UserSelect  size="medium" ref="userSelect1" :disabled="true" :readonly="true" :limit='1' :value="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
+              <UserSelect  size="medium" ref="userSelect1"  :readonly="true" :limit='1' :value="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
             </el-form-item>
           </el-col>
 
           <el-col v-if="inputForm.signatureType === '2'" :span="12">
             <el-form-item label="签字注师2" prop="signatureAnnotator2"
                           :rules="[
+                          {required: true, message: '签字注师2不能为空', trigger: 'change'},
+                          {required: true, message: '签字注师2不能为空', trigger: 'blur'}
                    ]">
               <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-              <UserSelect  size="medium" ref="userSelect2" :disabled="true" :readonly="true" :limit='1' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+              <UserSelect  size="medium" ref="userSelect2"  :readonly="true" :limit='1' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -665,6 +673,23 @@
             this.$refs.userSelect1.clearSelectData()
             this.$forceUpdate()
           })
+        } else if (this.commonJS.isNotEmpty(this.inputForm.signatureAnnotator2) &&
+          this.inputForm.projectMasterId1 !== this.inputForm.signatureAnnotator2 &&
+          this.inputForm.projectMasterId2 !== this.inputForm.signatureAnnotator2 &&
+          this.inputForm.projectMasterId1 !== value &&
+          this.inputForm.projectMasterId2 !== value &&
+          this.commonJS.isNotEmpty(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 = ''
+            this.$refs.userSelect1.changeNameValue('')
+            this.$refs.userSelect1.clearSelectData()
+            this.$forceUpdate()
+          })
         } else {
           this.inputForm.signatureAnnotator1 = value
         }
@@ -678,6 +703,22 @@
             this.$refs.userSelect2.clearSelectData()
             this.$forceUpdate()
           })
+        } else if (this.commonJS.isNotEmpty(this.inputForm.signatureAnnotator1) &&
+          this.inputForm.projectMasterId1 !== this.inputForm.signatureAnnotator1 &&
+          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 = ''
+            this.$refs.userSelect2.changeNameValue('')
+            this.$refs.userSelect2.clearSelectData()
+            this.$forceUpdate()
+          })
         } else {
           this.inputForm.signatureAnnotator2 = value
         }
@@ -756,7 +797,9 @@
           procDefId: '',
           procDefKey: '',
           formTitle: '',
-          title: ''
+          title: '',
+          projectMasterId1: '',
+          projectMasterId2: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -1402,7 +1445,9 @@
           cwFileInfoList: [],
           reviewStatus: '',
           taskName: '',
-          realHeaderName: ''
+          realHeaderName: '',
+          projectMasterId1: '',
+          projectMasterId2: ''
         }
         // this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()