From f15d124d78b404ec40840978e7c24e39c44f5e6b Mon Sep 17 00:00:00 2001 From: danshihao Date: Thu, 22 Aug 2024 09:49:42 +0800 Subject: [PATCH] =?UTF-8?q?[update=2089221]=20=E8=A7=A3=E8=AF=BB=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=88=86=E5=8F=91=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8E=E5=8E=BB=E6=8E=89=E8=BD=AC=E5=8A=9E=E5=92=8C=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/enums/commonEnums.js | 2 +- .../workCenter/processCenter/table/TodoList.vue | 11 +++++++++-- .../StandardInterpretationProcess.vue | 17 ++++++++++++++--- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index d079f91..b55306e 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -190,7 +190,7 @@ export const StandardInterpretationNodes = new EsEnums({ initiated: { text: '法规工程师发起', value: 'regulatory_engineer_start', btn: ['save', 'submit'] }, controlDepartLiaisonDistribution: { text: '主控部门联络人分发', value: 'contact_person_distribute', btn: ['transfer', 'save', 'submit'] }, standardInterpreterDistribution: { text: '标准主解读人分发', value: 'master_interpret_distribute', btn: ['reject', 'transfer', 'save', 'submit'] }, - standardInterpreterReDistribution: { text: '标准主解读人分发', value: 'master_interpret_again_distribute', btn: ['transfer', 'save', 'submit'] }, + standardInterpreterReDistribution: { text: '标准主解读人分发', value: 'master_interpret_again_distribute', btn: ['save', 'submit'] }, interpreterFillInfo: { text: '解读人填写信息', value: 'interpreting_people_fillout', btn: ['reject', 'transfer', 'save', 'submit'] }, mainInterpreterSingleLineReview: { text: '标准主解读人审核', value: 'master_interpret_approve', btn: ['reject', 'transfer', 'save', 'agree'] }, standardInterpreterSummary: { text: '标准主解读人汇总', value: 'master_interpret_summary', btn: ['transfer', 'save', 'submit'] }, diff --git a/src/views/workCenter/processCenter/table/TodoList.vue b/src/views/workCenter/processCenter/table/TodoList.vue index 059da6a..98e22e8 100644 --- a/src/views/workCenter/processCenter/table/TodoList.vue +++ b/src/views/workCenter/processCenter/table/TodoList.vue @@ -77,7 +77,7 @@ import { import { ProcessType, MarketListReleaseNodes, - NewRegulationsImportNodes, StandardInterpretationNodes + NewRegulationsImportNodes, StandardInterpretationNodes, YesOrNoEnum } from '@/enums/commonEnums' import { getAction } from '../../../../api/manage' import { RegulatoryComplianceCheckNodes } from '../../../../enums/commonEnums' @@ -160,7 +160,10 @@ export default { // 新法规导入流程 [ProcessType.NEW_REGULATIONS_IMPORT.value]: [NewRegulationsImportNodes.initiated.value], // 标准解读流程 - [ProcessType.STANDARD_INTERPRETATION_PROCESS.value]: [StandardInterpretationNodes.initiated.value], + [ProcessType.STANDARD_INTERPRETATION_PROCESS.value]: [ + StandardInterpretationNodes.initiated.value, + StandardInterpretationNodes.standardInterpreterReDistribution.value + ], // 法规符合性排查流程 [ProcessType.REGULATORY_COMPLIANCE_CHECK.value]: [RegulatoryComplianceCheckNodes.initiated.value], // 市场清单发布流程 @@ -259,6 +262,10 @@ export default { }, // 是否显示转办按钮 isShowTurnTo (record) { + // 解读流程分发部分数据后去掉转办按钮 + if (record.prcType + '' === ProcessType.STANDARD_INTERPRETATION_PROCESS.value && StandardInterpretationNodes.standardInterpreterDistribution.value === record.nodeId) { + return YesOrNoEnum.NO.value === record.showRejectTransition + } if (record.prcType && record.nodeId) { return !this.notTurnToBtn[record.prcType + ''].some(tt => record.nodeId.indexOf(tt) !== -1) } else { diff --git a/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue b/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue index 1c7a190..8cff866 100644 --- a/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue +++ b/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue @@ -114,7 +114,7 @@ {{ $t('countersign') }} - {{ $t('turnTo') }} + {{ $t('turnTo') }} {{ $t('preservation') }} @@ -122,7 +122,7 @@ {{ $t('submit') }} - {{ $t('reject') }} + {{ $t('reject') }} @@ -140,7 +140,7 @@ import { ProcessKey, ProcessType, StandardInterpretationNodes, - StandardSource + StandardSource, YesOrNoEnum } from '@/enums/commonEnums' import { interpretGetProjectId, @@ -239,6 +239,17 @@ export default { } }, computed: { + // 是否部分数据已经分发(就不显示驳回和转办按钮) + isPartialDistribution () { + // 分发节点 + const isDistributeNode = StandardInterpretationNodes.standardInterpreterDistribution.value === this.currentNodeId + // 是否已经分发部分数据 + const dataStatus = this.info.data && this.info.data.processStandardInterpret && this.info.data.processStandardInterpret.showRejectTransition + if (isDistributeNode && (dataStatus === YesOrNoEnum.NO.value)) { + return false + } + return true + }, /** * 当前节点数组 * 一个节点对应多个nodeId