|
|
@@ -173,7 +173,7 @@ import {
|
|
|
} from "@/api/system/role";
|
|
|
import {listSimpleMenus} from "@/api/system/menu";
|
|
|
import {assignRoleMenu, listRoleMenus, assignRoleDataScope} from "@/api/system/permission";
|
|
|
-import {listSimpleDepts} from "@/api/system/dept";
|
|
|
+import {listSimpleDeptsRole} from "@/api/system/dept";
|
|
|
import {CommonStatusEnum, SystemDataScopeEnum} from "@/utils/constants";
|
|
|
import {DICT_TYPE, getDictDatas} from "@/utils/dict";
|
|
|
|
|
|
@@ -399,6 +399,7 @@ export default {
|
|
|
},
|
|
|
/** 分配数据权限操作 */
|
|
|
handleDataScope(row) {
|
|
|
+
|
|
|
this.reset();
|
|
|
// 处理了 form 的角色 name 和 code 的展示
|
|
|
this.form.id = row.id;
|
|
|
@@ -407,7 +408,7 @@ export default {
|
|
|
// 打开弹窗
|
|
|
this.openDataScope = true;
|
|
|
// 获得部门列表
|
|
|
- listSimpleDepts().then(response => {
|
|
|
+ listSimpleDeptsRole().then(response => {
|
|
|
// 处理 deptOptions 参数
|
|
|
this.deptOptions = [];
|
|
|
this.deptOptions.push(...this.handleTree(response.data, "id"));
|
|
|
@@ -416,7 +417,7 @@ export default {
|
|
|
// 获得角色拥有的数据权限
|
|
|
getRole(row.id).then(response => {
|
|
|
this.form.dataScope = response.data.dataScope;
|
|
|
- this.$refs.dept.setCheckedKeys(response.data.dataScopeDeptIds, false);
|
|
|
+ this.$refs.dept.setCheckedKeys(response.data.dataScopeDeptIds?response.data.dataScopeDeptIds:[], false);
|
|
|
});
|
|
|
});
|
|
|
},
|