From 9cb1c3c39136c89974bc4049fca5e450e757b1be Mon Sep 17 00:00:00 2001
From: 13404089107 <puwei@sinata.cn>
Date: 星期五, 15 八月 2025 17:51:03 +0800
Subject: [PATCH] fix

---
 laboratory/src/views/system/user/components/inherit.vue |   52 +++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/laboratory/src/views/system/user/components/inherit.vue b/laboratory/src/views/system/user/components/inherit.vue
index 6ebed67..039306b 100644
--- a/laboratory/src/views/system/user/components/inherit.vue
+++ b/laboratory/src/views/system/user/components/inherit.vue
@@ -3,21 +3,25 @@
         <el-dialog :visible.sync="dialogVisible" @close="$emit('close')" title="账号继承" :show-close="false">
             <div class="inherit-title">当前账号</div>
             <div class="inherit-content">
-                <div>姓名:张三</div>
-                <div>电话:102929292929</div>
-                <div>角色:工艺工程师</div>
-                <div>登录账号:328746378</div>
+                <div>姓名:{{row.nickName||''}}</div>
+                <div>电话:{{row.phonenumber||''}}</div>
+                <div>角色:{{row.roleName||''}}</div>
+                <div>登录账号:{{row.userName||''}}</div>
             </div>
             <div class="inherit-table-title">
                 <div class="inherit-title">继承账号</div>
                 <el-button type="primary" @click="selectMember">选择人员</el-button>
             </div>
-            <Table :data="tableData" :total="0">
-                <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" />
+            <Table :data="tableData" :total="0" :height='null'>
+                <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" />
+        <SelectMember ref="selectMember" @submit='submitChoose' :roleType='row.roleType' />
     </div>
 </template>
 
 <script>
+import {inherit} from '../service'
 export default {
     props: {
         dialogVisible: {
@@ -43,9 +48,11 @@
     },
     data() {
         return {
+            tableData:[]
         };
     },
     created() {
+        console.log('this.row this.row',this.row)
         if (Object.keys(this.row).length) {
             this.form = {
                 ...this.row
@@ -57,7 +64,30 @@
         selectMember() {
             this.$refs.selectMember.open()
         },
+        submitChoose(data){
+            if(data.length==0){
+                this.$message.error('请选择一个继承账号')
+                return 
+            }
+            if(data.length>1){
+                this.$message.error('只能选择一个继承账号')
+                return 
+            }
+            this.$refs.selectMember.close()
+            this.tableData=data
+            console.log('data data data',data)
+
+        },
         submit() {
+            let params={
+                userId:this.row.userId,
+                oldUserId:this.tableData[0].userId
+            }
+            inherit({...params}).then(res=>{
+                this.$message.success('继承成功')
+                this.$emit('close')
+            })
+
         }
     },
 };

--
Gitblit v1.7.1