Merge branch 'refs/heads/milestone-20251104-现金二期' into lihui/feature-20251104165712-现金二期

# Conflicts:
#	src/views/consume/gold/coinConsumeDetail.vue

src/views/consume/gold/coinConsumeDetail.vue

@@ -1,12 +1,24 @@
 <script setup>
-import { computed, onMounted, ref } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
 import { dayjs, ElMessage } from 'element-plus'
 import request from '@/util/http.js'
 import API from '@/util/http.js'
 import moment from 'moment'
 import { reverseMarketMapping } from "@/utils/marketMap.js";
+import {hasMenuPermission, permissionMapping} from "@/utils/menuTreePermission.js";
+import { storeToRefs } from 'pinia'
+import { useAdminStore } from '@/store/index.js'
+const adminStore = useAdminStore()
+const { flag } = storeToRefs(adminStore)
 // 之后整理一下
 
+// 监听全局flag状态变化
+watch(flag, (newFlag, oldFlag) => {
+  if(newFlag !== oldFlag) {
+    ConsumeSelectBy()
+  }
+})
+
 /*
 ====================工具方法==============================
 */
@@ -141,6 +153,14 @@ const totalGoldSearch = ref({
   goodsName: ""
 })
 
+const selectPermission = ref(false)
+// 初始化权限状态
+const initPermissions = async() => {
+  if (!menuTree.value || !menuTree.value.length) return;
+  selectPermission.value = hasMenuPermission(menuTree.value, permissionMapping.gold_coin_consumption_details);
+
+
+};
 
 /*
 ====================方法=================================
@@ -163,6 +183,11 @@ const getAdminData = async function () {
 
 const ConsumeSelectBy = async function (val) {
 
+  if (!selectPermission) {
+    ElMessage.error('暂无权限')
+    return
+  }
+
   try {
 
     // 搜索参数页码赋值
@@ -212,7 +237,7 @@ const ConsumeSelectBy = async function (val) {
           ...consumeUser.value,
           sortField: sortField.value,
           sortOrder: sortOrder.value,
-          flag: showEmployeeData.value ? 0 : 1 // 新增 flag 参数
+          flag: flag.value // 新增 flag 参数
         }
       }
     })
@@ -221,7 +246,7 @@ const ConsumeSelectBy = async function (val) {
 
     // 合计数的接口
     // 复制一份 detail.value 并移除排序字段和排序方式
-    const detailWithoutSort = { ...consumeUser.value, flag: showEmployeeData.value ? 0 : 1 }
+    const detailWithoutSort = { ...consumeUser.value, flag: flag.value }
     delete detailWithoutSort.sortField
     delete detailWithoutSort.sortOrder
 
@@ -233,7 +258,7 @@ const ConsumeSelectBy = async function (val) {
     totalGoldSearch.value.market = consumeUser.value.market
     totalGoldSearch.value.goodsName = consumeUser.value.goodsName
     totalGoldSearch.value.jwcode = consumeUser.value.jwcode
-    totalGoldSearch.value.flag = showEmployeeData.value ? 0 : 1 // 新增 flag 参数
+    totalGoldSearch.value.flag = flag.value // 新增 flag 参数
     //
     const resultTotalGold = await request({
       // url: '/consume/statsGold',
@@ -412,6 +437,7 @@ const handleCurrentChange = function (val) {
 // 计算总金币数
 const sumGold = computed(() => permanentGolds.value + freeGolds.value + taskGolds.value)
 onMounted(async function () {
+  await initPermissions()
   await getAdminData()
   await ConsumeSelectBy()
   // getActivity();
@@ -432,7 +458,7 @@ const exportExcel = async function () {
       goodsName: consumeUser.value.goodsName || '',
       sortField: sortField.value || '',
       sortOrder: sortOrder.value || '',
-      flag: showEmployeeData.value ? 0 : 1 // 新增 flag 参数
+      flag: flag.value // 新增 flag 参数
 
     }
   }

src/views/recharge/gold/coinRechargeDetail.vue

@@ -1,13 +1,24 @@
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import moment from 'moment'
 import API from '@/util/http.js'
 import { reverseMarketMapping } from '@/utils/marketMap.js';
 import dayjs from "dayjs";
+import { storeToRefs } from 'pinia'
+import { useAdminStore } from '@/store/index.js'
+const adminStore = useAdminStore()
+const { flag } = storeToRefs(adminStore)
 
 //新增员工数数据复选框，默认不勾选
-const showEmployeeData = ref(false)
+// const showEmployeeData = ref(false)
+
+// 监听全局flag状态变化
+watch(flag, (newFlag, oldFlag) => {
+  if(newFlag !== oldFlag) {
+    get()
+  }
+})
 
 const trimJwCode = () => {
   if (rechargeUser.value.jwcode) {
@@ -334,7 +345,7 @@ const get = async function (val) {
       url: '/recharge/selectBy',
       data: {
         ...getObj.value,
-        rechargeUser: { ...rechargeUser.value, flag: showEmployeeData.value ? 0 : 1 }//新增flag参数
+        rechargeUser: { ...rechargeUser.value, flag: flag.value }//新增flag参数
       }
     })
     // 复制一份 rechargeUser.value 并移除排序字段和排序方式
@@ -342,7 +353,7 @@ const get = async function (val) {
       ...rechargeUser.value,
       sortField: undefined,
       sortOrder: undefined,
-      flag: showEmployeeData.value ? 0 : 1 // 新增 flag 参数
+      flag: flag.value // 新增 flag 参数
     })
     const resultTotalGold = await API({
       url: '/recharge/statsGold',
@@ -488,7 +499,7 @@ const exportExcel = async function () {
   const params = {
     rechargeUser: {
       ...rechargeUser.value,
-      flag: showEmployeeData.value ? 0 : 1
+      flag: flag.value
     },
     page: getObj.value.pageNum,
     size: total.value
@@ -608,7 +619,7 @@ const getTagText = (state) => {
             <el-option v-for="item in platform" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </div>
-        <el-checkbox v-model="showEmployeeData" @change="search()">员工数据</el-checkbox>
+        <!-- <el-checkbox v-model="showEmployeeData" @change="search()">员工数据</el-checkbox> -->
       </div>
     </el-col>
     <el-col>