BruceSun
/
SAMS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 任务节点单独设置表单

rf
tony 2022-12-18 21:55:50 +08:00
parent bfd75ac552
commit 682592fcdf
6 changed files with 286 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowTaskController.java
View File

@ -214,4 +214,14 @@ public class FlowTaskController {
return flowTaskService.flowXmlAndNode(procInsId,deployId); return flowTaskService.flowXmlAndNode(procInsId,deployId);
} }
/**
* 流程节点表单
* @param taskId 流程任务编号
* @return
*/
@GetMapping("/flowTaskForm")
public AjaxResult flowTaskForm(@RequestParam(value = "taskId",required = false) String taskId) throws Exception {
return flowTaskService.flowTaskForm(taskId);
}
} }

7
ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowTaskService.java
View File

@ -180,4 +180,11 @@ public interface IFlowTaskService {
* @return * @return
*/ */
AjaxResult flowXmlAndNode(String procInsId,String deployId); AjaxResult flowXmlAndNode(String procInsId,String deployId);
/**
* 流程节点表单
* @param taskId 流程任务编号
* @return
*/
AjaxResult flowTaskForm(String taskId) throws Exception;
} }

85
ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
View File

@ -1,7 +1,10 @@
package com.ruoyi.flowable.service.impl; package com.ruoyi.flowable.service.impl;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.TypeReference;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.flowable.common.constant.ProcessConstants; import com.ruoyi.flowable.common.constant.ProcessConstants;
@ -22,6 +25,7 @@ import com.ruoyi.flowable.flow.FindNextNodeUtil;
import com.ruoyi.flowable.flow.FlowableUtils; import com.ruoyi.flowable.flow.FlowableUtils;
import com.ruoyi.flowable.service.IFlowTaskService; import com.ruoyi.flowable.service.IFlowTaskService;
import com.ruoyi.flowable.service.ISysDeployFormService; import com.ruoyi.flowable.service.ISysDeployFormService;
import com.ruoyi.flowable.service.ISysFormService;
import com.ruoyi.system.domain.SysForm; import com.ruoyi.system.domain.SysForm;
import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
@ -54,6 +58,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.InputStream; import java.io.InputStream;
import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@ -70,14 +75,12 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
@Resource @Resource
private ISysUserService sysUserService; private ISysUserService sysUserService;
@Resource @Resource
private ISysRoleService sysRoleService; private ISysRoleService sysRoleService;
@Resource @Resource
private ISysDeployFormService sysInstanceFormService; private ISysDeployFormService sysInstanceFormService;
@Resource
private ISysFormService sysFormService;
/** /**
* 完成任务 * 完成任务
@ -1075,14 +1078,84 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
ProcessDefinition definition = repositoryService.createProcessDefinitionQuery().deploymentId(deployId).singleResult(); ProcessDefinition definition = repositoryService.createProcessDefinitionQuery().deploymentId(deployId).singleResult();
InputStream inputStream = repositoryService.getResourceAsStream(definition.getDeploymentId(), definition.getResourceName()); InputStream inputStream = repositoryService.getResourceAsStream(definition.getDeploymentId(), definition.getResourceName());
String xmlData = IOUtils.toString(inputStream, StandardCharsets.UTF_8); String xmlData = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
result.put("nodeData",flowViewerList); result.put("nodeData", flowViewerList);
result.put("xmlData",xmlData); result.put("xmlData", xmlData);
return AjaxResult.success(result); return AjaxResult.success(result);
} catch (Exception e) { } catch (Exception e) {
return AjaxResult.error("高亮历史任务失败"); return AjaxResult.error("高亮历史任务失败");
} }
} }
/**
* 流程节点表单
*
* @param taskId 流程任务编号
* @return
*/
@Override
public AjaxResult flowTaskForm(String taskId) throws Exception {
JSONObject result = new JSONObject();
result.put("formKeyExist",false);
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
BpmnModel bpmnModel = repositoryService.getBpmnModel(task.getProcessDefinitionId());
FlowElement flowElement = bpmnModel.getFlowElement(task.getTaskDefinitionKey());
// 流程变量
Map<String, Object> parameters = new HashMap<>();
HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().includeProcessVariables().finished().taskId(taskId).singleResult();
if (Objects.nonNull(historicTaskInstance)) {
parameters = historicTaskInstance.getProcessVariables();
} else {
parameters = taskService.getVariables(taskId);
}
// TODO 暂时只处理用户任务上的表单
if (flowElement instanceof UserTask) {
String formKey = ((UserTask) flowElement).getFormKey();
if (StringUtils.isNotBlank(formKey)) {
SysForm sysForm = sysFormService.selectSysFormById(Long.parseLong(formKey));
JSONObject oldVariables = JSONObject.parseObject(JSON.toJSONString(parameters.get("variables")));
List<JSONObject> oldFields = JSON.parseObject(JSON.toJSONString(oldVariables.get("fields")), new TypeReference<List<JSONObject>>() {
});
oldFields.forEach(obj -> obj.put("disabled", true));
JSONObject data = JSONObject.parseObject(sysForm.getFormContent());
List<JSONObject> newFields = JSON.parseObject(JSON.toJSONString(data.get("fields")), new TypeReference<List<JSONObject>>() {
});
oldFields.addAll(newFields);
oldVariables.put("fields", oldFields);
oldVariables.put("disabled", false);
oldVariables.put("formBtns", true);
result.put("formData",oldVariables);
result.put("formKeyExist",true);
return AjaxResult.success("", result);
} else {
result.put("formData",parameters.get("variables"));
return AjaxResult.success("", result);
}
} else {
result.put("formData",parameters.get("variables"));
return AjaxResult.success("", result);
}
}
/**
* 将Object类型的数据转化成Map<String,Object>
*
* @param obj
* @return
* @throws Exception
*/
public Map<String, Object> obj2Map(Object obj) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
Field[] fields = obj.getClass().getDeclaredFields();
for (Field field : fields) {
field.setAccessible(true);
map.put(field.getName(), field.get(obj));
}
return map;
}
/** /**
* 流程完成时间处理 * 流程完成时间处理
* *

8
ruoyi-ui/src/api/flowable/todo.js
View File

@ -123,3 +123,11 @@ export function exportDeployment(query) {
params: query params: query
}) })
} }
// 流程节点表单
export function flowTaskForm(query) {
return request({
url: '/flowable/task/flowTaskForm',
method: 'get',
params: query
})
}

8
ruoyi-ui/src/components/Process/components/nodePanel/property/multiInstance.vue
View File

@ -46,14 +46,14 @@ export default {
name: 'collection', name: 'collection',
label: '集合', label: '集合',
tooltip: 'collection: 属性会作为表达式进行解析。如果表达式解析为字符串而不是一个集合，<br />不论是因为本身配置的就是静态字符串值，还是表达式计算结果为字符串，<br />这个字符串都会被当做变量名，并从流程变量中用于获取实际的集合。', tooltip: 'collection: 属性会作为表达式进行解析。如果表达式解析为字符串而不是一个集合，<br />不论是因为本身配置的就是静态字符串值，还是表达式计算结果为字符串，<br />这个字符串都会被当做变量名，并从流程变量中用于获取实际的集合。',
rules: [{ required: true, message: '请输入集合名称', trigger: ['blur', 'change'] }] // rules: [{ required: true, message: '请输入集合名称', trigger: ['blur', 'change'] }]
}, },
{ {
xType: 'input', xType: 'input',
name: 'elementVariable', name: 'elementVariable',
label: '元素变量', label: '元素变量',
tooltip: 'elementVariable: 每创建一个用户任务前，先以该元素变量为label，集合中的一项为value，<br />创建（局部）流程变量，该局部流程变量被用于指派用户任务。<br />一般来说，该字符串应与指定人员变量相同。', tooltip: 'elementVariable: 每创建一个用户任务前，先以该元素变量为label，集合中的一项为value，<br />创建（局部）流程变量，该局部流程变量被用于指派用户任务。<br />一般来说，该字符串应与指定人员变量相同。',
rules: [{ required: true, message: '请输入元素变量', trigger: ['blur', 'change'] }] // rules: [{ required: true, message: '请输入元素变量', trigger: ['blur', 'change'] }]
}, },
{ {
xType: 'select', xType: 'select',
@ -61,14 +61,14 @@ export default {
label: '执行方式', label: '执行方式',
tooltip: '并行会签（parallel）、串行会签(sequential)，其中并行会签的意思是 多个人同时执行任务。串行会签是按顺序执行任务。', tooltip: '并行会签（parallel）、串行会签(sequential)，其中并行会签的意思是 多个人同时执行任务。串行会签是按顺序执行任务。',
dic: [{label: '串行', value: true}, {label: '并行', value: false}], dic: [{label: '串行', value: true}, {label: '并行', value: false}],
rules: [{ required: true, message: '请选择执行方式', trigger: ['blur', 'change'] }] // rules: [{ required: true, message: '请选择执行方式', trigger: ['blur', 'change'] }]
}, },
{ {
xType: 'input', xType: 'input',
name: 'completionCondition', name: 'completionCondition',
label: '完成条件', label: '完成条件',
tooltip: 'completionCondition: 多实例活动在所有实例都完成时结束，然而也可以指定一个表达式，在每个实例<br />结束时进行计算。当表达式计算为true时，将销毁所有剩余的实例，并结束多实例<br />活动，继续执行流程。例如 ${nrOfCompletedInstances/nrOfInstances >= 0.6 }，<br />表示当任务完成60%时，该节点就算完成', tooltip: 'completionCondition: 多实例活动在所有实例都完成时结束，然而也可以指定一个表达式，在每个实例<br />结束时进行计算。当表达式计算为true时，将销毁所有剩余的实例，并结束多实例<br />活动，继续执行流程。例如 ${nrOfCompletedInstances/nrOfInstances >= 0.6 }，<br />表示当任务完成60%时，该节点就算完成',
rules: [{ required: true, message: '请输入完成条件', trigger: ['blur', 'change'] }] // rules: [{ required: true, message: '请输入完成条件', trigger: ['blur', 'change'] }]
} }
], ],
operate: [ operate: [

294
ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
View File

@ -1,33 +1,37 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card class="box-card" > <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span class="el-icon-document">待办任务</span> <span class="el-icon-document">待办任务</span>
<el-tag style="margin-left:10px">发起人:{{startUser}}</el-tag> <el-tag style="margin-left:10px">发起人:{{ startUser }}</el-tag>
<el-tag>任务节点:{{taskName}}</el-tag> <el-tag>任务节点:{{ taskName }}</el-tag>
<el-button style="float: right;" size="mini" type="primary" @click="goBack">关闭</el-button> <el-button style="float: right;" size="mini" type="primary" @click="goBack">关闭</el-button>
</div> </div>
<el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick"> <el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
<!--表单信息--> <!--表单信息-->
<el-tab-pane label="表单信息" name="1"> <el-tab-pane label="表单信息" name="1">
<el-col :span="16" :offset="4"> <el-col :span="16" :offset="4">
<div class="test-form"> <div class="test-form">
<parser :key="new Date().getTime()" :form-conf="variablesData" /> <!-- <parser :key="new Date().getTime()" :form-conf="variablesData"/>-->
</div> <parser :key="new Date().getTime()" :form-conf="variablesData" @submit="submitForm" ref="parser"/>
<div style="margin-left:15%;margin-bottom: 20px;font-size: 14px;">
<el-button icon="el-icon-edit-outline" type="success" size="mini" @click="handleComplete">审批</el-button> </div>
<!-- <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">委派</el-button>--> <div style="margin-left:15%;margin-bottom: 20px;font-size: 14px;">
<!-- <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleAssign">转办</el-button>--> <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini"
<!-- <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">签收</el-button>--> @click="handleComplete">审批
<el-button icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退回</el-button> </el-button>
<el-button icon="el-icon-circle-close" type="danger" size="mini" @click="handleReject">驳回</el-button> <!-- <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">委派</el-button>-->
</div> <!-- <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleAssign">转办</el-button>-->
</el-col> <!-- <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>-->
</div>
</el-col>
</el-tab-pane> </el-tab-pane>
<!--流程流转记录--> <!--流程流转记录-->
<el-tab-pane label="流转记录" name="2"> <el-tab-pane label="流转记录" name="2">
<!--flowRecordList--> <!--flowRecordList-->
<el-col :span="16" :offset="4" > <el-col :span="16" :offset="4">
<div class="block"> <div class="block">
<el-timeline> <el-timeline>
<el-timeline-item <el-timeline-item
@ -36,33 +40,33 @@
:icon="setIcon(item.finishTime)" :icon="setIcon(item.finishTime)"
:color="setColor(item.finishTime)" :color="setColor(item.finishTime)"
> >
<p style="font-weight: 700">{{item.taskName}}</p> <p style="font-weight: 700">{{ item.taskName }}</p>
<el-card :body-style="{ padding: '10px' }"> <el-card :body-style="{ padding: '10px' }">
<el-descriptions class="margin-top" :column="1" size="small" border> <el-descriptions class="margin-top" :column="1" size="small" border>
<el-descriptions-item v-if="item.assigneeName" label-class-name="my-label"> <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
<template slot="label"><i class="el-icon-user"></i>办理人</template> <template slot="label"><i class="el-icon-user"></i>办理人</template>
{{item.assigneeName}} {{ item.assigneeName }}
<el-tag type="info" size="mini">{{item.deptName}}</el-tag> <el-tag type="info" size="mini">{{ item.deptName }}</el-tag>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item v-if="item.candidate" label-class-name="my-label"> <el-descriptions-item v-if="item.candidate" label-class-name="my-label">
<template slot="label"><i class="el-icon-user"></i>候选办理</template> <template slot="label"><i class="el-icon-user"></i>候选办理</template>
{{item.candidate}} {{ item.candidate }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label-class-name="my-label"> <el-descriptions-item label-class-name="my-label">
<template slot="label"><i class="el-icon-date"></i>接收时间</template> <template slot="label"><i class="el-icon-date"></i>接收时间</template>
{{item.createTime}} {{ item.createTime }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item v-if="item.finishTime" label-class-name="my-label"> <el-descriptions-item v-if="item.finishTime" label-class-name="my-label">
<template slot="label"><i class="el-icon-date"></i>处理时间</template> <template slot="label"><i class="el-icon-date"></i>处理时间</template>
{{item.finishTime}} {{ item.finishTime }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item v-if="item.duration" label-class-name="my-label"> <el-descriptions-item v-if="item.duration" label-class-name="my-label">
<template slot="label"><i class="el-icon-time"></i>耗时</template> <template slot="label"><i class="el-icon-time"></i>耗时</template>
{{item.duration}} {{ item.duration }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item v-if="item.comment" label-class-name="my-label"> <el-descriptions-item v-if="item.comment" label-class-name="my-label">
<template slot="label"><i class="el-icon-tickets"></i>处理意见</template> <template slot="label"><i class="el-icon-tickets"></i>处理意见</template>
{{item.comment.comment}} {{ item.comment.comment }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
@ -75,56 +79,60 @@
<el-tab-pane label="流程图" name="3"> <el-tab-pane label="流程图" name="3">
<flow :flowData="flowData"/> <flow :flowData="flowData"/>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<!--审批任务--> <!--审批任务-->
<el-dialog :title="completeTitle" :visible.sync="completeOpen" width="60%" append-to-body> <el-dialog :title="completeTitle" :visible.sync="completeOpen" width="60%" append-to-body>
<el-form ref="taskForm" :model="taskForm"> <el-form ref="taskForm" :model="taskForm">
<el-form-item prop="targetKey"> <el-form-item prop="targetKey">
<flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="handleUserSelect"></flow-user> <flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="handleUserSelect"></flow-user>
<flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect"></flow-role> <flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect"></flow-role>
</el-form-item> </el-form-item>
<el-form-item label="处理意见" label-width="80px" prop="comment" :rules="[{ required: true, message: '请输入处理意见', trigger: 'blur' }]"> <el-form-item label="处理意见" label-width="80px" prop="comment"
<el-input type="textarea" v-model="taskForm.comment" placeholder="请输入处理意见"/> :rules="[{ required: true, message: '请输入处理意见', trigger: 'blur' }]">
</el-form-item> <el-input type="textarea" v-model="taskForm.comment" placeholder="请输入处理意见"/>
</el-form> </el-form-item>
<span slot="footer" class="dialog-footer"> </el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="completeOpen = false">取 消</el-button> <el-button @click="completeOpen = false">取 消</el-button>
<el-button type="primary" @click="taskComplete">确 定</el-button> <el-button type="primary" @click="taskComplete">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<!--退回流程--> <!--退回流程-->
<el-dialog :title="returnTitle" :visible.sync="returnOpen" width="40%" append-to-body> <el-dialog :title="returnTitle" :visible.sync="returnOpen" width="40%" append-to-body>
<el-form ref="taskForm" :model="taskForm" label-width="80px" > <el-form ref="taskForm" :model="taskForm" label-width="80px">
<el-form-item label="退回节点" prop="targetKey"> <el-form-item label="退回节点" prop="targetKey">
<el-radio-group v-model="taskForm.targetKey"> <el-radio-group v-model="taskForm.targetKey">
<el-radio-button <el-radio-button
v-for="item in returnTaskList" v-for="item in returnTaskList"
:key="item.id" :key="item.id"
:label="item.id" :label="item.id"
>{{item.name}}</el-radio-button> >{{ item.name }}
</el-radio-group> </el-radio-button>
</el-form-item> </el-radio-group>
<el-form-item label="退回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]"> </el-form-item>
<el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见"/> <el-form-item label="退回意见" prop="comment"
</el-form-item> :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
</el-form> <el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见"/>
<span slot="footer" class="dialog-footer"> </el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="returnOpen = false">取 消</el-button> <el-button @click="returnOpen = false">取 消</el-button>
<el-button type="primary" @click="taskReturn">确 定</el-button> <el-button type="primary" @click="taskReturn">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<!--驳回流程--> <!--驳回流程-->
<el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body> <el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body>
<el-form ref="taskForm" :model="taskForm" label-width="80px" > <el-form ref="taskForm" :model="taskForm" label-width="80px">
<el-form-item label="驳回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]"> <el-form-item label="驳回意见" prop="comment"
<el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见"/> :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
</el-form-item> <el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见"/>
</el-form> </el-form-item>
<span slot="footer" class="dialog-footer"> </el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="rejectOpen = false">取 消</el-button> <el-button @click="rejectOpen = false">取 消</el-button>
<el-button type="primary" @click="taskReject">确 定</el-button> <el-button type="primary" @click="taskReject">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</el-card> </el-card>
</div> </div>
</template> </template>
@ -134,8 +142,16 @@ import {flowRecord} from "@/api/flowable/finished";
import FlowUser from '@/components/flow/User' import FlowUser from '@/components/flow/User'
import FlowRole from '@/components/flow/Role' import FlowRole from '@/components/flow/Role'
import Parser from '@/components/parser/Parser' import Parser from '@/components/parser/Parser'
import {getProcessVariables, flowXmlAndNode} from "@/api/flowable/definition"; import {getProcessVariables, flowXmlAndNode, definitionStart} from "@/api/flowable/definition";
import {complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate} from "@/api/flowable/todo"; import {
complete,
rejectTask,
returnList,
returnTask,
getNextFlowNode,
delegate,
flowTaskForm,
} from "@/api/flowable/todo";
import flow from '@/views/flowable/task/todo/detail/flow' import flow from '@/views/flowable/task/todo/detail/flow'
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import {listUser} from "@/api/system/user"; import {listUser} from "@/api/system/user";
@ -175,18 +191,20 @@ export default {
src: null, src: null,
rules: {}, // 表单校验 rules: {}, // 表单校验
variablesForm: {}, // 流程变量数据 variablesForm: {}, // 流程变量数据
taskForm:{ taskForm: {
returnTaskShow: false, // 是否展示回退表单 returnTaskShow: false, // 是否展示回退表单
delegateTaskShow: false, // 是否展示回退表单 delegateTaskShow: false, // 是否展示回退表单
defaultTaskShow: true, // 默认处理 defaultTaskShow: true, // 默认处理
comment:"", // 意见内容 comment: "", // 意见内容
procInsId: "", // 流程实例编号 procInsId: "", // 流程实例编号
instanceId: "", // 流程实例编号 instanceId: "", // 流程实例编号
deployId: "", // 流程定义编号 deployId: "", // 流程定义编号
taskId: "" ,// 流程任务编号 taskId: "",// 流程任务编号
procDefId: "", // 流程编号 procDefId: "", // 流程编号
targetKey:"", targetKey: "",
variables:{}, variables: {
variables: {}
},
}, },
assignee: null, assignee: null,
formConf: {}, // 默认表单数据 formConf: {}, // 默认表单数据
@ -199,13 +217,14 @@ export default {
returnOpen: false, returnOpen: false,
rejectOpen: false, rejectOpen: false,
rejectTitle: null, rejectTitle: null,
userData:[], userData: [],
checkSendUser: false, // 是否展示人员选择模块 checkSendUser: false, // 是否展示人员选择模块
checkSendRole: false,// 是否展示角色选择模块 checkSendRole: false,// 是否展示角色选择模块
checkType: 'single', // 选择类型 checkType: 'single', // 选择类型
taskName: null, // 任务节点 taskName: null, // 任务节点
startUser: null, // 发起人信息, startUser: null, // 发起人信息,
multiInstanceVars: '' // 会签节点 multiInstanceVars: '', // 会签节点
formKeyExist: false, // 当前节点是否存在表单
}; };
}, },
created() { created() {
@ -217,17 +236,18 @@ export default {
this.taskForm.procInsId = this.$route.query.procInsId; this.taskForm.procInsId = this.$route.query.procInsId;
this.taskForm.executionId = this.$route.query.executionId; this.taskForm.executionId = this.$route.query.executionId;
this.taskForm.instanceId = this.$route.query.procInsId; this.taskForm.instanceId = this.$route.query.procInsId;
// 流程任务重获取变量表单 // 流程任务获取变量信息
if (this.taskForm.taskId) { if (this.taskForm.taskId) {
this.processVariables(this.taskForm.taskId) this.processVariables(this.taskForm.taskId)
this.getNextFlowNode(this.taskForm.taskId) this.getFlowTaskForm(this.taskForm.taskId)
// this.getNextFlowNode(this.taskForm.taskId)
} }
this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId); this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);
} }
}, },
methods: { methods: {
handleClick(tab, event) { handleClick(tab, event) {
if (tab.name === '3'){ if (tab.name === '3') {
flowXmlAndNode({procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId}).then(res => { flowXmlAndNode({procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId}).then(res => {
this.flowData = res.data; this.flowData = res.data;
}) })
@ -258,7 +278,7 @@ export default {
this.$set(this.taskForm.variables, "approval", selectVal.join(',')); this.$set(this.taskForm.variables, "approval", selectVal.join(','));
} }
} else { } else {
this.$set(this.taskForm.variables, "approval", selection); this.$set(this.taskForm.variables, "approval", selection);
} }
} }
}, },
@ -296,7 +316,18 @@ export default {
if (taskId) { if (taskId) {
// 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示 // 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示
getProcessVariables(taskId).then(res => { getProcessVariables(taskId).then(res => {
this.variablesData = res.data.variables; // this.variablesData = res.data.variables;
});
}
},
/** 流程节点表单 */
getFlowTaskForm(taskId) {
if (taskId) {
// 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示
flowTaskForm({taskId: taskId}).then(res => {
this.variablesData = res.data.formData;
this.taskForm.variables = res.data.formData;
this.formKeyExist = res.data.formKeyExist;
}); });
} }
}, },
@ -326,35 +357,51 @@ export default {
}, },
/** 加载审批任务弹框 */ /** 加载审批任务弹框 */
handleComplete() { handleComplete() {
this.completeOpen = true; // this.completeOpen = true;
this.completeTitle = "流程审批"; // this.completeTitle = "流程审批";
this.submitForm(null);
}, },
/** 用户审批任务 */ /** 用户审批任务 */
taskComplete() { taskComplete() {
if (!this.taskForm.variables && this.checkSendUser){ if (!this.taskForm.variables && this.checkSendUser) {
this.$modal.msgError("请选择流程接收人员!"); this.$modal.msgError("请选择流程接收人员!");
return; return;
} }
if (!this.taskForm.variables && this.checkSendRole){ if (!this.taskForm.variables && this.checkSendRole) {
this.$modal.msgError("请选择流程接收角色组!"); this.$modal.msgError("请选择流程接收角色组!");
return; return;
} }
if (!this.taskForm.comment){ if (!this.taskForm.comment) {
this.$modal.msgError("请输入审批意见!"); this.$modal.msgError("请输入审批意见!");
return; return;
} }
console.log(this.taskForm,"流程审批提交表单数据") if (this.taskForm && this.formKeyExist) {
complete(this.taskForm).then(response => { // 表单是否禁用
this.$modal.msgSuccess(response.msg); this.taskForm.formData.formData.disabled = true;
this.goBack(); // 是否显示按钮
}); this.taskForm.formData.formData.formBtns = false;
this.taskForm.variables = Object.assign({}, this.taskForm.variables, this.taskForm.formData.valData);
this.taskForm.variables.variables = this.taskForm.formData.formData;
console.log(this.taskForm, "流程审批提交表单数据")
complete(this.taskForm).then(response => {
this.$modal.msgSuccess(response.msg);
this.goBack();
});
} else {
console.log(this.taskForm, "流程审批提交表单数据")
complete(this.taskForm).then(response => {
this.$modal.msgSuccess(response.msg);
this.goBack();
});
}
}, },
/** 委派任务 */ /** 委派任务 */
handleDelegate() { handleDelegate() {
this.taskForm.delegateTaskShow = true; this.taskForm.delegateTaskShow = true;
this.taskForm.defaultTaskShow = false; this.taskForm.defaultTaskShow = false;
}, },
handleAssign(){ handleAssign() {
}, },
/** 返回页面 */ /** 返回页面 */
@ -363,28 +410,6 @@ export default {
this.$store.dispatch("tagsView/delView", this.$route); this.$store.dispatch("tagsView/delView", this.$route);
this.$router.go(-1) this.$router.go(-1)
}, },
/** 接收子组件传的值 */
getData(data) {
if (data) {
const variables = [];
data.fields.forEach(item => {
let variableData = {};
variableData.label = item.__config__.label
// 表单值为多个选项时
if (item.__config__.defaultValue instanceof Array) {
const array = [];
item.__config__.defaultValue.forEach(val => {
array.push(val)
})
variableData.val = array;
} else {
variableData.val = item.__config__.defaultValue
}
variables.push(variableData)
})
this.variables = variables;
}
},
/** 驳回任务 */ /** 驳回任务 */
handleReject() { handleReject() {
this.rejectOpen = true; this.rejectOpen = true;
@ -411,7 +436,7 @@ export default {
}) })
}, },
/** 提交退回任务 */ /** 提交退回任务 */
taskReturn() { taskReturn() {
this.$refs["taskForm"].validate(valid => { this.$refs["taskForm"].validate(valid => {
if (valid) { if (valid) {
returnTask(this.taskForm).then(res => { returnTask(this.taskForm).then(res => {
@ -444,7 +469,43 @@ export default {
this.taskForm.defaultTaskShow = true; this.taskForm.defaultTaskShow = true;
this.returnTaskList = []; this.returnTaskList = [];
}, },
} /** 申请流程表单数据提交 */
submitForm(formData) {
// 根据当前任务或者流程设计配置的下一步节点 todo 暂时未涉及到考虑网关、表达式和多节点情况
const params = {taskId: this.taskForm.taskId}
getNextFlowNode(params).then(res => {
const data = res.data;
if (data) {
if (data.type === 'assignee') { // 指定人员
this.checkSendUser = true;
this.checkType = "single";
} else if (data.type === 'candidateUsers') { // 候选人员(多个)
this.checkSendUser = true;
this.checkType = "multiple";
} else if (data.type === 'candidateGroups') { // 指定组(所属角色接收任务)
this.checkSendRole = true;
} else if (data.type === 'multiInstance') { // 会签?
// 流程设计指定的 elementVariable 作为会签人员列表
this.multiInstanceVars = data.vars;
this.checkSendUser = true;
this.checkType = "multiple";
}
if (this.checkSendUser || this.checkSendRole) {
this.completeOpen = true;
this.completeTitle = "流程审批";
this.taskForm.formData = formData;
}
} else {
// 最后一个任务节点
console.log(this.taskForm, "流程审批提交表单数据")
complete(this.taskForm).then(response => {
this.$modal.msgSuccess(response.msg);
this.goBack();
});
}
})
},
},
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -459,6 +520,7 @@ export default {
display: table; display: table;
content: ""; content: "";
} }
.clearfix:after { .clearfix:after {
clear: both clear: both
} }