From 8ccd87a3f903314701d4d0bd95014282aaaa00ba Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 23 Nov 2023 17:26:46 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=8A=82=E7=82=B91=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E5=92=8C=E9=A9=B3=E5=9B=9E=E5=90=8E=E8=B0=83=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RevisionPlanActivelyReportFlow.vue | 11 ++++++-- .../RevisionPlanStandardizationInitFlow.vue | 13 ++++++--- .../EnterpriseStandardAnnulFlow.vue | 10 ++++++- .../EnterpriseStandardChangeFlow.vue | 11 ++++++-- .../PlanApprovalChangeFlow.vue | 1 - .../EnterpriseStandardRecheckFlow.vue | 27 ++++++++++++------- .../EnterpriseStandardRevisionFlow.vue | 11 ++++++-- .../EnterpriseStandardSealSaveFlow.vue | 10 ++++++- .../EnterpriseStandardStartUseFlow.vue | 10 ++++++- 9 files changed, 80 insertions(+), 24 deletions(-) diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue index 42cc48ba..e99608ed 100644 --- a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue @@ -412,7 +412,6 @@ export default { activelyReportSave(paramObj).then(res => { if (res.success) { this.$message.success(res.message) - this.goBack() } else { this.$message.warning(res.message) } @@ -439,7 +438,15 @@ export default { const param = {} // 需要给后端的参数 param.common = { ...values, ...approvalValues, ...data.formInline } param.flowUser = personnelObj - activelyReportApproval(param).then(res => { + let func + if (this.$route.query.taskId) { + // 有taskId说明是驳回的提交 + func = activelyReportAgree + param.common.taskId = this.$route.query.taskId + } else { + func = activelyReportApproval + } + func(param).then(res => { if (res.success) { this.$message.success(res.message) this.goBack() diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue index 6db7e04c..54156972 100644 --- a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue +++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue @@ -146,8 +146,6 @@ import { standardizationInitReject, standardizationInitGetDataById } from '@/api/workCenter' -import Vue from 'vue' -import { USER_INFO } from '@/store/mutation-types' import pick from 'lodash.pick' import { WorkCenterMixin } from '@/mixins/WorkCenterMixin' import { ProcessKey } from '../../../enums/commonEnums' @@ -331,7 +329,6 @@ export default { standardizationInitSave(param).then(res => { if (res.success) { this.$message.success(res.message) - this.goBack() } else { this.$message.warning(res.message) } @@ -355,7 +352,15 @@ export default { param.common = { ...values, ...approvalValues } param.dataList = data.dataSource param.flowUser = personnelObj - standardizationInitApproval(param).then(res => { + let func + if (this.$route.query.taskId) { + // 有taskId说明是驳回的提交 + func = standardizationInitAgree + param.common.taskId = this.$route.query.taskId + } else { + func = standardizationInitApproval + } + func(param).then(res => { if (res.success) { this.$message.success(res.message) this.goBack() diff --git a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue index 2e3a4dc1..9ab111c6 100644 --- a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue +++ b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue @@ -346,7 +346,15 @@ export default { paramObj.common = { ...values, ...approvalValues } paramObj.flowUser = personnelObj paramObj.data = data.formInline - enStandardAnnulApproval(paramObj).then(res => { + let func + if (this.$route.query.taskId) { + // 有taskId说明是驳回的提交 + func = enStandardAnnulAgree + paramObj.common.taskId = this.$route.query.taskId + } else { + func = enStandardAnnulApproval + } + func(paramObj).then(res => { if (res.success) { this.$message.success(res.message) this.goBack() diff --git a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue index d90f7dae..fd45b4ee 100644 --- a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue @@ -328,7 +328,6 @@ export default { enStandardChangeSave(paramObj).then(res => { if (res.success) { this.$message.success(res.message) - this.goBack() } else { this.$message.warning(res.message) } @@ -356,7 +355,15 @@ export default { param.flowUser = personnelObj param.data = Object.assign({}, data.formInline) param.data.list = data.dataSource - enStandardChangeApproval(param).then(res => { + let func + if (this.$route.query.taskId) { + // 有taskId说明是驳回的提交 + func = enStandardChangeAgree + param.common.taskId = this.$route.query.taskId + } else { + func = enStandardChangeApproval + } + func(param).then(res => { if (res.success) { this.$message.success(res.message) this.goBack() diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue index 9e58e9f6..8ae925c2 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue @@ -716,7 +716,6 @@ export default { enterprisePlanApprovalSave(param).then(res => { if (res.success) { this.$message.success(res.message) - this.goBack() } else { this.$message.warning(res.message) } diff --git a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue index 7082807e..fd6f6bc3 100644 --- a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue +++ b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue @@ -52,15 +52,14 @@
{{ $t('basicServiceInformation') }}
- - - - - - + + + + + - - + + @@ -232,7 +231,7 @@ export default { switchValue: 'base', // 头部tab选中值 disabled: false, onlyLook: false, // 是否仅查看 - currentNode: 1, // 当前节点 + currentNode: 2, // 当前节点 currentNodeName: '', model: {}, processInfoForm: this.$form.createForm(this), @@ -376,7 +375,15 @@ export default { paramObj.common = { ...values, ...approvalValues } paramObj.flowUser = personnelObj paramObj.data = data.formInline - enStandardRecheckApproval(paramObj).then(res => { + let func + if (this.$route.query.taskId) { + // 有taskId说明是驳回的提交，或者自动发起的节点1 + func = enStandardRecheckAgree + paramObj.common.taskId = this.$route.query.taskId + } else { + func = enStandardRecheckApproval + } + func(paramObj).then(res => { if (res.success) { this.$message.success(res.message) this.goBack() diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue index d6ae8245..4a6ddc22 100644 --- a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue +++ b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue @@ -423,7 +423,6 @@ export default { enStandardEditSave(paramObj).then(res => { if (res.success) { this.$message.success(res.message) - this.goBack() } else { this.$message.warning(res.message) } @@ -453,7 +452,15 @@ export default { } else { param.dataList = [data.formInline] } - enStandardEditApproval(param).then(res => { + let func + if (this.$route.query.taskId) { + // 有taskId说明是驳回的提交 + func = enStandardEditAgree + param.common.taskId = this.$route.query.taskId + } else { + func = enStandardEditApproval + } + func(param).then(res => { if (res.success) { this.$message.success(res.message) this.goBack() diff --git a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue index 1a3b2173..d05346fa 100644 --- a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue +++ b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue @@ -346,7 +346,15 @@ export default { paramObj.common = { ...values, ...approvalValues } paramObj.flowUser = personnelObj paramObj.data = data.formInline - enStandardSealSaveApproval(paramObj).then(res => { + let func + if (this.$route.query.taskId) { + // 有taskId说明是驳回的提交 + func = enStandardSealSaveAgree + paramObj.common.taskId = this.$route.query.taskId + } else { + func = enStandardSealSaveApproval + } + func(paramObj).then(res => { if (res.success) { this.$message.success(res.message) this.goBack() diff --git a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue index 44544e83..9ffe4bfe 100644 --- a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue +++ b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue @@ -346,7 +346,15 @@ export default { paramObj.common = { ...values, ...approvalValues } paramObj.flowUser = personnelObj paramObj.data = data.formInline - enStandardStartUseApproval(paramObj).then(res => { + let func + if (this.$route.query.taskId) { + // 有taskId说明是驳回的提交 + func = enStandardStartUseAgree + paramObj.common.taskId = this.$route.query.taskId + } else { + func = enStandardStartUseApproval + } + func(paramObj).then(res => { if (res.success) { this.$message.success(res.message) this.goBack()