|
@@ -49,6 +49,7 @@
|
|
|
>
|
|
|
<el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
|
|
|
<el-table-column align="center" label="商户" prop="companyName"></el-table-column>
|
|
|
+ <el-table-column align="center" label="父级" prop="parentRoleName"></el-table-column>
|
|
|
<el-table-column align="center" label="角色" prop="name"></el-table-column>
|
|
|
<el-table-column align="center" label="适用机构" prop="type">
|
|
|
<template slot-scope="scope">
|
|
@@ -107,6 +108,30 @@
|
|
|
label-position="left"
|
|
|
label-width="100px"
|
|
|
>
|
|
|
+ <el-form-item label="父级" prop="parentRoleId">
|
|
|
+ <el-select
|
|
|
+ v-model="addForm.parentRoleId"
|
|
|
+ placeholder="请选择"
|
|
|
+ @change="
|
|
|
+ v => {
|
|
|
+ if (v && dataList22.find(item => item.adminRoleId == v)) {
|
|
|
+ addForm.parentRoleName = dataList22.find(item => item.adminRoleId == v).name
|
|
|
+ } else {
|
|
|
+ addForm.parentRoleName = ''
|
|
|
+ }
|
|
|
+ }
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in (dataList22 || []).filter(a => a.adminRoleId != addForm.adminRoleId)"
|
|
|
+ :key="item.adminRoleId"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.adminRoleId"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
<el-form-item label="角色名" prop="name">
|
|
|
<el-input v-model="addForm.name" autocomplete="off" placeholder="请输入角色名"></el-input>
|
|
|
</el-form-item>
|
|
@@ -191,7 +216,9 @@ export default {
|
|
|
addForm: {
|
|
|
name: '', // 角色名
|
|
|
type: '',
|
|
|
- level: ''
|
|
|
+ level: '',
|
|
|
+ parentRoleId: '',
|
|
|
+ parentRoleName: ''
|
|
|
},
|
|
|
addFormRules: {
|
|
|
name: [{ required: true, message: '请输入角色名', trigger: 'blur' }],
|
|
@@ -203,7 +230,8 @@ export default {
|
|
|
children: 'children',
|
|
|
label: 'moduleName'
|
|
|
},
|
|
|
- adminRoleGetRoleType: []
|
|
|
+ adminRoleGetRoleType: [],
|
|
|
+ dataList22: []
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
@@ -211,6 +239,12 @@ export default {
|
|
|
},
|
|
|
created() {
|
|
|
this.getList()
|
|
|
+ getRoleList({
|
|
|
+ pageNum: 1,
|
|
|
+ pageSize: -1
|
|
|
+ }).then(res => {
|
|
|
+ this.dataList22 = res.data.records
|
|
|
+ })
|
|
|
adminRoleGetRoleType().then(res => {
|
|
|
this.adminRoleGetRoleType = res.data
|
|
|
})
|
|
@@ -293,12 +327,24 @@ export default {
|
|
|
removeTab('list')
|
|
|
this.getList()
|
|
|
this.$successMsg('编辑成功')
|
|
|
+ getRoleList({
|
|
|
+ pageNum: 1,
|
|
|
+ pageSize: -1
|
|
|
+ }).then(res => {
|
|
|
+ this.dataList22 = res.data.records
|
|
|
+ })
|
|
|
})
|
|
|
} else {
|
|
|
addRole(params).then(res => {
|
|
|
removeTab('list')
|
|
|
this.getList()
|
|
|
this.$successMsg('新增成功')
|
|
|
+ getRoleList({
|
|
|
+ pageNum: 1,
|
|
|
+ pageSize: -1
|
|
|
+ }).then(res => {
|
|
|
+ this.dataList22 = res.data.records
|
|
|
+ })
|
|
|
})
|
|
|
}
|
|
|
}
|