From b5a41d62b12c58dc49fe9b449b87cb39d5993b75 Mon Sep 17 00:00:00 2001
From: gaoyunqi <gaoyunqi@gdyd.com>
Date: Wed, 15 May 2024 18:10:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=B0=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E9=80=89=E6=8B=A9=E6=A1=86=E6=90=9C=E7=B4=A2=E4=B8=8D?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=B7=A5=E5=8F=B7=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Form/src/componentMap.ts            |  2 --
 .../Form/src/components/SelectDepartmentV2.vue     | 14 ++++++++++----
 .../Form/src/components/SelectUserV2.vue           |  6 +++---
 src/components/Form/src/types/index.ts             |  2 --
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/components/Form/src/componentMap.ts b/src/components/Form/src/componentMap.ts
index ad18bc3..a63e746 100644
--- a/src/components/Form/src/componentMap.ts
+++ b/src/components/Form/src/componentMap.ts
@@ -100,9 +100,7 @@ componentMap.set('ApiCascader', ApiCascader);
 componentMap.set('Slider', Slider);
 componentMap.set('Rate', Rate);
 componentMap.set('Dept', SelectDepartmentV2);
-componentMap.set('DeptV2', SelectDepartmentV2);
 componentMap.set('User', SelectUserV2);
-componentMap.set('UserV2', SelectUserV2);
 componentMap.set('Info', CommonInfo);
 componentMap.set('Area', SelectArea);
 componentMap.set('SubForm', SubForm);
diff --git a/src/components/Form/src/components/SelectDepartmentV2.vue b/src/components/Form/src/components/SelectDepartmentV2.vue
index 12c3ea2..d0828b2 100644
--- a/src/components/Form/src/components/SelectDepartmentV2.vue
+++ b/src/components/Form/src/components/SelectDepartmentV2.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 100%" @click="show">
+  <div style="width: 100%" @click="show" class="depart-select">
     <a-input v-model:value="departNames" :bordered="bordered" :disabled="disabled" :placeholder="placeholder"
       :size="size" readonly>
       <template v-if="prefix" #prefix>
@@ -9,7 +9,7 @@
         <Icon :icon="suffix" />
       </template>
     </a-input>
-    <ModalPanel :visible="visible" :width="800" :title="t('添加部门')" @submit="submit" @close="close">
+    <ModalPanel :visible="visible" :width="800" :title="t('选择部门')" @submit="submit" @close="close" class="depart-select-dialog">
       <div class="choose-dep-box">
         <div class="choose-dep">
           <a-spin class="loading-box" :spinning="loading" />
@@ -141,7 +141,13 @@ function close() {
   emits('close');
 }
 </script>
-
+<style lang="less">
+.depart-select-dialog {
+  .content {
+    margin-bottom: 0;
+  }
+}
+</style>
 <style lang="less" scoped>
 .choose-dep-box {
   display: flex;
@@ -196,4 +202,4 @@ function close() {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/Form/src/components/SelectUserV2.vue b/src/components/Form/src/components/SelectUserV2.vue
index 4615f29..a30e4f9 100644
--- a/src/components/Form/src/components/SelectUserV2.vue
+++ b/src/components/Form/src/components/SelectUserV2.vue
@@ -112,7 +112,7 @@ const props = defineProps({
 });
 let timeoutId = null;
 let resetMemberList = []
-const searchPlaceholder = '请输入姓名搜索'
+const searchPlaceholder = '请输入姓名或工号搜索'
 // 防止输入多次调用搜索接口导致问题，使用防抖
 watch(selectPersonNames, (newValue) => {
   if (newValue && activeKey.value !== 'allPerson') {
@@ -166,7 +166,7 @@ const searchAllMemberParams = ref({
   limit: 1,
   size: 25,
   isSearchAll: true,
-  name: ''
+  keyword: ''
 })
 const searchAllMemberTotal = ref(0)
 const searchAllMemberList = ref()
@@ -178,7 +178,7 @@ async function departChange(e) {
 }
 async function searchNameChanged(val) {
   searchAllMemberParams.value.limit = 1
-  searchAllMemberParams.value.name = val
+  searchAllMemberParams.value.keyword = val
   getAllMemberList()
 }
 async function getAllMemberList() {
diff --git a/src/components/Form/src/types/index.ts b/src/components/Form/src/types/index.ts
index 51f3171..bfe2020 100644
--- a/src/components/Form/src/types/index.ts
+++ b/src/components/Form/src/types/index.ts
@@ -125,9 +125,7 @@ export type ComponentType =
   | 'ChildTable'
   | 'Divider'
   | 'Dept'
-  | 'DeptV2'
   | 'User'
-  | 'UserV2'
   | 'Info'
   | 'Area'
   | 'SubForm'