From fcfe17d3272d49d42db926516aacdb2549592a87 Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Tue, 5 Aug 2025 10:17:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E9=87=91=E5=B8=81=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=9A=84=E7=BA=A7=E8=81=94=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=EF=BC=8C=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=9A=84=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/audit/gold/rechargeAudit.vue | 79 ++++++----------------------------
 src/views/audit/gold/refundAudit.vue   | 75 +++++---------------------------
 src/views/workspace/index.vue          | 12 +++---
 3 files changed, 29 insertions(+), 137 deletions(-)

diff --git a/src/views/audit/gold/rechargeAudit.vue b/src/views/audit/gold/rechargeAudit.vue
index e1aad58..51a424b 100644
--- a/src/views/audit/gold/rechargeAudit.vue
+++ b/src/views/audit/gold/rechargeAudit.vue
@@ -24,14 +24,11 @@
             <el-text class="mx-1" size="large">所属地区：</el-text>
             <el-cascader
                 v-model="selectedMarketPath"
-                :options="markets"
+                :options="market"
                 placeholder="请选择所属地区"
                 clearable
-                collapse-tags
-                collapse-tags-tooltip
                 style="width:180px"
                 @change="handleMarketChange"
-                :props="props"
             />
           </el-col>
         </el-row>
@@ -93,11 +90,7 @@
             </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">
-                {{  scope.row.market || "----" }}
-              </template>
-            </el-table-column>
+            <el-table-column prop="market" label="所属地区" width="100px"/>
             <el-table-column prop="activity" label="活动名称" width="100px" show-overflow-tooltip/>
             <el-table-column prop="money" label="充值金额" sortable="custom" width="110px">
               <template #default="scope">{{ scope.row.permanentGold / 100 }}</template>
@@ -189,7 +182,6 @@
 
 <script setup>
 import {onMounted, reactive, ref} from 'vue'
-import {reverseMarketMapping} from '@/utils/marketMap.js'
 import {ElMessage} from 'element-plus'
 import request from '@/util/http.js'
 import API from '@/util/http.js'
@@ -230,7 +222,7 @@ const rechargeAudit = ref({
   payModel: "", // 支付方式
   startTime: "", // 充值时间开始
   endTime: "", // 充值时间结束
-  markets: [], // 地区
+  market: "", // 地区
   auditStatus: "0",
 })
 
@@ -245,7 +237,7 @@ const total = ref(50)
 const getTime = ref([])
 const activity = ref([])
 // 搜索地区列表
-const markets = ref([])
+const market = ref("")
 // 驳回弹出框
 const rejectDialogVisible = ref(false)
 // 驳回理由
@@ -385,7 +377,7 @@ const resetSearch = function () {
     payModel: "",
     startTime: "",
     endTime: "",
-    markets: [],
+    market: "",
     auditStatus: rechargeAudit.value.auditStatus,
 
   }
@@ -621,61 +613,14 @@ const previewImage = (imageUrl) => {
 };
 
 // 存储地区选择变化
-const selectedMarketPath = ref([])
-//处理地区选择变化
+const selectedMarketPath = ref("")
 const handleMarketChange = (value) => {
-  if (Array.isArray(value) && value.length > 0) {
-    const ids = new Set();
-
-    value.forEach(path => {
-      const lastName = path[path.length - 1];
-      const id = reverseMarketMapping[lastName];
-      if (id) ids.add(Number(id));
-    });
-
-    // 添加额外处理：如果一个父节点下所有子节点都被选中，则把父节点也加入
-    const getAllLeafNames = (nodes) => {
-      const leafNames = [];
-
-      const traverse = (node, parentName = null) => {
-        if (!node.children || node.children.length === 0) {
-          leafNames.push({name: node.label, parent: parentName});
-        } else {
-          node.children.forEach(child => traverse(child, node.label));
-        }
-      };
-
-      nodes.forEach(node => traverse(node));
-      return leafNames;
-    };
-
-    const leafNameMap = getAllLeafNames(markets.value); // 所有叶子节点和对应父级名称
-
-    // 列表构建
-    const parentToChildren = {};
-    leafNameMap.forEach(({name, parent}) => {
-      if (!parentToChildren[parent]) parentToChildren[parent] = [];
-      parentToChildren[parent].push(name);
-    });
-
-    // 构建当前被选中的叶子节点
-    const selectedLeafNames = value.map(path => path[path.length - 1]);
-
-    // 如果 parent 下所有子节点都选中了，就把 parent 加进来
-    Object.entries(parentToChildren).forEach(([parent, children]) => {
-      const allChildrenSelected = children.every(child => selectedLeafNames.includes(child));
-      if (allChildrenSelected && reverseMarketMapping[parent]) {
-        ids.add(Number(reverseMarketMapping[parent]));
-      }
-    });
-
-    rechargeAudit.value.markets = Array.from(ids);
+  if (value && value.length > 0) {
+    rechargeAudit.value.market = value[value.length - 1]
   } else {
-    rechargeAudit.value.markets = [];
+    rechargeAudit.value.market = ''
   }
-
-  console.log('最终映射后的 market IDs:', rechargeAudit.value.markets);
-};
+}
 
 const props = {multiple: true}
 // 获取地区，修改为级联下拉框
@@ -707,8 +652,8 @@ const getMarket = async function () {
       });
     };
     // 存储地区信息
-    markets.value = transformTree(result.data)
-    console.log('转换后的地区树==============', markets.value)
+    market.value = transformTree(result.data)
+    console.log('转换后的地区树==============', market.value)
   } catch (error) {
     console.log('请求失败', error)
   }
diff --git a/src/views/audit/gold/refundAudit.vue b/src/views/audit/gold/refundAudit.vue
index 6e0e5e2..9a137af 100644
--- a/src/views/audit/gold/refundAudit.vue
+++ b/src/views/audit/gold/refundAudit.vue
@@ -25,14 +25,11 @@
               <el-text class="mx-1" size="large">所属地区：</el-text>
               <el-cascader
                   v-model="selectedMarketPath"
-                  :options="markets"
+                  :options="market"
                   placeholder="请选择所属地区"
                   clearable
-                  collapse-tags
-                  collapse-tags-tooltip
                   style="width:180px"
                   @change="handleMarketChange"
-                  :props="props"
               />
             </el-col>
           </el-row>
@@ -172,7 +169,6 @@ import {onMounted, reactive, ref} from 'vue'
 import {ElMessage} from 'element-plus'
 import API from '@/util/http.js'
 import moment from 'moment'
-import {reverseMarketMapping} from "@/utils/marketMap.js";
 import {useAdminStore} from "@/store/index.js";
 import {storeToRefs} from "pinia";
 import {findMenuById, permissionMapping} from "@/utils/menuTreePermission.js"
@@ -203,7 +199,7 @@ const searchForm = ref({
   jwcode: '',
   refundModel: '',
   goodsName: '',
-  markets: [],
+  market: "",
   startTime: '',
   endTime: '',
   auditStatus: '0'
@@ -294,7 +290,7 @@ const showRejectDialog = (row) => {
   rejectDialogVisible.value = true
 }
 // 查地区
-const markets = ref([])
+const market = ref("")
 
 // 查商品名
 const getRefundGoods = async () => {
@@ -435,7 +431,7 @@ const resetSearch = function () {
     jwcode: '',
     refundType: '',
     goodsName: '',
-    markets: [],
+    market: "",
     startTime: '',
     endTime: '',
     sortField: '',
@@ -549,63 +545,14 @@ const adminReject = async function () {
 }
 
 // 存储地区选择变化
-const selectedMarketPath = ref([])
-//处理地区选择变化
+const selectedMarketPath = ref("")
 const handleMarketChange = (value) => {
-  if (Array.isArray(value) && value.length > 0) {
-    const ids = new Set();
-
-    value.forEach(path => {
-      const lastName = path[path.length - 1];
-      const id = reverseMarketMapping[lastName];
-      if (id) ids.add(Number(id));
-    });
-
-    // 添加额外处理：如果一个父节点下所有子节点都被选中，则把父节点也加入
-    const getAllLeafNames = (nodes) => {
-      const leafNames = [];
-
-      const traverse = (node, parentName = null) => {
-        if (!node.children || node.children.length === 0) {
-          leafNames.push({name: node.label, parent: parentName});
-        } else {
-          node.children.forEach(child => traverse(child, node.label));
-        }
-      };
-
-      nodes.forEach(node => traverse(node));
-      return leafNames;
-    };
-
-    const leafNameMap = getAllLeafNames(markets.value); // 所有叶子节点和对应父级名称
-
-    // 列表构建
-    const parentToChildren = {};
-    leafNameMap.forEach(({name, parent}) => {
-      if (!parentToChildren[parent]) parentToChildren[parent] = [];
-      parentToChildren[parent].push(name);
-    });
-
-    // 构建当前被选中的叶子节点
-    const selectedLeafNames = value.map(path => path[path.length - 1]);
-
-    // 如果 parent 下所有子节点都选中了，就把 parent 加进来
-    Object.entries(parentToChildren).forEach(([parent, children]) => {
-      const allChildrenSelected = children.every(child => selectedLeafNames.includes(child));
-      if (allChildrenSelected && reverseMarketMapping[parent]) {
-        ids.add(Number(reverseMarketMapping[parent]));
-      }
-    });
-
-    searchForm.value.markets = Array.from(ids);
+  if (value && value.length > 0) {
+    searchForm.value.market = value[value.length - 1]
   } else {
-    searchForm.value.markets = [];
+    searchForm.value.market = ''
   }
-
-  console.log('最终映射后的 market IDs:', searchForm.value.markets);
-};
-
-const props = {multiple: true}
+}
 // 获取地区，修改为级联下拉框
 const getMarket = async function () {
   try {
@@ -635,8 +582,8 @@ const getMarket = async function () {
       });
     };
     // 存储地区信息
-    markets.value = transformTree(result.data)
-    console.log('转换后的地区树==============', markets.value)
+    market.value = transformTree(result.data)
+    console.log('转换后的地区树==============', market.value)
   } catch (error) {
     console.log('请求失败', error)
   }
diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue
index 2f43749..0a8ee0c 100644
--- a/src/views/workspace/index.vue
+++ b/src/views/workspace/index.vue
@@ -48,7 +48,7 @@
         <div>
           <div class="margin-bottom">永久金币：{{ currentPermanent / 100 }}</div>
           <div class="margin-bottom">免费金币：{{ currentFree / 100 }}</div>
-          <div class="margin-bottom">[六月到期|{{ currentFreeJune / 100 }}]&nbsp;&nbsp;&nbsp;&nbsp;[12月到期|{{
+          <div class="margin-bottom">[六月到期|{{ currentFreeJune / 100 }}]&nbsp;&nbsp;&nbsp;&nbsp;[十二月到期|{{
               currentFreeDecember /
               100
             }}]
@@ -148,16 +148,16 @@
           </el-col>
           <el-col :span="24">
             <el-row>
-              <div style="margin-top:5px">合计&nbsp;&nbsp;&nbsp;&nbsp;
+              <div style="margin-top:5px">合计&nbsp;
                 永久金币 {{
                   activeTab === 'recharge' ? sumRechargePermanent / 100 : sumConsumePermanent / 100
-                }}&nbsp;&nbsp;&nbsp;&nbsp;
+                }}
                 免费金币 {{
                   activeTab === 'recharge' ? sumRechargeFree / 100 : sumConsumeFree / 100
-                }}&nbsp;&nbsp;&nbsp;&nbsp;
+                }}
                 任务金币 {{
                   activeTab === 'recharge' ? sumRechargeTask / 100 : sumConsumeTask / 100
-                }}&nbsp;&nbsp;&nbsp;&nbsp;
+                }}
               </div>
               <div @change="handleDatePickerChange">
                 <el-button @click="getToday()" label="day" style="margin-left:250px"
@@ -705,7 +705,7 @@ const updateChart = (chartData) => {
       },
       xAxis: {
         type: 'category',
-        data: markets.value.map(m => marketMapping[m] || m),
+        data: markets.value,
         axisLabel: {
           interval: 0,
           rotate: 30

From 6ea5157e98309e9298c052957208a1eb01146314 Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Tue, 5 Aug 2025 10:31:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=BA=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/permissions/userPermission.vue | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/permissions/userPermission.vue b/src/views/permissions/userPermission.vue
index 127019f..fe57750 100644
--- a/src/views/permissions/userPermission.vue
+++ b/src/views/permissions/userPermission.vue
@@ -697,11 +697,12 @@ const handleMarketChangeEditUser = (value) => {
   }
 };
 
-
-
-// 计算属性：控制级联选择器的选项禁用状态
+const addUserProps ={
+  multiple: true,
+}
+/*// 计算属性：控制级联选择器的选项禁用状态
 const addUserProps = computed(() => {
-  // 判断是否已选择总部（注意：addAdmin.market 存储的是最后一级地区数组）
+  // 判断是否已选择总部
   const hasHeadquarters = addAdmin.value.market.includes('总部');
 
   return {
@@ -712,11 +713,14 @@ const addUserProps = computed(() => {
 
     }
   };
-});
+});*/
 
-// 计算属性：控制级联选择器的选项禁用状态
+const editUserProps = {
+  multiple: true,
+}
+/*// 计算属性：控制级联选择器的选项禁用状态
 const editUserProps = computed(() => {
-  // 判断是否已选择总部（注意：addAdmin.market 存储的是最后一级地区数组）
+  // 判断是否已选择总部
   const hasHeadquarters = permissionEditObj.value.market.includes('总部');
 
   return {
@@ -727,7 +731,7 @@ const editUserProps = computed(() => {
 
     }
   };
-});
+});*/
 
 const selectParentNodes = (treeData, nodeId, checkedKeys) => {
   if (!Array.isArray(treeData)) return false;