diff --git a/package.json b/package.json
index e925926..22f87ae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saber-admin",
- "version": "2.0.3",
+ "version": "2.0.4",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
diff --git a/src/api/system/menu.js b/src/api/system/menu.js
index 5ff0482..9da4329 100644
--- a/src/api/system/menu.js
+++ b/src/api/system/menu.js
@@ -46,3 +46,51 @@ export const getMenu = (id) => {
}
})
}
+
+export const getListScope = (current, size, params) => {
+ return request({
+ url: '/api/blade-system/data-scope/list',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
+export const removeScope = (ids) => {
+ return request({
+ url: '/api/blade-system/data-scope/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
+}
+
+export const addScope = (row) => {
+ return request({
+ url: '/api/blade-system/data-scope/submit',
+ method: 'post',
+ data: row
+ })
+}
+
+export const updateScope = (row) => {
+ return request({
+ url: '/api/blade-system/data-scope/submit',
+ method: 'post',
+ data: row
+ })
+}
+
+export const getMenuScope = (id) => {
+ return request({
+ url: '/api/blade-system/data-scope/detail',
+ method: 'get',
+ params: {
+ id,
+ }
+ })
+}
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 2e677c5..8614737 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -18,13 +18,14 @@ export const grantTree = () => {
})
}
-export const grant = (roleIds, menuIds) => {
+export const grant = (roleIds, menuIds, scopeIds) => {
return request({
url: '/api/blade-system/role/grant',
method: 'post',
params: {
roleIds,
- menuIds
+ menuIds,
+ scopeIds
}
})
}
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index 793efbb..db6b9c6 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -24,6 +24,10 @@
@click="handleDelete">删 除
+
+ {{row.deptCategoryName}}
+
@@ -59,12 +63,12 @@
viewBtn: true,
column: [
{
- label: "部门名称",
+ label: "机构名称",
prop: "deptName",
search: true,
rules: [{
required: true,
- message: "请输入部门名称",
+ message: "请输入机构名称",
trigger: "blur"
}]
},
@@ -90,17 +94,17 @@
}]
},
{
- label: "部门全称",
+ label: "机构全称",
prop: "fullName",
search: true,
rules: [{
required: true,
- message: "请输入部门全称",
+ message: "请输入机构全称",
trigger: "blur"
}]
},
{
- label: "上级部门",
+ label: "上级机构",
prop: "parentId",
dicData: [],
type: "tree",
@@ -110,11 +114,27 @@
},
rules: [{
required: false,
- message: "请选择上级部门",
+ message: "请选择上级机构",
trigger: "click"
}]
},
-
+ {
+ label: "机构类型",
+ type: "select",
+ dicUrl: "/api/blade-system/dict/dictionary?code=org_category",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ width: 180,
+ prop: "deptCategory",
+ slot: true,
+ rules: [{
+ required: true,
+ message: "请输入机构类型",
+ trigger: "blur"
+ }]
+ },
{
label: "排序",
prop: "sort",
@@ -129,12 +149,12 @@
{
label: "备注",
prop: "remark",
- span: 24,
rules: [{
required: false,
message: "请输入备注",
trigger: "blur"
- }]
+ }],
+ hide: true
}
]
},
@@ -242,10 +262,10 @@
}
done();
},
- currentChange(currentPage){
+ currentChange(currentPage) {
this.page.currentPage = currentPage;
},
- sizeChange(pageSize){
+ sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
onLoad(page, params = {}) {
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index b7e61de..2f9124e 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -24,18 +24,54 @@
@click="handleDelete">删 除
-
+
+ 数据权限
+
+
+
+
+
+
+ 删 除
+
+
+
+
diff --git a/src/views/system/role.vue b/src/views/system/role.vue
index 5036665..f871d49 100644
--- a/src/views/system/role.vue
+++ b/src/views/system/role.vue
@@ -29,16 +29,31 @@
-
-
-
+ width="345px">
+
+
+
+
+
+
+
+
+
+ 敬请期待
+
+