From 181380af98eeccada81d45ab6334bb42badd9bc5 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Wed, 10 Jan 2024 17:30:44 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug79820?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/workCenter/zh.js | 4 +++- .../PlanApprovalChangeFlow.vue | 20 +++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index f1197709..7557294a 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -88,7 +88,9 @@ module.exports = { pleaseSelectLeastTwoExpert: '请至少选择两位专家', newPrincipalDrafter: '新主起草人', newMainDraftUnit: '新主起草单位', - newHeadOfMainDraftingUnit: '新起草单位负责人' + newHeadOfMainDraftingUnit: '新起草单位负责人', + existingNumber: '企标编号已存在,需等待重新生成顺序号', + numberReset: '顺序号已重新生成' }, // 年度制修订计划 revisionPlanActivelyReport: { diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue index 7b5c4182..f083851a 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue @@ -807,11 +807,6 @@ export default { this.switchValue = 'user' return } - // 专家审批至少需要选两个专家 todo: 后端选多人流程进行不下去,暂时不限制传多人 - // if (personnelObj.standardExpert.split(',').length < 2) { - // this.$message.warning(this.$t('workCenter.enterpriseInitChangePlan.pleaseSelectLeastTwoExpert')) - // return - // } console.log(this.formInline) this.processInfoForm.validateFields((err, values) => { this.$refs.ruleForm.validate(valid => { @@ -898,12 +893,25 @@ export default { } else { func = enterprisePlanApproval } - func(param).then(res => { + func(param).then(async res => { if (res.success) { this.$message.success(res.message) this.goBack() } else { this.$message.warning(res.message) + if (res.message === this.$t('workCenter.enterpriseInitChangePlan.existingNumber')) { + // 已经存在编号,重新生成 + if ([ProjectType.ENACT.value, ProjectType.MODIFY.value, ProjectType.MERGE.value].includes(this.formInline.projectType)) { + // 是制定修订或者合并,重新获取企标编号 + this.loading = true + await this.$refs.approvalBaseInfo.getEnStandardNo() + setTimeout(() => { + this.loading = false + // 提示顺序号已重新生成 + this.$message.success(this.$t('workCenter.enterpriseInitChangePlan.numberReset')) + }, 500) + } + } } }).finally(() => { this.loading = false