流程修改

src/views/modules/cw/projectReportArchive/ProjectReportArchiveForm.vue

@@ -331,7 +331,8 @@
           signatureAnnotator2: '',
           signatureAnnotator2Name: '',
           reportCreateName: '',
-          reportId: ''
+          reportId: '',
+          reportRemarks: ''
         },
         keyWatch: '',
         activeName: 'files',
@@ -441,7 +442,8 @@
           signatureAnnotator2: '',
           signatureAnnotator2Name: '',
           reportCreateName: '',
-          reportId: ''
+          reportId: '',
+          reportRemarks: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -644,7 +646,8 @@
           signatureAnnotator2: '',
           signatureAnnotator2Name: '',
           reportCreateName: '',
-          reportId: ''
+          reportId: '',
+          reportRemarks: ''
         }
         this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()

src/views/modules/cw/projectReportArchive/ProjectReportArchiveTaskForm.vue

@@ -317,7 +317,8 @@
           signatureAnnotator2: '',
           signatureAnnotator2Name: '',
           reportCreateName: '',
-          reportId: ''
+          reportId: '',
+          reportRemarks: ''
         },
         keyWatch: '',
         activeName: 'files',
@@ -419,7 +420,8 @@
           signatureAnnotator2: '',
           signatureAnnotator2Name: '',
           reportCreateName: '',
-          reportId: ''
+          reportId: '',
+          reportRemarks: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -680,7 +682,8 @@
           signatureAnnotator2: '',
           signatureAnnotator2Name: '',
           reportCreateName: '',
-          reportId: ''
+          reportId: '',
+          reportRemarks: ''
         }
         this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()

src/views/modules/cw/reportCancellApply/ReportCancellApplyList.vue

@@ -108,11 +108,11 @@
 
           <vxe-column title="操作" width="150px" fixed="right" align="center">
             <template  slot-scope="scope">
-              <el-button v-if="hasPermission('cwProjectReport:edit')&&scope.row.createById === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4')" type="text"  size="small" @click="push(scope.row)">修改</el-button>
-              <el-button v-else-if="hasPermission('cwProjectReport:edit')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+              <el-button v-if="hasPermission('cwProjectReport:edit')&&scope.row.createById === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3')" type="text"  size="small" @click="push(scope.row)">修改</el-button>
+              <el-button v-else-if="hasPermission('cwProjectReport:edit')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='5')" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
               <el-button v-if="hasPermission('cwProjectReport:edit')&&scope.row.createById === $store.state.user.id&&scope.row.status==='2'" type="text"  size="small" @click="reback(scope.row)">撤回</el-button>
-              <el-button v-if="hasPermission('cwProjectReport:del')&&scope.row.createById === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
-              <el-button v-else-if="hasPermission('cwProjectReport:del')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-if="hasPermission('cwProjectReport:del')&&scope.row.createById === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-else-if="hasPermission('cwProjectReport:del')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='5')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
             </template>
           </vxe-column>
         </vxe-table>
@@ -311,6 +311,7 @@
             this.$router.push({
               path: '/flowable/task/TaskForm',
               query: {
+                ...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 procDefId: this.processDefinitionAuditId,
                 procDefKey: this.procDefAuditKey,
                 status: 'startAndHold',
@@ -331,8 +332,10 @@
         let title = `发起流程【报告作废申请】`
         let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[报告作废申请]`
         let status = 'startAndHold'
-        if (row.status === '3' || row.status === '4') {
+        if (row.status === '3') {
           status = 'startAndClose'
+        } else if (row.status === '4') {
+          status = 'reapplyFlag'
         }
         this.taskService.getTaskDef({ procDefId: this.processDefinitionAuditId,
           businessId: row.id,
@@ -340,6 +343,7 @@
             this.$router.push({
               path: '/flowable/task/TaskForm',
               query: {
+                ...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 procDefId: this.processDefinitionAuditId,
                 procDefKey: this.procDefAuditKey,
                 title: title,
@@ -366,6 +370,7 @@
             this.$router.push({
               path: '/flowable/task/TaskFormDetail',
               query: {
+                ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 isShow: 'false',
                 readOnly: true,
                 title: '质控管理' + '流程详情',

src/views/modules/cw/reportCancellApply/ReportCancellApplyTaskForm.vue

@@ -263,6 +263,16 @@
         //   }
         // })
       },
+      reapplyForm (callback) {
+        this.reportCancellApplyService.queryById(this.inputForm.id).then(({data}) => {
+          if (data.status !== '4') { // 审核状态不是“驳回”，就弹出提示
+            this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+            throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+          } else {
+            this.doSubmit('reapply', callback)
+          }
+        })
+      },
       // 表单提交
       doSubmit (status, callback) {
         if (status === 'save') {
@@ -293,6 +303,8 @@
           this.inputForm.agreeDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
           this.inputForm.agreeUserId = this.$store.state.user.id
           this.inputForm.status = '5'
+        } else if (status === 'reapply') {
+          this.inputForm.status = '2'
         }
         this.$refs['inputForm'].validate((valid) => {
           if (valid) {
@@ -317,7 +329,7 @@
           }
         })
       },
-      async updateStatusById (type) {
+      async updateStatusById (type, callback) {
         if (type === 'reject' || type === 'reback') {
           await this.reportCancellApplyService.queryById(this.inputForm.id).then(({data}) => {
             if (data.status !== '2') { // status的值不等于“审核中”就弹出提示
@@ -328,14 +340,18 @@
                 // 驳回
                 this.inputForm.status = '4'
                 let param = {status: '4', id: this.inputForm.id}
-                this.reportCancellApplyService.updateStatusById(param)
+                this.reportCancellApplyService.updateStatusById(param).then(() => {
+                  callback()
+                })
                 // this.projectRecordsService.updateStatusById(param)
               }
               if (type === 'reback') {
                 // 撤回
                 let param = {status: '3', id: this.inputForm.id}
                 // this.projectRecordsService.updateStatusById(param)
-                this.reportCancellApplyService.updateStatusById(param)
+                this.reportCancellApplyService.updateStatusById(param).then(() => {
+                  callback()
+                })
               }
             }
           })
@@ -359,6 +375,19 @@
           //     }
           //   }
           // })
+        } else if (type === 'hold') {
+          this.reportCancellApplyService.queryById(this.inputForm.id).then(({data}) => {
+            if (data.status !== '4') { // status的值不等于“驳回”就弹出提示
+              this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+              throw new Error()
+            } else {
+              // 终止
+              let param = {status: '1', id: this.inputForm.id}
+              this.reportCancellApplyService.updateStatusById(param).then(() => {
+                callback()
+              })
+            }
+          })
         }
       },
       close () {

src/views/modules/cw/reportCancellApplyArchived/ReportCancellApplyArchivedList.vue

@@ -122,9 +122,9 @@
               <el-button v-if="hasPermission('cw:cwProjectReport:filed')&&scope.row.createById === $store.state.user.id&&scope.row.status==='5'&& (scope.row.applyFileType === undefined || scope.row.applyFileType === '0')" type="text"  size="small" @click="archived(scope.row.id)">归档</el-button>
               <!--归档暂存修改-->
               <el-button v-if="hasPermission('cw:cwProjectReport:filed') && scope.row.status === '5'  && scope.row.createId === $store.state.user.id && scope.row.applyFileType === '1'" type="text" size="small" @click="archived(scope.row.id)">修改</el-button>
-              <el-button v-else-if="hasPermission('cw:cwProjectReport:edit')&&isAdmin&&(scope.row.applyFileType==='1'||scope.row.applyFileType==='3'||scope.row.applyFileType==='4'||scope.row.applyFileType==='5')" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+              <el-button v-else-if="hasPermission('cw:cwProjectReport:edit')&&isAdmin&&(scope.row.applyFileType==='1'||scope.row.applyFileType==='3'||scope.row.applyFileType==='5')" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
               <!--纸质归档撤回驳回修改-->
-              <el-button v-if="hasPermission('cw:cwProjectReport:filed') && scope.row.status === '5'  && scope.row.createId === $store.state.user.id && (scope.row.applyFileType === '3' || scope.row.applyFileType === '4')" type="text" size="small" @click="paperFiledAndClose(scope.row.id)">修改</el-button>
+              <el-button v-if="hasPermission('cw:cwProjectReport:filed') && scope.row.status === '5'  && scope.row.createId === $store.state.user.id && (scope.row.applyFileType === '3' )" type="text" size="small" @click="paperFiledAndClose(scope.row.id)">修改</el-button>
               <!--纸质归档撤回-->
               <el-button v-if="hasPermission('cw:cwProjectReport:back') && scope.row.status === '5'  && scope.row.applyFileType === '2'" type="text"  size="small" @click="rebackPaperFiled(scope.row)">撤回</el-button>
 <!--              <el-button v-else-if="hasPermission('cw:cwProjectReport:del')&&isAdmin&&(scope.row.applyFileType==='1'||scope.row.applyFileType==='3'||scope.row.applyFileType==='4'||scope.row.applyFileType==='5')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>-->
@@ -390,11 +390,12 @@
                 this.$router.push({
                   path: '/flowable/task/TaskFormDetail',
                   query: {
+                    ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                     readOnly: true,
                     title: '报告作废归档流程详情',
                     formTitle: '报告作废归档流程详情',
-                    businessId: row.id,
-                    ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title')}
+                    businessId: row.id
+                  }
                 })
               })
             }
@@ -469,6 +470,7 @@
                 this.$router.push({
                   path: '/flowable/task/TaskForm',
                   query: {
+                    ...pick(reture.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                     procDefId: data.id,
                     procDefKey: data.key,
                     status: 'startAndHoldFiled',
@@ -501,6 +503,7 @@
                 this.$router.push({
                   path: '/flowable/task/TaskForm',
                   query: {
+                    ...pick(reture.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                     procDefId: data.id,
                     procDefKey: data.key,
                     status: 'startAndCloseFiled',

src/views/modules/cw/reportCancellApplyArchived/ReportCancellApplyArchivedTaskForm.vue

@@ -501,6 +501,16 @@
           }
         })
       },
+      reapplyForm (callback) {
+        this.reportCancellApplyArchivedService.queryById(this.inputForm.id).then(({data}) => {
+          if (data.applyFileType !== '4') { // 审核状态不是“驳回”，就弹出提示
+            this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+            throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+          } else {
+            this.doSubmit('reapply', callback)
+          }
+        })
+      },
       // 表单提交
       doSubmit (status, callback) {
         if (status === 'save') {
@@ -528,6 +538,8 @@
         } else if (status === 'start') {
           // 送审  待审核
           this.inputForm.applyFileType = '2'
+        } else if (status === 'reapply') {
+          this.inputForm.applyFileType = '2'
         }
         this.$refs['inputForm'].validate((valid) => {
           if (valid) {
@@ -582,67 +594,81 @@
         })
       },
       async updateStatusById (type, callback) {
-        if (type === 'reject' || type === 'reback') {
-          if (await this.$refs.uploadComponent.checkProgress()) {
-            this.loading = false
-            throw new Error()
-          }
-          await this.reportCancellApplyArchivedService.queryById(this.inputForm.id).then(({data}) => {
-            console.log('data', data)
-            if (data.applyFileType !== '2') { // status的值不等于“审核中”就弹出提示
-              this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
-              throw new Error()
-            } else {
-              if (type === 'reject') {
-                // 驳回
-                this.inputForm.applyFileType = '4'
-                let param = {applyFileType: '4', id: this.inputForm.id}
+        if (await this.$refs.uploadComponent.checkProgress()) {
+          this.loading = false
+          throw new Error()
+        } else {
+          if (type === 'reject' || type === 'reback') {
+            this.reportCancellApplyArchivedService.queryById(this.inputForm.id).then(({data}) => {
+              console.log('data', data)
+              if (data.applyFileType !== '2') { // status的值不等于“审核中”就弹出提示
+                this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+                throw new Error()
+              } else {
+                if (type === 'reject') {
+                  // 驳回
+                  this.inputForm.applyFileType = '4'
+                  let param = {applyFileType: '4', id: this.inputForm.id}
+                  this.reportCancellApplyArchivedService.updateStatusById(param).then(() => {
+                    callback()
+                  })
+                  // this.projectRecordsService.updateStatusById(param)
+                }
+                // if (type === 'reject') {
+                //   if (this.inputForm.isNumber !== this.inputForm.number) {
+                //     this.$message.error('“案卷号”与“确认案卷号”不一致，请重新填写')
+                //     this.loading = false
+                //     throw new Error('“案卷号”与“确认案卷号”不一致，请重新填写')
+                //   } else {
+                //     // 驳回
+                //     let _this = this
+                //     const wait = function () {
+                //       return new Promise(function (resolve, reject) {
+                //         _this.inputForm.applyFileType = '4'
+                //         _this.loading = true
+                //         if (_this.$refs.uploadComponent.checkProgress()) {
+                //           _this.loading = false
+                //           reject(new Error())
+                //         }
+                //         _this.$refs.uploadComponent.getDataList().then((list) => {
+                //           // list为返回数据
+                //           _this.inputForm.workAttachmentDtoList = list
+                //         })
+                //         resolve()
+                //       })
+                //     }
+                //     wait().then(() => {
+                //       this.reportCancellApplyArchivedService.saveForm(this.inputForm).then(({data}) => {
+                //         this.loading = false
+                //       }).catch(() => {
+                //         this.loading = false
+                //       })
+                //     }).catch(() => {
+                //       this.loading = false
+                //     })
+                //   }
+                // }
+                if (type === 'reback') {
+                  // 撤回
+                  let param = {applyFileType: '3', id: this.inputForm.id}
+                  this.projectReportArchiveService.updateStatusById(param)
+                }
+              }
+            })
+          } else if (type === 'hold') {
+            this.reportCancellApplyArchivedService.queryById(this.inputForm.id).then(({data}) => {
+              if (data.applyFileType !== '4') { // status的值不等于“驳回”就弹出提示
+                this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+                throw new Error()
+              } else {
+                // 终止
+                let param = {applyFileType: '1', id: this.inputForm.id}
                 this.reportCancellApplyArchivedService.updateStatusById(param).then(() => {
                   callback()
                 })
-                // this.projectRecordsService.updateStatusById(param)
               }
-              // if (type === 'reject') {
-              //   if (this.inputForm.isNumber !== this.inputForm.number) {
-              //     this.$message.error('“案卷号”与“确认案卷号”不一致，请重新填写')
-              //     this.loading = false
-              //     throw new Error('“案卷号”与“确认案卷号”不一致，请重新填写')
-              //   } else {
-              //     // 驳回
-              //     let _this = this
-              //     const wait = function () {
-              //       return new Promise(function (resolve, reject) {
-              //         _this.inputForm.applyFileType = '4'
-              //         _this.loading = true
-              //         if (_this.$refs.uploadComponent.checkProgress()) {
-              //           _this.loading = false
-              //           reject(new Error())
-              //         }
-              //         _this.$refs.uploadComponent.getDataList().then((list) => {
-              //           // list为返回数据
-              //           _this.inputForm.workAttachmentDtoList = list
-              //         })
-              //         resolve()
-              //       })
-              //     }
-              //     wait().then(() => {
-              //       this.reportCancellApplyArchivedService.saveForm(this.inputForm).then(({data}) => {
-              //         this.loading = false
-              //       }).catch(() => {
-              //         this.loading = false
-              //       })
-              //     }).catch(() => {
-              //       this.loading = false
-              //     })
-              //   }
-              // }
-              if (type === 'reback') {
-                // 撤回
-                let param = {applyFileType: '3', id: this.inputForm.id}
-                this.projectReportArchiveService.updateStatusById(param)
-              }
-            }
-          })
+            })
+          }
         }
       },
       close () {

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

@@ -157,28 +157,30 @@
 
           <vxe-column title="操作" width="150px" fixed="right" align="center">
             <template  slot-scope="scope">
-              <el-button v-if="hasPermission('cwProjectReport:edit')&&
-                              (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId))&&
+              <el-button v-if="isAdmin" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+              <el-button v-else-if="hasPermission('cwProjectReport:edit')&&
+                              (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId))&&
                               scope.row.status === '5'&&
-                              (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === '4' || scope.row.reviewStatus === '5' || commonJS.isEmpty(scope.row.reviewStatus)) &&
+                              (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === '5' || commonJS.isEmpty(scope.row.reviewStatus)) &&
                               (
-                              (scope.row.signatureType === '1' && (scope.row.status1 === '0' || scope.row.status1 === '3' || scope.row.status1 === '5')) ||
-                              (scope.row.signatureType === '2' && (scope.row.status2 === '0' || scope.row.status2 === '3' || scope.row.status2 === '5')) ||
-                              (scope.row.signatureType === '3' && (scope.row.status3 === '0' || scope.row.status3 === '3' || scope.row.status3 === '5'))
+                              (scope.row.signatureType === '1' && (scope.row.status1 === '0' || scope.row.status1 === '3' )) ||
+                              (scope.row.signatureType === '2' && (scope.row.status2 === '0' || scope.row.status2 === '3' )) ||
+                              (scope.row.signatureType === '3' && (scope.row.status3 === '0' || scope.row.status3 === '3' ))
                               )
                               " type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
-              <el-button v-if="hasPermission('cwProjectReport:del')&&
+              <el-button v-if="isAdmin" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-else-if="hasPermission('cwProjectReport:del')&&
                               (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId))&&
                               scope.row.status === '5'&&
-                              (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === '4' || scope.row.reviewStatus === '5' || commonJS.isEmpty(scope.row.reviewStatus)) &&
+                              (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === '5' || commonJS.isEmpty(scope.row.reviewStatus)) &&
                               (
-                              (scope.row.signatureType === '1' && (scope.row.status1 === '0' || scope.row.status1 === '3' || scope.row.status1 === '5')) ||
-                              (scope.row.signatureType === '2' && (scope.row.status2 === '0' || scope.row.status2 === '3' || scope.row.status2 === '5')) ||
-                              (scope.row.signatureType === '3' && (scope.row.status3 === '0' || scope.row.status3 === '3' || scope.row.status3 === '5'))
+                              (scope.row.signatureType === '1' && (scope.row.status1 === '0' || scope.row.status1 === '3' )) ||
+                              (scope.row.signatureType === '2' && (scope.row.status2 === '0' || scope.row.status2 === '3' )) ||
+                              (scope.row.signatureType === '3' && (scope.row.status3 === '0' || scope.row.status3 === '3' ))
                               )
                               " type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
 <!--              复核流程-->
-              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === '4' || scope.row.reviewStatus === undefined || scope.row.reviewStatus === '')" type="text" size="small" @click="pushF(scope.row)">复核</el-button>
+              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === undefined || scope.row.reviewStatus === '')" type="text" size="small" @click="pushF(scope.row)">复核</el-button>
               <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && 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.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '1' && (scope.row.status1 === '0' || scope.row.status1 === '3')" type="text" size="small" @click="pushS(scope.row)">公章</el-button>
@@ -466,7 +468,7 @@
       },
       // 查看报告复核流程结果
       detail (row) {
-        if (row.status !== '0' && row.status !== '1') {
+        if (row.reviewStatus !== '0' && row.reviewStatus !== '1') {
           // eslint-disable-next-line eqeqeq
           this.taskService.getTaskDef({
             procInsId: row.procInsId3,
@@ -562,17 +564,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.reviewStatus === '3') {
           status = 'startAndClose'
+        } else if (row.reviewStatus === '4') {
+          status = 'reapplyFlag'
         }
         this.taskService.getTaskDef({ procDefId: this.processDefinitionAuditId,
           businessId: row.id,
           businessTable: 'cw_project_report_review'}).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.processDefinitionAuditId,
                 procDefKey: this.procDefAuditKey,
                 title: title,

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

@@ -907,6 +907,16 @@
           }
         })
       },
+      reapplyForm (callback) {
+        this.projectReportService.queryById(this.inputForm.id).then(({data}) => {
+          if (data.reviewStatus !== '4') { // 审核状态不是“驳回”，就弹出提示
+            this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+            throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+          } else {
+            this.doSubmit('reapply', callback)
+          }
+        })
+      },
       // 表单提交
       doSubmit (status, callback) {
         if (status === 'save') {
@@ -945,6 +955,7 @@
           // this.inputForm.status = '5'
         } else if (status === 'reapply') {
           this.inputForm.reviewStatus = '2'
+          this.inputForm.assignee = this.inputForm.reviewBy
         }
         this.$refs['inputForm'].validate((valid) => {
           if (valid) {
@@ -1012,7 +1023,7 @@
             }
           })
         } else if (type === 'hold') {
-          this.reportReviewService.queryById(this.inputForm.id).then(({data}) => {
+          this.projectReportService.queryById(this.inputForm.id).then(({data}) => {
             if (data.reviewStatus !== '4') { // status的值不等于“驳回”就弹出提示
               this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
               throw new Error()

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

@@ -453,6 +453,15 @@
           })
         }
       },
+      // Process_1667978088459 客户修改
+      // Process_1668394732246 项目登记
+      // Process_1668503117077 报告质控管理员审核
+      // Process_1669014216650 报告签章-公章
+      // Process_1669087010742 报告签章-公章+执业章
+      // Process_1668677901585 项目报告归档
+      // Process_1670486210438 报告复核
+      // Process_1668759076824 报告作废申请
+      // Process_1670548572652 报告作废归档
       // 驳回
       reject (vars) {
         if (this.procDefId.includes('Process_1667978088459') ||
@@ -460,7 +469,10 @@
           this.procDefId.includes('Process_1668503117077') ||
           this.procDefId.includes('Process_1669014216650') ||
           this.procDefId.includes('Process_1669087010742') ||
-          this.procDefId.includes('Process_1668677901585')
+          this.procDefId.includes('Process_1668677901585') ||
+          this.procDefId.includes('Process_1670486210438') ||
+          this.procDefId.includes('Process_1668759076824') ||
+          this.procDefId.includes('Process_1670548572652')
         ) {
           console.log('进入新版驳回')
           this.$confirm(`确定驳回流程吗?`, '提示', {