代码调整提交

src/views/modules/cw/workContract/WorkContractList.vue

@@ -528,12 +528,12 @@
       },
       // 归档
       filed (id) {
-        this.processService.getByName('合同登记归档').then(({data}) => {
+        this.processService.getByName('评估-合同归档').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             console.log('data', data)
             // 读取流程表单
-            let tabTitle = `发起流程【合同登记归档】`
-            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [合同登记归档]`
+            let tabTitle = `发起流程【评估-合同归档】`
+            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [评估-合同归档]`
             this.taskService.getTaskDef({ procDefId: data.id,
               businessId: id,
               businessTable: 'work_contract_file',
@@ -560,12 +560,12 @@
       },
       // 归档
       filedAndClose (id) {
-        this.processService.getByName('合同登记归档').then(({data}) => {
+        this.processService.getByName('评估-合同归档').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             console.log('data', data)
             // 读取流程表单
-            let tabTitle = `发起流程【合同登记归档】`
-            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [合同登记归档]`
+            let tabTitle = `发起流程【评估-合同归档】`
+            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [评估-合同归档]`
             this.taskService.getTaskDef({ procDefId: data.id,
               businessId: id,
               businessTable: 'work_contract_file',

src/views/modules/finance/invoice/InvoiceList.vue

@@ -445,7 +445,7 @@
             this.procDefKey = data.key
           }
         })
-        this.processService.getByName('发票作废').then(({data}) => {
+        this.processService.getByName('评估-发票作废').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionInvalidId = data.id
             this.procDefInvalidKey = data.key
@@ -564,8 +564,8 @@
       // 发起发票作废审批
       invoiceInvalidPush (row) {
         // 读取流程表单
-        let title = `发起流程【发票作废】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[发票作废]`
+        let title = `发起流程【评估-发票作废】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[评估-发票作废]`
         let status = 'startAndHold'
         if (row.status === '7') {
           status = 'startAndClose'
@@ -632,8 +632,8 @@
               ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
               isShow: 'false',
               readOnly: true,
-              title: '发票作废' + '流程详情',
-              formTitle: '发票作废' + '流程详情',
+              title: '评估-发票作废' + '流程详情',
+              formTitle: '评估-发票作废' + '流程详情',
               businessId: row.financeInvoiceInvalidDTO.id,
               status: 'reback'
             }

src/views/modules/program/registered/ProjectList.vue

@@ -323,37 +323,37 @@
           this.tablePage.total = data.total
           this.loading = false
         })
-        this.processService.getByName('项目登记流程').then(({data}) => {
+        this.processService.getByName('评估-项目登记').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionAuditId = data.id
             this.procDefAuditKey = data.key
           }
         })
-        this.processService.getByName('项目一级校审').then(({data}) => {
+        this.processService.getByName('评估-项目一级校审').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId1 = data.id
             this.procDefKey1 = data.key
           }
         })
-        this.processService.getByName('项目二级校审').then(({data}) => {
+        this.processService.getByName('评估-项目二级校审').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId2 = data.id
             this.procDefKey2 = data.key
           }
         })
-        this.processService.getByName('项目三级校审').then(({data}) => {
+        this.processService.getByName('评估-项目三级校审').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId3 = data.id
             this.procDefKey3 = data.key
           }
         })
-        this.processService.getByName('项目登记归档').then(({data}) => {
+        this.processService.getByName('评估-项目归档').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionIdArchive = data.id
             this.procDefKeyArchive = data.key
           }
         })
-        this.processService.getByName('报告签发审批').then(({data}) => {
+        this.processService.getByName('评估-报告签发').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId4 = data.id
             this.procDefKey4 = data.key
@@ -419,8 +419,8 @@
       },
       start () {
         // 读取流程表单
-        let tabTitle = `发起流程【项目登记审批】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [项目登记新建]`
+        let tabTitle = `发起流程【评估-项目登记】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [评估-项目登记]`
         this.taskService.getTaskDef({ procDefId: this.processDefinitionAuditId,
           status: 'startAndHold'}).then((data) => {
             this.$router.push({
@@ -522,8 +522,8 @@
       // 发起一级校审
       firstAuditPush (row) {
         // 读取流程表单
-        let title = `发起流程【项目一级校审】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[项目一级校审]`
+        let title = `发起流程【评估-项目一级校审】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[评估-项目一级校审]`
         let status = 'startAndHold'
         if (row.status1 === '3') {
           status = 'startAndClose'
@@ -600,8 +600,8 @@
       // 发起二级校审
       secondAuditPush (row) {
         // 读取流程表单
-        let title = `发起流程【项目二级校审】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[项目二级校审]`
+        let title = `发起流程【评估-项目二级校审】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[评估-项目二级校审]`
         let status = 'startAndHold'
         if (row.status2 === '3') {
           status = 'startAndClose'
@@ -678,8 +678,8 @@
       // 发起三级校审
       thirdAuditPush (row) {
         // 读取流程表单
-        let title = `发起流程【项目三级校审】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[项目三级校审]`
+        let title = `发起流程【评估-项目三级校审】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[评估-项目三级校审]`
         let status = 'startAndHold'
         if (row.status3 === '3') {
           status = 'startAndClose'
@@ -756,8 +756,8 @@
       // 发起项目登记归档
       archivePush (row) {
         // 读取流程表单
-        let title = `发起流程【项目登记归档】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[项目登记归档]`
+        let title = `发起流程【评估-项目归档】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[评估-项目归档]`
         let status = 'startAndHold'
         if (row.archiveStatus === '3') {
           status = 'startAndClose'
@@ -800,8 +800,8 @@
                 ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 isShow: 'false',
                 readOnly: true,
-                title: '项目登记归档' + '流程详情',
-                formTitle: '项目登记归档' + '流程详情',
+                title: '评估-项目归档' + '流程详情',
+                formTitle: '评估-项目归档' + '流程详情',
                 businessId: row.archiveId,
                 status: 'reback'
               }
@@ -971,8 +971,8 @@
       // 签发
       issued (row) {
         // 读取流程表单
-        let title = `发起流程【报告签发审批】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[报告签发审批]`
+        let title = `发起流程【评估-报告签发】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[评估-报告签发]`
         let status = 'startAndHold'
         if (row.issuedStatus === '3' || row.issuedStatus === '2') {
           status = 'startAndClose'

src/views/modules/program/registered/ProjectList2022.vue

@@ -430,8 +430,8 @@
       },
       start () {
         // 读取流程表单
-        let tabTitle = `发起流程【项目登记审批】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [项目登记新建]`
+        let tabTitle = `发起流程【评估-项目登记】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [评估-项目登记]`
         this.taskService.getTaskDef({ procDefId: this.processDefinitionAuditId,
           status: 'startAndHold'}).then((data) => {
             this.$router.push({
@@ -529,8 +529,8 @@
       // 发起一级校审
       firstAuditPush (row) {
         // 读取流程表单
-        let title = `发起流程【项目一级校审】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[项目一级校审]`
+        let title = `发起流程【评估-项目一级校审】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[评估-项目一级校审]`
         let status = 'startAndHold'
         if (row.status1 === '3' || row.status1 === '4') {
           status = 'startAndClose'
@@ -604,8 +604,8 @@
       // 发起二级校审
       secondAuditPush (row) {
         // 读取流程表单
-        let title = `发起流程【项目二级校审】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[项目二级校审]`
+        let title = `发起流程【评估-项目二级校审】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[评估-项目二级校审]`
         let status = 'startAndHold'
         if (row.status2 === '3' || row.status2 === '4') {
           status = 'startAndClose'
@@ -679,8 +679,8 @@
       // 发起三级校审
       thirdAuditPush (row) {
         // 读取流程表单
-        let title = `发起流程【项目三级校审】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[项目三级校审]`
+        let title = `发起流程【评估-项目三级校审】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[评估-项目三级校审]`
         let status = 'startAndHold'
         if (row.status3 === '3' || row.status3 === '4') {
           status = 'startAndClose'
@@ -754,8 +754,8 @@
       // 发起项目登记归档
       archivePush (row) {
         // 读取流程表单
-        let title = `发起流程【项目登记归档】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[项目登记归档]`
+        let title = `发起流程【评估-项目归档】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[评估-项目归档]`
         let status = 'startAndHold'
         if (row.archiveStatus === '3' || row.archiveStatus === '4') {
           status = 'startAndClose'
@@ -794,8 +794,8 @@
               query: {
                 isShow: 'false',
                 readOnly: true,
-                title: '项目登记归档' + '流程详情',
-                formTitle: '项目登记归档' + '流程详情',
+                title: '评估-项目归档' + '流程详情',
+                formTitle: '评估-项目归档' + '流程详情',
                 businessId: row.archiveId,
                 status: 'reback',
                 ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'title', 'businessId')
@@ -966,8 +966,8 @@
       // 签发
       issued (row) {
         // 读取流程表单
-        let title = `发起流程【报告签发审批】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[报告签发审批]`
+        let title = `发起流程【评估-报告签发】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[评估-报告签发]`
         let status = 'startAndHold'
         if (row.issuedStatus === '3' || row.issuedStatus === '4' || row.issuedStatus === '2') {
           status = 'startAndClose'

src/views/modules/program/registered/ProjectThreeAuditForm.vue

@@ -426,7 +426,7 @@
                   }).catch(() => {
                     this.loading = false
                   })
-                  return
+                  // return
                 }
                 if (type === 'reback') {
                   // 撤回

src/views/modules/sys/workContract/WorkContractList.vue

@@ -274,7 +274,7 @@
           this.tablePage.total = data.total
           this.loading = false
         })
-        this.processService.getByName('合同登记新建').then(({data}) => {
+        this.processService.getByName('评估-合同登记').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId = data.id
             this.procDefKey = data.key
@@ -299,7 +299,7 @@
       add () {
         this.start()
       },
-      // 合同登记新建详情
+      // 评估-合同登记详情
       detail (row) {
         // eslint-disable-next-line eqeqeq
         if (!this.commonJS.isEmpty(row.status) && row.status != '1') {
@@ -361,8 +361,8 @@
       },
       start () {
         // 读取流程表单
-        let tabTitle = `发起流程【合同登记新建】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [合同登记新建]`
+        let tabTitle = `发起流程【评估-合同登记】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [评估-合同登记]`
         this.taskService.getTaskDef({ procDefId: this.processDefinitionId,
           status: 'startAndHold'}).then((data) => {
             this.$router.push({
@@ -383,7 +383,7 @@
             })
           })
       },
-      // 合同登记新建撤回驳回修改
+      // 评估-合同登记撤回驳回修改
       edit (row) {
         // if (row.status === '3' || row.status === '4') {
         //   this.editWithClose(row)
@@ -423,8 +423,8 @@
       },
       // editWithHold (row) {
       //   // 读取流程表单
-      //   let tabTitle = `发起流程【合同登记新建】`
-      //   let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [合同登记新建]`
+      //   let tabTitle = `发起流程【评估-合同登记】`
+      //   let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [评估-合同登记]`
       //   this.taskService.getTaskDef({ procDefId: this.processDefinitionId,
       //     businessId: row.id,
       //     businessTable: 'work_contract_info',
@@ -449,8 +449,8 @@
       // },
       // editWithClose (row) {
       //   // 读取流程表单
-      //   let tabTitle = `发起流程【合同登记新建】`
-      //   let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [合同登记新建]`
+      //   let tabTitle = `发起流程【评估-合同登记】`
+      //   let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [评估-合同登记]`
       //   this.taskService.getTaskDef({ procDefId: this.processDefinitionId,
       //     businessId: row.id,
       //     businessTable: 'work_contract_info',
@@ -474,7 +474,7 @@
       //     })
       //   })
       // },
-      // 合同登记新建撤回
+      // 评估-合同登记撤回
       reback (row) {
         this.$confirm(`确定要撤回该申请吗?`, '提示', {
           confirmButtonText: '确定',
@@ -594,11 +594,11 @@
       },
       // 归档
       filed (id) {
-        this.processService.getByName('合同登记归档').then(({data}) => {
+        this.processService.getByName('评估-合同归档').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             // 读取流程表单
-            let tabTitle = `发起流程【合同登记归档】`
-            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [合同登记归档]`
+            let tabTitle = `发起流程【评估-合同归档】`
+            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [评估-合同归档]`
             this.taskService.getTaskDef({ procDefId: data.id,
               businessId: id,
               businessTable: 'work_contract_file',
@@ -650,11 +650,11 @@
       },
       // 归档驳回撤回修改
       filedAndClose (row) {
-        this.processService.getByName('合同登记归档').then(({data}) => {
+        this.processService.getByName('评估-合同归档').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             // 读取流程表单
-            let tabTitle = `发起流程【合同登记归档】`
-            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[合同登记归档]`
+            let tabTitle = `发起流程【评估-合同归档】`
+            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[评估-合同归档]`
             let status = 'startAndCloseFiled'
             if (row.filedType === '3') {
               status = 'startAndClose'