From 3527f281db502b382fe49765aefeae3cae3c3bda Mon Sep 17 00:00:00 2001 From: danshihao Date: Wed, 17 Jul 2024 16:28:36 +0800 Subject: [PATCH] =?UTF-8?q?[update=20=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?= =?UTF-8?q?=E6=B5=81=E7=A8=8B]=20=E9=87=8D=E6=96=B0=E5=88=86=E5=8F=91?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=A9=BA=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/workCenter/en.js | 3 ++- src/common/lang/workCenter/zh.js | 3 ++- .../modules/InterpretationMainInterpreterDistribute.vue | 8 +++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js index 217f20c..fc5dbc1 100644 --- a/src/common/lang/workCenter/en.js +++ b/src/common/lang/workCenter/en.js @@ -122,7 +122,8 @@ module.exports = { pleaseSelectInterpreter: 'Select at least one piece of data for each department involved to interpret', pleaseSelectClause: 'Please select terms', interpretationDistribution: 'Interpretation and Distribution', - interpretationTable: 'Interpretation Table' + interpretationTable: 'Interpretation Table', + interpretationAttributes: 'Interpretation of attributes' }, // 流程配置 processConfig: { diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index 3437a8b..f427783 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -122,7 +122,8 @@ module.exports = { pleaseSelectInterpreter: '至少选择一条数据的各涉及部门解读人', pleaseSelectClause: '请选择条款', interpretationDistribution: '解读分发', - interpretationTable: '解读表' + interpretationTable: '解读表', + interpretationAttributes: '解读属性' }, // 流程配置 processConfig: { diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue index bbc3d72..bcce856 100644 --- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue +++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue @@ -97,7 +97,7 @@ import UserSelection from '@comp/selection/UserSelection' import InterpretationClauseTable from '@views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable' -import { DecompositionSource, IsDistribute } from '@/enums/commonEnums' +import { DecompositionSource, IsDistribute, StandardInterpretationNodes } from '@/enums/commonEnums' export default { name: 'InterpretationMainInterpreterDistribute', components: { InterpretationClauseTable, UserSelection }, @@ -264,13 +264,15 @@ export default { obj._flag = true this.$message.warn(this.$t('workCenter.standardInterpretationProcess.pleaseSelectTheNextStep')) } else { + // 是否重新分发节点 + const isReDistribute = this.currentNodeId === StandardInterpretationNodes.standardInterpreterReDistribution.value // 只要下一步了,对新增的部分进行校验 obj.clauseData = this.$refs.interpretationClauseTable.getData() // 至少一条条款数据(重新分发节点可以删了代表不分发) - if (!obj.clauseData.length) { + if (!obj.clauseData.length && !isReDistribute) { this.$message.warn(this.$t('addAtLeastOneRowOfData')) obj._flag = true - } else if (this.isDistribute && !obj.clauseData.some(item => item.interpretPersonIds)) { + } else if (obj.clauseData.length && this.isDistribute && !obj.clauseData.some(item => item.interpretPersonIds)) { // 有数据且选分发时候校验 至少一条数据选择解读人 this.$message.warn(this.$t('workCenter.standardInterpretationProcess.pleaseSelectInterpreter')) obj._flag = true