From 810937d46a51ff0a380f52d9affc7dced54d7a08 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 13 Jun 2024 17:35:16 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E6=B5=81=E7=A8=8B=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=8F=90=E4=BA=A4=E4=BA=8C=E6=AC=A1=E5=BC=B9?= =?UTF-8?q?=E6=A1=86=E6=8F=90=E9=86=92=E6=8F=92=E5=85=A5=E7=AD=BE=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/workCenter/zh.js | 6 +- .../EnterpriseStandardRevisionFlow.vue | 78 ++++++++++++++----- 2 files changed, 62 insertions(+), 22 deletions(-) diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index 2cc6dd1a..2776b30d 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -160,7 +160,11 @@ module.exports = { esPlan: '企标计划', deadlineNeedGreaterThan: '征求意见截止日期需要比征求意见稿计划完成日期早', noStandardTextLook: '暂无标准文本可查看', - summaryOfOpinions: '意见汇总' + summaryOfOpinions: '意见汇总', + confirmIsInsertSignature: '确认是否已插入签章', + confirmIsInsertSignatureCont: '本节点需要前往在线编辑页面插入签章,请前往在线编辑页面确认是否已经插入签章,检查签章页无误后再行提交。', + confirmIsInsertSignatureOkText: '前往在线编辑页面', + confirmIsInsertSignatureCancelText: '确认签章页无误并提交' }, // 企标更改流程 enStandardChange: { diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue index cd0d127b..c51ee117 100644 --- a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue +++ b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue @@ -629,27 +629,63 @@ export default { // 提交 handleSubmit () { if (this.loading) return - this.approvalInfoForm.validateFields(async (approvalErr, approvalValues) => { - const data = await this.$refs.baseInfoRef.getDataValidate() - if (!approvalErr && data) { - const param = {} // 需要传给后端的数据 - param.common = Object.assign({}, approvalValues) - param.common.taskId = this.$route.query.taskId - param.data = data - this.loading = true - enStandardEditAgree(param).then(res => { - if (res.success) { - this.$message.success(res.message) - this.goBack() - } else { - this.$message.warning(res.message) - this.loading = false - } - }) - } else { - this.switchValue = 'base' - } - }) + if (this.currentNode === 18) { + // 是最后一个节点,二次弹框确认在线编辑是否插入了签章 + this.$confirm({ + title: this.$t('workCenter.enStandardRevision.confirmIsInsertSignature'), + content: this.$t('workCenter.enStandardRevision.confirmIsInsertSignatureCont'), + cancelText: this.$t('workCenter.enStandardRevision.confirmIsInsertSignatureCancelText'), + okText: this.$t('workCenter.enStandardRevision.confirmIsInsertSignatureOkText'), + onOk: () => { + this.$refs.baseInfoRef.toOnlineEditor() + }, + onCancel: () => { + this.approvalInfoForm.validateFields(async (approvalErr, approvalValues) => { + const data = await this.$refs.baseInfoRef.getDataValidate() + if (!approvalErr && data) { + const param = {} // 需要传给后端的数据 + param.common = Object.assign({}, approvalValues) + param.common.taskId = this.$route.query.taskId + param.data = data + this.loading = true + enStandardEditAgree(param).then(res => { + if (res.success) { + this.$message.success(res.message) + this.goBack() + } else { + this.$message.warning(res.message) + this.loading = false + } + }) + } else { + this.switchValue = 'base' + } + }) + } + }) + } else { + this.approvalInfoForm.validateFields(async (approvalErr, approvalValues) => { + const data = await this.$refs.baseInfoRef.getDataValidate() + if (!approvalErr && data) { + const param = {} // 需要传给后端的数据 + param.common = Object.assign({}, approvalValues) + param.common.taskId = this.$route.query.taskId + param.data = data + this.loading = true + enStandardEditAgree(param).then(res => { + if (res.success) { + this.$message.success(res.message) + this.goBack() + } else { + this.$message.warning(res.message) + this.loading = false + } + }) + } else { + this.switchValue = 'base' + } + }) + } }, // 同意 handleAgree () {