diff --git a/src/model/workflow/workflowConfig.ts b/src/model/workflow/workflowConfig.ts index 0377566..af5b756 100644 --- a/src/model/workflow/workflowConfig.ts +++ b/src/model/workflow/workflowConfig.ts @@ -90,6 +90,10 @@ export interface ProcessConfig { parentId: string; //父节点(流程id) remark: string; //节点描述 code: string; //模板编码 + minApprover: string; //最少审批人 + maxApprover: string; //最多审批人 + maxCirculate: string; //最多传阅人 + minCirculate: string; //最少传阅人 category: undefined | string; //分类 nameRule?: string; //命名规则 nameRuleConfigs?: NameRule; // 命名规则列表 diff --git a/src/views/workflow/design/bpmn/components/ApproveRules.vue b/src/views/workflow/design/bpmn/components/ApproveRules.vue index f9a7a0f..d0d05af 100644 --- a/src/views/workflow/design/bpmn/components/ApproveRules.vue +++ b/src/views/workflow/design/bpmn/components/ApproveRules.vue @@ -5,7 +5,7 @@ style="width: 100%" :tree-data="autoAgreeRuleOptions" tree-checkable - allow-clear + ow-clear :placeholder="t('请选择自动同意规则')" @change="changeAutoAgreeRule" /> @@ -26,6 +26,59 @@ @change="changeDesignatedApprover" /> + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/workflow/design/bpmn/components/ApproveUserRules.vue b/src/views/workflow/design/bpmn/components/ApproveUserRules.vue index 9085289..bb1f6fa 100644 --- a/src/views/workflow/design/bpmn/components/ApproveUserRules.vue +++ b/src/views/workflow/design/bpmn/components/ApproveUserRules.vue @@ -103,11 +103,11 @@ }, minApprover: { type: Number, - default: 0, + default: null, }, maxApprover: { type: Number, - default: 0, + default: null, }, }); diff --git a/src/views/workflow/design/bpmn/components/member/MemberUserTable.vue b/src/views/workflow/design/bpmn/components/member/MemberUserTable.vue index 4995443..9063cbd 100644 --- a/src/views/workflow/design/bpmn/components/member/MemberUserTable.vue +++ b/src/views/workflow/design/bpmn/components/member/MemberUserTable.vue @@ -51,11 +51,11 @@ }, maxCirculate: { type: Number, - default: 0, + default: null, }, minCirculate: { type: Number, - default: 0, + default: null, }, }); diff --git a/src/views/workflow/design/bpmn/config/property.ts b/src/views/workflow/design/bpmn/config/property.ts index c5487c7..43f915c 100644 --- a/src/views/workflow/design/bpmn/config/property.ts +++ b/src/views/workflow/design/bpmn/config/property.ts @@ -75,6 +75,10 @@ export const initProperties = (id: InfoId, type: InfoType, name: string, parentI properties.autoAgreeRule = processInfo.autoAgreeRule; properties.noHandler = processInfo.noHandler; properties.isPrevChooseNext = processInfo.isPrevChooseNext; + properties.minApprover = processInfo.minApprover; + properties.maxApprover = processInfo.maxApprover; + properties.maxCirculate = processInfo.maxCirculate; + properties.minCirculate = processInfo.minCirculate; } if (id === 'Activity_draft') { // 将草稿节点的审批人设置为流程发起者 diff --git a/src/views/workflow/design/bpmn/config/propertyConfig.ts b/src/views/workflow/design/bpmn/config/propertyConfig.ts index d0662a3..f4ef585 100644 --- a/src/views/workflow/design/bpmn/config/propertyConfig.ts +++ b/src/views/workflow/design/bpmn/config/propertyConfig.ts @@ -46,6 +46,10 @@ export const processConfig: ProcessConfig = { nameRule: '', //命名规则 nameRuleConfigs: [], // 命名规则列表 autoAgreeRule: [], //自动同意规则 + minApprover: '', //最少审批人 + maxApprover: '', //最多审批人 + maxCirculate: '', //最多传阅人 + minCirculate: '', //最少传阅人 isPrevChooseNext: DesignatedApprover.NOT_SPECIFIED, //是否上一节点审批人指定下一节点审批人 noHandler: NoHandler.ADMIN, //无对应处理人 appShow: false, //移动端是否显示 diff --git a/src/views/workflow/design/bpmn/panel/process/basic/Index.vue b/src/views/workflow/design/bpmn/panel/process/basic/Index.vue index e1a7fcd..f7b23c0 100644 --- a/src/views/workflow/design/bpmn/panel/process/basic/Index.vue +++ b/src/views/workflow/design/bpmn/panel/process/basic/Index.vue @@ -28,6 +28,14 @@ v-model:autoAgreeRule="processInfo.autoAgreeRule" v-model:noHandler="processInfo.noHandler" v-model:isPrevChooseNext="processInfo.isPrevChooseNext" + v-model:provisionalApprover="processInfo.provisionalApprover" + v-model:isChooseMulti="processInfo.isChooseMulti" + v-model:isChooseAll="processInfo.isChooseAll" + v-model:isReadOnly="processInfo.isReadOnly" + v-model:minApprover="processInfo.minApprover" + v-model:maxApprover="processInfo.maxApprover" + v-model:maxCirculate="processInfo.maxCirculate" + v-model:minCirculate="processInfo.minCirculate" />