Commit a92975dd by lanyulei

feat: 添加任务是否可执行的配置。

parent b5b9f575
......@@ -18,6 +18,14 @@
</el-select>
</div>
<div class="panelRow">
<el-checkbox
size="small"
:disabled="readOnly"
:value="model.isExecuteTask"
@change="(e) => onChange('isExecuteTask', e)"
>是否执行任务</el-checkbox>
</div>
<div class="panelRow">
<div>{{ i18n['sequenceFlow.expression'] }}</div>
<el-input
style="width:90%; font-size:12px"
......
<template>
<div class="detailPanel" :style="{'height':height+'px'}" style="overflow-y: scroll; padding-bottom: 10px;">
<div class="detailPanel" :style="{'height':height+'px'}" style="overflow-y: auto; padding-bottom: 10px;">
<UserTaskDetail
v-if="model.clazz === 'userTask'"
:model="model"
......
......@@ -319,7 +319,6 @@ export default {
getDepartments() {
getOrdinaryDeptList().then(response => {
this.departments = response.data
console.log(this.departments)
})
},
/** 查询流程列表 */
......
......@@ -51,7 +51,7 @@
:key="index"
type="primary"
:disabled="submitDisabled"
@click="submitAction(item.target)"
@click="submitAction(item)"
>
{{ item.label }}
</el-button>
......@@ -129,17 +129,17 @@ export default {
this.currentNode = this.processStructureValue.nodes[0]
})
},
submitAction(target) {
submitAction(item) {
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
this.submitDisabled = true
var stateMap = {}
this.ruleForm.process = parseInt(this.$route.query.processId)
this.ruleForm.classify = this.processStructureValue.process.classify
stateMap['id'] = target
stateMap['id'] = item.target
this.ruleForm.source_state = this.processStructureValue.nodes[this.active].label
for (var v of this.processStructureValue.nodes) {
if (v.id === target) {
if (v.id === item.target) {
if (v.assignType !== undefined) {
stateMap['process_method'] = v.assignType
}
......@@ -176,6 +176,7 @@ export default {
Promise.all(promiseList).then(values => {
this.ruleForm.source = this.processStructureValue.nodes[this.active].id
this.ruleForm.tpls.form_data = values
this.ruleForm.is_exec_task = item.isExecuteTask
createWorkOrder(this.ruleForm).then(response => {
if (response.code === 200) {
this.$router.push({ path: '/process/upcoming' })
......
......@@ -296,6 +296,7 @@ export default {
flow_properties: item.flowProperties === undefined ? 2 : parseInt(item.flowProperties),
work_order_id: parseInt(this.$route.query.workOrderId),
remarks: this.remarks,
is_exec_task: item.isExecuteTask,
tpls: this.tpls
}).then(response => {
if (response.code === 200) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment