Merge branch 'dev-zhangzx/IBLALD' into 'dev'

流程预审选人增加配置项

See merge request itc-framework/ma/2024/front!38
This commit is contained in:
890147
2025-03-03 09:13:11 +00:00
4 changed files with 54 additions and 1 deletions

View File

@ -12,9 +12,11 @@
<template v-for="node in flowNextNodes"> <template v-for="node in flowNextNodes">
<a-form-item v-if="_action === 'agree' && !isEnd" :label="flowNextNodes.length > 1 ? node.activityName + '审批人' : '审批人'"> <a-form-item v-if="_action === 'agree' && !isEnd" :label="flowNextNodes.length > 1 ? node.activityName + '审批人' : '审批人'">
<a-select v-show="node.chooseAssign" v-model:value="node.assignees" :options="node.nextAssignees" <a-select v-show="node.chooseAssign" v-model:value="node.assignees" :options="node.nextAssignees"
:placeholder="'请选择' + node.activityName + '的审批人'" max-tag-count="responsive" mode="multiple" :placeholder="'请选择' + node.activityName + '的审批人'" max-tag-count="responsive"
:mode="node.isChooseMulti? 'multiple' : ''"
:filterOption="search" :filterOption="search"
></a-select> ></a-select>
</template>
<span v-show="!node.chooseAssign">{{ getAssigneeText(node) }}</span> <span v-show="!node.chooseAssign">{{ getAssigneeText(node) }}</span>
</a-form-item> </a-form-item>
</template> </template>

View File

@ -37,6 +37,24 @@
> >
<a-switch :checked="props.provisionalApprover" @change="changeProvisionalApprover" /> <a-switch :checked="props.provisionalApprover" @change="changeProvisionalApprover" />
</FormItem> </FormItem>
<!-- 多选 / -->
<FormItem
:label="t('多选:')"
>
<a-switch :checked="props.isChooseMulti" @change="changeIsChooseMulti" />
</FormItem>
<!-- 全选 / -->
<FormItem
:label="t('全选:')"
>
<a-switch :checked="props.isChooseAll" @change="changeIsChooseAll" />
</FormItem>
<!-- 只读 / -->
<FormItem
:label="t('只读:')"
>
<a-switch :checked="props.isReadOnly" @change="changeIsReadOnly" />
</FormItem>
</template> </template>
<script setup lang="ts" name="ProcessBasic"> <script setup lang="ts" name="ProcessBasic">
@ -49,11 +67,26 @@
'update:noHandler', 'update:noHandler',
'update:isPrevChooseNext', 'update:isPrevChooseNext',
'update:provisionalApprover', 'update:provisionalApprover',
'update:isChooseMulti',
'update:isChooseAll',
'update:isReadOnly',
]); ]);
const props = defineProps({ const props = defineProps({
autoAgreeRule: Array, autoAgreeRule: Array,
noHandler: Number || String || Boolean, noHandler: Number || String || Boolean,
isPrevChooseNext: Number || String || Boolean, isPrevChooseNext: Number || String || Boolean,
isChooseMulti: {
type: Boolean,
default: true,
},
isChooseAll: {
type: Boolean,
default: false,
},
isReadOnly: {
type: Boolean,
default: false,
},
provisionalApprover: { provisionalApprover: {
type: Boolean || undefined, type: Boolean || undefined,
default: undefined, default: undefined,
@ -124,6 +157,18 @@
function changeProvisionalApprover(val: Boolean) { function changeProvisionalApprover(val: Boolean) {
emits('update:provisionalApprover', val); emits('update:provisionalApprover', val);
} }
// 多选
function changeIsChooseMulti(val: Boolean) {
emits('update:isChooseMulti', val);
}
// 全选
function changeIsChooseAll(val: Boolean) {
emits('update:isChooseAll', val);
}
// 只读
function changeIsReadOnly(val: Boolean) {
emits('update:isReadOnly', val);
}
</script> </script>
<style lang="less" scoped></style> <style lang="less" scoped></style>

View File

@ -134,6 +134,9 @@ const UserProperties: UserTaskConfig = {
autoAgreeRule: [], //自动同意规则 autoAgreeRule: [], //自动同意规则
isPrevChooseNext: DesignatedApprover.NOT_SPECIFIED, //是否上一节点审批人指定下一节点审批人 isPrevChooseNext: DesignatedApprover.NOT_SPECIFIED, //是否上一节点审批人指定下一节点审批人
provisionalApprover: false, //临时审批人 provisionalApprover: false, //临时审批人
isChooseMulti: true, //是否多选
isChooseAll: false, //是否全选
isReadOnly: false, //是否只读
noHandler: NoHandler.ADMIN, //无对应处理人 noHandler: NoHandler.ADMIN, //无对应处理人
countersignConfig: { countersignConfig: {
multipleInstancesType: MultipleInstancesType.NONE, //多实例类型 multipleInstancesType: MultipleInstancesType.NONE, //多实例类型

View File

@ -23,6 +23,9 @@
v-model:noHandler="formInfo.noHandler" v-model:noHandler="formInfo.noHandler"
v-model:isPrevChooseNext="formInfo.isPrevChooseNext" v-model:isPrevChooseNext="formInfo.isPrevChooseNext"
v-model:provisionalApprover="formInfo.provisionalApprover" v-model:provisionalApprover="formInfo.provisionalApprover"
v-model:isChooseMulti="formInfo.isChooseMulti"
v-model:isChooseAll="formInfo.isChooseAll"
v-model:isReadOnly="formInfo.isReadOnly"
/> />
<MemberTable <MemberTable
v-model:memberList="formInfo.approverConfigs" v-model:memberList="formInfo.approverConfigs"