diff --git a/src/stores/processStore.js b/src/stores/processStore.js index 23a7f57..83d7486 100644 --- a/src/stores/processStore.js +++ b/src/stores/processStore.js @@ -59,7 +59,7 @@ export const useProcessStore = defineStore('process', () => { const getFormMap = () => { //表单映射对象 const map = new Map(); - processData.value.formItems.forEach(item => itemToMap(map, item)) + processData.value.formItems?.forEach(item => itemToMap(map, item)) return map } diff --git a/src/views/workflow/process/DefaultNodeProps.js b/src/views/workflow/process/DefaultNodeProps.js index 93bb2cb..b280a9f 100644 --- a/src/views/workflow/process/DefaultNodeProps.js +++ b/src/views/workflow/process/DefaultNodeProps.js @@ -73,6 +73,7 @@ export const CONDITION_PROPS = { //抄送节点默认属性 export const CC_PROPS = { + assignedType: "ASSIGN_USER", //审批类型 shouldAdd: false, assignedUser: [], formPerms: [] diff --git a/src/views/workflow/process/config/ApprovalNodeConfig.vue b/src/views/workflow/process/config/ApprovalNodeConfig.vue index 82a2e0f..2545821 100644 --- a/src/views/workflow/process/config/ApprovalNodeConfig.vue +++ b/src/views/workflow/process/config/ApprovalNodeConfig.vue @@ -254,11 +254,8 @@ import {useProcessStore} from '@/stores/processStore.js' import UserPicker from '../common/UserPicker.vue' import RolePicker from '../common/RolePicker.vue' -import Ellipsis from '../common/Ellipsis.vue' import RoleItems from "../common/RoleItems.vue"; import {computed, defineProps} from 'vue' -import {checkMatrix} from "../../../../api/user/user"; -import {ElNotification} from "element-plus"; const processStore = useProcessStore() diff --git a/src/views/workflow/process/config/CcNodeConfig.vue b/src/views/workflow/process/config/CcNodeConfig.vue index 80f47e5..0669c21 100644 --- a/src/views/workflow/process/config/CcNodeConfig.vue +++ b/src/views/workflow/process/config/CcNodeConfig.vue @@ -1,20 +1,32 @@ diff --git a/src/views/workflow/process/config/ConditionGroupItemConfig.vue b/src/views/workflow/process/config/ConditionGroupItemConfig.vue index cd2bcdc..1f375d0 100644 --- a/src/views/workflow/process/config/ConditionGroupItemConfig.vue +++ b/src/views/workflow/process/config/ConditionGroupItemConfig.vue @@ -1,46 +1,51 @@