Skip to content

Commit 812e5b5

Browse files
committed
【功能修复】工作流:修复流程预测的 candidateUsers 展示不正确
1 parent 8465f8f commit 812e5b5

File tree

2 files changed

+24
-25
lines changed

2 files changed

+24
-25
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@
334334
<div
335335
@click="openChildrenTask()"
336336
class="hover-bg-gray-100 rounded-xl p-6px"
337-
v-if="runningTask?.children"
337+
v-if="runningTask?.children.length > 0"
338338
>
339339
<Icon :size="14" icon="ep:semi-select" />&nbsp; 减签
340340
</div>

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

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -81,30 +81,6 @@
8181
/>
8282
</div>
8383
</div>
84-
<!-- 情况二:遍历每个审批节点下的【候选的】task 任务。例如说,1)依次审批,2)未来的审批任务等 -->
85-
<div
86-
v-for="(user, idx1) in activity.candidateUsers"
87-
:key="idx1"
88-
class="bg-gray-100 h-35px rounded-3xl flex items-center p-8px gap-2 dark:color-gray-600 position-relative"
89-
>
90-
<el-avatar :size="28" v-if="user.avatar" :src="user.avatar" />
91-
<el-avatar :size="28" v-else>
92-
{{ user.nickname.substring(0, 1) }}
93-
</el-avatar>
94-
{{ user.nickname }}
95-
96-
<!-- 信息:任务 ICON -->
97-
<div
98-
v-if="onlyStatusIconShow.includes(task.status)"
99-
class="position-absolute top-22px left-26px bg-#fff rounded-full flex items-center p-2px"
100-
>
101-
<Icon
102-
:size="12"
103-
:icon="statusIconMap2['-1']?.icon"
104-
:color="statusIconMap2['-1']?.color"
105-
/>
106-
</div>
107-
</div>
10884
</div>
10985
<div
11086
v-if="
@@ -117,6 +93,29 @@
11793
</div>
11894
</div>
11995
</div>
96+
<!-- 情况二:遍历每个审批节点下的【候选的】task 任务。例如说,1)依次审批,2)未来的审批任务等 -->
97+
<div
98+
v-for="(user, idx1) in activity.candidateUsers"
99+
:key="idx1"
100+
class="bg-gray-100 h-35px rounded-3xl flex items-center p-8px gap-2 dark:color-gray-600 position-relative"
101+
>
102+
<el-avatar :size="28" v-if="user.avatar" :src="user.avatar" />
103+
<el-avatar :size="28" v-else>
104+
{{ user.nickname.substring(0, 1) }}
105+
</el-avatar>
106+
{{ user.nickname }}
107+
108+
<!-- 信息:任务 ICON -->
109+
<div
110+
class="position-absolute top-22px left-26px bg-#fff rounded-full flex items-center p-2px"
111+
>
112+
<Icon
113+
:size="12"
114+
:icon="statusIconMap2['-1']?.icon"
115+
:color="statusIconMap2['-1']?.color"
116+
/>
117+
</div>
118+
</div>
120119
</div>
121120
</div>
122121
</el-timeline-item>

0 commit comments

Comments
 (0)