From 834ed22f5ba54b59f412c942dffa16ed8ffd4f29 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 3 Nov 2025 16:55:45 +0800
Subject: [PATCH] =?UTF-8?q?1.0.26=20=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/index.vue |  2 +-
 src/views/system/user/index.vue | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 6339df9..baadca6 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -108,7 +108,7 @@
           <el-col :span="12">
             <el-form-item label="负责人" prop="leader">
               <el-select v-model="form.leader" placeholder="请选择负责人">
-                <el-option v-for="item in deptUserList" :key="item.userId" :label="item.userName" :value="item.userId" />
+                <el-option v-for="item in deptUserList" :key="item.userId" :label="item.nickName" :value="item.userId" />
               </el-select>
             </el-form-item>
           </el-col>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 595cc1d..a7ed722 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -102,13 +102,17 @@
             <el-table-column v-if="columns[2].visible" key="nickName" label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
             <el-table-column v-if="columns[3].visible" key="deptName" label="部门" align="center" prop="deptName" :show-overflow-tooltip="true" />
             <el-table-column v-if="columns[4].visible" key="phonenumber" label="手机号码" align="center" prop="phonenumber" width="120" />
-            <el-table-column v-if="columns[5].visible" key="status" label="状态" align="center">
+            <el-table-column v-if="columns[5].visible" key="roles" label="角色" align="center" prop="roles" :show-overflow-tooltip="true">
+              <template #default="scope">
+                <span>{{ scope.row.roles?.map((role: any) => role.roleName).join(', ') || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="columns[6].visible" key="status" label="状态" align="center">
               <template #default="scope">
                 <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
               </template>
             </el-table-column>
-
-            <el-table-column v-if="columns[6].visible" label="创建时间" align="center" prop="createTime" width="160">
+            <el-table-column v-if="columns[7].visible" label="创建时间" align="center" prop="createTime" width="160">
               <template #default="scope">
                 <span>{{ scope.row.createTime }}</span>
               </template>
@@ -339,8 +343,9 @@ const columns = ref<FieldOption[]>([
   { key: 2, label: `用户姓名`, visible: true, children: [] },
   { key: 3, label: `部门`, visible: true, children: [] },
   { key: 4, label: `手机号码`, visible: true, children: [] },
-  { key: 5, label: `状态`, visible: true, children: [] },
-  { key: 6, label: `创建时间`, visible: true, children: [] }
+  { key: 5, label: `角色`, visible: true, children: [] },
+  { key: 6, label: `状态`, visible: true, children: [] },
+  { key: 7, label: `创建时间`, visible: true, children: [] }
 ]);
 
 const deptTreeRef = ref<ElTreeInstance>();