Skip to content

phsl / admin

Go to a project
Commit b0d4e39e by 芋道源码 Committed by GitHub
Options

Merge pull request #129 from zws-code/feature/bpm_fix_250206 

Feature/bpm fix 250206
parents d40f1c31 59842b09
Showing with 16 additions and 14 deletions
src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
label="指定角色" label="指定角色"
prop="roleIds" prop="roleIds"
> >
<el-select v-model="configForm.roleIds" clearable multiple style="width: 100%"> <el-select filterable v-model="configForm.roleIds" clearable multiple style="width: 100%">
<el-option <el-option
v-for="item in roleOptions" v-for="item in roleOptions"
:key="item.id" :key="item.id"
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
prop="postIds" prop="postIds"
span="24" span="24"
> >
<el-select v-model="configForm.postIds" clearable multiple style="width: 100%"> <el-select filterable v-model="configForm.postIds" clearable multiple style="width: 100%">
<el-option <el-option
v-for="item in postOptions" v-for="item in postOptions"
:key="item.id" :key="item.id"
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
prop="userIds" prop="userIds"
span="24" span="24"
> >
<el-select v-model="configForm.userIds" clearable multiple style="width: 100%"> <el-select filterable v-model="configForm.userIds" clearable multiple style="width: 100%">
<el-option <el-option
v-for="item in userOptions" v-for="item in userOptions"
:key="item.id" :key="item.id"
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
label="指定用户组" label="指定用户组"
prop="userGroups" prop="userGroups"
> >
<el-select v-model="configForm.userGroups" clearable multiple style="width: 100%"> <el-select filterable v-model="configForm.userGroups" clearable multiple style="width: 100%">
<el-option <el-option
v-for="item in userGroupOptions" v-for="item in userGroupOptions"
:key="item.id" :key="item.id"
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
label="表单内用户字段" label="表单内用户字段"
prop="formUser" prop="formUser"
> >
<el-select v-model="configForm.formUser" clearable style="width: 100%"> <el-select filterable v-model="configForm.formUser" clearable style="width: 100%">
<el-option <el-option
v-for="(item, idx) in userFieldOnFormOptions" v-for="(item, idx) in userFieldOnFormOptions"
:key="idx" :key="idx"
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
label="表单内部门字段" label="表单内部门字段"
prop="formDept" prop="formDept"
> >
<el-select v-model="configForm.formDept" clearable style="width: 100%"> <el-select filterable v-model="configForm.formDept" clearable style="width: 100%">
<el-option <el-option
v-for="(item, idx) in deptFieldOnFormOptions" v-for="(item, idx) in deptFieldOnFormOptions"
:key="idx" :key="idx"
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
prop="deptLevel" prop="deptLevel"
span="24" span="24"
> >
<el-select v-model="configForm.deptLevel" clearable> <el-select filterable v-model="configForm.deptLevel" clearable>
<el-option <el-option
v-for="(item, index) in MULTI_LEVEL_DEPT" v-for="(item, index) in MULTI_LEVEL_DEPT"
:key="index" :key="index"
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
label="驳回节点" label="驳回节点"
prop="returnNodeId" prop="returnNodeId"
> >
<el-select v-model="configForm.returnNodeId" clearable style="width: 100%"> <el-select filterable v-model="configForm.returnNodeId" clearable style="width: 100%">
<el-option <el-option
v-for="item in returnTaskList" v-for="item in returnTaskList"
:key="item.id" :key="item.id"
...@@ -293,6 +293,7 @@ ...@@ -293,6 +293,7 @@
/> />
</el-form-item> </el-form-item>
<el-select <el-select
filterable
v-model="timeUnit" v-model="timeUnit"
class="mr-2" class="mr-2"
:style="{ width: '100px' }" :style="{ width: '100px' }"
...@@ -332,6 +333,7 @@ ...@@ -332,6 +333,7 @@
span="24" span="24"
> >
<el-select <el-select
filterable
v-model="configForm.assignEmptyHandlerUserIds" v-model="configForm.assignEmptyHandlerUserIds"
clearable clearable
multiple multiple
...@@ -758,22 +760,22 @@ const showUserTaskNodeConfig = (node: SimpleFlowNode) => { ...@@ -758,22 +760,22 @@ const showUserTaskNodeConfig = (node: SimpleFlowNode) => {
getNodeConfigFormFields(node.fieldsPermission) getNodeConfigFormFields(node.fieldsPermission)
// 5. 监听器 // 5. 监听器
// 5.1 创建任务 // 5.1 创建任务
configForm.value.taskCreateListenerEnable = node.taskCreateListener!.enable configForm.value.taskCreateListenerEnable = node.taskCreateListener?.enable
configForm.value.taskCreateListenerPath = node.taskCreateListener!.path configForm.value.taskCreateListenerPath = node.taskCreateListener?.path
configForm.value.taskCreateListener = { configForm.value.taskCreateListener = {
header: node.taskCreateListener?.header ?? [], header: node.taskCreateListener?.header ?? [],
body: node.taskCreateListener?.body ?? [] body: node.taskCreateListener?.body ?? []
} }
// 5.2 指派任务 // 5.2 指派任务
configForm.value.taskAssignListenerEnable = node.taskAssignListener!.enable configForm.value.taskAssignListenerEnable = node.taskAssignListener?.enable
configForm.value.taskAssignListenerPath = node.taskAssignListener!.path configForm.value.taskAssignListenerPath = node.taskAssignListener?.path
configForm.value.taskAssignListener = { configForm.value.taskAssignListener = {
header: node.taskAssignListener?.header ?? [], header: node.taskAssignListener?.header ?? [],
body: node.taskAssignListener?.body ?? [] body: node.taskAssignListener?.body ?? []
} }
// 5.3 完成任务 // 5.3 完成任务
configForm.value.taskCompleteListenerEnable = node.taskCompleteListener!.enable configForm.value.taskCompleteListenerEnable = node.taskCompleteListener?.enable
configForm.value.taskCompleteListenerPath = node.taskCompleteListener!.path configForm.value.taskCompleteListenerPath = node.taskCompleteListener?.path
configForm.value.taskCompleteListener = { configForm.value.taskCompleteListener = {
header: node.taskCompleteListener?.header ?? [], header: node.taskCompleteListener?.header ?? [],
body: node.taskCompleteListener?.body ?? [] body: node.taskCompleteListener?.body ?? []
......
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