diff --git a/ruoyi-ui/src/views/flowable/task/finished/record.vue b/ruoyi-ui/src/views/flowable/task/finished/record.vue index 07d6035..b3bad20 100644 --- a/ruoyi-ui/src/views/flowable/task/finished/record.vue +++ b/ruoyi-ui/src/views/flowable/task/finished/record.vue @@ -114,7 +114,7 @@

{{item.taskName}}

@@ -147,6 +147,8 @@ {{item.comment.comment}} + + @@ -385,6 +387,9 @@ export default { this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId); this.finished = finished; }, + isRefuse(comment) { + return comment !== null &&comment !== undefined && comment.type !== null && comment.type !== undefined && comment.type === "3" + }, /** 查询部门下拉树结构 */ getTreeselect() { treeselect().then(response => { @@ -421,8 +426,13 @@ export default { this.taskList = res.data }) }, - setIcon(val) { - if (val) { + setIcon(finishTime,comment) { + console.log('setIcon::',comment) + // 驳回状态 + if (this.isRefuse(comment)) { + return "el-icon-close"; + + } else if (finishTime) { return "el-icon-check"; } else { return "el-icon-time"; diff --git a/ruoyi-ui/src/views/flowable/task/record/resubmit.vue b/ruoyi-ui/src/views/flowable/task/record/resubmit.vue index b348399..b55b2d8 100644 --- a/ruoyi-ui/src/views/flowable/task/record/resubmit.vue +++ b/ruoyi-ui/src/views/flowable/task/record/resubmit.vue @@ -419,7 +419,6 @@ export default { this.taskForm.taskId= this.flowRecordList[0].taskId complete(this.taskForm).then(response => { this.msgSuccess(response.msg); - this.goBack(); }); }, /** 审批任务 */