From 917b2102bde856d1eec3ae9431b6081c66f406f1 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 7 Apr 2026 14:00:08 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(system):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6=E4=B8=BA?= =?UTF-8?q?=20UserSelectV2=20=E5=B9=B6=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=A0=91=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/StoreStaffTableSelect.vue | 8 +- src/views/mes/cal/calendar/UserView.vue | 4 +- .../mes/dv/checkrecord/CheckRecordForm.vue | 4 +- src/views/mes/dv/checkrecord/index.vue | 4 +- .../dv/maintenrecord/MaintenRecordForm.vue | 4 +- src/views/mes/dv/maintenrecord/index.vue | 4 +- src/views/mes/dv/repair/RepairForm.vue | 6 +- .../mes/pro/andon/config/AndonConfigForm.vue | 4 +- .../mes/pro/andon/record/AndonRecordForm.vue | 6 +- src/views/mes/pro/andon/record/index.vue | 6 +- src/views/mes/pro/card/CardProcessList.vue | 4 +- src/views/mes/pro/feedback/FeedbackForm.vue | 6 +- src/views/mes/pro/feedback/index.vue | 6 +- src/views/mes/pro/workrecord/index.vue | 4 +- src/views/mes/qc/ipqc/IpqcForm.vue | 4 +- src/views/mes/qc/iqc/IqcForm.vue | 4 +- src/views/mes/qc/iqc/index.vue | 4 +- src/views/mes/qc/oqc/OqcForm.vue | 4 +- src/views/mes/qc/rqc/RqcForm.vue | 4 +- src/views/mes/qc/rqc/index.vue | 4 +- src/views/mes/wm/barcode/BarcodeForm.vue | 4 +- src/views/mes/wm/packages/PackageForm.vue | 4 +- .../components/WmPackageSelectDialog.vue | 4 +- src/views/mes/wm/packages/index.vue | 4 +- .../wm/stocktaking/task/StockTakingForm.vue | 4 +- .../system/dept/components/DeptTreeSelect.vue | 107 ++++++ src/views/system/user/DeptTree.vue | 79 ----- .../user/components/UserSelectDialogV2.vue | 319 ++++++++++++++++++ .../system/user/components/UserSelectV2.vue | 172 ++++++++++ src/views/system/user/index.vue | 15 +- 30 files changed, 660 insertions(+), 146 deletions(-) create mode 100644 src/views/system/dept/components/DeptTreeSelect.vue delete mode 100644 src/views/system/user/DeptTree.vue create mode 100644 src/views/system/user/components/UserSelectDialogV2.vue create mode 100644 src/views/system/user/components/UserSelectV2.vue diff --git a/src/views/mall/trade/delivery/pickUpStore/components/StoreStaffTableSelect.vue b/src/views/mall/trade/delivery/pickUpStore/components/StoreStaffTableSelect.vue index c5acda31e..5b09d0696 100644 --- a/src/views/mall/trade/delivery/pickUpStore/components/StoreStaffTableSelect.vue +++ b/src/views/mall/trade/delivery/pickUpStore/components/StoreStaffTableSelect.vue @@ -5,7 +5,7 @@ - + @@ -137,7 +137,7 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import * as UserApi from '@/api/system/user' -import DeptTree from '@/views/system/user/DeptTree.vue' +import DeptTreeSelect from '@/views/system/dept/components/DeptTreeSelect.vue' // 是否全选 const isCheckAll = ref(false) @@ -189,8 +189,8 @@ const resetQuery = () => { } /** 处理部门被点击 */ -const handleDeptNodeClick = async (row) => { - queryParams.deptId = row.id +const handleDeptNodeClick = async (deptId: number | undefined) => { + queryParams.deptId = deptId await getList() } diff --git a/src/views/mes/cal/calendar/UserView.vue b/src/views/mes/cal/calendar/UserView.vue index 645b3a742..01f687c08 100644 --- a/src/views/mes/cal/calendar/UserView.vue +++ b/src/views/mes/cal/calendar/UserView.vue @@ -4,7 +4,7 @@ - diff --git a/src/views/system/user/DeptTree.vue b/src/views/system/user/DeptTree.vue deleted file mode 100644 index 71ed6cd50..000000000 --- a/src/views/system/user/DeptTree.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - diff --git a/src/views/system/user/components/UserSelectDialogV2.vue b/src/views/system/user/components/UserSelectDialogV2.vue new file mode 100644 index 000000000..d01617a47 --- /dev/null +++ b/src/views/system/user/components/UserSelectDialogV2.vue @@ -0,0 +1,319 @@ + + + + + + diff --git a/src/views/system/user/components/UserSelectV2.vue b/src/views/system/user/components/UserSelectV2.vue new file mode 100644 index 000000000..79cb3dc35 --- /dev/null +++ b/src/views/system/user/components/UserSelectV2.vue @@ -0,0 +1,172 @@ + + + + + + diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 566451728..fbd1bfadd 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -7,7 +7,7 @@ - + @@ -219,7 +219,7 @@ import * as UserApi from '@/api/system/user' import UserForm from './UserForm.vue' import UserImportForm from './UserImportForm.vue' import UserAssignRoleForm from './UserAssignRoleForm.vue' -import DeptTree from './DeptTree.vue' +import DeptTreeSelect from '@/views/system/dept/components/DeptTreeSelect.vue' defineOptions({ name: 'SystemUser' }) @@ -265,14 +265,9 @@ const resetQuery = () => { } /** 处理部门被点击 */ -const handleDeptNodeClick = async (row: any) => { - if (row === undefined) { - queryParams.deptId = undefined - await getList() - } else { - queryParams.deptId = row.id - await getList() - } +const handleDeptNodeClick = async (deptId: number | undefined) => { + queryParams.deptId = deptId + await getList() } /** 添加/修改操作 */