diff --git a/src/fvcomponents/fvSearchForm/index.vue b/src/fvcomponents/fvSearchForm/index.vue index 3bfba16..bd83ec6 100644 --- a/src/fvcomponents/fvSearchForm/index.vue +++ b/src/fvcomponents/fvSearchForm/index.vue @@ -23,6 +23,7 @@ v-bind="item.props || {}" v-on="item.on || {}" v-model="form[item.prop]" + @keyup.enter.native="getValues" > diff --git a/src/views/workflow/process/DefaultNodeProps.js b/src/views/workflow/process/DefaultNodeProps.js index a780129..7ab000e 100644 --- a/src/views/workflow/process/DefaultNodeProps.js +++ b/src/views/workflow/process/DefaultNodeProps.js @@ -9,6 +9,7 @@ export const APPROVAL_PROPS = { assignedUser: [] //审批人列表 }, matrixApproval: true, + dstiMatrix: false, skipSelf: true, timeLimit: { //边界事件 timeout: { //超时提醒时间 diff --git a/src/views/workflow/process/config/ApprovalNodeConfig.vue b/src/views/workflow/process/config/ApprovalNodeConfig.vue index 332daaf..475e30c 100644 --- a/src/views/workflow/process/config/ApprovalNodeConfig.vue +++ b/src/views/workflow/process/config/ApprovalNodeConfig.vue @@ -58,7 +58,8 @@
- @@ -104,6 +105,10 @@ + + + diff --git a/src/views/workflow/process/nodes/ApprovalNode.vue b/src/views/workflow/process/nodes/ApprovalNode.vue index 183ec0a..ebe9e94 100644 --- a/src/views/workflow/process/nodes/ApprovalNode.vue +++ b/src/views/workflow/process/nodes/ApprovalNode.vue @@ -67,6 +67,8 @@ const content = computed(() => { } case "SELF": return '发起人自己' + case "DSTI_MATRIX": + return '科创部用户跳过' case "SELF_SELECT": return config.selfSelect.multiple ? '发起人自选多人' : '发起人自选一人' case "LEADER_TOP":