|
|
@@ -55,8 +55,8 @@
|
|
|
<div class="flex flex-align-center">
|
|
|
<div class="timeline-box-user flex-1">
|
|
|
<span style="padding-left: 4px">{{ active.createBy }}</span>
|
|
|
- <div class="comment">
|
|
|
- <div class="comment-content">{{ active.content }}</div>
|
|
|
+ <div v-if="active.local_content" class="comment">
|
|
|
+ <div class="comment-content">{{ active.local_content }}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<span class="timeline-box-date">{{ formatTimestamp(active.finishTime) }}</span>
|
|
|
@@ -308,10 +308,10 @@ const getTaskDetail = () => {
|
|
|
const activeList = data.processApprovals
|
|
|
activeList.forEach(v => {
|
|
|
v.local_timestamp = v.id && formatTimestamp(v.createTime)
|
|
|
- const _content = JSON.parse(v.content || '{}')
|
|
|
+ const _content = v.content // JSON.parse(v.content || '{}')
|
|
|
v.local_nodeUserList = _content.nodeUserList || []
|
|
|
v.local_nodeRoleList = _content.nodeRoleList || []
|
|
|
- v.local_content = _content.content
|
|
|
+ v.local_content = _content?.opinion
|
|
|
})
|
|
|
activeData.value = activeList
|
|
|
console.log(data, 'data.......')
|
lanceJiang