File tree Expand file tree Collapse file tree 2 files changed +9
-6
lines changed
src/views/bpm/processInstance/detail Expand file tree Collapse file tree 2 files changed +9
-6
lines changed Original file line number Diff line number Diff line change 3
3
<el-timeline class =" pt-20px" >
4
4
<!-- 遍历每个审批节点 -->
5
5
<el-timeline-item
6
- v-for =" (activity, index) in approveNodes "
6
+ v-for =" (activity, index) in activityNodes "
7
7
:key =" index"
8
8
size =" large"
9
9
:icon =" getApprovalNodeIcon(activity.status, activity.nodeType)"
107
107
</div >
108
108
</div >
109
109
<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
+ "
111
114
class =" text-#a5a5a5 text-13px mt-1 w-full bg-#f8f8fa p2 rounded-md"
112
115
>
113
116
审批意见:{{ task.reason }}
@@ -135,7 +138,7 @@ import endSvg from '@/assets/svgs/bpm/end.svg'
135
138
136
139
defineOptions ({ name: ' BpmProcessInstanceTimeline' })
137
140
defineProps <{
138
- approveNodes : ProcessInstanceApi .ApprovalNodeInfo [] // 审批节点信息
141
+ activityNodes : ProcessInstanceApi .ApprovalNodeInfo [] // 审批节点信息
139
142
}>()
140
143
141
144
// 审批节点
Original file line number Diff line number Diff line change 65
65
</el-col >
66
66
<el-col :span =" 7" >
67
67
<!-- 审批记录时间线 -->
68
- <ProcessInstanceTimeline ref =" timelineRef" :approve -nodes =" approveNodes " />
68
+ <ProcessInstanceTimeline ref =" timelineRef" :activity -nodes =" activityNodes " />
69
69
</el-col >
70
70
</el-row >
71
71
</el-scrollbar >
@@ -229,7 +229,7 @@ const getApprovalDetail = async () => {
229
229
}
230
230
231
231
// 获取审批节点,显示 Timeline 的数据
232
- approveNodes .value = data .approveNodes
232
+ activityNodes .value = data .activityNodes
233
233
234
234
// 获取待办任务显示操作按钮
235
235
operationButtonRef .value ?.loadTodoTask (data .todoTask )
@@ -239,7 +239,7 @@ const getApprovalDetail = async () => {
239
239
}
240
240
241
241
// 审批节点信息
242
- const approveNodes = ref <ProcessInstanceApi .ApprovalNodeInfo []>([])
242
+ const activityNodes = ref <ProcessInstanceApi .ApprovalNodeInfo []>([])
243
243
/**
244
244
* 设置表单权限
245
245
*/
You can’t perform that action at this time.
0 commit comments