From 6c342eb10b001b75781f755fab9ba923587f3b85 Mon Sep 17 00:00:00 2001
From: GAOANG <1140589958@qq.com>
Date: Thu, 26 Sep 2024 09:29:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=80=89=E6=8B=A9=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Form/src/components/SelectUserListV2.vue       |  2 +-
 .../Form/src/components/SelectUserV2.vue           | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/Form/src/components/SelectUserListV2.vue b/src/components/Form/src/components/SelectUserListV2.vue
index 5b78685..10a2ef2 100644
--- a/src/components/Form/src/components/SelectUserListV2.vue
+++ b/src/components/Form/src/components/SelectUserListV2.vue
@@ -5,7 +5,7 @@
 				{{ item.name }}
 			</div>
 			<div class="user-select-item-right">
-				<div class="select-circle" :class="item.selected ? 'selected' : ''" v-if="multiple && !viewList">
+				<div class="select-circle" :class="item.selected ? 'selected' : ''" v-if="!viewList">
 					<check-outlined v-if="item.selected" />
 				</div>
 				<div class="delete-circle" v-if="canDel" @click="delItem(item)">
diff --git a/src/components/Form/src/components/SelectUserV2.vue b/src/components/Form/src/components/SelectUserV2.vue
index 712b79a..d469506 100644
--- a/src/components/Form/src/components/SelectUserV2.vue
+++ b/src/components/Form/src/components/SelectUserV2.vue
@@ -29,14 +29,14 @@
                             </div>
                         </div>
                         <div class="user-select-box">
-                            <SelectUserListV2 :data="searchDepartMemberList" emptyDescription="暂无人员" @selectId="changeDepMemberSelect"></SelectUserListV2>
+                            <SelectUserListV2 :multiple="multiple" :data="searchDepartMemberList" emptyDescription="暂无人员" @selectId="changeDepMemberSelect"></SelectUserListV2>
                             <div v-if="false" class="user-select-pagination">
                                 <a-pagination v-model:current="searchDepartMemberParams.limit" :pageSize="searchDepartMemberParams.size" :total="searchDepartMemberTotal" />
                             </div>
                         </div>
                     </div>
                     <div v-show="activeKey === 'allPerson'" class="all-user-select-box">
-                        <SelectUserListV2 :data="searchAllMemberList" @selectId="changeMemberSelect"></SelectUserListV2>
+                        <SelectUserListV2 :multiple="multiple" :data="searchAllMemberList" @selectId="changeMemberSelect"></SelectUserListV2>
                         <div v-if="searchAllMemberTotal > 25" class="all-user-select-pagination">
                             <a-form-item label="" name="pagination">
                                 <a-pagination
@@ -228,7 +228,7 @@
     async function getUserList(params) {
         return await getUserPageListNew(params);
     }
-
+ 
     function departCompleted() {
         treeLoading.value = false;
     }
@@ -251,11 +251,17 @@
                 item.selected = !!!item.selected;
                 selected = item.selected;
                 selectedItem = item;
+            } else if (!props.multiple) {
+                item.selected = false
             }
         });
         let memberList = selectedMemberList.value;
         if (selected) {
-            memberList.push(selectedItem);
+            if(props.multiple) {
+                memberList.push(selectedItem);
+            } else {
+                memberList = [selectedItem]
+            }
             selectedMemberList.value = memberList;
         } else {
             selectedMemberList.value = memberList.filter((m) => m.id !== id);