Quellcode durchsuchen

流程代码调整

user5 vor 2 Jahren
Ursprung
Commit
1bbefbc664

+ 8 - 8
src/views/modules/cw/invoice/InvoiceList.vue

@@ -439,13 +439,13 @@
           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
           }
         })
-        this.processService.getByName('财务-发票作废').then(({data}) => {
+        this.processService.getByName('会计-发票作废').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionInvalidId = data.id
             this.procDefInvalidKey = data.key
@@ -506,8 +506,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({
@@ -531,8 +531,8 @@
       // 发起发票申请审批
       invoicePush (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 === '3') {
           status = 'startAndClose'
@@ -610,8 +610,8 @@
                   ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                   isShow: 'false',
                   readOnly: true,
-                  title: '发票申请' + '流程详情',
-                  formTitle: '发票申请' + '流程详情',
+                  title: '会计-发票申请' + '流程详情',
+                  formTitle: '会计-发票申请' + '流程详情',
                   businessId: row.id,
                   status: 'reback'
                 }

+ 7 - 7
src/views/modules/cw/projectReportArchive/ProjectReportArchiveList.vue

@@ -367,7 +367,7 @@
           this.loading = false
         })
         this.checkIsAdmin()
-        this.processService.getByName('财务-项目报告归档').then(({data}) => {
+        this.processService.getByName('会计-项目报告归档').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionAuditId = data.id
             this.procDefAuditKey = data.key
@@ -412,8 +412,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({
@@ -437,8 +437,8 @@
       // 发起项目归档
       push (row) {
         // 读取流程表单
-        let title = `发起流程【项目报告归档】`
-        let processTitle = `${this.userName} 发起了 ${row.reportNo} - ${row.projectName} [项目报告归档]`
+        let title = `发起流程【会计-项目报告归档】`
+        let processTitle = `${this.userName} 发起了 ${row.reportNo} - ${row.projectName} [会计-项目报告归档]`
         let status = 'startAndHold'
         if (row.status === '3' || row.status === '4') {
           status = 'startAndClose'
@@ -479,8 +479,8 @@
                 ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 isShow: 'false',
                 readOnly: true,
-                title: '项目报告归档' + '流程详情',
-                formTitle: '项目报告归档' + '流程详情',
+                title: '会计-项目报告归档' + '流程详情',
+                formTitle: '会计-项目报告归档' + '流程详情',
                 businessId: row.id,
                 status: 'reback'
               }

+ 5 - 5
src/views/modules/cw/reportCancellApply/ReportCancellApplyList.vue

@@ -254,7 +254,7 @@
         //   this.loading = false
         // })
         this.checkIsAdmin()
-        this.processService.getByName('财务-报告作废申请').then(({data}) => {
+        this.processService.getByName('会计-报告作废申请').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionAuditId = data.id
             this.procDefAuditKey = data.key
@@ -304,8 +304,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({
@@ -329,8 +329,8 @@
       // 发起客户登记
       push (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 === '3') {
           status = 'startAndClose'

+ 9 - 9
src/views/modules/cw/reportCancellApplyArchived/ReportCancellApplyArchivedList.vue

@@ -273,7 +273,7 @@
         //   this.loading = false
         // })
         this.checkIsAdmin()
-        this.processService.getByName('财务-报告作废归档').then(({data}) => {
+        this.processService.getByName('会计-报告作废归档').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionAuditId = data.id
             this.procDefAuditKey = data.key
@@ -392,8 +392,8 @@
                   query: {
                     ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                     readOnly: true,
-                    title: '报告作废归档流程详情',
-                    formTitle: '报告作废归档流程详情',
+                    title: '会计-报告作废归档流程详情',
+                    formTitle: '会计-报告作废归档流程详情',
                     businessId: row.id
                   }
                 })
@@ -457,12 +457,12 @@
       } */
       // 报告作废归档
       archived (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: 'cw_project_report_cancell_apply_archived',
@@ -490,12 +490,12 @@
       },
       // 归档撤回驳回修改
       paperFiledAndClose (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: 'cw_project_report_cancell_apply_archived',

+ 1 - 0
src/views/modules/cw/reportManagement/ReportManagementForm.vue

@@ -1122,6 +1122,7 @@
         // })
         this.$nextTick(() => {
           this.$refs.enclosure.clearUpload()
+          this.$refs.archiveFile.clearUpload()
           this.$refs.signatureFile.clearUpload()
           this.$refs.inputForm.resetFields()
           this.loading = true

+ 11 - 11
src/views/modules/cw/reportManagement/ReportManagementList.vue

@@ -351,7 +351,7 @@
             this.procDefAuditKey = data.key
           }
         })
-        this.processService.getByName('财务-报告签章-公章').then(({data}) => {
+        this.processService.getByName('会计-报告签章-电子公章').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionSId = data.id
             this.procDefSKey = data.key
@@ -564,8 +564,8 @@
       pushF (row) {
         // console.log('row', 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 = 'startAndClose'
         if (row.reviewStatus === '3') {
           status = 'startAndClose'
@@ -596,8 +596,8 @@
       },
       pushS (row) {
         // 读取流程表单
-        let title = `发起流程【报告签章-公章】`
-        let processTitle = `${this.userName} 发起了 ${row.reportNo} - ${row.projectName} [报告签章-公章]`
+        let title = `发起流程【会计-报告签章-电子公章】`
+        let processTitle = `${this.userName} 发起了 ${row.reportNo} - ${row.projectName} [会计-报告签章-电子公章]`
         let status = 'startAndClose'
         if (row.status1 === '3') {
           status = 'startAndClose'
@@ -628,8 +628,8 @@
       },
       pushS3 (row) {
         // 读取流程表单
-        let title = `发起流程【报告签章-实体公章】`
-        let processTitle = `${this.userName} 发起了 ${row.reportNo} - ${row.projectName} [报告签章-实体公章]`
+        let title = `发起流程【会计-报告签章-实体公章】`
+        let processTitle = `${this.userName} 发起了 ${row.reportNo} - ${row.projectName} [会计-报告签章-实体公章]`
         let status = 'startAndClose'
         if (row.status3 === '3') {
           status = 'startAndClose'
@@ -672,8 +672,8 @@
                 ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 isShow: 'false',
                 readOnly: true,
-                title: '报告签章-公章' + '流程详情',
-                formTitle: '报告签章-公章' + '流程详情',
+                title: '会计-报告签章-电子公章' + '流程详情',
+                formTitle: '会计-报告签章-电子公章' + '流程详情',
                 businessId: row.sid1,
                 status: 'reback'
               }
@@ -695,8 +695,8 @@
                 ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 isShow: 'false',
                 readOnly: true,
-                title: '报告签章-实体公章' + '流程详情',
-                formTitle: '报告签章-实体公章' + '流程详情',
+                title: '会计-报告签章-实体公章' + '流程详情',
+                formTitle: '会计-报告签章-实体公章' + '流程详情',
                 businessId: row.sid3,
                 status: 'reback'
               }

+ 14 - 0
src/views/modules/cw/reportManagement/ReportManagementSignatureForm.vue

@@ -439,6 +439,10 @@
           <!--        附件-->
           <UpLoadComponent ref="archiveFile" @clickSign="clickSign"></UpLoadComponent>
         </el-tab-pane>
+        <el-tab-pane label="已签章附件" name="signatureFile">
+          <!--        附件-->
+          <UpLoadComponent ref="signatureFile"></UpLoadComponent>
+        </el-tab-pane>
       </el-tabs>
     </el-row>
     <!--    <UpLoadComponentDialog ref="upLoadComponentDialog" @getUpload="getUpload"></UpLoadComponentDialog>-->
@@ -546,6 +550,7 @@
           remark2: '',
           remark3: '',
           cwFileInfoList: [],
+          cwFileInfoList2: [],
           reviewStatus: '',
           taskName: '',
           realHeaderName: ''
@@ -716,6 +721,7 @@
         this.loading = false
         this.$nextTick(() => {
           this.$refs.archiveFile.clearUpload()
+          this.$refs.signatureFile.clearUpload()
           this.$refs.inputForm.resetFields()
           this.loading = true
           this.projectReportService.queryBySignatureId(this.inputForm.id).then(({data}) => {
@@ -761,6 +767,7 @@
               this.$emit('callBackFunc', 'hide')
               this.jobScheduler()
             }
+            this.$refs.signatureFile.newUpload('view', data.signatureFileList, 'cwWorkContract', null, null, null, null, false)
           })
         })
       },
@@ -810,8 +817,11 @@
                 })
               }
               this.inputForm.cwFileInfoList = list
+              console.log(1)
               this.reportReviewService.save(this.inputForm).then(() => {
                 let da = {cwFileInfoList: this.inputForm.cwFileInfoList, id: this.inputForm.id}
+                console.log(this.inputForm)
+                console.log(da)
                 this.projectReportService.saveSignFiles(da).then(() => {
                   this.projectReportService.saveData(this.inputForm).then(({data}) => {
                     if (this.inputForm.signatureType === '2') {
@@ -888,6 +898,7 @@
                       })
                     }
                     this.inputForm.cwFileInfoList = list
+                    console.log(2)
                     this.reportReviewService.save(this.inputForm).then(() => {
                       let da = {cwFileInfoList: this.inputForm.cwFileInfoList, id: this.inputForm.id}
                       this.projectReportService.saveSignFiles(da).then(() => {
@@ -931,6 +942,7 @@
                       })
                     }
                     this.inputForm.cwFileInfoList = list
+                    console.log(3)
                     this.reportReviewService.save(this.inputForm).then(() => {
                       let da = {cwFileInfoList: this.inputForm.cwFileInfoList, id: this.inputForm.id}
                       this.projectReportService.saveSignFiles(da).then(() => {
@@ -976,6 +988,7 @@
                       })
                     }
                     this.inputForm.cwFileInfoList = list
+                    console.log(4)
                     this.reportReviewService.save(this.inputForm).then(() => {
                       let da = {cwFileInfoList: this.inputForm.cwFileInfoList, id: this.inputForm.id}
                       this.projectReportService.saveSignFiles(da).then(() => {
@@ -1034,6 +1047,7 @@
                   })
                 }
                 this.inputForm.cwFileInfoList = list
+                console.log(5)
                 this.reportReviewService.save(this.inputForm).then(() => {
                   let da = {cwFileInfoList: this.inputForm.cwFileInfoList, id: this.inputForm.id}
                   this.projectReportService.saveSignFiles(da).then(() => {

+ 15 - 5
src/views/modules/cw/reportManagement/reportReview/ReportReviewForm.vue

@@ -581,14 +581,18 @@
           </el-form>
         </el-form>
         <el-tabs v-model="activeName" type="border-card" @tab-click="tabHandleClick">
-<!--          <el-tab-pane label="签章文件" name="archiveFile">-->
-<!--            &lt;!&ndash;        签章文件&ndash;&gt;-->
-<!--            <UpLoadComponent ref="archiveFile"></UpLoadComponent>-->
-<!--          </el-tab-pane>-->
           <el-tab-pane label="附件" name="enclosure">
             <!--        附件-->
             <UpLoadComponent ref="enclosure"></UpLoadComponent>
           </el-tab-pane>
+          <el-tab-pane label="签章文件" name="archiveFile">
+            <!--        签章文件-->
+            <UpLoadComponent ref="archiveFile"></UpLoadComponent>
+          </el-tab-pane>
+          <el-tab-pane label="已签章附件" name="signatureFile">
+            <!--        附件-->
+            <UpLoadComponent ref="signatureFile"></UpLoadComponent>
+          </el-tab-pane>
         </el-tabs>
       </el-col>
     </el-row>
@@ -816,6 +820,7 @@
           remark3: '',
           opinionType: '',
           cwFileInfoList: [],
+          cwFileInfoList2: [],
           servedUnitId: '',
           reviewStatus: '',
           taskName: '',
@@ -826,6 +831,8 @@
         this.inputForm.id = id
         this.loading = false
         this.$refs.enclosure.clearUpload()
+        this.$refs.archiveFile.clearUpload()
+        this.$refs.signatureFile.clearUpload()
         this.reviewBys = []
         this.$nextTick(() => {
           // this.$refs.inputForm.resetFields()
@@ -857,7 +864,8 @@
               })
             }
             this.$refs.enclosure.newUpload('view', data.cwFileInfoList2, 'cwWorkContract', null, null, null, null, false)
-            // this.$refs.archiveFile.newUpload('view', data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
+            this.$refs.archiveFile.newUpload('view', data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
+            this.$refs.signatureFile.newUpload('view', data.signatureFileList, 'cwWorkContract', null, null, null, null, false)
             this.loading = false
           })
         })
@@ -1089,6 +1097,8 @@
         // this.$refs.uploadComponent.clearUpload()
         // this.$refs.inputForm.resetFields()
         this.$refs.enclosure.clearUpload()
+        this.$refs.archiveFile.clearUpload()
+        this.$refs.signatureFile.clearUpload()
       },
       tabHandleClick (event) {
         // console.log(event)

+ 9 - 9
src/views/modules/cw/workClientInfo/WorkClientList.vue

@@ -329,7 +329,7 @@
           this.loading = false
         })
         this.checkIsAdmin()
-        this.processService.getByName('财务-客户修改').then(async ({data}) => {
+        this.processService.getByName('会计-客户修改').then(async ({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionAuditId = data.id
             this.procDefAuditKey = data.key
@@ -374,8 +374,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({
@@ -401,8 +401,8 @@
           this.$store.dispatch('tagsView/delView', {fullPath: this.$route.fullPath})
           this.$router.push({query: {}})
           // 读取流程表单
-          let title = `发起流程【客户修改】`
-          let processTitle = `${this.userName} 发起了 ${data.no} - ${data.name} [客户修改]`
+          let title = `发起流程【会计-客户修改】`
+          let processTitle = `${this.userName} 发起了 ${data.no} - ${data.name} [会计-客户修改]`
           let status = 'startAndClose'
           if (data.status === '3') {
             status = 'startAndClose'
@@ -440,8 +440,8 @@
             this.refreshList()
           } else {
             // 读取流程表单
-            let title = `发起流程【客户修改】`
-            let processTitle = `${this.userName} 发起了 ${row.no} - ${row.name} [客户修改]`
+            let title = `发起流程【会计-客户修改】`
+            let processTitle = `${this.userName} 发起了 ${row.no} - ${row.name} [会计-客户修改]`
             let status = 'startAndClose'
             if (row.status === '3') {
               status = 'startAndClose'
@@ -486,8 +486,8 @@
                 ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 isShow: 'false',
                 readOnly: true,
-                title: '客户修改' + '流程详情',
-                formTitle: '客户修改' + '流程详情',
+                title: '会计-客户修改' + '流程详情',
+                formTitle: '会计-客户修改' + '流程详情',
                 businessId: row.id,
                 status: 'reback'
               }

+ 16 - 16
src/views/modules/cw/workContract/ContractRegistration.vue

@@ -325,7 +325,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
@@ -418,8 +418,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({
@@ -441,8 +441,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: 'cw_work_contract_info',
@@ -467,8 +467,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',
@@ -683,12 +683,12 @@
       }, */
       // 借用
       borrow (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: 'cw_work_contract_borrow',
@@ -756,12 +756,12 @@
       },
       // 纸质归档
       paperFiled (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: 'cw_work_contract_file_paper',
@@ -789,12 +789,12 @@
       },
       // 纸质归档撤回驳回修改
       paperFiledAndClose (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: 'cw_work_contract_file_paper',

+ 3 - 3
src/views/modules/sys/workContract/WorkContractList.vue

@@ -735,11 +735,11 @@
       },
       // 借用
       borrow (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_borrow',