From 679ede97899d73d5a7619091b6ee3b7c881d1627 Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期六, 28 六月 2025 10:04:27 +0800
Subject: [PATCH] 修改bug

---
 laboratory/src/views/system/user/components/inherit.vue |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/laboratory/src/views/system/user/components/inherit.vue b/laboratory/src/views/system/user/components/inherit.vue
index e452b04..88fbe84 100644
--- a/laboratory/src/views/system/user/components/inherit.vue
+++ b/laboratory/src/views/system/user/components/inherit.vue
@@ -13,11 +13,15 @@
                 <el-button type="primary" @click="selectMember">选择人员</el-button>
             </div>
             <Table :data="tableData" :total="0" :height='null'>
-                <el-table-column label="姓名" prop="role" />
-                <el-table-column label="联系电话" prop="name" />
-                <el-table-column label="角色" prop="createTime" />
-                <el-table-column label="登陆账号" prop="createTime" />
-                <el-table-column label="登录状态" prop="createTime" />
+                <el-table-column label="姓名" prop="nickName" />
+                <el-table-column label="联系电话" prop="phonenumber" />
+                <el-table-column label="角色" prop="roleName" />
+                <el-table-column label="登陆账号" prop="phonenumber" />
+                <el-table-column label="登录状态" prop="status">
+                    <template v-if="row.status==1">
+                        <el-tag>正常</el-tag>
+                    </template>
+                </el-table-column>
                 <el-table-column label="创建时间" prop="createTime" />
             </Table>
             <div class="select-member-footer">
@@ -25,11 +29,12 @@
                 <el-button type="primary" @click="submit">保存</el-button>
             </div>
         </el-dialog>
-        <SelectMember ref="selectMember" @submit='submitChoose'/>
+        <SelectMember ref="selectMember" @submit='submitChoose' :roleType='row.roleType' />
     </div>
 </template>
 
 <script>
+import {inherit} from '../service'
 export default {
     props: {
         dialogVisible: {
@@ -47,6 +52,7 @@
         };
     },
     created() {
+        console.log('this.row this.row',this.row)
         if (Object.keys(this.row).length) {
             this.form = {
                 ...this.row
@@ -69,9 +75,19 @@
             }
             this.$refs.selectMember.close()
             this.tableData=data
+            console.log('data data data',data)
 
         },
         submit() {
+            let params={
+                userId:this.id,
+                oldUserId:this.tableData[0].id
+            }
+            inherit(params).then(res=>{
+                this.$message.success('继承成功')
+                this.$emit('close')
+            })
+
         }
     },
 };

--
Gitblit v1.7.1