From d7e6523dadb931cda5f3919a6dbcbae993f088e2 Mon Sep 17 00:00:00 2001 From: jason <2667446@qq.com> Date: Sat, 4 Jan 2025 15:24:38 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91=E5=BB=B6=E8=BF=9F=E5=99=A8=E8=8A=82=E7=82=B9=E7=9A=84?= =?UTF-8?q?=E9=AB=98=E4=BA=AE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/ProcessInstanceSimpleViewer.vue | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue b/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue index 0808bec9..0017d3fe 100644 --- a/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue +++ b/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue @@ -82,7 +82,6 @@ const setSimpleModelNodeTaskStatus = ( } return } - // 审批节点 if ( simpleModel.type === NodeType.START_USER_NODE || @@ -98,26 +97,33 @@ const setSimpleModelNodeTaskStatus = ( } // TODO 是不是还缺一个 cancel 的状态 } - // 抄送节点 if (simpleModel.type === NodeType.COPY_TASK_NODE) { - // 抄送节点 只有通过和未执行状态 + // 抄送节点,只有通过和未执行状态 if (finishedActivityIds.includes(simpleModel.id)) { simpleModel.activityStatus = TaskStatusEnum.APPROVE } else { simpleModel.activityStatus = TaskStatusEnum.NOT_START } } - // 条件节点 对应 SequenceFlow + // 延迟器节点 + if (simpleModel.type === NodeType.DELAY_TIMER_NODE) { + // 延迟器节点,只有通过和未执行状态 + if (finishedActivityIds.includes(simpleModel.id)) { + simpleModel.activityStatus = TaskStatusEnum.APPROVE + } else { + simpleModel.activityStatus = TaskStatusEnum.NOT_START + } + } + // 条件节点对应 SequenceFlow if (simpleModel.type === NodeType.CONDITION_NODE) { - // 条件节点。只有通过和未执行状态 + // 条件节点,只有通过和未执行状态 if (finishedSequenceFlowActivityIds.includes(simpleModel.id)) { simpleModel.activityStatus = TaskStatusEnum.APPROVE } else { simpleModel.activityStatus = TaskStatusEnum.NOT_START } } - // 网关节点 if ( simpleModel.type === NodeType.CONDITION_BRANCH_NODE || @@ -155,13 +161,13 @@ const setSimpleModelNodeTaskStatus = (