root/nl-sso-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/nl-sso-server

Browse Source
This commit is contained in:
liyongde
2022-12-16 16:12:26 +08:00
parent db04de9f48 e66104d3cf
commit 52cc2c6b09
5 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nladmin-ui/src/views/system/user/index.vue
View File

@@ -154,7 +154,11 @@
<el-table-column prop="gender" label="性别" :min-width="flexWidth('personName',crud.data,'性别')" />
<el-table-column prop="phone" label="电话" :min-width="flexWidth('phone',crud.data,'电话')" />
<el-table-column prop="email" label="邮箱" :min-width="flexWidth('email',crud.data,'邮箱')" />
<el-table-column show-overflow-tooltip prop="deptnames" label="部门" />
<el-table-column show-overflow-tooltip prop="depts" label="部门" >
<template slot-scope="scope">
<span>{{ scope.row.depts }}</span>
</template>
</el-table-column>>
<el-table-column label="状态" align="center" prop="enabled">
<template slot-scope="scope">
<span :style="{'color': caseStatusColorFilter(scope.row.isUsed)}">{{ enabledTypeOptions.find(item => {return item.key == scope.row.isUsed}).display_name }}</span>
@@ -318,7 +322,7 @@
</template>
<script>
import crudUser from '@/views/system/user'
import crudUser from '@/views/system/user/user'
import crudDept from '@/api/system/dept'
// import crudDataPermission from '@/views/system/permission/dataPermission'
import { getAll, getLevel } from '@/views/system/role/role'