diff --git a/src/api/system/user.js b/src/api/system/user.js index ae2cb86..1b67264 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -126,7 +126,7 @@ export function updateAuthRole(data) { }) } -// 查询部门下拉树结构 +// 查询部门下拉树结构,包含数据范围权限 export function deptTreeSelect() { return request({ url: '/system/user/deptTree', @@ -134,6 +134,14 @@ export function deptTreeSelect() { }) } +// 查询部门下拉树结构,无数据范围权限,全部部门用于下拉框 +export function deptTreeOptionsSelect() { + return request({ + url: '/system/user/deptTreeOption', + method: 'get' + }) +} + export function userOptionsSelect() { return request({ url: '/system/user/optionsSelect', diff --git a/src/views/equipments/consumables.vue b/src/views/equipments/consumables.vue index cce80de..a0edee0 100644 --- a/src/views/equipments/consumables.vue +++ b/src/views/equipments/consumables.vue @@ -86,7 +86,7 @@ plain icon="Plus" @click="handleAdd" - v-hasPermi="['equipment:consumables:add']" + v-hasPermi="['equipments:add']" >新增 @@ -97,7 +97,7 @@ icon="Edit" :disabled="single" @click="handleUpdate" - v-hasPermi="['equipment:consumables:edit']" + v-hasPermi="['equipments:edit']" >修改 @@ -108,7 +108,7 @@ icon="Delete" :disabled="multiple" @click="handleDelete" - v-hasPermi="['equipment:consumables:remove']" + v-hasPermi="['equipments:remove']" >删除 @@ -118,7 +118,7 @@ plain icon="Download" @click="handleExport" - v-hasPermi="['equipment:consumables:export']" + v-hasPermi="['equipments:export']" >导出 @@ -180,7 +180,7 @@ type="primary" icon="Edit" @click="handleUpdate(scope.row)" - v-hasPermi="['system:consumables:edit']" + v-hasPermi="['equipments:edit']" >修改 删除 diff --git a/src/views/equipments/index.vue b/src/views/equipments/index.vue index ff5e3b2..8708a35 100644 --- a/src/views/equipments/index.vue +++ b/src/views/equipments/index.vue @@ -225,7 +225,7 @@ import { addEquipments, updateEquipments, } from "@/api/equipments/equipments"; -import { deptTreeSelect } from "@/api/system/user"; +import { deptTreeOptionsSelect } from "@/api/system/user"; const { proxy } = getCurrentInstance(); const equipmentsList = ref([]); @@ -242,7 +242,7 @@ const deptTreeOptions = ref([]); /** 查询部门下拉树结构 */ function getDeptTree() { - deptTreeSelect().then((response) => { + deptTreeOptionsSelect().then((response) => { deptTreeOptions.value = response.data; }); }