diff --git a/src/views/permissions/rolePermission.vue b/src/views/permissions/rolePermission.vue index b7d25bc..1e5e606 100644 --- a/src/views/permissions/rolePermission.vue +++ b/src/views/permissions/rolePermission.vue @@ -240,23 +240,10 @@ const getLists = async function () { data: { id: roleId } }) data.value = res.data - // let originalData = res.data.filter(item => item.id !== 9); - // 排除金豆菜单 - // data.value = filterGoldenBeanMenus(originalData); - // data.value = data.value.filter(item => item.id !== 9); - - data.value = data.value.filter(item => item.id !== 9); + data.value = filterPermission(data.value) console.log('看看data', data.value) console.log('parentID:', addRole.value.parentId, 'roleId:', roleId) - - /* // 根据地区过滤金豆菜单 - if (addRole.value.market !== '总部') { - // 非总部地区：过滤掉金豆相关菜单 - originalData = filterGoldenBeanMenus(originalData); - } - data.value = originalData; // 更新菜单树数据*/ - if (addRole.value.parentId && addRole.value.parentId !== 2) { const result = await API({ url: '/general/roleMarket', @@ -290,11 +277,15 @@ const getLists = async function () { //金豆过滤 const goldenBeanMenuIds = new Set([ - 43, 55, 54, // 财务审核 -> 金豆审核 - 41, 47, 46, 48, // 充值管理 -> 金豆充值 - 42, 50, 49, 52, 51, // 消耗管理 -> 金豆消耗 - 45, 53 // 客户账户明细 -> 金豆客户账户明细 +permissionMapping.beanAudit, +permissionMapping.beanRecharge, +permissionMapping.beanConsume, +permissionMapping.beanDetail ]) +// 15,43,44,45,46,47,// 金豆审核 +// 18,52,53,54,// 金豆充值 +// 20,57,58,59,60,// 金豆消耗 +// 23// 金豆客户账户明细 const filterGoldenBeanMenus = (tree) => { return tree .filter(item => { @@ -309,6 +300,18 @@ const filterGoldenBeanMenus = (tree) => { return true }) } +// 过滤权限模块(????????)俺不会 +const filterPermission = (tree) => { + return tree.filter(item =>{ + if(item.id === permissionMapping.permissionManage){ + return false + } + else if(item.children && item.children.length > 0){ + item.children = filterPermission(item.children) + } + return true + }) +} // 处理编辑角色权限时的勾选事件 const handleEditRolePermissionCheck = (checkedNodes, checkedInfo) => { const { checkedKeys, checkedNodes: allCheckedNodes } = checkedInfo @@ -436,8 +439,8 @@ const permissionEditRoleInit = async function (row) { data: { id: roleId } }); data.value = res.data; - data.value = data.value.filter(item => item.id !== 9); - data.value = filterGoldenBeanMenus(data.value); + data.value = filterPermission(data.value) + //data.value = filterGoldenBeanMenus(data.value); // 收集当前行权限树的叶子节点id（只收集实际选中的叶子节点） if (row.tree && row.tree.length > 0) { @@ -571,7 +574,9 @@ const Rolerules = reactive({ const throttledHandleAddRole = _.throttle(handleAddRole, 5000, { trailing: false }) - +const canLook = findMenuById(menuTree.value,permissionMapping.roleManageShow) +const canAdd = findMenuById(menuTree.value, permissionMapping.addRoleInfo) +const canEdit = findMenuById(menuTree.value, permissionMapping.editRoleInfo) // 挂载 onMounted(async function () { await getRoleList() @@ -587,14 +592,14 @@ onMounted(async function () {
重置 - 查询 + 查询
- 新增角色 + 新增角色
@@ -621,7 +626,7 @@ onMounted(async function () { diff --git a/src/views/permissions/userPermission.vue b/src/views/permissions/userPermission.vue index 8a0caa7..6240935 100644 --- a/src/views/permissions/userPermission.vue +++ b/src/views/permissions/userPermission.vue @@ -891,6 +891,7 @@ const throttledPermissionEdit = _.throttle(permissionEdit, 5000, { const throttledPermissionAdd = _.throttle(permissionAdd, 5000, { trailing: false }) +const canLook = findMenuById(menuTree.value, permissionMapping.userManageShow)// 我真是服啦，查询也做嘛 const canAdd = findMenuById(menuTree.value, permissionMapping.addUserInfo) const canEdit = findMenuById(menuTree.value, permissionMapping.editUserInfo) const canReset = findMenuById(menuTree.value, permissionMapping.updateUserInfo) @@ -930,14 +931,14 @@ onMounted(async function () {
重置 - 查询 + 查询
- 新增用户 + 新增用户
@@ -959,16 +960,16 @@ onMounted(async function () {