签章流程调整

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

@@ -89,7 +89,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col v-if="inputForm.signatureType === '1' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
+          <el-col v-if="inputForm.signatureType === '1' || inputForm.signatureType === '3' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
             <el-form-item label="签字注师1" prop="signatureAnnotator1"
                           :rules="[
                    ]">
@@ -98,7 +98,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col v-if="inputForm.signatureType === '1' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
+          <el-col v-if="inputForm.signatureType === '1' || inputForm.signatureType === '3' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
             <el-form-item label="签字注师2" prop="signatureAnnotator2"
                           :rules="[
                    ]">
@@ -597,6 +597,7 @@
             this.inputForm.realCreate = JSON.parse(localStorage.getItem('user')).id
           }
           this.$refs.archiveFile.clearUpload()
+          this.$refs.archiveFile.newUpload(this.method, [], 'cwProjectReport', null, null, null, null, false)
           // this.$refs.inputForm.resetFields()
           // this.loading = true
           /* this.projectReportService.queryById(this.inputForm.id).then(({data}) => {
@@ -724,6 +725,7 @@
                   this.projectReportService.saveForm(this.inputForm).then(({data}) => {
                     callback(data.businessTable, data.businessId, this.inputForm)
                     this.close()
+                    this.$emit('refreshList')
                     this.loading = false
                   }).catch(() => {
                     this.close()

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

@@ -87,7 +87,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col v-if="inputForm.signatureType === '1' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
+              <el-col v-if="inputForm.signatureType === '1' || inputForm.signatureType === '3' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
                 <el-form-item label="签字注师1" prop="signatureAnnotator1"
                               :rules="[
                    ]">
@@ -96,7 +96,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col v-if="inputForm.signatureType === '1' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
+              <el-col v-if="inputForm.signatureType === '1' || inputForm.signatureType === '3' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
                 <el-form-item label="签字注师2" prop="signatureAnnotator2"
                               :rules="[
                    ]">
@@ -111,7 +111,7 @@
                               {required: true, message:'签字注师1不能为空', trigger:'blur'}
                    ]">
                   <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-                  <UserSelect size="medium" ref="userSelect1" :disabled="method === 'view'" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
+                  <UserSelect size="medium" ref="userSelect1" :disabled="method === 'view'" :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">
@@ -120,7 +120,7 @@
                               {required: true, message:'签字注师2不能为空', trigger:'blur'}
                    ]">
                   <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-                  <UserSelect size="medium" ref="userSelect2" :disabled="method === 'view'" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+                  <UserSelect size="medium" ref="userSelect2" :disabled="method === 'view'" :readonly="true" :limit='1' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -950,6 +950,7 @@
             // callback(data.businessTable, data.businessId, this.inputForm)
             this.close()
             this.loading = false
+            this.$emit('refreshList')
           }).catch(() => {
             this.loading = false
           })
@@ -1178,6 +1179,34 @@
           // console.log('list.length', list.length)
           // console.log(list)
         })
+      },
+      // 签字注师1改变事件
+      changeSignatory1 (value) {
+        if (this.inputForm.signatureAnnotator2 === value && this.commonJS.isNotEmpty(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
+        }
+      },
+      // 签字注师2改变事件
+      changeSignatory2 (value) {
+        if (this.inputForm.signatureAnnotator1 === value && this.commonJS.isNotEmpty(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
+        }
       }
     }
   }

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

@@ -128,6 +128,10 @@
                           :type="$dictUtils.getDictLabel('cw_project_report_sign_status_flag', scope.row.status2, '-')">
                 {{$dictUtils.getDictLabel("cw_project_report_sign_status", scope.row.status2, '-')}}
               </el-button>
+              <el-button v-if="scope.row.signatureType === '3'" type="text" @click="detailS3(scope.row)" effect="dark" size="mini"
+                         :type="$dictUtils.getDictLabel('cw_status_flag', scope.row.status3, '-')">
+                {{$dictUtils.getDictLabel("cw_status", scope.row.status3, '-')}}
+              </el-button>
             </template>
           </vxe-column>
 
@@ -142,10 +146,13 @@
               <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5'&& (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === '4' || scope.row.reviewStatus === undefined)" type="text" size="small" @click="pushF(scope.row)">复核</el-button>
               <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5'&& scope.row.reviewStatus === '2'" type="text" size="small" @click="rebackF(scope.row)">撤回复核申请</el-button>
 <!--              公章流程-->
-              <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5' && scope.row.signatureType === '1' && (scope.row.status1 === '0' || scope.row.status1 === '3' || scope.row.status1 === '4')" type="text" size="small" @click="pushS(scope.row)">公章</el-button>
+              <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5' && scope.row.signatureType === '1' && (scope.row.status1 === '0' || scope.row.status1 === '3')" type="text" size="small" @click="pushS(scope.row)">公章</el-button>
               <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5' && scope.row.signatureType === '1' && scope.row.status1 === '2'" type="text" size="small" @click="rebackS(scope.row)">撤回签章申请</el-button>
+<!--              实体章流程-->
+              <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5' && scope.row.signatureType === '3' && (scope.row.status3 === '0' || scope.row.status3 === '3')" type="text" size="small" @click="pushS3(scope.row)">实体章</el-button>
+              <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5' && scope.row.signatureType === '3' && scope.row.status3 === '2'" type="text" size="small" @click="rebackS3(scope.row)">撤回签章申请</el-button>
 <!--              公章+执业章流程-->
-              <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5' && scope.row.signatureType === '2' && (scope.row.status2 === '0' || scope.row.status2 === '3' || scope.row.status2 === '4')" type="text" size="small" @click="pushS2(scope.row)">公章+执业章</el-button>
+              <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5' && scope.row.signatureType === '2' && (scope.row.status2 === '0' || scope.row.status2 === '3')" type="text" size="small" @click="pushS2(scope.row)">公章+执业章</el-button>
               <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5' && scope.row.signatureType === '2' && (scope.row.status2 === '2' || scope.row.status2 === '6' || scope.row.status2 === '7')" type="text" size="small" @click="rebackS2(scope.row)">撤回签章申请</el-button>
             </template>
           </vxe-column>
@@ -162,8 +169,8 @@
         </vxe-pager>
       </div>
     </div>
-    <ReportManagementForm ref="reportManagementForm"></ReportManagementForm>
-    <ReportManagementAddForm ref="reportManagementAddForm"></ReportManagementAddForm>
+    <ReportManagementForm ref="reportManagementForm" @refreshList="refreshList"></ReportManagementForm>
+    <ReportManagementAddForm ref="reportManagementAddForm" @refreshList="refreshList"></ReportManagementAddForm>
   </div>
 </template>
 
@@ -547,17 +554,18 @@
         let title = `发起流程【报告签章-公章】`
         let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[报告签章-公章]`
         let status = 'startAndClose'
-        if (row.status1 === '3' || row.status1 === '4') {
+        if (row.status1 === '3') {
           status = 'startAndClose'
+        } else if (row.status1 === '4') {
+          status = 'reapplyFlag'
         }
         this.taskService.getTaskDef({ procDefId: this.processDefinitionSId,
           businessId: row.sid1,
           businessTable: 'cw_project_report_signature'}).then((data) => {
-            // console.log('row', row)
-            // console.log('rowid', row.sid1)
             this.$router.push({
               path: '/flowable/task/TaskForm',
               query: {
+                ...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 procDefId: this.processDefinitionSId,
                 procDefKey: this.procDefSKey,
                 title: title,
@@ -573,6 +581,38 @@
             })
           })
       },
+      pushS3 (row) {
+        // 读取流程表单
+        let title = `发起流程【报告签章-实体章】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[报告签章-实体章]`
+        let status = 'startAndClose'
+        if (row.status3 === '3') {
+          status = 'startAndClose'
+        } else if (row.status3 === '4') {
+          status = 'reapplyFlag'
+        }
+        this.taskService.getTaskDef({ procDefId: this.processDefinitionSId,
+          businessId: row.sid3,
+          businessTable: 'cw_project_report_signature'}).then((data) => {
+            this.$router.push({
+              path: '/flowable/task/TaskForm',
+              query: {
+                ...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+                procDefId: this.processDefinitionSId,
+                procDefKey: this.procDefSKey,
+                title: title,
+                formType: data.data.formType,
+                formUrl: data.data.formUrl,
+                formTitle: processTitle,
+                businessTable: 'cw_project_report_signature',
+                businessId: row.sid3,
+                isShow: 'false',
+                status: status,
+                routePath: '/cw/reportManagement/ReportManagementList'
+              }
+            })
+          })
+      },
       // 查看报告签章-公章流程结果
       detailS (row) {
         if (row.status1 !== '0' && row.status1 !== '1') {
@@ -584,13 +624,36 @@
             this.$router.push({
               path: '/flowable/task/TaskFormDetail',
               query: {
+                ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 isShow: 'false',
                 readOnly: true,
                 title: '报告签章-公章' + '流程详情',
                 formTitle: '报告签章-公章' + '流程详情',
                 businessId: row.sid1,
-                status: 'reback',
-                ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'title', 'businessId')
+                status: 'reback'
+              }
+            })
+          })
+        }
+      },
+      // 查看报告签章-实体章流程结果
+      detailS3 (row) {
+        if (row.status3 !== '0' && row.status3 !== '1') {
+          // eslint-disable-next-line eqeqeq
+          this.taskService.getTaskDef({
+            procInsId: row.procInsIds3,
+            procDefId: this.processDefinitionSId
+          }).then(({data}) => {
+            this.$router.push({
+              path: '/flowable/task/TaskFormDetail',
+              query: {
+                ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+                isShow: 'false',
+                readOnly: true,
+                title: '报告签章-实体章' + '流程详情',
+                formTitle: '报告签章-实体章' + '流程详情',
+                businessId: row.sid3,
+                status: 'reback'
               }
             })
           })
@@ -640,14 +703,38 @@
           })
         })
       },
+      // 撤回报告签章-实体章的申请流程
+      rebackS3 (row) {
+        this.$confirm(`确定要撤回该申请吗?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async () => {
+          await this.projectReportService.findBySignatureId(row.sid3).then(({data}) => {
+            if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+              this.$message.error('数据已发生改变或不存在，请刷新数据')
+              this.refreshList()
+            } else {
+              this.processService.revokeProcIns(row.procInsIds3).then(({data}) => {
+                let form = {status: '3', id: row.sid3}
+                this.projectReportService.updateSignatureStatusById(form)
+                this.$message.success(data)
+                this.refreshList()
+              })
+            }
+          })
+        })
+      },
       // 发起报告签章-公章+执业章流程
       pushS2 (row) {
         // 读取流程表单
         let title = `发起流程【报告签章-公章+执业章】`
         let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[报告签章-公章+执业章]`
         let status = 'startAndClose'
-        if (row.status2 === '3' || row.status2 === '4') {
+        if (row.status2 === '3') {
           status = 'startAndClose'
+        } else if (row.status2 === '4') {
+          status = 'reapplyFlag'
         }
         this.taskService.getTaskDef({ procDefId: this.processDefinitionSId2,
           businessId: row.sid2,
@@ -655,6 +742,7 @@
             this.$router.push({
               path: '/flowable/task/TaskForm',
               query: {
+                ...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 procDefId: this.processDefinitionSId2,
                 procDefKey: this.procDefSKey2,
                 title: title,
@@ -681,13 +769,13 @@
             this.$router.push({
               path: '/flowable/task/TaskFormDetail',
               query: {
+                ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 isShow: 'false',
                 readOnly: true,
                 title: '报告签章-公章+执业章' + '流程详情',
                 formTitle: '报告签章-公章+执业章' + '流程详情',
                 businessId: row.sid2,
-                status: 'reback',
-                ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'title', 'businessId')
+                status: 'reback'
               }
             })
           })

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

@@ -309,6 +309,7 @@
           status: '',
           status1: '',
           status2: '',
+          status3: '',
           realCreate: ''
         },
         keyWatch: '',
@@ -330,6 +331,10 @@
       // 页面关闭（路由跳转）时清除定时器
       clearInterval(this.interVal)
     },
+    destroy () {
+      // 页面关闭（路由跳转）时清除定时器
+      clearInterval(this.interVal)
+    },
     computed: {
       bus: {
         get () {
@@ -429,9 +434,11 @@
           status: '',
           status1: '',
           status2: '',
+          status3: '',
           realCreate: '',
           sid1: '',
           sid2: '',
+          sid3: '',
           signatureContractId: ''
         }
         this.inputForm.id = id
@@ -454,13 +461,24 @@
             if (this.commonJS.isEmpty(this.inputForm.realCreate)) {
               this.inputForm.realCreate = JSON.parse(localStorage.getItem('user')).id
             }
-            if (this.commonJS.isNotEmpty(this.inputForm.signatureContractId) && this.status === 'audit') {
+            let sFiles = ''
+            if (this.commonJS.isNotEmpty(data.cwFileInfoList)) {
+              // debugger
+              sFiles = data.cwFileInfoList.map(file => {
+                if (this.commonJS.isNotEmpty(file.sealType)) {
+                  if (file.sealType === '1') {
+                    return file.sealType
+                  }
+                }
+              }).join(',')
+            }
+            if (this.commonJS.isNotEmpty(this.inputForm.signatureContractId) && this.status === 'audit' && this.commonJS.isNotEmpty(sFiles) && this.inputForm.signatureType !== '3') {
               this.$refs.archiveFile.newUpload('view', data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false, 'audit')
             } else {
               this.$refs.archiveFile.newUpload('view', data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
             }
             this.loading = false
-            if (this.status === 'audit') {
+            if (this.status === 'audit' && this.commonJS.isNotEmpty(sFiles) && this.inputForm.signatureType !== '3') {
               this.$emit('callBackFunc', 'hide')
               this.jobScheduler()
             }
@@ -494,7 +512,6 @@
         this.doSubmit('save', callback)
       },
       startForm (callback) {
-        // this.doSubmit('start', callback)
         this.loading = true
         this.projectReportService.saveData(this.inputForm).then(({data}) => {
           if (this.inputForm.signatureType === '2') {
@@ -508,6 +525,38 @@
           throw new Error('流程发起失败')
         })
       },
+      reapplyForm (callback) {
+        if (this.inputForm.signatureType === '1') {
+          this.projectReportService.findBySignatureId(this.inputForm.sid1).then(({data}) => {
+            if (data.status !== '4') { // 审核状态不是“驳回”，就弹出提示
+              this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+              throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+            } else {
+              this.startForm(callback)
+            }
+          })
+        }
+        if (this.inputForm.signatureType === '2') {
+          this.projectReportService.findBySignatureId(this.inputForm.sid2).then(({data}) => {
+            if (data.status !== '4') { // 审核状态不是“驳回”，就弹出提示
+              this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+              throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+            } else {
+              this.startForm(callback)
+            }
+          })
+        }
+        if (this.inputForm.signatureType === '3') {
+          this.projectReportService.findBySignatureId(this.inputForm.sid3).then(({data}) => {
+            if (data.status !== '4') { // 审核状态不是“驳回”，就弹出提示
+              this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+              throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+            } else {
+              this.startForm(callback)
+            }
+          })
+        }
+      },
       async agreeForm (callback) {
         if (this.inputForm.signatureType === '1') {
           this.projectReportService.findBySignatureId(this.inputForm.sid1).then(({data}) => {
@@ -522,6 +571,19 @@
             }
           })
         }
+        if (this.inputForm.signatureType === '3') {
+          this.projectReportService.findBySignatureId(this.inputForm.sid3).then(({data}) => {
+            if (data.status !== '2') { // status的值不等于“审核中”就弹出提示
+              this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+              throw new Error()
+            } else {
+              let param = {status: '5', id: this.inputForm.sid3}
+              this.projectReportService.updateSignatureStatusById(param)
+              let table = 'cw_project_report_signature'
+              callback(table, this.inputForm.sid3, this.inputForm)
+            }
+          })
+        }
         if (this.inputForm.signatureType === '2') {
           this.projectReportService.findBySignatureId(this.inputForm.sid2).then(({data}) => {
             if (data.status !== this.inputForm.status2) { // status的值不等于“审核中”就弹出提示
@@ -552,7 +614,7 @@
           })
         }
       },
-      async updateStatusById (type) {
+      async updateStatusById (type, callback) {
         if (await this.$refs.archiveFile.checkProgress()) {
           this.loading = false
           throw new Error()
@@ -567,12 +629,39 @@
                   if (type === 'reject') {
                     // 驳回
                     let param = {status: '4', id: data.id}
-                    this.projectReportService.updateSignatureStatusById(param)
+                    this.projectReportService.updateSignatureStatusById(param).then(() => {
+                      callback()
+                    })
                   }
                   if (type === 'reback') {
                     // 撤回
                     let param = {status: '3', id: data.id}
-                    this.projectReportService.updateSignatureStatusById(param)
+                    this.projectReportService.updateSignatureStatusById(param).then(() => {
+                      callback()
+                    })
+                  }
+                }
+              })
+            }
+            if (this.inputForm.signatureType === '3') {
+              await this.projectReportService.findBySignatureId(this.inputForm.sid3).then(({data}) => {
+                if (data.status !== this.inputForm.status3) { // status的值不等于“审核中”就弹出提示
+                  this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+                  throw new Error()
+                } else {
+                  if (type === 'reject') {
+                    // 驳回
+                    let param = {status: '4', id: data.id}
+                    this.projectReportService.updateSignatureStatusById(param).then(() => {
+                      callback()
+                    })
+                  }
+                  if (type === 'reback') {
+                    // 撤回
+                    let param = {status: '3', id: data.id}
+                    this.projectReportService.updateSignatureStatusById(param).then(() => {
+                      callback()
+                    })
                   }
                 }
               })
@@ -586,16 +675,63 @@
                   if (type === 'reject') {
                     // 驳回
                     let param = {status: '4', id: data.id}
-                    this.projectReportService.updateSignatureStatusById(param)
+                    this.projectReportService.updateSignatureStatusById(param).then(() => {
+                      callback()
+                    })
                   }
                   if (type === 'reback') {
                     // 撤回
                     let param = {status: '3', id: data.id}
-                    this.projectReportService.updateSignatureStatusById(param)
+                    this.projectReportService.updateSignatureStatusById(param).then(() => {
+                      callback()
+                    })
                   }
                 }
               })
             }
+          } else if (type === 'hold') {
+            if (this.inputForm.signatureType === '1') {
+              this.projectReportService.findBySignatureId(this.inputForm.sid1).then(({data}) => {
+                if (data.status !== '4') { // status的值不等于“驳回”就弹出提示
+                  this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+                  throw new Error()
+                } else {
+                  // 终止
+                  let param = {status: '0', id: data.id}
+                  this.projectReportService.updateSignatureStatusById(param).then(() => {
+                    callback()
+                  })
+                }
+              })
+            }
+            if (this.inputForm.signatureType === '3') {
+              this.projectReportService.findBySignatureId(this.inputForm.sid3).then(({data}) => {
+                if (data.status !== '4') { // status的值不等于“驳回”就弹出提示
+                  this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+                  throw new Error()
+                } else {
+                  // 终止
+                  let param = {status: '0', id: data.id}
+                  this.projectReportService.updateSignatureStatusById(param).then(() => {
+                    callback()
+                  })
+                }
+              })
+            }
+            if (this.inputForm.signatureType === '2') {
+              this.projectReportService.findBySignatureId(this.inputForm.sid2).then(({data}) => {
+                if (data.status !== '4') { // status的值不等于“驳回”就弹出提示
+                  this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+                  throw new Error()
+                } else {
+                  // 终止
+                  let param = {status: '0', id: data.id}
+                  this.projectReportService.updateSignatureStatusById(param).then(() => {
+                    callback()
+                  })
+                }
+              })
+            }
           }
         }
       },
@@ -619,7 +755,8 @@
           realCreate: '',
           status: '',
           status1: '',
-          status2: ''
+          status2: '',
+          status3: ''
         }
         // this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()

src/views/modules/cw/workClientInfo/WorkClientList.vue

@@ -75,7 +75,7 @@
       <vxe-toolbar :refresh="{query: refreshList}" export custom>
         <template #buttons>
           <el-button v-if="hasPermission('cw_work_client:info:add')" type="primary" size="small" icon="el-icon-plus" @click="add()">新建</el-button>
-          <el-button v-if="hasPermission('cw_work_client:info:view')" size="small" @click="viewUpdateLog()">修改申请记录</el-button>
+<!--          <el-button v-if="hasPermission('cw_work_client:info:view')" size="small" @click="viewUpdateLog()">修改申请记录</el-button>-->
 
           <!--          <el-button v-if="hasPermission('klg:question:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.questionsTable && $refs.questionsTable.getCheckboxRecords().length === 0" plain>删除</el-button>-->
 <!--          <el-button type="warning" size="small" icon="el-icon-download" @click="exportFile()" plain>导出</el-button>-->

src/views/modules/flowable/task/TaskForm.vue

@@ -455,7 +455,12 @@
       },
       // 驳回
       reject (vars) {
-        if (this.procDefId.includes('Process_1667978088459') || this.procDefId.includes('Process_1668394732246') || this.procDefId.includes('Process_1668503117077')) {
+        if (this.procDefId.includes('Process_1667978088459') ||
+          this.procDefId.includes('Process_1668394732246') ||
+          this.procDefId.includes('Process_1668503117077') ||
+          this.procDefId.includes('Process_1669014216650') ||
+          this.procDefId.includes('Process_1669087010742')
+        ) {
           console.log('进入新版驳回')
           this.$confirm(`确定驳回流程吗?`, '提示', {
             confirmButtonText: '确定',