From 6b12fdd4241e9dcd9354e3bfcab25fbde4960674 Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期三, 25 六月 2025 17:58:10 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory

---
 culture/src/views/system/user/components/inherit.vue |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/culture/src/views/system/user/components/inherit.vue b/culture/src/views/system/user/components/inherit.vue
index e2f6799..7bb0f32 100644
--- a/culture/src/views/system/user/components/inherit.vue
+++ b/culture/src/views/system/user/components/inherit.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-dialog :visible.sync="dialogVisible" :z-index="1000" @close="$emit('close')" title="账号继承" :show-close="false">
+        <el-dialog :close-on-click-modal="false" :visible.sync="dialogVisible" :z-index="1000" @close="$emit('close')" title="账号继承" :show-close="false">
             <div class="inherit-title">当前账号</div>
             <div class="inherit-content">
                 <div>姓名:{{row.nickName}}</div>
@@ -25,7 +25,7 @@
                 <el-button type="primary" @click="submit">保存</el-button>
             </div>
         </el-dialog>
-        <SelectMember ref="selectMember" />
+        <SelectMember ref="selectMember" @submit="selectUser" />
     </div>
 </template>
 
@@ -57,6 +57,13 @@
         selectMember() {
             this.$refs.selectMember.open()
         },
+        selectUser(e){
+            this.$refs.selectMember.close()
+            this.$emit('confirm',{
+                userId:e[0].userId,
+                currentUserId:this.row.userId
+            })
+        },
         submit() {
         }
     },

--
Gitblit v1.7.1