From 286628d101850536838292bc2c2fb5e9b202149c Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 23 Mar 2025 17:27:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91BPM=EF=BC=9A=E6=B5=81=E7=A8=8B=E6=A8=A1=E5=9E=8B->?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF->=E8=B0=81=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=8F=91=E8=B5=B7=EF=BC=8C=E6=94=AF=E6=8C=81=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E5=A4=9A=E4=B8=AA=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DeptSelectForm/index.vue | 8 +++++--- .../src/nodes-config/StartUserNodeConfig.vue | 18 +++++++++++++----- src/views/bpm/model/form/index.vue | 11 ++++++----- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/components/DeptSelectForm/index.vue b/src/components/DeptSelectForm/index.vue index 9c6868fa..140f4956 100644 --- a/src/components/DeptSelectForm/index.vue +++ b/src/components/DeptSelectForm/index.vue @@ -59,7 +59,7 @@ const props = defineProps({ const treeRef = ref() const deptTree = ref([]) // 部门树形结构 -const selectedDeptIds = ref([]) // 选中的部门ID列表 +const selectedDeptIds = ref([]) // 选中的部门 ID 列表 const dialogVisible = ref(false) // 弹窗的是否展示 const formLoading = ref(false) // 表单的加载中 @@ -78,7 +78,9 @@ const open = async (selectedList?: DeptApi.DeptVO[]) => { // 设置已选择的部门 if (selectedList?.length) { await nextTick() - const selectedIds = selectedList.map(dept => dept.id).filter((id): id is number => id !== undefined) + const selectedIds = selectedList + .map((dept) => dept.id) + .filter((id): id is number => id !== undefined) selectedDeptIds.value = selectedIds treeRef.value?.setCheckedKeys(selectedIds) } @@ -117,4 +119,4 @@ const resetForm = () => { } defineExpose({ open }) // 提供 open 方法，用于打开弹窗 - \ No newline at end of file + diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/StartUserNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/StartUserNodeConfig.vue index f1100d24..9975d9b5 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/StartUserNodeConfig.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/StartUserNodeConfig.vue @@ -25,7 +25,14 @@ - 全部成员可以发起流程 + + 全部成员可以发起流程 +
{{ getUserNicknames(startUserIds) }} 可发起流程 @@ -37,7 +44,8 @@ placement="top" :content="getUserNicknames(startUserIds)" > - {{ getUserNicknames(startUserIds.slice(0,2)) }} 等 {{ startUserIds.length }} 人可发起流程 + {{ getUserNicknames(startUserIds.slice(0, 2)) }} 等 + {{ startUserIds.length }} 人可发起流程
@@ -52,11 +60,11 @@ placement="top" :content="getDeptNames(startDeptIds)" > - {{ getDeptNames(startDeptIds.slice(0,2)) }} 等 {{ startDeptIds.length }} 个部门的人可发起流程 + {{ getDeptNames(startDeptIds.slice(0, 2)) }} 等 + {{ startDeptIds.length }} 个部门可发起流程 -
@@ -170,7 +178,7 @@ const getUserNicknames = (userIds: number[]): string => { const getDeptNames = (deptIds: number[]): string => { if (!deptIds || deptIds.length === 0) { return '' - } + } const deptNames: string[] = [] deptIds.forEach((deptId) => { const found = deptOptions?.value.find((item) => item.id === deptId) diff --git a/src/views/bpm/model/form/index.vue b/src/views/bpm/model/form/index.vue index 2da0db49..42183e4d 100644 --- a/src/views/bpm/model/form/index.vue +++ b/src/views/bpm/model/form/index.vue @@ -94,7 +94,6 @@ import * as FormApi from '@/api/bpm/form' import { CategoryApi, CategoryVO } from '@/api/bpm/category' import * as UserApi from '@/api/system/user' import * as DeptApi from '@/api/system/dept' -import { useUserStoreWithOut } from '@/store/modules/user' import * as DefinitionApi from '@/api/bpm/definition' import { BpmModelFormType, BpmModelType, BpmAutoApproveType } from '@/utils/constants' import BasicInfo from './BasicInfo.vue' @@ -205,14 +204,16 @@ const initData = async () => { data.simpleModel = JSON.parse(data.simpleModel) } formData.value = data - formData.value.startUserType = formData.value.startUserIds?.length > 0 ? 1 : formData.value?.startDeptIds?.length > 0 ? 2 : 0 + formData.value.startUserType = + formData.value.startUserIds?.length > 0 ? 1 : formData.value?.startDeptIds?.length > 0 ? 2 : 0 } else if (['update', 'copy'].includes(actionType)) { // 情况二：修改场景/复制场景 const modelId = route.params.id as string formData.value = await ModelApi.getModel(modelId) - formData.value.startUserType = formData.value.startUserIds?.length > 0 ? 1 : formData.value?.startDeptIds?.length > 0 ? 2 : 0 + formData.value.startUserType = + formData.value.startUserIds?.length > 0 ? 1 : formData.value?.startDeptIds?.length > 0 ? 2 : 0 - // 复制场景 + // 特殊：复制场景 if (route.params.type === 'copy') { delete formData.value.id formData.value.name += '副本' @@ -233,7 +234,7 @@ const initData = async () => { userList.value = await UserApi.getSimpleUserList() // 获取部门列表 deptList.value = await DeptApi.getSimpleDeptList() - + // 最终，设置 currentStep 切换到第一步 currentStep.value = 0