|
|
@@ -214,7 +214,7 @@ export default {
|
|
|
// { prop: "sex",label: "性别",minWidth: 80,sortable: false,formatter: this.sexFormatter},
|
|
|
{ prop: "mobile", label: "联系电话", minWidth: 100, sortable: false },
|
|
|
{ prop: "email", label: "邮箱", minWidth: 100, sortable: false },
|
|
|
- { prop: "remark", label: "角色", minWidth: 100, sortable: false }
|
|
|
+ { prop: "roleName", label: "角色", minWidth: 100, sortable: false }
|
|
|
],
|
|
|
// 右侧列表查询数据End
|
|
|
|
|
|
@@ -326,12 +326,7 @@ export default {
|
|
|
this.$api.user.userQueryPage(this.pageRequest).then((res) => {
|
|
|
//角色权限过滤转换
|
|
|
res.data.content.forEach(item => {
|
|
|
- let roleArr = this.roleoptions.filter(items => {
|
|
|
- return item.roleId == items.id
|
|
|
- })
|
|
|
- if (roleArr.length) {
|
|
|
- item.roleId = roleArr[0].name
|
|
|
- }
|
|
|
+ item.roleId=Number(item.roleId)
|
|
|
})
|
|
|
this.pageResult = res.data;
|
|
|
}).then(data != null ? data.callback : '')
|