|
|
|
@ -131,6 +131,7 @@
|
|
|
|
|
<el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
|
|
|
|
|
<el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
|
|
|
|
|
<el-tree
|
|
|
|
|
props="menuOptions"
|
|
|
|
|
class="tree-border"
|
|
|
|
|
:data="menuOptions"
|
|
|
|
|
show-checkbox
|
|
|
|
@ -210,6 +211,7 @@ import {
|
|
|
|
|
deptTreeSelect
|
|
|
|
|
} from "@/api/system/role";
|
|
|
|
|
import {treeselect as menuTreeselect, roleMenuTreeselect} from "@/api/system/menu";
|
|
|
|
|
import {isBlank} from "@/utils/strUtil";
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
|
name: "Role",
|
|
|
|
@ -291,6 +293,9 @@ export default {
|
|
|
|
|
// roleKey: [
|
|
|
|
|
// {required: true, message: "权限字符不能为空", trigger: "blur"}
|
|
|
|
|
// ],
|
|
|
|
|
menuOptions:[
|
|
|
|
|
{required: true, message: "角色列表不能为空", trigger: "blur"}
|
|
|
|
|
],
|
|
|
|
|
roleSort: [
|
|
|
|
|
{required: true, message: "角色顺序不能为空", trigger: "blur"}
|
|
|
|
|
]
|
|
|
|
@ -533,6 +538,10 @@ export default {
|
|
|
|
|
if (valid) {
|
|
|
|
|
if (this.form.roleId != undefined) {
|
|
|
|
|
this.form.menuIds = this.getMenuAllCheckedKeys();
|
|
|
|
|
if( this.form.menuIds.length==0){
|
|
|
|
|
this.$message.error("菜单权限不能为空");
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
updateRole(this.form).then(response => {
|
|
|
|
|
this.$modal.msgSuccess("修改成功");
|
|
|
|
|
this.open = false;
|
|
|
|
@ -540,6 +549,10 @@ export default {
|
|
|
|
|
});
|
|
|
|
|
} else {
|
|
|
|
|
this.form.menuIds = this.getMenuAllCheckedKeys();
|
|
|
|
|
if(this.form.menuIds.length==0){
|
|
|
|
|
this.$message.error("菜单权限不能为空");
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
addRole(this.form).then(response => {
|
|
|
|
|
this.$modal.msgSuccess("新增成功");
|
|
|
|
|
this.open = false;
|
|
|
|
|