|
|
@@ -95,7 +95,7 @@
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="角色权限" prop="email">
|
|
|
- <el-select size="small" v-model="dataForm.remark" placeholder="请选择" @change="changeRole($event)" >
|
|
|
+ <el-select size="small" v-model="dataForm.roleId" placeholder="请选择" @change="changeRole($event)" >
|
|
|
<el-option :label="roleItem.name" :value="roleItem.id" v-for="(roleItem,roleIndex) in roleoptions" :key="roleIndex"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
@@ -210,7 +210,8 @@
|
|
|
// 新增或修改的弹出框Start
|
|
|
dialogVisible: false, // 新增编辑界面是否显示
|
|
|
dataForm:{ // 人员个人信息
|
|
|
- remark:""
|
|
|
+ remark:"",
|
|
|
+ roleId:""
|
|
|
},
|
|
|
// 新增或修改的弹出框End
|
|
|
roleoptions: [],
|
|
|
@@ -243,7 +244,6 @@
|
|
|
methods: {
|
|
|
getRoles(){
|
|
|
this.$api.role.findAll().then((res) => {
|
|
|
- console.log(res.data)
|
|
|
this.roleoptions = res.data
|
|
|
}).catch((error)=>{
|
|
|
this.roleoptions = [];
|
|
|
@@ -299,14 +299,21 @@
|
|
|
this.pageRequest.pageSize = data.pageRequest.pageSize;
|
|
|
}
|
|
|
this.$api.user.userQueryPage(this.pageRequest).then((res) => {
|
|
|
- console.log(res.data)
|
|
|
+ //角色权限过滤转换
|
|
|
+ res.data.content.forEach(item=>{
|
|
|
+ let roleArr = this.roleoptions.filter(items=>{
|
|
|
+ return item.roleId==items.id
|
|
|
+ })
|
|
|
+ if(roleArr.length){
|
|
|
+ item.roleId = roleArr[0].name
|
|
|
+ }
|
|
|
+ })
|
|
|
this.pageResult = res.data;
|
|
|
}).then(data != null ? data.callback : '')
|
|
|
},
|
|
|
|
|
|
handleTableEdit(params) {
|
|
|
// 编辑后线人员
|
|
|
- console.log(params.row)
|
|
|
Object.assign(this.dataForm, params.row);
|
|
|
this.dialogVisible = true
|
|
|
},
|