Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
812e5b58
authored
Oct 31, 2024
by
YunaiV
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【功能修复】工作流:修复流程预测的 candidateUsers 展示不正确
parent
8465f8fa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
25 deletions
+24
-25
src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
+1
-1
src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
+23
-24
No files found.
src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
View file @
812e5b58
...
...
@@ -334,7 +334,7 @@
<div
@
click=
"openChildrenTask()"
class=
"hover-bg-gray-100 rounded-xl p-6px"
v-if=
"runningTask?.children"
v-if=
"runningTask?.children
.length > 0
"
>
<Icon
:size=
"14"
icon=
"ep:semi-select"
/>
减签
</div>
...
...
src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
View file @
812e5b58
...
...
@@ -81,30 +81,6 @@
/>
</div>
</div>
<!-- 情况二:遍历每个审批节点下的【候选的】task 任务。例如说,1)依次审批,2)未来的审批任务等 -->
<div
v-for=
"(user, idx1) in activity.candidateUsers"
:key=
"idx1"
class=
"bg-gray-100 h-35px rounded-3xl flex items-center p-8px gap-2 dark:color-gray-600 position-relative"
>
<el-avatar
:size=
"28"
v-if=
"user.avatar"
:src=
"user.avatar"
/>
<el-avatar
:size=
"28"
v-else
>
{{ user.nickname.substring(0, 1) }}
</el-avatar>
{{ user.nickname }}
<!-- 信息:任务 ICON -->
<div
v-if=
"onlyStatusIconShow.includes(task.status)"
class=
"position-absolute top-22px left-26px bg-#fff rounded-full flex items-center p-2px"
>
<Icon
:size=
"12"
:icon=
"statusIconMap2['-1']?.icon"
:color=
"statusIconMap2['-1']?.color"
/>
</div>
</div>
</div>
<div
v-if=
"
...
...
@@ -117,6 +93,29 @@
</div>
</div>
</div>
<!-- 情况二:遍历每个审批节点下的【候选的】task 任务。例如说,1)依次审批,2)未来的审批任务等 -->
<div
v-for=
"(user, idx1) in activity.candidateUsers"
:key=
"idx1"
class=
"bg-gray-100 h-35px rounded-3xl flex items-center p-8px gap-2 dark:color-gray-600 position-relative"
>
<el-avatar
:size=
"28"
v-if=
"user.avatar"
:src=
"user.avatar"
/>
<el-avatar
:size=
"28"
v-else
>
{{ user.nickname.substring(0, 1) }}
</el-avatar>
{{ user.nickname }}
<!-- 信息:任务 ICON -->
<div
class=
"position-absolute top-22px left-26px bg-#fff rounded-full flex items-center p-2px"
>
<Icon
:size=
"12"
:icon=
"statusIconMap2['-1']?.icon"
:color=
"statusIconMap2['-1']?.color"
/>
</div>
</div>
</div>
</div>
</el-timeline-item>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment