From 75a2b331b71814a14c4872e5452ff3ed3c8e9c7e Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Thu, 4 Dec 2025 22:35:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[bpm][antd]=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=92=8C=E9=83=A8=E9=97=A8=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/bpm/model/form/modules/basic-info.vue  | 3 ++-
 .../src/views/bpm/processInstance/detail/modules/time-line.vue | 2 +-
 .../system/dept/components}/dept-select-modal.vue              | 1 -
 .../select-modal => views/system/dept/components}/index.ts     | 1 -
 apps/web-antd/src/views/system/user/components/index.ts        | 1 +
 .../system/user/components}/user-select-modal.vue              | 1 -
 6 files changed, 4 insertions(+), 5 deletions(-)
 rename apps/web-antd/src/{components/select-modal => views/system/dept/components}/dept-select-modal.vue (98%)
 rename apps/web-antd/src/{components/select-modal => views/system/dept/components}/index.ts (50%)
 create mode 100644 apps/web-antd/src/views/system/user/components/index.ts
 rename apps/web-antd/src/{components/select-modal => views/system/user/components}/user-select-modal.vue (99%)

diff --git a/apps/web-antd/src/views/bpm/model/form/modules/basic-info.vue b/apps/web-antd/src/views/bpm/model/form/modules/basic-info.vue
index 9ead376ff..a297e253e 100644
--- a/apps/web-antd/src/views/bpm/model/form/modules/basic-info.vue
+++ b/apps/web-antd/src/views/bpm/model/form/modules/basic-info.vue
@@ -25,8 +25,9 @@ import {
   Tooltip,
 } from 'ant-design-vue';
 
-import { DeptSelectModal, UserSelectModal } from '#/components/select-modal';
 import { ImageUpload } from '#/components/upload';
+import { DeptSelectModal } from '#/views/system/dept/components';
+import { UserSelectModal } from '#/views/system/user/components';
 
 const props = defineProps({
   categoryList: {
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 88fe40728..cb823f041 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
@@ -16,7 +16,7 @@ import { formatDateTime, isEmpty } from '@vben/utils';
 
 import { Avatar, Button, Image, Timeline, Tooltip } from 'ant-design-vue';
 
-import { UserSelectModal } from '#/components/select-modal';
+import { UserSelectModal } from '#/views/system/user/components';
 
 defineOptions({ name: 'BpmProcessInstanceTimeline' });
 
diff --git a/apps/web-antd/src/components/select-modal/dept-select-modal.vue b/apps/web-antd/src/views/system/dept/components/dept-select-modal.vue
similarity index 98%
rename from apps/web-antd/src/components/select-modal/dept-select-modal.vue
rename to apps/web-antd/src/views/system/dept/components/dept-select-modal.vue
index 09cea78ef..7b691dea3 100644
--- a/apps/web-antd/src/components/select-modal/dept-select-modal.vue
+++ b/apps/web-antd/src/views/system/dept/components/dept-select-modal.vue
@@ -1,4 +1,3 @@
-// TODO @芋艿：是否有更好的组织形式？！
 <script lang="ts" setup>
 import type { DataNode } from 'ant-design-vue/es/tree';
 
diff --git a/apps/web-antd/src/components/select-modal/index.ts b/apps/web-antd/src/views/system/dept/components/index.ts
similarity index 50%
rename from apps/web-antd/src/components/select-modal/index.ts
rename to apps/web-antd/src/views/system/dept/components/index.ts
index 2b6e91893..d373be445 100644
--- a/apps/web-antd/src/components/select-modal/index.ts
+++ b/apps/web-antd/src/views/system/dept/components/index.ts
@@ -1,2 +1 @@
 export { default as DeptSelectModal } from './dept-select-modal.vue';
-export { default as UserSelectModal } from './user-select-modal.vue';
diff --git a/apps/web-antd/src/views/system/user/components/index.ts b/apps/web-antd/src/views/system/user/components/index.ts
new file mode 100644
index 000000000..9cb1c93fd
--- /dev/null
+++ b/apps/web-antd/src/views/system/user/components/index.ts
@@ -0,0 +1 @@
+export { default as UserSelectModal } from './user-select-modal.vue';
diff --git a/apps/web-antd/src/components/select-modal/user-select-modal.vue b/apps/web-antd/src/views/system/user/components/user-select-modal.vue
similarity index 99%
rename from apps/web-antd/src/components/select-modal/user-select-modal.vue
rename to apps/web-antd/src/views/system/user/components/user-select-modal.vue
index 77ef98155..174dab28e 100644
--- a/apps/web-antd/src/components/select-modal/user-select-modal.vue
+++ b/apps/web-antd/src/views/system/user/components/user-select-modal.vue
@@ -1,5 +1,4 @@
 <script lang="ts" setup>
-// TODO @芋艿：是否有更好的组织形式？！
 import type { Key } from 'ant-design-vue/es/table/interface';
 
 import type { SystemDeptApi } from '#/api/system/dept';