From 9559bc470213081b0628641937048fd342291d80 Mon Sep 17 00:00:00 2001
From: 27942 <fefgf@bfdgfg>
Date: Fri, 26 Dec 2025 11:31:28 +0800
Subject: [PATCH] hthhth

---
 src/views/system/user/index.vue | 45 ++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 0fe54e5..a7752d4 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -99,18 +99,29 @@
             @selection-change="handleSelectionChange"
           >
             <el-table-column type="selection" width="50" align="center" />
-            <el-table-column label="用户名" prop="account" />
-            <el-table-column label="昵称" align="center" prop="username" />
+            <el-table-column label="用户名" prop="account" min-width="120">
+              <template #default="scope">
+                {{ scope.row.account || '-' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="昵称" align="center" prop="username" min-width="120">
+              <template #default="scope">
+                {{ scope.row.username || '-' }}
+              </template>
+            </el-table-column>
             <!--            <el-table-column label="性别" width="100" align="center">-->
             <!--              <template #default="scope">-->
             <!--                <DictLabel v-model="scope.row.gender" code="gender" />-->
             <!--              </template>-->
             <!--            </el-table-column>-->
-            <el-table-column label="部门" align="center" prop="department">
+            <el-table-column label="部门" align="center" prop="department" min-width="150">
               <template #default="scope">
-                <span v-if="scope.row.department && scope.row.department.length > 0">
+                <span v-if="scope.row.department && Array.isArray(scope.row.department) && scope.row.department.length > 0">
                   {{ scope.row.department.map((d: any) => d.username || d.name || '').filter((n: string) => n).join(', ') }}
                 </span>
+                <span v-else-if="scope.row.department && typeof scope.row.department === 'string'">
+                  {{ scope.row.department }}
+                </span>
                 <span v-else>-</span>
               </template>
             </el-table-column>
@@ -128,8 +139,16 @@
                 <span v-if="!scope.row.role || scope.row.role.length === 0">-</span>
               </template>
             </el-table-column>
-            <el-table-column label="手机号码" align="center" prop="mobilePhone" />
-            <el-table-column label="入职时间" align="center" prop="Dateofjoining" />
+            <el-table-column label="手机号码" align="center" prop="mobilePhone" min-width="120">
+              <template #default="scope">
+                {{ scope.row.mobilePhone || '-' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="入职时间" align="center" prop="Dateofjoining" min-width="120">
+              <template #default="scope">
+                {{ scope.row.Dateofjoining || '-' }}
+              </template>
+            </el-table-column>
             <el-table-column label="操作" fixed="right" align="center" width="280">
               <template #default="scope">
                 <el-button
@@ -682,13 +701,21 @@ const rules = reactive({
  * 获取列表数据
  */
 const fetchUserList = useDebounceFn(async () => {
-  if (!queryParams.department) return
+  // 如果没有选择部门，可以加载所有用户或者提示选择部门
+  // 暂时允许不选择部门时也加载数据
+  // if (!queryParams.department) return
 
   loading.value = true
   try {
     const res: any = await UserPersonnelList(queryParams)
-    pageData.value = res.data
-    total.value = res.total
+    pageData.value = res.data || []
+    total.value = res.total || 0
+    
+    // 调试：打印数据查看结构
+    if (pageData.value.length > 0) {
+      console.log('用户列表数据示例:', pageData.value[0])
+      console.log('部门数据:', pageData.value[0]?.department)
+    }
   } catch (error) {
     ElMessage.error('获取用户列表失败')
     console.error('获取用户列表失败:', error)