fix(approve) return flow

ruoyi-ui/src/views/flowable/task/finished/record.vue

@@ -388,7 +388,7 @@ export default {
       this.finished = finished;
     },
     isRefuse(comment) {
-      return comment !== null &&comment !== undefined && comment.type !== null && comment.type !== undefined && comment.type === "3"
+      return comment !== null &&comment !== undefined && comment.type !== null && comment.type !== undefined && (comment.type === "3" || comment.type === "2")
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {

ruoyi-ui/src/views/flowable/task/record/admin.vue

@@ -499,7 +499,7 @@ export default {
       })
     },
     isRefuse(comment) {
-      return comment !== null &&comment !== undefined && comment.type !== null && comment.type !== undefined && comment.type === "3"
+      return comment !== null &&comment !== undefined && comment.type !== null && comment.type !== undefined && (comment.type === "3" || comment.type === "2")
     },
     setIcon(finishTime,comment) {
       console.log('setIcon::',comment)

ruoyi-ui/src/views/flowable/task/record/index.vue

@@ -60,7 +60,7 @@
 <!--                <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleAssign">转办</el-button>-->
 <!--                <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">签收</el-button>-->
 <!--            <el-button  icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退回</el-button>-->
-            <el-button  icon="el-icon-circle-close" type="danger" size="mini" @click="handleReject">驳回</el-button>
+            <el-button  icon="el-icon-circle-close" type="danger" size="mini" @click="handleReturn">驳回</el-button>
           </div>
      </el-col>
 
@@ -446,7 +446,9 @@ export default {
       })
     },
     isRefuse(comment) {
-      return comment !== null &&comment !== undefined && comment.type !== null && comment.type !== undefined && comment.type === "3"
+      return comment !== null &&comment !== undefined && comment.type !== null
+        // type=3 驳回，type=2 退回
+        && comment.type !== undefined && (comment.type === "3" || comment.type === "2")
     },
     setIcon(finishTime,comment) {
       console.log('setIcon::',comment)
@@ -689,7 +691,8 @@ export default {
       this.returnOpen = true;
       this.returnTitle = "退回流程";
       returnList(this.taskForm).then(res => {
-        this.returnTaskList = res.data;
+        // 只取第一个节点（提交人）
+        this.returnTaskList = res.data.slice(0,1)
         this.taskForm.values = null;
       })
     },

ruoyi-ui/src/views/flowable/task/record/resubmit.vue

@@ -268,7 +268,7 @@ export default {
       })
     },
     isRefuse(comment) {
-      return comment !== null &&comment !== undefined && comment.type !== null && comment.type !== undefined && comment.type === "3"
+      return comment !== null &&comment !== undefined && comment.type !== null && comment.type !== undefined && (comment.type === "3" || comment.type === "2")
     },
     setIcon(finishTime,comment) {
       console.log('setIcon::',comment)