From 58ee708037df355593979e4338cae5aae068dedc Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Wed, 5 Nov 2025 13:27:13 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf:=20=E9=87=91=E5=B8=81?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E6=98=8E=E7=BB=86=E3=80=81=E9=87=91=E5=B8=81?=
 =?UTF-8?q?=E6=B6=88=E8=80=97=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/consume/gold/coinConsumeDetail.vue   | 21 ++++++++++++++++-----
 src/views/recharge/gold/coinRechargeDetail.vue | 23 +++++++++++++++++------
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/views/consume/gold/coinConsumeDetail.vue b/src/views/consume/gold/coinConsumeDetail.vue
index 46c33d5..da5c58d 100644
--- a/src/views/consume/gold/coinConsumeDetail.vue
+++ b/src/views/consume/gold/coinConsumeDetail.vue
@@ -1,13 +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()
+  }
+})
+
 /*
 ====================工具方法==============================
 */
@@ -226,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 参数
         }
       }
     })
@@ -235,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
 
@@ -247,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',
@@ -446,7 +457,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 参数
 
     }
   }
diff --git a/src/views/recharge/gold/coinRechargeDetail.vue b/src/views/recharge/gold/coinRechargeDetail.vue
index a9d986f..3ba566b 100644
--- a/src/views/recharge/gold/coinRechargeDetail.vue
+++ b/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>