From 96267e98a296153e8ac0fe22cbd12043917ab71a Mon Sep 17 00:00:00 2001
From: bob <bob.liu@happyelements.net>
Date: Wed, 15 Mar 2023 15:47:14 +0800
Subject: [PATCH] fix(flow)  flow reject status

---
 .../src/views/flowable/task/finished/record.vue  | 16 +++++++++++++---
 .../src/views/flowable/task/record/resubmit.vue  |  1 -
 2 files changed, 13 insertions(+), 4 deletions(-)

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 @@
             <el-timeline-item
               v-for="(item,index ) in flowRecordList"
               :key="record"
-              :icon="setIcon(item.finishTime)"
+              :icon="setIcon(item.finishTime, item.comment)"
               :color="setColor(item.finishTime)"
             >
               <p style="font-weight: 700">{{item.taskName}}</p>
@@ -147,6 +147,8 @@
                     {{item.comment.comment}}
                   </el-descriptions-item>
                 </el-descriptions>
+                <img v-if="isRefuse(item.comment)"  src="@/assets/images/refuse.png" width="50" height="50">
+
 
                 <!--                    <p  v-if="item.comment">-->
                 <!--                      <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.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();
       });
     },
     /** 审批任务 */