diff --git a/apps/web-antd/src/components/user-select-modal/index.ts b/apps/web-antd/src/components/user-select-modal/index.ts new file mode 100644 index 00000000..9cb1c93f --- /dev/null +++ b/apps/web-antd/src/components/user-select-modal/index.ts @@ -0,0 +1 @@ +export { default as UserSelectModal } from './user-select-modal.vue'; diff --git a/apps/web-antd/src/components/user-select-modal/user-select-modal.vue b/apps/web-antd/src/components/user-select-modal/user-select-modal.vue new file mode 100644 index 00000000..4c8db339 --- /dev/null +++ b/apps/web-antd/src/components/user-select-modal/user-select-modal.vue @@ -0,0 +1,370 @@ + + + + + + + + + + handleDeptSearch(e.target?.value ?? '')" + /> + + + + + + + + {{ item.nickname }} ({{ item.id }}) + + + + + + + + {{ confirmText }} + + {{ cancelText }} + + + + + diff --git a/apps/web-antd/src/views/bpm/processInstance/detail/index.vue b/apps/web-antd/src/views/bpm/processInstance/detail/index.vue index a469fb9f..9046151f 100644 --- a/apps/web-antd/src/views/bpm/processInstance/detail/index.vue +++ b/apps/web-antd/src/views/bpm/processInstance/detail/index.vue @@ -238,7 +238,11 @@ onMounted(async () => { 编号:{{ id || '-' }} diff --git a/apps/web-antd/src/views/bpm/processInstance/detail/modules/time-line.vue b/apps/web-antd/src/views/bpm/processInstance/detail/modules/time-line.vue index 83cd68d0..0a5a3d8f 100644 --- a/apps/web-antd/src/views/bpm/processInstance/detail/modules/time-line.vue +++ b/apps/web-antd/src/views/bpm/processInstance/detail/modules/time-line.vue @@ -10,6 +10,7 @@ import { formatDateTime, isEmpty } from '@vben/utils'; import { Avatar, Button, Image, Tooltip } from 'ant-design-vue'; +import { UserSelectModal } from '#/components/user-select-modal'; import { CandidateStrategyEnum, NodeTypeEnum, TaskStatusEnum } from '#/utils'; defineOptions({ name: 'BpmProcessInstanceTimeline' }); @@ -150,10 +151,12 @@ const customApproveUsers = ref>({}); // key:activityId // 打开选择用户弹窗 const handleSelectUser = (activityId: string, selectedList: any[]) => { + console.log(userSelectFormRef.value); userSelectFormRef.value.open(activityId, selectedList); }; // 选择用户完成 +const selectedUsers = ref([]); const handleUserSelectConfirm = (activityId: string, userList: any[]) => { customApproveUsers.value[activityId] = userList || []; emit('selectUserConfirm', activityId, userList); @@ -280,7 +283,7 @@ const shouldShowApprovalReason = (task: any, nodeType: NodeTypeEnum) => { @@ -438,5 +441,11 @@ const shouldShowApprovalReason = (task: any, nodeType: NodeTypeEnum) => { - +