权限下半完成

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 () {
         <el-input v-model="role.name" style="width: 240px" placeholder="请输入角色名称" clearable />
         <div style="margin-left: auto;">
           <el-button type="success" @click="reset()">重置</el-button>
-          <el-button type="primary" @click="searchRole()">查询</el-button>
+          <el-button type="primary" @click="searchRole()" :disabled="canLook" v-if="canLook">查询</el-button>
         </div>
       </div>
     </el-card>
 
     <el-card>
       <div class="add-item">
-        <el-button style="color: #048efb; border: 1px solid #048efb" @click="permissionAddInit()">新增角色</el-button>
+        <el-button style="color: #048efb; border: 1px solid #048efb" @click="permissionAddInit()" :disabled="!canAdd" v-if="canAdd">新增角色</el-button>
       </div>
       <div>
         <el-table :data="roleData" style="width: 100%" show-overflow-tooltip>
@@ -621,7 +626,7 @@ onMounted(async function () {
           </el-table-column>
           <el-table-column prop="operation" label="操作" width="200px">
             <template #default="scope">
-              <el-button type="warning" text @click="permissionEditRoleInit(scope.row)" :disabled="(scope.row.id === 2)|| (scope.row.id === 1)">
+              <el-button type="warning" text @click="permissionEditRoleInit(scope.row)" :disabled="(scope.row.id === 2)|| (scope.row.id === 1) || !canEdit" v-if="canEdit">
                 编辑
               </el-button>
             </template>

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 () {
 
         <div class="head-card-btn">
           <el-button type="success" @click="reset()">重置</el-button>
-          <el-button type="primary" @click="search()">查询</el-button>
+          <el-button type="primary" @click="search()" v-if="canLook">查询</el-button>
         </div>
       </div>
     </el-card>
     <el-card>
       <!-- 展示表单 -->
       <div class="add-item">
-        <el-button style="color: #048efb; border: 1px solid #048efb" :disabled="!canAdd" @click="userAddInit()">新增用户</el-button>
+        <el-button style="color: #048efb; border: 1px solid #048efb" :disabled="!canAdd" v-if="canAdd" @click="userAddInit()">新增用户</el-button>
       </div>
 
       <div>
@@ -959,16 +960,16 @@ onMounted(async function () {
           <el-table-column prop="remark" label="备注" />
           <el-table-column prop="operation" label="操作" width="280px">
             <template #default="scope">
-              <el-button type="warning" text :disabled="!canReset" @click="resetPassword(scope.row)">
+              <el-button type="warning" text :disabled="!canReset" @click="resetPassword(scope.row)" v-if="canReset">
                 重置密码
               </el-button>
-              <el-button type="primary" text @click="permissionEditInit(scope.row)"
+              <el-button type="primary" text @click="permissionEditInit(scope.row)" v-if="canEdit"
                 :disabled="!canEdit || scope.row.adminStatus === 0 || scope.row.account === adminData.account">
                 修改权限
               </el-button>
               <el-popconfirm title="确定将此用户删除吗？" @confirm="delConfirm">
                 <template #reference>
-                  <el-button type="danger" text @click="del(scope.row)"
+                  <el-button type="danger" text @click="del(scope.row)" v-if="canDel"
                     :disabled="!canDel ||scope.row.adminStatus === 0 || scope.row.account === adminData.account">
                     删除
                   </el-button>
@@ -984,7 +985,7 @@ onMounted(async function () {
           </el-table-column>
           <el-table-column prop="adminStatus" label="状态">
             <template #default="scope">
-              <el-switch :model-value="scope.row.adminStatus" :active-value="1" :inactive-value="0" size="large"
+              <el-switch :model-value="scope.row.adminStatus" :active-value="1" :inactive-value="0" size="large" v-if="change"
                 :disabled="!change || scope.row.account === adminData.account || statusLoading[scope.row.id]"
                 @change="(targetStatus) => showStatusConfirm(scope.row, targetStatus)" style="
                     --el-switch-on-color: #13ce66;

src/views/refund/gold/addCoinRefund.vue

@@ -502,7 +502,7 @@ onMounted(() =>{
           </div>
 
           <el-button type="success" @click="cancel()" style="margin-left: 200px">重置</el-button>
-          <el-button type="primary" :disabled="addDisabled" @click="addBefore"> 提交</el-button>
+          <el-button type="primary" :disabled="addDisabled" @click="addBefore" v-if="findMenuById(menuTree.value,permissionMapping.addCoinRefund)"> 提交</el-button>
         </el-form>
       </div>
     </div>

src/views/refund/gold/coinRefund.vue

@@ -3,12 +3,12 @@
     <!-- 这里放置标签切换的按钮 -->
     <el-button-group>
             <el-button :type="activeTab === 'coinRefundDetail' ? 'primary' : 'default'"
-                 @click="navigateTo('coinRefundDetail')" :disabled="!hasDetail">
+                 @click="navigateTo('coinRefundDetail')" :disabled="!hasDetail" v-if="hasDetail">
         金币退款明细
       </el-button>
       <!-- 切换后状态显示 primary 样式否则是默认样式 -->
       <el-button :type="activeTab === 'addCoinRefund' ? 'primary' : 'default'" @click="navigateTo('addCoinRefund')"
-                 :disabled="!hasAdd">
+                 :disabled="!hasAdd" v-if="hasAdd">
         新增退款
       </el-button>
     </el-button-group>

src/views/refund/gold/coinRefundDetail.vue

@@ -14,7 +14,7 @@ import dayjs from "dayjs";
 const adminStore = useAdminStore();
 const { adminData, menuTree } = storeToRefs(adminStore);
 const showEmployeeData = ref(false)
-
+const canLook = findMenuById(menuTree.value,permissionMapping.coinRefundDetail)
 
 const defaultTime = [
   new Date(2000, 1, 1, 0, 0, 0),
@@ -544,7 +544,7 @@ const getMarket = async function () {
           </el-button>
 
           <el-button type="success" @click="reset()">重置</el-button>
-          <el-button type="primary" @click="search()">查询</el-button>
+          <el-button type="primary" @click="search()" v-if="canLook">查询</el-button>
           <el-button type="primary" @click="exportExcel">导出Excel</el-button>
           <el-button type="primary" @click="openExportList">查看导出列表</el-button>
         </div>

src/views/usergold/gold/clientCount.vue

@@ -6,14 +6,14 @@
       <el-button
           :type="activeTab === 'clientCountDetail' ? 'primary' : 'default'"
           @click="navigateTo('clientCountDetail')"
-          :disabled="!hasDetail"
+          :disabled="!hasDetail" v-if="hasDetail"
       >
         金币明细
       </el-button>
       <el-button
           :type="activeTab === 'clientCountBalance' ? 'primary' : 'default'"
           @click="navigateTo('clientCountBalance')"
-          :disabled="!hasBalance"
+          :disabled="!hasBalance" v-if="hasBalance"
       >
         金币余额
       </el-button>