Skip to content

Commit d599134

Browse files
committed
【功能完善】工作流:审批详情 approve-nodes => activity-nodes 字段
1 parent dca54d0 commit d599134

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<el-timeline class="pt-20px">
44
<!-- 遍历每个审批节点 -->
55
<el-timeline-item
6-
v-for="(activity, index) in approveNodes"
6+
v-for="(activity, index) in activityNodes"
77
:key="index"
88
size="large"
99
:icon="getApprovalNodeIcon(activity.status, activity.nodeType)"
@@ -107,7 +107,10 @@
107107
</div>
108108
</div>
109109
<div
110-
v-if="task.reason && activity.nodeType === NodeType.USER_TASK_NODE"
110+
v-if="
111+
task.reason &&
112+
[NodeType.USER_TASK_NODE, NodeType.END_EVENT_NODE].includes(activity.nodeType)
113+
"
111114
class="text-#a5a5a5 text-13px mt-1 w-full bg-#f8f8fa p2 rounded-md"
112115
>
113116
审批意见:{{ task.reason }}
@@ -135,7 +138,7 @@ import endSvg from '@/assets/svgs/bpm/end.svg'
135138
136139
defineOptions({ name: 'BpmProcessInstanceTimeline' })
137140
defineProps<{
138-
approveNodes: ProcessInstanceApi.ApprovalNodeInfo[] // 审批节点信息
141+
activityNodes: ProcessInstanceApi.ApprovalNodeInfo[] // 审批节点信息
139142
}>()
140143
141144
// 审批节点

src/views/bpm/processInstance/detail/index.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
</el-col>
6666
<el-col :span="7">
6767
<!-- 审批记录时间线 -->
68-
<ProcessInstanceTimeline ref="timelineRef" :approve-nodes="approveNodes" />
68+
<ProcessInstanceTimeline ref="timelineRef" :activity-nodes="activityNodes" />
6969
</el-col>
7070
</el-row>
7171
</el-scrollbar>
@@ -229,7 +229,7 @@ const getApprovalDetail = async () => {
229229
}
230230
231231
// 获取审批节点,显示 Timeline 的数据
232-
approveNodes.value = data.approveNodes
232+
activityNodes.value = data.activityNodes
233233
234234
// 获取待办任务显示操作按钮
235235
operationButtonRef.value?.loadTodoTask(data.todoTask)
@@ -239,7 +239,7 @@ const getApprovalDetail = async () => {
239239
}
240240
241241
// 审批节点信息
242-
const approveNodes = ref<ProcessInstanceApi.ApprovalNodeInfo[]>([])
242+
const activityNodes = ref<ProcessInstanceApi.ApprovalNodeInfo[]>([])
243243
/**
244244
* 设置表单权限
245245
*/

0 commit comments

Comments
 (0)