From e05ab300eeac085eed8742422cfac96b84076cd9 Mon Sep 17 00:00:00 2001
From: wx-jincw <jin.chenwei@iwhalecloud.com>
Date: Thu, 29 Aug 2024 17:18:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../broker/broker/components/BrokerUser.vue   |  7 +++++++
 bs-ui/src/views/system/user/index.vue         | 20 +++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/bs-ui/src/views/broker/broker/components/BrokerUser.vue b/bs-ui/src/views/broker/broker/components/BrokerUser.vue
index 7d5c855..8582f4e 100644
--- a/bs-ui/src/views/broker/broker/components/BrokerUser.vue
+++ b/bs-ui/src/views/broker/broker/components/BrokerUser.vue
@@ -212,6 +212,13 @@
     <!-- 添加或修改代理商经纪对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="70%" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="登录账号" prop="userName">
+              <el-input v-model="form.userName" placeholder="" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户昵称" prop="nickName">
diff --git a/bs-ui/src/views/system/user/index.vue b/bs-ui/src/views/system/user/index.vue
index 7753d79..7033b52 100644
--- a/bs-ui/src/views/system/user/index.vue
+++ b/bs-ui/src/views/system/user/index.vue
@@ -147,8 +147,9 @@
 
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="登陆账号" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column type="index" width="50" align="center" :index="customIndex" />
+          <!-- <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" /> -->
+          <el-table-column label="登陆账号" align="center" key="userName" prop="userName" v-if="columns[0].visible" :show-overflow-tooltip="true" />
           <el-table-column label="真实姓名" align="center" key="realName" prop="realName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
           <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
@@ -215,6 +216,13 @@
     <!-- 添加或修改用户配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="登录账号" prop="userName">
+              <el-input v-model="form.userName" placeholder="" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户昵称" prop="nickName">
@@ -444,8 +452,9 @@ export default {
       },
       // 列信息
       columns: [
-        { key: 0, label: `用户编号`, visible: true },
-        { key: 1, label: `登陆账号`, visible: true },
+        // { key: 0, label: `用户编号`, visible: true },
+        { key: 0, label: `登陆账号`, visible: true },
+        { key: 1, label: `真实姓名`, visible: true },
         { key: 2, label: `用户昵称`, visible: true },
         { key: 3, label: `部门`, visible: true },
         { key: 4, label: `手机号码`, visible: true },
@@ -499,6 +508,9 @@ export default {
     });
   },
   methods: {
+    customIndex(index) {
+      return index + 1 + (this.queryParams.pageNum - 1) * this.queryParams.pageSize;
+    },
     /** 查询用户列表 */
     getList() {
       this.loading = true;