|
|
@@ -60,8 +60,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.content" class="comment">
|
|
|
+ <div class="comment-content">{{ active.content.opinion }}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<span class="timeline-box-date">{{ formatTimestamp(active.finishTime) }}</span>
|
|
|
@@ -75,11 +75,15 @@
|
|
|
<span v-if="active.id" style="padding-left: 4px">{{ active.createBy }}</span>
|
|
|
<div v-if="active.content">
|
|
|
<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" />
|
|
|
+ <div v-if="active.content.nodeUserList">
|
|
|
+ <FlowNodeAvatar v-for="nodeUser in active.content.nodeUserList" :key="nodeUser.id" :name="nodeUser.name" />
|
|
|
+ </div>
|
|
|
+ <div v-if="active.content.nodeRoleList">
|
|
|
+ <FlowNodeAvatar v-for="nodeRole in active.content.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.content.opinion" class="comment">
|
|
|
+ <div class="comment-content">{{ active.content.opinion }}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -313,7 +317,6 @@ const getTaskDetail = () => {
|
|
|
})
|
|
|
.then(data => {
|
|
|
activeData.value = data.processApprovals
|
|
|
- console.log(data, 'data.......')
|
|
|
// validateForm.value.origin = data
|
|
|
try {
|
|
|
/*descItemsData.value.list = JSON.parse(data.formContent).map(item => {
|
hubin