|
@@ -46,12 +46,7 @@
|
|
|
|
|
|
<!--审批流-->
|
|
<!--审批流-->
|
|
<el-timeline style="margin-left: 50px">
|
|
<el-timeline style="margin-left: 50px">
|
|
- <el-timeline-item
|
|
|
|
- v-for="active in activeData"
|
|
|
|
- :key="active.id"
|
|
|
|
- hollow
|
|
|
|
- :timestamp="active.id ? formatTimestamp(new Date(active.createTime)) : ''"
|
|
|
|
- >
|
|
|
|
|
|
+ <el-timeline-item v-for="active in activeData" :key="active.id" hollow :timestamp="active.local_timestamp">
|
|
<template #dot>
|
|
<template #dot>
|
|
<FlowTypeDot :status="active.id ? 0 : 1" :type="active.taskType" :name="active.createBy" />
|
|
<FlowTypeDot :status="active.id ? 0 : 1" :type="active.taskType" :name="active.createBy" />
|
|
</template>
|
|
</template>
|
|
@@ -74,11 +69,11 @@
|
|
<div class="timeline-box-user flex-1">
|
|
<div class="timeline-box-user flex-1">
|
|
<span v-if="active.id" style="padding-left: 4px">{{ active.createBy }}</span>
|
|
<span v-if="active.id" style="padding-left: 4px">{{ active.createBy }}</span>
|
|
<div style="display: flex; gap: 6px; margin-top: 3px">
|
|
<div style="display: flex; gap: 6px; margin-top: 3px">
|
|
- <FlowNodeAvatar v-for="nodeUser in JSON.parse(active.content).nodeUserList" :key="nodeUser.id" :name="nodeUser.name" />
|
|
|
|
- <FlowNodeAvatar v-for="nodeRole in JSON.parse(active.content).nodeRoleList" :key="nodeRole.id" :name="nodeRole.name" />
|
|
|
|
|
|
+ <FlowNodeAvatar v-for="nodeUser in active.local_nodeUserList" :key="nodeUser.id" :name="nodeUser.name" />
|
|
|
|
+ <FlowNodeAvatar v-for="nodeRole in active.local_nodeRoleList" :key="nodeRole.id" :name="nodeRole.name" />
|
|
</div>
|
|
</div>
|
|
- <div v-if="JSON.parse(active.content).content" class="comment">
|
|
|
|
- <div class="comment-content">{{ JSON.parse(active.content).content }}</div>
|
|
|
|
|
|
+ <div v-if="active.local_content" class="comment">
|
|
|
|
+ <div class="comment-content">{{ active.local_content }}</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<span class="timeline-box-date">{{ formatTimestamp(active.finishTime) }}</span>
|
|
<span class="timeline-box-date">{{ formatTimestamp(active.finishTime) }}</span>
|
|
@@ -310,7 +305,15 @@ const getTaskDetail = () => {
|
|
instanceState: cur.instanceState
|
|
instanceState: cur.instanceState
|
|
})
|
|
})
|
|
.then(data => {
|
|
.then(data => {
|
|
- activeData.value = data.processApprovals
|
|
|
|
|
|
+ const activeList = data.processApprovals
|
|
|
|
+ activeList.forEach(v => {
|
|
|
|
+ v.local_timestamp = v.id && formatTimestamp(v.createTime)
|
|
|
|
+ const _content = v.content || {}
|
|
|
|
+ v.local_nodeUserList = JSON.parse(_content.nodeUserList || '[]')
|
|
|
|
+ v.local_nodeRoleList = JSON.parse(_content.nodeRoleList || '[]')
|
|
|
|
+ v.local_content = JSON.parse(_content.content || '{}')
|
|
|
|
+ })
|
|
|
|
+ activeData.value = activeList
|
|
console.log(data, 'data.......')
|
|
console.log(data, 'data.......')
|
|
// validateForm.value.origin = data
|
|
// validateForm.value.origin = data
|
|
try {
|
|
try {
|