diff --git a/ruoyi-ui/src/views/flowable/task/finished/record.vue b/ruoyi-ui/src/views/flowable/task/finished/record.vue
index b3bad20..0a1efa5 100644
--- a/ruoyi-ui/src/views/flowable/task/finished/record.vue
+++ b/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() {
diff --git a/ruoyi-ui/src/views/flowable/task/record/admin.vue b/ruoyi-ui/src/views/flowable/task/record/admin.vue
index 0b72b21..b5286fd 100644
--- a/ruoyi-ui/src/views/flowable/task/record/admin.vue
+++ b/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)
diff --git a/ruoyi-ui/src/views/flowable/task/record/index.vue b/ruoyi-ui/src/views/flowable/task/record/index.vue
index 60d46a9..ad7810f 100644
--- a/ruoyi-ui/src/views/flowable/task/record/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/record/index.vue
@@ -60,7 +60,7 @@
- 驳回
+ 驳回
@@ -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;
})
},
diff --git a/ruoyi-ui/src/views/flowable/task/record/resubmit.vue b/ruoyi-ui/src/views/flowable/task/record/resubmit.vue
index 1dfd562..296c97b 100644
--- a/ruoyi-ui/src/views/flowable/task/record/resubmit.vue
+++ b/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)