From bc396cb187aa7633b6dd1a3ab63773cc8976a41c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十月 2023 17:24:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev
---
platform/src/views/system/user.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/platform/src/views/system/user.vue b/platform/src/views/system/user.vue
index 5e4d7f5..532e469 100644
--- a/platform/src/views/system/user.vue
+++ b/platform/src/views/system/user.vue
@@ -33,15 +33,16 @@
:data="tableData.list"
:default-sort = "{prop: 'createTime', order: 'descending'}"
stripe
+ border
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="avatar" label="澶村儚" width="80px" class-name="table-column-avatar" fixed="left">
+ <!-- <el-table-column prop="avatar" label="澶村儚" width="80px" class-name="table-column-avatar" fixed="left">
<template slot-scope="{row}">
<img :src="row.avatar == null ? '/static/avatar/man.png' : row.avatar">
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column prop="realname" label="濮撳悕" min-width="100px" fixed="left"></el-table-column>
<el-table-column prop="username" label="鐢ㄦ埛鍚�" min-width="120px"></el-table-column>
<el-table-column prop="empNo" label="宸ュ彿" sortable="custom" sort-by="EMP_NO" min-width="80px"></el-table-column>
@@ -65,10 +66,10 @@
<el-table-column prop="birthday" label="鐢熸棩" sortable="custom" sort-by="BIRTHDAY" min-width="100px"></el-table-column>
<el-table-column prop="roles" label="瑙掕壊" min-width="160px" class-name="table-column-strings">
<template slot-scope="{row}">
- <ul>
- <li v-for="role in row.roles" :key="role.id">{{role.name}}</li>
- </ul>
- </template>
+ <ul>
+ <li v-for="role in row.roles" :key="role.id">{{role.name}}</li>
+ </ul>
+ </template>
</el-table-column>
<el-table-column prop="createUser" label="鍒涘缓浜�" min-width="100px">
<template slot-scope="{row}">{{row.createUserInfo == null ? '' : row.createUserInfo.username}}</template>
@@ -125,6 +126,7 @@
return {
// 鎼滅储
searchForm: {
+ type:0,
username: '', // 鍚嶅瓧
realname: '', // 濮撳悕
rootDeptId: null, // 閮ㄩ棬ID
--
Gitblit v1.9.3