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
8b35ee53
authored
Aug 22, 2024
by
GoldenZqqq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 删除测试数据、工作流审批页面右侧时间线使用接口返回的真实数据
parent
5968fc5f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
45 deletions
+16
-45
src/views/bpm/processInstance/detail/index_new.vue
+16
-45
No files found.
src/views/bpm/processInstance/detail/index_new.vue
View file @
8b35ee53
...
@@ -13,9 +13,7 @@
...
@@ -13,9 +13,7 @@
<img
class=
"rounded-full h-28px"
src=
"@/assets/imgs/avatar.jpg"
alt=
""
/>
<img
class=
"rounded-full h-28px"
src=
"@/assets/imgs/avatar.jpg"
alt=
""
/>
{{
processInstance
?.
startUser
?.
nickname
}}
{{
processInstance
?.
startUser
?.
nickname
}}
</div>
</div>
<div
class=
"text-#878c93"
>
<div
class=
"text-#878c93"
>
{{
formatDate
(
processInstance
.
startTime
)
}}
提交
</div>
{{
dayjs
(
processInstance
.
startTime
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
}}
提交
</div>
</div>
</div>
<el-tabs>
<el-tabs>
...
@@ -210,25 +208,33 @@
...
@@ -210,25 +208,33 @@
</el-col>
</el-col>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<el-timeline
class=
"pt-20px"
>
<el-timeline
class=
"pt-20px"
>
<el-timeline-item
type=
"primary"
size=
"large"
>
<div
class=
"flex flex-col items-start gap-2"
>
<div
class=
"font-bold"
>
发起人:{{ processInstance?.startUser?.nickname }}
</div>
<el-tag
type=
"success"
>
发起
</el-tag>
<div
class=
"text-#a5a5a5 text-12px"
>
发起时间:{{ formatDate(processInstance.startTime) }}
</div>
</div>
</el-timeline-item>
<el-timeline-item
<el-timeline-item
v-for=
"(activity, index) in
activitie
s"
v-for=
"(activity, index) in
task
s"
:key=
"index"
:key=
"index"
type=
"primary"
type=
"primary"
size=
"large"
size=
"large"
>
>
<div
class=
"flex flex-col items-start gap-2"
>
<div
class=
"flex flex-col items-start gap-2"
>
<div
class=
"font-bold"
>
<div
class=
"font-bold"
>
审批人:{{ activity.assigneeUser?.nickname }}
</div>
{{ index === 0 ? '发起人' : '审批人' }}:{{ activity.createBy }}
</div
>
<dict-tag
<dict-tag
:type=
"DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS"
:type=
"DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS"
:value=
"activity.status"
:value=
"activity.status"
/>
/>
<!-- TODO:暂无该字段 -->
<div
v-if=
"activity.receiveTime"
class=
"text-#a5a5a5 text-12px"
>
<div
v-if=
"activity.receiveTime"
class=
"text-#a5a5a5 text-12px"
>
接收时间:{{ activity.receiveTime }}
接收时间:{{ activity.receiveTime }}
</div>
</div>
<div
v-if=
"activity.
audit
Time"
class=
"text-#a5a5a5 text-12px"
>
<div
v-if=
"activity.
create
Time"
class=
"text-#a5a5a5 text-12px"
>
审批时间:{{ activity.
audit
Time }}
审批时间:{{ activity.
create
Time }}
</div>
</div>
<div
v-if=
"activity.opinion"
class=
"text-#a5a5a5 text-12px w-100%"
>
<div
v-if=
"activity.opinion"
class=
"text-#a5a5a5 text-12px w-100%"
>
<div
class=
"mb-5px"
>
审批意见:
</div>
<div
class=
"mb-5px"
>
审批意见:
</div>
...
@@ -284,7 +290,7 @@
...
@@ -284,7 +290,7 @@
</ContentWrap>
</ContentWrap>
</template>
</template>
<
script
lang=
"ts"
setup
>
<
script
lang=
"ts"
setup
>
import
dayjs
from
'dayjs
'
import
{
formatDate
}
from
'@/utils/formatTime
'
import
{
DICT_TYPE
}
from
'@/utils/dict'
import
{
DICT_TYPE
}
from
'@/utils/dict'
import
{
useUserStore
}
from
'@/store/modules/user'
import
{
useUserStore
}
from
'@/store/modules/user'
import
{
setConfAndFields2
}
from
'@/utils/formCreate'
import
{
setConfAndFields2
}
from
'@/utils/formCreate'
...
@@ -546,41 +552,6 @@ onMounted(async () => {
...
@@ -546,41 +552,6 @@ onMounted(async () => {
// 获得用户列表
// 获得用户列表
userOptions
.
value
=
await
UserApi
.
getSimpleUserList
()
userOptions
.
value
=
await
UserApi
.
getSimpleUserList
()
})
})
/* 测试数据 */
const
activities
=
[
{
status
:
1
,
receiveTime
:
'2024-06-25 13:30'
,
createBy
:
'张三'
},
{
status
:
1
,
receiveTime
:
'2024-06-25 13:30'
,
auditTime
:
'2024-07-12 16:32'
,
opinion
:
'已阅,同意'
,
createBy
:
'李四'
},
{
status
:
1
,
receiveTime
:
'2024-06-25 13:30'
,
auditTime
:
'2024-07-12 16:32'
,
createBy
:
'王五'
},
{
status
:
1
,
receiveTime
:
'2024-06-25 13:30'
,
auditTime
:
'2024-07-12 16:32'
,
opinion
:
'已阅,同意'
,
createBy
:
'刘六'
},
{
status
:
1
,
receiveTime
:
'2024-06-25 13:30'
,
auditTime
:
'2024-07-12 16:32'
,
createBy
:
'徐七'
}
]
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
...
...
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