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
d599134d
authored
Oct 26, 2024
by
YunaiV
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【功能完善】工作流:审批详情 approve-nodes => activity-nodes 字段
parent
dca54d07
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
+6
-3
src/views/bpm/processInstance/detail/index.vue
+3
-3
No files found.
src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
View file @
d599134d
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<el-timeline
class=
"pt-20px"
>
<el-timeline
class=
"pt-20px"
>
<!-- 遍历每个审批节点 -->
<!-- 遍历每个审批节点 -->
<el-timeline-item
<el-timeline-item
v-for=
"(activity, index) in a
pprove
Nodes"
v-for=
"(activity, index) in a
ctivity
Nodes"
:key=
"index"
:key=
"index"
size=
"large"
size=
"large"
:icon=
"getApprovalNodeIcon(activity.status, activity.nodeType)"
:icon=
"getApprovalNodeIcon(activity.status, activity.nodeType)"
...
@@ -107,7 +107,10 @@
...
@@ -107,7 +107,10 @@
</div>
</div>
</div>
</div>
<div
<div
v-if=
"task.reason && activity.nodeType === NodeType.USER_TASK_NODE"
v-if=
"
task.reason &&
[NodeType.USER_TASK_NODE, NodeType.END_EVENT_NODE].includes(activity.nodeType)
"
class=
"text-#a5a5a5 text-13px mt-1 w-full bg-#f8f8fa p2 rounded-md"
class=
"text-#a5a5a5 text-13px mt-1 w-full bg-#f8f8fa p2 rounded-md"
>
>
审批意见:{{ task.reason }}
审批意见:{{ task.reason }}
...
@@ -135,7 +138,7 @@ import endSvg from '@/assets/svgs/bpm/end.svg'
...
@@ -135,7 +138,7 @@ import endSvg from '@/assets/svgs/bpm/end.svg'
defineOptions
({
name
:
'BpmProcessInstanceTimeline'
})
defineOptions
({
name
:
'BpmProcessInstanceTimeline'
})
defineProps
<
{
defineProps
<
{
a
pprove
Nodes
:
ProcessInstanceApi
.
ApprovalNodeInfo
[]
// 审批节点信息
a
ctivity
Nodes
:
ProcessInstanceApi
.
ApprovalNodeInfo
[]
// 审批节点信息
}
>
()
}
>
()
// 审批节点
// 审批节点
...
...
src/views/bpm/processInstance/detail/index.vue
View file @
d599134d
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
</el-col>
</el-col>
<el-col
:span=
"7"
>
<el-col
:span=
"7"
>
<!-- 审批记录时间线 -->
<!-- 审批记录时间线 -->
<ProcessInstanceTimeline
ref=
"timelineRef"
:a
pprove-nodes=
"approve
Nodes"
/>
<ProcessInstanceTimeline
ref=
"timelineRef"
:a
ctivity-nodes=
"activity
Nodes"
/>
</el-col>
</el-col>
</el-row>
</el-row>
</el-scrollbar>
</el-scrollbar>
...
@@ -229,7 +229,7 @@ const getApprovalDetail = async () => {
...
@@ -229,7 +229,7 @@ const getApprovalDetail = async () => {
}
}
// 获取审批节点,显示 Timeline 的数据
// 获取审批节点,显示 Timeline 的数据
a
pproveNodes
.
value
=
data
.
approve
Nodes
a
ctivityNodes
.
value
=
data
.
activity
Nodes
// 获取待办任务显示操作按钮
// 获取待办任务显示操作按钮
operationButtonRef
.
value
?.
loadTodoTask
(
data
.
todoTask
)
operationButtonRef
.
value
?.
loadTodoTask
(
data
.
todoTask
)
...
@@ -239,7 +239,7 @@ const getApprovalDetail = async () => {
...
@@ -239,7 +239,7 @@ const getApprovalDetail = async () => {
}
}
// 审批节点信息
// 审批节点信息
const
a
pprove
Nodes
=
ref
<
ProcessInstanceApi
.
ApprovalNodeInfo
[]
>
([])
const
a
ctivity
Nodes
=
ref
<
ProcessInstanceApi
.
ApprovalNodeInfo
[]
>
([])
/**
/**
* 设置表单权限
* 设置表单权限
*/
*/
...
...
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