From cba04741fcc1b443abee4f1f7441956831fb1254 Mon Sep 17 00:00:00 2001
From: yxh <yxh1103@qq.com>
Date: Wed, 22 Jan 2025 11:07:48 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=94=A8=E6=88=B7=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E6=89=B9=E9=87=8F=E9=80=89=E6=8B=A9=EF=BC=8C=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E5=B7=B2=E9=80=89=E6=8B=A9=E7=94=A8=E6=88=B7bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../selectUser/component/userList.vue         | 14 ++++++-
 src/components/selectUser/index.vue           | 39 ++++++++++++-------
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/components/selectUser/component/userList.vue b/src/components/selectUser/component/userList.vue
index 0b4c341..23adbad 100644
--- a/src/components/selectUser/component/userList.vue
+++ b/src/components/selectUser/component/userList.vue
@@ -1,6 +1,7 @@
 <template>
 	<div class="system-user-list-container"  style="min-height: 600px;">
-    <el-table :data="tableData.data" style="width: 100%" >
+    <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange">
+      <el-table-column v-if="multiple" type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" width="60" />
       <el-table-column prop="userNickname" label="姓名" show-overflow-tooltip></el-table-column>
       <el-table-column label="操作" width="100" >
@@ -58,9 +59,13 @@ export default defineComponent({
     genderData:{
       type:Array,
       default:()=>[]
+    },
+    multiple:{
+      type:Boolean,
+      default:true
     }
   },
-  emits:['ok'],
+  emits:['ok','okBatch'],
 	components: {  },
 	setup(prop,{emit}) {
     const {proxy,props} = <any>getCurrentInstance();
@@ -99,10 +104,15 @@ export default defineComponent({
     const onOpenSelectUser = (row:any) => {
       emit("ok",row);
     }
+    // 多选框选中数据
+    const handleSelectionChange = (selection:any[])=> {
+      emit("okBatch",selection)
+    };
 		return {
       sys_user_sex,
       setUserList,
       onOpenSelectUser,
+      handleSelectionChange,
 			...toRefs(state),
 		};
 	},
diff --git a/src/components/selectUser/index.vue b/src/components/selectUser/index.vue
index f8796b2..2cf97c2 100644
--- a/src/components/selectUser/index.vue
+++ b/src/components/selectUser/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div v-if="deptUser.length > 0">
-      <el-tag  closable  :disable-transitions="false" class="u-m-r-10" v-for="(item,index) in deptUser"  :key="'sel_'+index" @close="handleClose(index)" >{{item.userNickname}}</el-tag>
+      <el-tag  closable  :disable-transitions="false" class="u-m-r-10" v-for="(item) in deptUser"  :key="'sel_'+item.id" @close="handleClose(item.id)" >{{item.userNickname}}</el-tag>
     </div>
     <el-button
         style="padding-left: 10px;"
@@ -69,7 +69,8 @@
                   </el-form-item>
                 </el-form>
               </div>
-              <UserList ref="userListRef" :dept-data="deptData" :gender-data="sys_user_sex" :param="param" @ok="handleSelectUserOk"/>
+              <UserList ref="userListRef" :dept-data="deptData" :gender-data="sys_user_sex" :param="param" :multiple="multiple"
+                        @ok="handleSelectUserOk" @okBatch="handleSelectUserOkBatch"/>
             </el-card>
           </el-col>
           <el-col :span="6">
@@ -88,7 +89,7 @@
                   <el-table :data="selectedUserInfo">
                     <el-table-column  label="操作"  >
                       <template #default="scope">
-                        <el-button type="danger" plain @click="remove(scope.$index)">移除</el-button>
+                        <el-button type="danger" plain @click="remove(scope.row.id)">移除</el-button>
                       </template>
                     </el-table-column>
                     <el-table-column prop="userNickname" label="姓名"  />
@@ -242,26 +243,37 @@ export default defineComponent({
       }
 
     }
+    const handleSelectUserOkBatch = (row:any[])=>{
+      if(prop.multiple){
+        const ids:any[] = []
+        row.forEach((item:any)=>{
+          if(!selectedUsers.value.includes(item.id)){
+            ids.push(item.id)
+          }
+        })
+        if(ids.length>0){
+          selectedUsers.value = [...selectedUsers.value!,...ids]
+        }
+      }
+    }
     const goBack = ()=>{
       visible.value = false;
     }
     const removeAll = ()=>{
       selectedUsers.value = []
     }
-    const remove = (index:number)=>{
-      index = (selectedUsersPage.value-1)*10+index
-      let newSel:any = [...selectedUsers.value!]
-      selectedUsers.value = []
-      newSel.splice(index,1)
-      selectedUsers.value = newSel
+    const remove = (id:number)=>{
+      selectedUsers.value = selectedUsers.value.filter((item:any)=>{
+        return item !== id
+      })
     }
     const handleSelectUser = ()=>{
       openDialog()
     }
-    const handleClose = (index:number)=>{
-      let newSel:any = [...selectedUsers.value!]
-      newSel.splice(index, 1);
-      selectedUsers.value = newSel
+    const handleClose = (id:number)=>{
+      selectedUsers.value =  selectedUsers.value.filter((item:any)=>{
+        return item !== id
+      })
     }
     return {
       selectedUsersPage,
@@ -279,6 +291,7 @@ export default defineComponent({
       openDialog,
       getUserList,
       handleSelectUserOk,
+      handleSelectUserOkBatch,
       handleNodeClick,
       resetQuery,
       goBack,