refactor：删掉各个详情页面前端的映射，权限加上了金豆的过滤，只有总部可以点击

src/views/audit/gold/rechargeAudit.vue

@@ -189,7 +189,7 @@
 
 <script setup>
 import {onMounted, reactive, ref} from 'vue'
-import {marketMapping, reverseMarketMapping} from '@/utils/marketMap.js'
+import {reverseMarketMapping} from '@/utils/marketMap.js'
 import {ElMessage} from 'element-plus'
 import request from '@/util/http.js'
 import API from '@/util/http.js'

src/views/audit/gold/refundAudit.vue

@@ -83,11 +83,8 @@
       <el-table-column type="index" label="序号" width="60"/>
       <el-table-column prop="name" label="姓名" width="120"/>
       <el-table-column prop="jwcode" label="精网号" width="120"/>
-      <el-table-column prop="market" label="所属地区" width="120">
-        <template #default="scope">
-          {{ marketMapping[scope.row.market] || scope.row.market }}
-        </template>
-      </el-table-column>
+      <el-table-column prop="market" label="所属地区" width="120"/>
+
       <el-table-column prop="refundType" label="退款类型" width="120"/>
       <el-table-column prop="refundModel" label="退款方式" width="120">
         <template #default="{ row }">
@@ -175,7 +172,12 @@ import {onMounted, reactive, ref} from 'vue'
 import {ElMessage} from 'element-plus'
 import API from '@/util/http.js'
 import moment from 'moment'
-import {marketMapping, reverseMarketMapping} from "@/utils/marketMap.js";
+import {reverseMarketMapping} from "@/utils/marketMap.js";
+import {useAdminStore} from "@/store/index.js";
+import {storeToRefs} from "pinia";
+import {findMenuById, permissionMapping} from "@/utils/menuTreePermission.js"
+import dayjs from "dayjs";
+
 const defaultTime = [
   new Date(2000, 1, 1, 0, 0, 0),
   new Date(2000, 2, 1,23 , 59, 59),
@@ -336,11 +338,6 @@ const get = async function (val) {
   }
 }
 
-import {useAdminStore} from "@/store/index.js";
-import {storeToRefs} from "pinia";
-import {findMenuById, permissionMapping} from "@/utils/menuTreePermission.js"
-import dayjs from "dayjs";
-
 const adminStore = useAdminStore();
 const {menuTree} = storeToRefs(adminStore);
 

src/views/consume/gold/coinConsumeDetail.vue

@@ -4,7 +4,7 @@ import {dayjs, ElMessage} from 'element-plus'
 import request from '@/util/http.js'
 import API from '@/util/http.js'
 import moment from 'moment'
-import {marketMapping, reverseMarketMapping} from "@/utils/marketMap.js";
+import {reverseMarketMapping} from "@/utils/marketMap.js";
 // 之后整理一下
 
 /*
@@ -15,7 +15,7 @@ import {marketMapping, reverseMarketMapping} from "@/utils/marketMap.js";
 const formatTime = (val) => val ? dayjs(val).format('YYYY-MM-DD HH:mm:ss') : ''
 const defaultTime = [
   new Date(2000, 1, 1, 0, 0, 0),
-  new Date(2000, 2, 1,23 , 59, 59),
+  new Date(2000, 2, 1, 23, 59, 59),
 ]
 /*
 ====================数据=================================
@@ -115,7 +115,7 @@ const goods = ref([])
 const totalGoldSearch = ref({
   jwcode: null,
   payPlatform: "",
-  market:"" ,
+  market: "",
   startTime: "",
   endTime: "",
   goodsName: ""
@@ -292,7 +292,7 @@ const reset = function () {
 const getToday = function () {
   const today = dayjs()
   const startTime = today.startOf('day').format('YYYY-MM-DD HH:mm:ss')
-  const endTime =today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = 'today' // 标记当前激活状态
@@ -579,7 +579,8 @@ const getMarket = async function () {
             <div class="head-card-element">
               <el-text class="mx-1" size="large">消耗时间：</el-text>
               <el-date-picker v-model="getTime" type="datetimerange" range-separator="至" start-placeholder="起始时间"
-                              end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange" :default-time="defaultTime"/>
+                              end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"
+                              :default-time="defaultTime"/>
               <el-button @click="getToday()" style="margin-left: 10px"
                          :type="activeTimeRange === 'today' ? 'primary' : ''"> 今
               </el-button>
@@ -625,11 +626,7 @@ const getMarket = async function () {
             <el-table-column prop="name" label="姓名" width="150px" fixed="left"/>
             <!-- 固定精网号列 -->
             <el-table-column prop="jwcode" label="精网号" width="110px" fixed="left"/>
-            <el-table-column prop="market" label="所属地区" width="110px">
-              <template #default="scope">
-                {{ marketMapping[scope.row.market] || scope.row.market }}
-              </template>
-            </el-table-column>
+            <el-table-column prop="market" label="所属地区" width="110px"/>
             <el-table-column prop="goodsName" label="商品" width="160px" show-overflow-tooltip/>
             <el-table-column prop="payPlatform" label="消耗平台" width="120px">
               <template #default="scope">
@@ -689,7 +686,7 @@ const getMarket = async function () {
 
   <!-- 导出弹窗 -->
   <el-dialog v-model="exportListVisible" title="导出列表" width="80%">
-        <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
+    <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
       <el-table-column prop="fileName" label="文件名"/>
       <el-table-column prop="state" label="状态">
         <template #default="scope">

src/views/permissions/rolePermission.vue

@@ -317,10 +317,20 @@ const getLists = async function () {
       data: {id: roleId}
     })
     data.value = res.data
-    data.value = data.value.filter(item => item.id !== 9);
+    let originalData = res.data.filter(item => item.id !== 9); // 排除权限管理
+
+    // data.value = data.value.filter(item => item.id !== 9);
     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',
@@ -353,6 +363,33 @@ const getLists = async function () {
     console.log('请求失败', error)
   }
 }
+
+//金豆过滤
+const goldenBeanMenuIds = new Set([
+  43, 55, 54,       // 财务审核 -> 金豆审核
+  41, 47, 46, 48,   // 充值管理 -> 金豆充值
+  42, 50, 49, 52, 51, // 消耗管理 -> 金豆消耗
+  45, 53            // 客户账户明细 -> 金豆客户账户明细
+]);
+const filterGoldenBeanMenus = (tree) => {
+  return tree
+      .filter(item => {
+        // 排除金豆相关的顶层菜单
+        if (goldenBeanMenuIds.has(item.id)) {
+          return false;
+        }
+        // 递归处理子菜单
+        if (item.children && item.children.length > 0) {
+          item.children = filterGoldenBeanMenus(item.children);
+        }
+        return true;
+      });
+};
+
+const handleMarketChange = () => {
+  getLists(); // 重新获取并过滤菜单树
+};
+
 const treeRef = ref(null)
 // 处理编辑角色权限时的勾选事件
 const handleEditRolePermissionCheck = (checkedNodes, checkedInfo) => {
@@ -734,7 +771,7 @@ onMounted(async function () {
           </el-select>
         </el-form-item>
         <el-form-item prop="market" label="所属地区:" required>
-          <el-select v-model="addRole.market" placeholder="请选择所属地区" style="width: 240px" clearable>
+          <el-select v-model="addRole.market" placeholder="请选择所属地区" style="width: 240px" clearable @change="handleMarketChange" >
             <el-option v-for="item in addRoleMarket" :key="item" :label="item" :value="item"/>
           </el-select>
         </el-form-item>

src/views/recharge/gold/coinRechargeDetail.vue

@@ -3,7 +3,7 @@ import {onMounted, ref} from 'vue'
 import {ElMessage} from 'element-plus'
 import moment from 'moment'
 import API from '@/util/http.js'
-import {marketMapping, reverseMarketMapping} from '@/utils/marketMap.js';
+import {reverseMarketMapping} from '@/utils/marketMap.js';
 import dayjs from "dayjs";
 //这是获取用户信息的接口
 const adminData = ref({})
@@ -648,11 +648,7 @@ const getTagText = (state) => {
             </el-table-column>
             <el-table-column fixed="left" prop="name" label="姓名" width="150px"/>
             <el-table-column fixed="left" prop="jwcode" label="精网号" width="110px"/>
-            <el-table-column prop="market" label="所属地区" width="100px">
-              <template #default="scope">
-                <span>{{ marketMapping[scope.row.market] || scope.row.market }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="market" label="所属地区" width="100px"/>
             <el-table-column prop="activity" label="活动名称" width="110px" show-overflow-tooltip/>
             <el-table-column prop="rateName" label="货币名称" width="110px"/>
             <el-table-column prop="money" sortable="custom" label="充值金额" width="110px"/>

src/views/refund/gold/coinRefundDetail.vue

@@ -5,7 +5,8 @@ import {ElMessage} from 'element-plus'
 import moment from 'moment'
 import API from '@/util/http.js'
 import request from '@/util/http.js'
-import {marketMapping, reverseMarketMapping} from "@/utils/marketMap.js";
+import {reverseMarketMapping} from "@/utils/marketMap.js";
+
 const defaultTime = [
   new Date(2000, 1, 1, 0, 0, 0),
   new Date(2000, 2, 1,23 , 59, 59),
@@ -647,11 +648,7 @@ const getMarket = async function () {
                 fixed="left"
                 width="110px"
             />
-            <el-table-column prop="market" label="所属地区" width="110px">
-              <template #default="scope">
-                {{ marketMapping[scope.row.market] || scope.row.market }}
-              </template>
-            </el-table-column>
+            <el-table-column prop="market" label="所属地区" width="110px"/>
             <el-table-column prop="goodsName" label="商品名称" width="110px" show-overflow-tooltip/>
             <el-table-column prop="refundType" label="退款类型" width="100px"/>
 

src/views/usergold/gold/clientCountBalance.vue

@@ -1,13 +1,10 @@
 <script setup>
 // 这是客户金币余额页面
-import { ref, onMounted, reactive, computed, watch } from 'vue'
-import ElementPlus from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import axios from 'axios'
+import {onMounted, ref} from 'vue'
+import {ElMessage} from 'element-plus'
 import moment from 'moment'
-import { ta } from 'element-plus/es/locales.mjs'
 import API from '@/util/http.js'
-import { marketMapping, reverseMarketMapping } from "@/utils/marketMap.js";
+import {reverseMarketMapping} from "@/utils/marketMap.js";
 
 // 变量
 //这是获取用户信息的接口
@@ -15,7 +12,7 @@ const adminData = ref({})
 const dialogVisible = ref(false)
 const getAdminData = async function () {
   try {
-    const result = await API({ url: '/admin/userinfo', data: {} })
+    const result = await API({url: '/admin/userinfo', data: {}})
     adminData.value = result
     // console.log('请求成功', result)
     console.log('管理员用户信息', adminData.value)
@@ -85,7 +82,7 @@ const get = async function (val) {
 
     // 发送POST请求
 
-    const requestData = { ...getObj.value, user: { ...user.value } };//控制台打印请求的参数
+    const requestData = {...getObj.value, user: {...user.value}};//控制台打印请求的参数
     console.log('最终请求参数', JSON.stringify(requestData, null, 2)); // 打印格式化后的请求参数
 
     //console.log('请求参数', requestData);
@@ -93,7 +90,7 @@ const get = async function (val) {
     const result = await API({
       url: '/goldDetail/getGold',
       method: 'post',
-      data: { ...getObj.value, user: { ...user.value } }
+      data: {...getObj.value, user: {...user.value}}
     })
     console.log('响应数据', result)
     tableData.value = result.data.list
@@ -167,7 +164,7 @@ const search = function () {
 }
 // 重置
 const reset = function () {
-  user.value = { market: "" }
+  user.value = {market: ""}
   sortField.value = ''
   sortOrder.value = ''
   get()
@@ -220,7 +217,7 @@ const exportExcel = async function () {
       market: user.value.market || ""
     }
   }
-  const res = await API({ url: '/goldDetail/exportGold', data: params })
+  const res = await API({url: '/goldDetail/exportGold', data: params})
   if (res.code === 200) {
     ElMessage.success('导出成功')
   }
@@ -242,7 +239,7 @@ const exportListLoading = ref(false)
 const getExportList = async () => {
   exportListLoading.value = true
   try {
-    const result = await API({ url: '/export/export' })
+    const result = await API({url: '/export/export'})
     if (result.code === 200) {
       const filteredData = result.data.filter(item => {
         return item.type === 1; //返回type為0即客户金币余额的数据
@@ -327,8 +324,8 @@ const getMarket = async function () {
 
       return allChildren.map(child => {
         const grandchildren = child.children && child.children.length
-          ? transformTree([child]) // 递归处理子节点
-          : null;
+            ? transformTree([child]) // 递归处理子节点
+            : null;
 
         return {
           value: child.name,
@@ -354,7 +351,7 @@ const getMarket = async function () {
         <div class="head-card">
           <div class="head-card-element">
             <el-text class="mx-1" size="large">精网号：</el-text>
-            <el-input v-model="user.jwcode" style="width: 160px" placeholder="请输入精网号" clearable />
+            <el-input v-model="user.jwcode" style="width: 160px" placeholder="请输入精网号" clearable/>
           </div>
           <div class="head-card-element">
             <el-text class="mx-1" size="large">所属地区：</el-text>
@@ -389,29 +386,25 @@ const getMarket = async function () {
         <!-- 设置表格容器的高度和滚动样式 -->
         <div style="height: 626px; overflow-y: auto">
           <el-table :data="tableData" @cellClick="cellClick" style="width: 100%" height="626px"
-            @sort-change="handleSortChange">
+                    @sort-change="handleSortChange">
             <el-table-column type="index" label="序号" width="100px" fixed="left">
               <template #default="scope">
                 <span>{{
-                  scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
-                }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="name" label="姓名" width="120" />
-            <el-table-column prop="jwcode" label="精网号" width="120" />
-            <el-table-column prop="market" label="所属地区" width="120">
-              <template #default="scope">
-                {{ marketMapping[scope.row.market] || scope.row.market }}
+                    scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+                  }}</span>
               </template>
             </el-table-column>
+            <el-table-column prop="name" label="姓名" width="120"/>
+            <el-table-column prop="jwcode" label="精网号" width="120"/>
+            <el-table-column prop="market" label="所属地区" width="120"/>
             <el-table-column prop="allJb" label="金币总数" width="120" aligh="center">
               <template #default="scope">
                 <span>{{
-                  ((scope.row.currentPermanentGold || 0) +
-                    (scope.row.currentFreeJune || 0) +
-                    (scope.row.currentFreeDecember || 0) +
-                    (scope.row.currentTaskGold || 0)) / 100
-                }}</span>
+                    ((scope.row.currentPermanentGold || 0) +
+                        (scope.row.currentFreeJune || 0) +
+                        (scope.row.currentFreeDecember || 0) +
+                        (scope.row.currentTaskGold || 0)) / 100
+                  }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="currentPermanentGold" label="永久金币" sortable="custom" width="110">
@@ -464,8 +457,8 @@ const getMarket = async function () {
                     <div>
                       <div>永久金币：{{ (scope.row.sumConsumeGold || 0) / 100 }}</div>
                       <div>免费金币：{{
-                        ((scope.row.sumConsumeJune || 0) + (scope.row.sumConsumeDecember || 0)) / 100
-                      }}
+                          ((scope.row.sumConsumeJune || 0) + (scope.row.sumConsumeDecember || 0)) / 100
+                        }}
                       </div>
                       <div>任务金币：{{ (scope.row.sumConsumeJune || 0) / 100 }}</div>
                     </div>
@@ -489,8 +482,9 @@ const getMarket = async function () {
         <!-- 分页 -->
         <div class="pagination" style="margin-top: 20px">
           <el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
-            layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
-            @current-change="handleCurrentChange"></el-pagination>
+                         layout="total, sizes, prev, pager, next, jumper" :total="total"
+                         @size-change="handlePageSizeChange"
+                         @current-change="handleCurrentChange"></el-pagination>
         </div>
       </el-card>
     </el-col>
@@ -498,7 +492,7 @@ const getMarket = async function () {
 
   <el-dialog v-model="exportListVisible" title="导出列表" width="80%">
     <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
-      <el-table-column prop="fileName" label="文件名" />
+      <el-table-column prop="fileName" label="文件名"/>
       <el-table-column prop="state" label="状态">
         <template #default="scope">
           <el-tag :type="getTagType(scope.row.state)" :effect="scope.row.state === 3 ? 'light' : 'plain'">
@@ -514,7 +508,7 @@ const getMarket = async function () {
       <el-table-column label="操作">
         <template #default="scope">
           <el-button type="primary" size="small" @click="downloadExportFile(scope.row)"
-            :disabled="scope.row.state !== 2">
+                     :disabled="scope.row.state !== 2">
             下载
           </el-button>
         </template>

src/views/usergold/gold/clientCountDetail.vue

@@ -1,13 +1,10 @@
 <script setup>
-import {ref, onMounted, computed, nextTick, watch} from 'vue'
+import {onMounted, ref} from 'vue'
 
 import {ElMessage} from 'element-plus'
-import axios from 'axios'
 import moment from 'moment'
 import API from '@/util/http.js'
-import {writeFile, utils} from 'xlsx'
-import request from "@/util/request.js";
-import {marketMapping, reverseMarketMapping} from "../../../utils/marketMap.js";
+import {reverseMarketMapping} from "../../../utils/marketMap.js";
 import dayjs from "dayjs";
 
 // 标记当前激活的时间范围按钮
@@ -552,11 +549,7 @@ const getMarket = async function () {
               </el-table-column>
               <el-table-column fixed="left" prop="name" label="姓名" width="150"/>
               <el-table-column fixed="left" prop="jwcode" label="精网号" width="120"/>
-              <el-table-column prop="market" label="所属地区" width="120">
-                <template #default="scope">
-                  {{ marketMapping[scope.row.market] || scope.row.market }}
-                </template>
-              </el-table-column>
+              <el-table-column prop="market" label="所属地区" width="120"/>
               <el-table-column prop="payPlatform" label="平台信息" width="140">
 
               </el-table-column>