- 审批
+ 审批
+ 委派
+ 转办
+ 签收
退回
驳回
@@ -64,6 +50,10 @@
确 定
取 消
+
+ 确 定
+ 取 消
+
@@ -127,7 +117,7 @@
import {flowRecord} from "@/api/flowable/finished";
import Parser from '@/components/parser/Parser'
import {definitionStart, getProcessVariables, userList } from "@/api/flowable/definition";
-import {complete, rejectTask, returnList, returnTask, getNextFlowNode} from "@/api/flowable/todo";
+import {complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate} from "@/api/flowable/todo";
export default {
name: "Record",
components: {
@@ -145,10 +135,10 @@ export default {
variablesForm: {}, // 流程变量数据
taskForm:{
returnTaskShow: false, // 是否展示回退表单
+ delegateTaskShow: false, // 是否展示回退表单
defaultTaskShow: true, // 默认处理
- noUserShow: false, // 审批用户
- allUserShow: false, // 候选用户
- allGroupShow: false, // 审批组
+ sendUserShow: false, // 审批用户
+ multiple: false,
comment:"", // 意见内容
procInsId: "", // 流程实例编号
instanceId: "", // 流程实例编号
@@ -158,8 +148,6 @@ export default {
vars: "",
},
userList:[], // 流程候选人
- roleList:[], // 流程候选组
- users:[], // 流程候选人
assignee: null,
formConf: {}, // 默认表单数据
formConfOpen: false, // 是否加载默认表单数据
@@ -272,16 +260,19 @@ export default {
getNextFlowNode(params).then(res => {
const data = res.data;
if (data) {
+ this.taskForm.sendUserShow = true;
if (data.type === 'assignee') {
this.userList = res.data.userList;
- this.taskForm.noUserShow = true;
-
} else if (data.type === 'candidateUsers') {
this.userList = res.data.userList;
- this.taskForm.allUserShow = true;
+ this.taskForm.multiple = true;
} else {
- this.roleList = res.data.roleList
- this.taskForm.allGroupShow = true;
+ res.data.roleList.forEach(role =>{
+ role.userId = role.roleId;
+ role.nickName = role.roleName;
+ })
+ this.userList = res.data.roleList;
+ this.taskForm.multiple = false;
}
}
})
@@ -297,6 +288,15 @@ export default {
});
}
});
+ },
+ /** 委派任务 */
+ handleDelegate() {
+ this.taskForm.delegateTaskShow = true;
+ this.taskForm.defaultTaskShow = false;
+
+ },
+ handleAssign(){
+
},
/** 返回页面 */
goBack() {
@@ -360,14 +360,15 @@ export default {
this.returnTaskList = res.data;
this.taskForm.returnTaskShow = true;
this.taskForm.defaultTaskShow = false;
- this.taskForm.noUserShow = false;
+ this.taskForm.sendUserShow = false;
+ this.taskForm.values = null;
})
},
/** 取消回退任务按钮 */
cancelTask() {
this.taskForm.returnTaskShow = false;
this.taskForm.defaultTaskShow = true;
- this.taskForm.noUserShow = true;
+ this.taskForm.sendUserShow = true;
this.returnTaskList = [];
},
/** 提交退回任务 */
@@ -380,7 +381,25 @@ export default {
});
}
});
- }
+ },
+ /** 委派任务 */
+ submitDeleteTask() {
+ this.$refs["taskForm"].validate(valid => {
+ if (valid) {
+ delegate(this.taskForm).then(response => {
+ this.msgSuccess(response.msg);
+ this.goBack();
+ });
+ }
+ });
+ },
+ /** 取消回退任务按钮 */
+ cancelDelegateTask() {
+ this.taskForm.delegateTaskShow = false;
+ this.taskForm.defaultTaskShow = true;
+ this.taskForm.sendUserShow = true;
+ this.returnTaskList = [];
+ },
}
};