From e93d241d51765e701d89cd7f6f4088c6cb22949b Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期五, 21 四月 2023 16:51:47 +0800 Subject: [PATCH] 修改 --- src/views/system/user/index.vue | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index b652fea..9af926e 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -38,7 +38,7 @@ </el-table-column> <el-table-column prop="positionId" label="职务" show-overflow-tooltip> <template #default="scope"> - {{ parseNumber(scope.row.positionId) }} + {{ scope.row.positions?.map(i=>i.positionName).join('、') }} </template> </el-table-column> <!-- <el-table-column prop="type" label="职务" show-overflow-tooltip>--> @@ -46,7 +46,7 @@ <!-- {{ `${userTypeList.find(item => item.id === scope.row.type)?.name}` }}--> <!-- </template>--> <!-- </el-table-column>--> - <el-table-column prop="department.depName" label="部门" show-overflow-tooltip></el-table-column> + <el-table-column prop="depName" label="部门" show-overflow-tooltip></el-table-column> <el-table-column prop="phone" label="手机号" show-overflow-tooltip></el-table-column> <el-table-column prop="email" label="邮箱" show-overflow-tooltip></el-table-column> <el-table-column prop="status" label="用户状态" show-overflow-tooltip> @@ -56,8 +56,9 @@ </template> </el-table-column> <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column> - <el-table-column label="操作" width="100"> + <el-table-column label="操作" width="140"> <template #default="scope"> + <el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onOpenUserDialog('查看', scope.row)">查看</el-button> <el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onOpenUserDialog('修改', scope.row)">修改</el-button> <el-button style="color: red" :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button> </template> -- Gitblit v1.9.2