merge

src/store/index.js

@@ -6,6 +6,7 @@ export const useAdminStore = defineStore('admin', {
         adminData: null, // 用户信息
         menuTree: [], // 菜单权限树
         marketList: {}, // 市场列表
+        flag: 0, //员工数据开关状态，0=不包含员工数据，1=包含员工数据
     }),
     actions: {
         // 设置用户信息并同步到localStorage
@@ -24,11 +25,18 @@ export const useAdminStore = defineStore('admin', {
             localStorage.setItem('marketList', JSON.stringify(list))
         },
 
+        // 设置员工数据开关状态（使用数字0和1）
+        setFlag(flag) {
+            this.flag = flag
+            localStorage.setItem('flag', JSON.stringify(flag))
+        },
+
         // 从localStorage初始化数据
         initFromLocalStorage() {
             const adminData = localStorage.getItem('adminData')
             const menuTree = localStorage.getItem('menuTree')
             const marketList = localStorage.getItem('marketList')
+            const flag = localStorage.getItem('flag')
 
             if (adminData) {
                 this.adminData = JSON.parse(adminData)
@@ -41,6 +49,10 @@ export const useAdminStore = defineStore('admin', {
             if (marketList) {
                 this.marketList = JSON.parse(marketList)
             }
+
+            if (flag) {
+                this.flag = JSON.parse(flag)
+            }
         },
 
         // 清空状态并移除localStorage数据
@@ -48,9 +60,11 @@ export const useAdminStore = defineStore('admin', {
             this.adminData = null
             this.menuTree = []
             this.marketList = {}
+            this.flag = 0
             localStorage.removeItem('adminData')
             localStorage.removeItem('menuTree')
             localStorage.removeItem('marketList')
+            localStorage.removeItem('flag')
             // localStorage.removeItem('token')
         }
     }

src/views/home.vue

@@ -79,7 +79,7 @@ const menuList = ref([])
 // 获取仓库实例
 const adminStore = useAdminStore()
 // 解构状态（保持响应式） 获得 adminData（用户信息） 和 menuTree（菜单树）
-const { adminData, menuTree } = storeToRefs(adminStore)
+const { adminData, menuTree, flag } = storeToRefs(adminStore)
 
 // 筛选权限菜单 ,menuTree 是组件通信拿的
 menuList.value = filterMenu(menuTree.value)
@@ -156,6 +156,13 @@ function logout() {
   ElMessage.success('退出成功')
 }
 
+// 切换员工数据开关状态
+const toggleFlag = () => {
+  const newFlag = flag.value === 1 ? 0 : 1
+  adminStore.setFlag(newFlag)
+  ElMessage.success(newFlag === 1 ? '员工数据已隐藏' : '员工数据已显示')
+  console.log('flag',newFlag)
+}
 
 </script>
 
@@ -243,6 +250,10 @@ function logout() {
               <template #dropdown>
                 <el-dropdown-menu>
                   <el-dropdown-item @click="refreshData()">数据刷新</el-dropdown-item>
+                  <!-- 员工数据开关 -->
+                  <el-dropdown-item @click="toggleFlag()">
+                    {{ flag === 1 ? '显示员工数据' : '隐藏员工数据' }}
+                  </el-dropdown-item>
                   <el-dropdown-item @click="message()">查看个人信息</el-dropdown-item>
                   <el-dropdown-item @click="openChangePassword">修改密码</el-dropdown-item>
                   <el-dropdown-item @click="logout">退出登录</el-dropdown-item>

src/views/usergold/gold/clientCountDetail.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 
 import { ElMessage } from 'element-plus'
 import moment from 'moment'
@@ -10,9 +10,18 @@ import { useAdminStore } from "@/store/index.js"
 import { storeToRefs } from "pinia"
 import { findMenuById, permissionMapping } from "@/utils/menuTreePermission.js"
 const adminStore = useAdminStore()
-const { adminData, menuTree } = storeToRefs(adminStore)
+const { adminData, menuTree, flag } = storeToRefs(adminStore)
 //新增复选框员工数据
-const showEmployeeData = ref(false)
+// const showEmployeeData = ref(false)
+
+// 监听全局flag状态变化
+ watch(flag, (newFlag, oldFlag) => {
+  // 当flag状态改变时，重新发送请求
+  if (newFlag !== oldFlag) {
+    console.log('员工数据flag状态改变，重新加载数据', newFlag)
+    get()
+  }
+})
 
 
 // 标记当前激活的时间范围按钮
@@ -165,7 +174,10 @@ const get = async function (val) {
     const result = await API({
       url: '/goldDetail/getGoldDetail',
       method: 'post',
-      data: { ...getObj.value, goldDetail: { ...goldDetail.value, flag: showEmployeeData.value ? 0 : 1 } }
+      data: { ...getObj.value, goldDetail: { ...goldDetail.value, 
+        // flag: showEmployeeData.value ? 0 : 1 
+        flag: flag.value
+      } }
     })
     console.log('响应数据', result)
     tableData.value = result.data.list
@@ -174,7 +186,10 @@ const get = async function (val) {
       url: '/goldDetail/getTotal',
       method: 'post',
       data: {
-        goldDetail: { ...goldDetail.value, flag: showEmployeeData.value ? 0 : 1 },
+        goldDetail: { ...goldDetail.value, 
+          // flag: showEmployeeData.value ? 0 : 1 
+          flag: flag.value
+        },
         /* jwcode: goldDetail.value.jwcode || '',
          payPlatform: goldDetail.value.payPlatform || '',
          type: goldDetail.value.type || '',
@@ -300,7 +315,8 @@ const exportExcel = async function () {
       endTime: goldDetail.value.endTime || '',
       sortField: goldDetail.value.sortField || '',
       sortOrder: goldDetail.value.sortOrder || '',
-      flag: showEmployeeData.value ? 0 : 1 // 新增 flag 参数
+      // flag: showEmployeeData.value ? 0 : 1 // 新增 flag 参数
+      flag: flag.value
     },
 
   }
@@ -485,9 +501,9 @@ const format3 = (num) => {
             <el-cascader class="selectContent"  v-model="selectedMarketPath" :options="markets" placeholder="请选择所属地区"
               style="width:10vw" clearable @change="handleMarketChange" />
           </div>
-          <div>
+          <!-- <div>
             <el-checkbox v-model="showEmployeeData" @change="search()">员工数据</el-checkbox>
-          </div>
+          </div> -->
         </div>
       </el-col>