|
|
@ -114,7 +114,7 @@
|
|
|
|
<el-timeline-item
|
|
|
|
<el-timeline-item
|
|
|
|
v-for="(item,index ) in flowRecordList"
|
|
|
|
v-for="(item,index ) in flowRecordList"
|
|
|
|
:key="record"
|
|
|
|
:key="record"
|
|
|
|
:icon="setIcon(item.finishTime)"
|
|
|
|
:icon="setIcon(item.finishTime, item.comment)"
|
|
|
|
:color="setColor(item.finishTime)"
|
|
|
|
:color="setColor(item.finishTime)"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<p style="font-weight: 700">{{item.taskName}}</p>
|
|
|
|
<p style="font-weight: 700">{{item.taskName}}</p>
|
|
|
@ -147,6 +147,8 @@
|
|
|
|
{{item.comment.comment}}
|
|
|
|
{{item.comment.comment}}
|
|
|
|
</el-descriptions-item>
|
|
|
|
</el-descriptions-item>
|
|
|
|
</el-descriptions>
|
|
|
|
</el-descriptions>
|
|
|
|
|
|
|
|
<img v-if="isRefuse(item.comment)" src="@/assets/images/refuse.png" width="50" height="50">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- <p v-if="item.comment">-->
|
|
|
|
<!-- <p v-if="item.comment">-->
|
|
|
|
<!-- <el-tag type="success" v-if="item.comment.type === '1'"> {{item.comment.comment}}</el-tag>-->
|
|
|
|
<!-- <el-tag type="success" v-if="item.comment.type === '1'"> {{item.comment.comment}}</el-tag>-->
|
|
|
@ -385,6 +387,9 @@ export default {
|
|
|
|
this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);
|
|
|
|
this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);
|
|
|
|
this.finished = finished;
|
|
|
|
this.finished = finished;
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
isRefuse(comment) {
|
|
|
|
|
|
|
|
return comment !== null &&comment !== undefined && comment.type !== null && comment.type !== undefined && comment.type === "3"
|
|
|
|
|
|
|
|
},
|
|
|
|
/** 查询部门下拉树结构 */
|
|
|
|
/** 查询部门下拉树结构 */
|
|
|
|
getTreeselect() {
|
|
|
|
getTreeselect() {
|
|
|
|
treeselect().then(response => {
|
|
|
|
treeselect().then(response => {
|
|
|
@ -421,8 +426,13 @@ export default {
|
|
|
|
this.taskList = res.data
|
|
|
|
this.taskList = res.data
|
|
|
|
})
|
|
|
|
})
|
|
|
|
},
|
|
|
|
},
|
|
|
|
setIcon(val) {
|
|
|
|
setIcon(finishTime,comment) {
|
|
|
|
if (val) {
|
|
|
|
console.log('setIcon::',comment)
|
|
|
|
|
|
|
|
// 驳回状态
|
|
|
|
|
|
|
|
if (this.isRefuse(comment)) {
|
|
|
|
|
|
|
|
return "el-icon-close";
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} else if (finishTime) {
|
|
|
|
return "el-icon-check";
|
|
|
|
return "el-icon-check";
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
return "el-icon-time";
|
|
|
|
return "el-icon-time";
|
|
|
|