From ac72656e8172d93c97898b27ac1bed0d057a604e Mon Sep 17 00:00:00 2001
From: zhangyongQINGHU <15371817+zhangyongqinghu@user.noreply.gitee.com>
Date: Sat, 22 Nov 2025 11:00:48 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E7=B2=BE=E7=BD=91=E5=8F=B7=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moneyManage/receiveDetail/receiveFinance.vue   |   39 +-
 .../moneyManage/receiveDetail/receiveHead.vue      |   37 +-
 .../moneyManage/receiveDetail/receiveManage.vue    | 2821 ++++++++++----------
 .../moneyManage/receiveDetail/receiveService.vue   |    8 +-
 .../moneyManage/refundDetail/refundCharge.vue      |   21 +-
 .../moneyManage/refundDetail/refundFinance.vue     |   30 +-
 .../moneyManage/refundDetail/refundHeader.vue      |   23 +-
 .../moneyManage/refundDetail/refundService.vue     |   15 +-
 8 files changed, 1518 insertions(+), 1476 deletions(-)

diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue
index 59706cc..e21b9f9 100644
--- a/src/views/moneyManage/receiveDetail/receiveFinance.vue
+++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue
@@ -762,10 +762,10 @@ const exportExcel = async function () {
         payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency);
     }
 
-    if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
-        ElMessage.error('精网号只能是数字')
-        return
-    }
+    // if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
+    //     ElMessage.error('精网号只能是数字')
+    //     return
+    // }
 
     const cashRoleId = '1';
     const submitterMarket = adminData.value.markets;
@@ -882,10 +882,10 @@ const getlist = async () => {
             payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency);
         }
 
-        if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
-            ElMessage.error('精网号只能是数字')
-            return
-        }
+        // if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
+        //     ElMessage.error('精网号只能是数字')
+        //     return
+        // }
 
         // 地区财务固定参数：角色ID=1，按标签页筛选状态
         const cashRoleId = '1';
@@ -997,7 +997,6 @@ const submitRefund = async () => {
 // 2.2 搜索与重置
 const search = () => {
     getlist();
-    ElMessage.success('查询成功');
 };
 
 const reset = () => {
@@ -1239,17 +1238,17 @@ const getAdminData = async () => {
         adminData.value = result;
 
         // 超级管理员判断（仅用于角色切换权限）
-        if (adminData.value.roleId === 2) {
-            superAdmin.value = true;
-            // 管理员所属地区提示
-            if (adminData.value.markets === '总部' || adminData.value.markets === '研发部') {
-                ElMessageBox.alert(
-                    '管理员账号仅显示所属地区的财务数据，请确认地区设置',
-                    '温馨提示',
-                    { type: 'warning' }
-                );
-            }
-        }
+        // if (adminData.value.roleId === 2) {
+        //     superAdmin.value = true;
+        //     // 管理员所属地区提示
+        //     if (adminData.value.markets === '总部' || adminData.value.markets === '研发部') {
+        //         ElMessageBox.alert(
+        //             '管理员账号仅显示所属地区的财务数据，请确认地区设置',
+        //             '温馨提示',
+        //             { type: 'warning' }
+        //         );
+        //     }
+        // }
     } catch (error) {
         console.error('管理员信息获取失败：', error);
         ElMessage.error('管理员信息加载异常');
diff --git a/src/views/moneyManage/receiveDetail/receiveHead.vue b/src/views/moneyManage/receiveDetail/receiveHead.vue
index 0320d88..4224f4c 100644
--- a/src/views/moneyManage/receiveDetail/receiveHead.vue
+++ b/src/views/moneyManage/receiveDetail/receiveHead.vue
@@ -617,10 +617,10 @@ const exportExcel = async function () {
         payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency);
     }
 
-    if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
-        ElMessage.error('精网号只能是数字')
-        return
-    }
+    // if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
+    //     ElMessage.error('精网号只能是数字')
+    //     return
+    // }
 
     const cashRoleId = '2';
     const submitterMarket = adminData.value.markets;
@@ -785,10 +785,10 @@ const getlist = async () => {
             }
         }
 
-        if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
-            ElMessage.error('精网号只能是数字')
-            return
-        }
+        // if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
+        //     ElMessage.error('精网号只能是数字')
+        //     return
+        // }
 
         const result = await request({
             url: '/cashCollection/selectCollection',
@@ -878,7 +878,6 @@ const submitRefund = async () => {
 // 2.2 搜索与重置
 const search = () => {
     getlist();
-    ElMessage.success('查询成功');
 };
 
 const reset = () => {
@@ -1044,16 +1043,16 @@ const getAdminData = async () => {
         adminData.value = result;
 
         // 超级管理员判断（仅用于角色切换权限）
-        if (adminData.value.roleId === 2) {
-            // 管理员所属地区提示
-            if (adminData.value.markets === '总部' || adminData.value.markets === '研发部') {
-                ElMessageBox.alert(
-                    '管理员账号仅显示所属地区的财务数据，请确认地区设置',
-                    '温馨提示',
-                    { type: 'warning' }
-                );
-            }
-        }
+        // if (adminData.value.roleId === 2) {
+        //     // 管理员所属地区提示
+        //     if (adminData.value.markets === '总部' || adminData.value.markets === '研发部') {
+        //         ElMessageBox.alert(
+        //             '管理员账号仅显示所属地区的财务数据，请确认地区设置',
+        //             '温馨提示',
+        //             { type: 'warning' }
+        //         );
+        //     }
+        // }
     } catch (error) {
         console.error('管理员信息获取失败：', error);
         ElMessage.error('管理员信息加载异常');
diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue
index b5c2ed0..917d63b 100644
--- a/src/views/moneyManage/receiveDetail/receiveManage.vue
+++ b/src/views/moneyManage/receiveDetail/receiveManage.vue
@@ -1,367 +1,367 @@
 <template>
-    <div class="content">
-        <div class="div-card1">
-            <el-card class="card1" style="margin-bottom: 0.5vh; min-height: 110px;">
-                <div class="row1">
-                    <div class="rowItem">
-                        <el-text style="width: 4vw;">精网号</el-text>
-                        <el-input v-model="searchData.jwcode" placeholder="请输入精网号" style="width:10vw;"
-                            clearable></el-input>
-                    </div>
-                    <div class="rowItem">
-                        <el-text style="width: 4vw;">客户姓名</el-text>
-                        <el-input v-model="searchData.name" placeholder="请输入客户姓名" style="width:10vw;"
-                            clearable></el-input>
-                    </div>
-                    <div class="rowItem">
-                        <el-text style="width: 4vw;">所属地区</el-text>
-                        <el-cascader style="width: 9vw;" v-model="searchData.markets" :options="market"
-                            placeholder="请选择所属地区" clearable @change="handleMarketChange" />
-                    </div>
-                    <!-- 地区财务固定显示付款币种，删除客服的订单状态 -->
-                    <div class="rowItem">
-                        <el-text style="width: 4vw;">付款币种</el-text>
-                        <el-select v-model="searchData.paymentCurrency" placeholder="请选择付款币种" style="width: 10vw;"
-                            clearable>
-                            <el-option v-for="item in customOptions" :key="item" :label="item" :value="item" />
-                        </el-select>
-                    </div>
-                    <div class="rowItem">
-                        <el-text style="width: 4vw;">支付方式</el-text>
-                        <el-select v-model="searchData.payType" placeholder="请选择支付方式" style="width: 10vw;" clearable>
-                            <el-option v-for="item in paytypeList" :key="item" :label="item" :value="item" />
-                        </el-select>
-                    </div>
-                </div>
-                <div class="row2" style="margin-top: 10px;">
-                    <div class="left">
-                        <div class="rowItem">
-                            <el-text style="width: 4vw;">活动名称</el-text>
-                            <el-select v-model="searchData.activity" placeholder="请选择活动方式" style="width: 10vw;"
-                                clearable>
-                                <el-option v-for="item in activityList" :key="item.id" :label="item.activityName"
-                                    :value="item.id" />
-                            </el-select>
-                        </div>
-                        <div class="rowItem">
-                            <el-text style="width: 4vw;">产品名称</el-text>
-                            <el-cascader v-model="searchData.goodsName" :options="productList" style="width: 10vw;"
-                                clearable />
-                        </div>
-                        <div class="rowItem" style="width: 25vw">
-                            <el-text style="width: 4vw; margin-left: 0.5vw;">付款时间</el-text>
-                            <el-date-picker v-model="getTime" type="datetimerange" range-separator="至"
-                                start-placeholder="起始时间" end-placeholder="结束时间" style="width: 22vw; "
-                                @change="handleDatePickerChange" :default-time="defaultTime"
-                                :disabled-date="disabledDate" />
-                        </div>
-                    </div>
-                    <el-button style="width: 3vw;" type="primary" @click="search">查询</el-button>
-                    <el-button style="width: 3vw;" type="success" @click="reset">重置</el-button>
-                    <el-button v-if="activeTab == 'done'" style="width: 5vw;" type="warning"
-                        @click="exportExcel()">导出excel</el-button>
-                    <el-button v-if="activeTab == 'done'" style="width: 6vw;" type="primary"
-                        @click="openExportList">查看导出列表</el-button>
-                </div>
-            </el-card>
+  <div class="content">
+    <div class="div-card1">
+      <el-card class="card1" style="margin-bottom: 0.5vh; min-height: 110px;">
+        <div class="row1">
+          <div class="rowItem">
+            <el-text style="width: 4vw;">精网号</el-text>
+            <el-input v-model="searchData.jwcode" placeholder="请输入精网号" style="width:10vw;"
+                      clearable></el-input>
+          </div>
+          <div class="rowItem">
+            <el-text style="width: 4vw;">客户姓名</el-text>
+            <el-input v-model="searchData.name" placeholder="请输入客户姓名" style="width:10vw;"
+                      clearable></el-input>
+          </div>
+          <div class="rowItem">
+            <el-text style="width: 4vw;">所属地区</el-text>
+            <el-cascader style="width: 9vw;" v-model="searchData.markets" :options="market"
+                         placeholder="请选择所属地区" clearable @change="handleMarketChange" />
+          </div>
+          <!-- 地区财务固定显示付款币种，删除客服的订单状态 -->
+          <div class="rowItem">
+            <el-text style="width: 4vw;">付款币种</el-text>
+            <el-select v-model="searchData.paymentCurrency" placeholder="请选择付款币种" style="width: 10vw;"
+                       clearable>
+              <el-option v-for="item in customOptions" :key="item" :label="item" :value="item" />
+            </el-select>
+          </div>
+          <div class="rowItem">
+            <el-text style="width: 4vw;">支付方式</el-text>
+            <el-select v-model="searchData.payType" placeholder="请选择支付方式" style="width: 10vw;" clearable>
+              <el-option v-for="item in paytypeList" :key="item" :label="item" :value="item" />
+            </el-select>
+          </div>
+        </div>
+        <div class="row2" style="margin-top: 10px;">
+          <div class="left">
+            <div class="rowItem">
+              <el-text style="width: 4vw;">活动名称</el-text>
+              <el-select v-model="searchData.activity" placeholder="请选择活动方式" style="width: 10vw;"
+                         clearable>
+                <el-option v-for="item in activityList" :key="item.id" :label="item.activityName"
+                           :value="item.id" />
+              </el-select>
+            </div>
+            <div class="rowItem">
+              <el-text style="width: 4vw;">产品名称</el-text>
+              <el-cascader v-model="searchData.goodsName" :options="productList" style="width: 10vw;"
+                           clearable />
+            </div>
+            <div class="rowItem" style="width: 25vw">
+              <el-text style="width: 4vw; margin-left: 0.5vw;">付款时间</el-text>
+              <el-date-picker v-model="getTime" type="datetimerange" range-separator="至"
+                              start-placeholder="起始时间" end-placeholder="结束时间" style="width: 22vw; "
+                              @change="handleDatePickerChange" :default-time="defaultTime"
+                              :disabled-date="disabledDate" />
+            </div>
+          </div>
+          <el-button style="width: 3vw;" type="primary" @click="search">查询</el-button>
+          <el-button style="width: 3vw;" type="success" @click="reset">重置</el-button>
+          <el-button v-if="activeTab == 'done'" style="width: 5vw;" type="warning"
+                     @click="exportExcel()">导出excel</el-button>
+          <el-button v-if="activeTab == 'done'" style="width: 6vw;" type="primary"
+                     @click="openExportList">查看导出列表</el-button>
         </div>
+      </el-card>
+    </div>
 
 
-        <div class="div-card2">
-            <el-card class="card2">
-                <div class="btns">
-                    <!-- 地区财务专属标签页（待审核/已通过/已完成/已驳回） -->
-                    <div class="tabs">
-                        <el-button-group>
-                            <el-button class="btnItem"
-                                :style="{ backgroundColor: activeTab === 'wait' ? '#2741DE' : '#E5EBFE', color: activeTab === 'wait' ? 'white' : '#666' }"
-                                @click="navigateTo('wait')">
-                                待审核
-                            </el-button>
-                            <el-button class="btnItem"
-                                :style="{ backgroundColor: activeTab === 'pass' ? '#2741DE' : '#E5EBFE', color: activeTab === 'pass' ? 'white' : '#666' }"
-                                @click="navigateTo('pass')">
-                                已通过
-                            </el-button>
-                            <el-button class="btnItem"
-                                :style="{ backgroundColor: activeTab === 'done' ? '#2741DE' : '#E5EBFE', color: activeTab === 'done' ? 'white' : '#666' }"
-                                @click="navigateTo('done')">
-                                已完成
-                            </el-button>
-                            <el-button class="btnItem"
-                                :style="{ backgroundColor: activeTab === 'reject' ? '#2741DE' : '#E5EBFE', color: activeTab === 'reject' ? 'white' : '#666' }"
-                                @click="navigateTo('reject')">
-                                已驳回
-                            </el-button>
-                        </el-button-group>
-                        <div class="info-tooltip">
-                            <el-popover placement="top" title="数据说明" :width="260" trigger="hover"
-                                content="收款的所有页面：订单记录默认按照付款时间降序排列" popper-class="custom-popover" :show-arrow="false">
-                                <template #reference>
-                                    <el-icon class="service-icon">
-                                        <Warning />
-                                    </el-icon>
-                                </template>
-                            </el-popover>
-                        </div>
-                    </div>
-                    <!-- 删除客服的“添加收款”按钮 -->
-                    <div class="btnAdd"></div>
-                </div>
+    <div class="div-card2">
+      <el-card class="card2">
+        <div class="btns">
+          <!-- 地区财务专属标签页（待审核/已通过/已完成/已驳回） -->
+          <div class="tabs">
+            <el-button-group>
+              <el-button class="btnItem"
+                         :style="{ backgroundColor: activeTab === 'wait' ? '#2741DE' : '#E5EBFE', color: activeTab === 'wait' ? 'white' : '#666' }"
+                         @click="navigateTo('wait')">
+                待审核
+              </el-button>
+              <el-button class="btnItem"
+                         :style="{ backgroundColor: activeTab === 'pass' ? '#2741DE' : '#E5EBFE', color: activeTab === 'pass' ? 'white' : '#666' }"
+                         @click="navigateTo('pass')">
+                已通过
+              </el-button>
+              <el-button class="btnItem"
+                         :style="{ backgroundColor: activeTab === 'done' ? '#2741DE' : '#E5EBFE', color: activeTab === 'done' ? 'white' : '#666' }"
+                         @click="navigateTo('done')">
+                已完成
+              </el-button>
+              <el-button class="btnItem"
+                         :style="{ backgroundColor: activeTab === 'reject' ? '#2741DE' : '#E5EBFE', color: activeTab === 'reject' ? 'white' : '#666' }"
+                         @click="navigateTo('reject')">
+                已驳回
+              </el-button>
+            </el-button-group>
+            <div class="info-tooltip">
+              <el-popover placement="top" title="数据说明" :width="260" trigger="hover"
+                          content="收款的所有页面：订单记录默认按照付款时间降序排列" popper-class="custom-popover" :show-arrow="false">
+                <template #reference>
+                  <el-icon class="service-icon">
+                    <Warning />
+                  </el-icon>
+                </template>
+              </el-popover>
+            </div>
+          </div>
+          <!-- 删除客服的“添加收款”按钮 -->
+          <div class="btnAdd"></div>
+        </div>
 
-                <div class="table">
-                    <el-table :data="tableData" style="width: 80vw;height:64vh;" @sort-change="handleSortChange"
-                        :row-style="{ height: '60px' }" :header-cell-style="{ textAlign: 'center' }"
-                        :cell-style="{ textAlign: 'center' }">
-                        <el-table-column type="index" label="序号" width="100px" fixed="left">
-                            <template #default="scope">
-                                <span>{{ scope.$index + 1 + (pageInfo.pageNum - 1) * pageInfo.pageSize }}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column fixed="left" prop="jwcode" label="Homily ID" width="110px" />
-                        <el-table-column fixed="left" prop="name" label="姓名" width="110px" />
-                        <el-table-column prop="marketName" label="所属地区" width="80px" />
-                        <el-table-column prop="activity" label="活动名称" width="120px" show-overflow-tooltip />
-                        <el-table-column prop="goodsName" label="产品名称" width="120px" />
-                        <el-table-column prop="goodNum" label="产品数量" width="130px">
-                            <template #default="scope">
-                                <span v-if="scope.row.goodsName == '金币充值'">{{ scope.row.permanentGold }}</span>
-                                <span v-else>{{ scope.row.goodNum }}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="paymentCurrency" label="付款币种" width="100px" />
-                        <el-table-column prop="paymentAmount" label="付款金额" width="120px" />
-                        <!-- 地区财务显示到账币种/金额/手续费（已通过/已完成标签页） -->
-                        <el-table-column prop="receivedCurrency" label="到账币种"
-                            v-if="activeTab == 'pass' || activeTab == 'done'" width="150px"></el-table-column>
-                        <el-table-column prop="receivedAmount" label="到账金额"
-                            v-if="activeTab == 'pass' || activeTab == 'done'" width="150px">
-                            <template #default="scope">
-                                <div v-if="!scope.row.receivedAmount">
-                                    <text style="color: #FA5A1E;">待补充</text>
-                                </div>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="handlingCharge" label="手续费"
-                            v-if="activeTab == 'pass' || activeTab == 'done'" width="150px">
-                            <template #default="scope">
-                                <div v-if="scope.row.handlingCharge == null">
-                                    <text style="color: #FA5A1E;">待补充</text>
-                                </div>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="payType" label="支付方式" width="130px" />
-                        <el-table-column prop="payTime" label="付款时间" width="180px" />
-                        <el-table-column prop="voucher" label="转账凭证" width="110px">
-                            <template #default="scope">
-                                <div v-if="scope.row.voucher"
-                                    style="display: flex; justify-content: center; align-items: center; cursor: pointer;"
-                                    @click="previewImage(scope.row.voucher)">
-                                    <img :src="scope.row.voucher" alt="支付凭证" style="width: auto; height: 40px;">
-                                </div>
-                                <div v-else
-                                    style="display: flex; justify-content: center; align-items: center; height: 40px;">
-                                    ——
-                                </div>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="submitterName" label="提交人" width="150px"
-                            show-overflow-tooltip></el-table-column>
-                        <!-- 地区财务显示审核人（已通过/已驳回/已完成标签页） -->
-                        <el-table-column prop="auditName" label="审核人"
-                            v-if="activeTab == 'pass' || activeTab == 'reject' || activeTab == 'done'" width="150px"
-                            show-overflow-tooltip></el-table-column>
-                        <el-table-column prop="receivedTime" label="到账时间"
-                            v-if="activeTab == 'pass' || activeTab == 'done'" width="180px" />
-                        <el-table-column prop="remark" label="备注" v-if="activeTab != 'reject'" width="150px"
-                            show-overflow-tooltip></el-table-column>
-                        <el-table-column prop="status" fixed="right" label="订单状态" v-if="activeTab == 'done'"
-                            width="150px" show-overflow-tooltip>
-                            <template #default="scope">
-                                <span style="color: rgb(242, 84, 83);" v-if="scope.row.status == 6">退款</span>
-                                <span style="color: rgb(127,204,133);" v-else>正常</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="auditTime" label="驳回时间" v-if="activeTab == 'reject'" width="180px"
-                            show-overflow-tooltip></el-table-column>
-                        <el-table-column prop="rejectReason" label="驳回理由" v-if="activeTab == 'reject'" width="150px">
-                            <template #default="scope">
-                                <div class="ellipsis-container"
-                                    @mouseenter="handleMouseEnter($event, scope.row.rejectReason)"
-                                    @mouseleave="handleMouseLeave" @mousemove="handleMouseMove($event)">
+        <div class="table">
+          <el-table :data="tableData" style="width: 80vw;height:64vh;" @sort-change="handleSortChange"
+                    :row-style="{ height: '60px' }" :header-cell-style="{ textAlign: 'center' }"
+                    :cell-style="{ textAlign: 'center' }">
+            <el-table-column type="index" label="序号" width="100px" fixed="left">
+              <template #default="scope">
+                <span>{{ scope.$index + 1 + (pageInfo.pageNum - 1) * pageInfo.pageSize }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column fixed="left" prop="jwcode" label="Homily ID" width="110px" />
+            <el-table-column fixed="left" prop="name" label="姓名" width="110px" />
+            <el-table-column prop="marketName" label="所属地区" width="80px" />
+            <el-table-column prop="activity" label="活动名称" width="120px" show-overflow-tooltip />
+            <el-table-column prop="goodsName" label="产品名称" width="120px" />
+            <el-table-column prop="goodNum" label="产品数量" width="130px">
+              <template #default="scope">
+                <span v-if="scope.row.goodsName == '金币充值'">{{ scope.row.permanentGold }}</span>
+                <span v-else>{{ scope.row.goodNum }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="paymentCurrency" label="付款币种" width="100px" />
+            <el-table-column prop="paymentAmount" label="付款金额" width="120px" />
+            <!-- 地区财务显示到账币种/金额/手续费（已通过/已完成标签页） -->
+            <el-table-column prop="receivedCurrency" label="到账币种"
+                             v-if="activeTab == 'pass' || activeTab == 'done'" width="150px"></el-table-column>
+            <el-table-column prop="receivedAmount" label="到账金额"
+                             v-if="activeTab == 'pass' || activeTab == 'done'" width="150px">
+              <template #default="scope">
+                <div v-if="!scope.row.receivedAmount">
+                  <text style="color: #FA5A1E;">待补充</text>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="handlingCharge" label="手续费"
+                             v-if="activeTab == 'pass' || activeTab == 'done'" width="150px">
+              <template #default="scope">
+                <div v-if="scope.row.handlingCharge == null">
+                  <text style="color: #FA5A1E;">待补充</text>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="payType" label="支付方式" width="130px" />
+            <el-table-column prop="payTime" label="付款时间" width="180px" />
+            <el-table-column prop="voucher" label="转账凭证" width="110px">
+              <template #default="scope">
+                <div v-if="scope.row.voucher"
+                     style="display: flex; justify-content: center; align-items: center; cursor: pointer;"
+                     @click="previewImage(scope.row.voucher)">
+                  <img :src="scope.row.voucher" alt="支付凭证" style="width: auto; height: 40px;">
+                </div>
+                <div v-else
+                     style="display: flex; justify-content: center; align-items: center; height: 40px;">
+                  ——
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="submitterName" label="提交人" width="150px"
+                             show-overflow-tooltip></el-table-column>
+            <!-- 地区财务显示审核人（已通过/已驳回/已完成标签页） -->
+            <el-table-column prop="auditName" label="审核人"
+                             v-if="activeTab == 'pass' || activeTab == 'reject' || activeTab == 'done'" width="150px"
+                             show-overflow-tooltip></el-table-column>
+            <el-table-column prop="receivedTime" label="到账时间"
+                             v-if="activeTab == 'pass' || activeTab == 'done'" width="180px" />
+            <el-table-column prop="remark" label="备注" v-if="activeTab != 'reject'" width="150px"
+                             show-overflow-tooltip></el-table-column>
+            <el-table-column prop="status" fixed="right" label="订单状态" v-if="activeTab == 'done'"
+                             width="150px" show-overflow-tooltip>
+              <template #default="scope">
+                <span style="color: rgb(242, 84, 83);" v-if="scope.row.status == 6">退款</span>
+                <span style="color: rgb(127,204,133);" v-else>正常</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="auditTime" label="驳回时间" v-if="activeTab == 'reject'" width="180px"
+                             show-overflow-tooltip></el-table-column>
+            <el-table-column prop="rejectReason" label="驳回理由" v-if="activeTab == 'reject'" width="150px">
+              <template #default="scope">
+                <div class="ellipsis-container"
+                     @mouseenter="handleMouseEnter($event, scope.row.rejectReason)"
+                     @mouseleave="handleMouseLeave" @mousemove="handleMouseMove($event)">
                                     <span class="ellipsis-text">
                                         {{ scope.row.rejectReason || '—' }}
                                     </span>
-                                    <!-- 自定义提示框 -->
-                                    <div v-if="showTooltip && tooltipContent" class="custom-tooltip" :style="{
+                  <!-- 自定义提示框 -->
+                  <div v-if="showTooltip && tooltipContent" class="custom-tooltip" :style="{
                                         left: `${tooltipLeft}px`,
                                         top: `${tooltipTop}px`
                                     }">
-                                        {{ tooltipContent }}
-                                    </div>
-                                </div>
-                            </template>
-                        </el-table-column>
-                        <!-- 地区财务表格操作（待审核→审核，已通过→编辑） -->
-                        <el-table-column fixed="right" label="操作" width="120px" v-if="activeTab != 'reject'">
-                            <template #default=scope>
-                                <el-link v-if="activeTab == 'wait'" style="color: #2741DE;"
-                                    @click="openAuditForm(scope.row)">审核
-                                </el-link>
-                                <el-link
-                                    v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4) && scope.row.receivedMarket == scope.row.submitterMarket"
-                                    style="color: #2741DE;" @click="openEditForm(scope.row)">编辑
-                                </el-link>
-                                <el-link
-                                    v-else-if="activeTab == 'done' && scope.row.status == 4 && startsWith(scope.row.orderCode, 'GOLDCOIN')"
-                                    style="color: rgb(242, 84, 83);" @click="openRefundConfirm(scope.row)">退款
-                                </el-link>
-                            </template>
-                        </el-table-column>
-                    </el-table>
+                    {{ tooltipContent }}
+                  </div>
                 </div>
-                <div class="pagination">
-                    <el-pagination background :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"
-                        :page-sizes="[5, 10, 20, 50, 100]" layout="total, sizes, prev, pager, next, jumper"
-                        :total="total" @size-change="handlePagination('size', $event)"
-                        @current-change="handlePagination('page', $event)"></el-pagination>
-                </div>
-            </el-card>
+              </template>
+            </el-table-column>
+            <!-- 地区财务表格操作（待审核→审核，已通过→编辑） -->
+            <el-table-column fixed="right" label="操作" width="120px" v-if="activeTab != 'reject'">
+              <template #default=scope>
+                <el-link v-if="activeTab == 'wait'" style="color: #2741DE;"
+                         @click="openAuditForm(scope.row)">审核
+                </el-link>
+                <el-link
+                    v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4) && scope.row.receivedMarket == scope.row.submitterMarket"
+                    style="color: #2741DE;" @click="openEditForm(scope.row)">编辑
+                </el-link>
+                <el-link
+                    v-else-if="activeTab == 'done' && scope.row.status == 4 && startsWith(scope.row.orderCode, 'GOLDCOIN')"
+                    style="color: rgb(242, 84, 83);" @click="openRefundConfirm(scope.row)">退款
+                </el-link>
+              </template>
+            </el-table-column>
+          </el-table>
         </div>
-        <!-- 退款确认弹窗 -->
-        <div class="recallDialog" v-show="refundConfirmDialog">
-            <div class="close">
-                <button @click="closeConfirmRefund" class="Btn">关闭</button>
-            </div>
-            <div class="text">
-                <text class="txt">{{ textContent }}</text>
-            </div>
-            <div class="cancle">
-                <button @click="closeConfirmRefund" class="Btn">取消</button>
-            </div>
-            <div class="confirm">
-                <button @click="openRefundDialog" class="Btn">确定</button>
-            </div>
+        <div class="pagination">
+          <el-pagination background :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"
+                         :page-sizes="[5, 10, 20, 50, 100]" layout="total, sizes, prev, pager, next, jumper"
+                         :total="total" @size-change="handlePagination('size', $event)"
+                         @current-change="handlePagination('page', $event)"></el-pagination>
         </div>
+      </el-card>
+    </div>
+    <!-- 退款确认弹窗 -->
+    <div class="recallDialog" v-show="refundConfirmDialog">
+      <div class="close">
+        <button @click="closeConfirmRefund" class="Btn">关闭</button>
+      </div>
+      <div class="text">
+        <text class="txt">{{ textContent }}</text>
+      </div>
+      <div class="cancle">
+        <button @click="closeConfirmRefund" class="Btn">取消</button>
+      </div>
+      <div class="confirm">
+        <button @click="openRefundDialog" class="Btn">确定</button>
+      </div>
+    </div>
 
-        <!-- 导出列表 -->
-        <el-dialog v-model="exportListVisible" title="导出列表" width="60vw">
-            <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">
-                        <el-tag :type="getTagType(scope.row.state)" :effect="scope.row.state === 3 ? 'light' : 'plain'">
-                            {{ getTagText(scope.row.state) }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="createTime" label="创建时间">
-                    <template #default="scope">
-                        {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作">
-                    <template #default="scope">
-                        <el-button type="primary" size="small" @click="downloadExportFile(scope.row)"
-                            :disabled="scope.row.state !== 2">
-                            下载
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button text @click="exportListVisible = false">关闭</el-button>
-                </div>
-            </template>
-        </el-dialog>
-
-        <!-- 审核弹窗 -->
-        <el-dialog class="adddialog" v-model="auditFormisible" width="20vw" :before-close="closeAuditForm">
-            <el-form class="addForm" label-width="4vw" label-position="left">
-                <el-form-item label="精网号">
-                    <el-input disabled="true" v-model="auditFormData.jwcode" placeholder="请输入驳回理由" />
-                </el-form-item>
-                <el-form-item label="客户姓名">
-                    <el-input disabled="true" v-model="auditFormData.name" placeholder="请输入客户姓名" />
-                </el-form-item>
-                <el-form-item label="所属地区">
-                    <el-input disabled="true" v-model="auditFormData.market" />
-                </el-form-item>
-                <el-form-item label="活动名称">
-                    <el-input disabled="true" v-model="auditFormData.activity" placeholder="请输入活动名称" />
-                </el-form-item>
-                <el-form-item label="产品名称">
-                    <el-select disabled="true" v-model="auditFormData.goodsName" />
-                </el-form-item>
-                <el-form-item v-if="!isGold" label="产品数量">
-                    <div style="display: flex;">
-                        <el-input disabled="true" style="padding-right: 30px; flex: 3;" v-model="auditFormData.goodNum"
-                            placeholder="请输入产品数量" />
-                        <CurrencySelect disabled="true" v-model="auditFormData.numUnit" :items="numUnitList"
+    <!-- 导出列表 -->
+    <el-dialog v-model="exportListVisible" title="导出列表" width="60vw">
+      <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">
+            <el-tag :type="getTagType(scope.row.state)" :effect="scope.row.state === 3 ? 'light' : 'plain'">
+              {{ getTagText(scope.row.state) }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="创建时间">
+          <template #default="scope">
+            {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template #default="scope">
+            <el-button type="primary" size="small" @click="downloadExportFile(scope.row)"
+                       :disabled="scope.row.state !== 2">
+              下载
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button text @click="exportListVisible = false">关闭</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 审核弹窗 -->
+    <el-dialog class="adddialog" v-model="auditFormisible" width="20vw" :before-close="closeAuditForm">
+      <el-form class="addForm" label-width="4vw" label-position="left">
+        <el-form-item label="精网号">
+          <el-input disabled="true" v-model="auditFormData.jwcode" placeholder="请输入驳回理由" />
+        </el-form-item>
+        <el-form-item label="客户姓名">
+          <el-input disabled="true" v-model="auditFormData.name" placeholder="请输入客户姓名" />
+        </el-form-item>
+        <el-form-item label="所属地区">
+          <el-input disabled="true" v-model="auditFormData.market" />
+        </el-form-item>
+        <el-form-item label="活动名称">
+          <el-input disabled="true" v-model="auditFormData.activity" placeholder="请输入活动名称" />
+        </el-form-item>
+        <el-form-item label="产品名称">
+          <el-select disabled="true" v-model="auditFormData.goodsName" />
+        </el-form-item>
+        <el-form-item v-if="!isGold" label="产品数量">
+          <div style="display: flex;">
+            <el-input disabled="true" style="padding-right: 30px; flex: 3;" v-model="auditFormData.goodNum"
+                      placeholder="请输入产品数量" />
+            <CurrencySelect disabled="true" v-model="auditFormData.numUnit" :items="numUnitList"
                             style="flex: 1.5;" placeholder="单位" @change="handleCurrencyChange" />
-                    </div>
-                </el-form-item>
-                <div v-show="isGold" style="margin-bottom: 15px;  display: flex;">
-                    <div style=" display: flex; ">
+          </div>
+        </el-form-item>
+        <div v-show="isGold" style="margin-bottom: 15px;  display: flex;">
+          <div style=" display: flex; ">
                         <span
                             style="color: #999999; display: flex; white-space: nowrap;align-items: center;">永久金币：</span>
-                        <el-input disabled="true"
-                            style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
-                            v-model="auditFormData.permanentGold" />
-                    </div>
-                    <div style="padding-right: 5px; display: flex;">
+            <el-input disabled="true"
+                      style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
+                      v-model="auditFormData.permanentGold" />
+          </div>
+          <div style="padding-right: 5px; display: flex;">
                         <span
                             style="color: #999999; display: flex; white-space: nowrap;align-items: center;">免费金币：</span>
-                        <el-input disabled="true"
-                            style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
-                            v-model="auditFormData.freeGold" />
-                    </div>
-                </div>
-                <el-form-item label="付款币种">
-                    <el-select disabled="true" v-model="auditFormData.paymentCurrency" placeholder="请选择付款币种"
-                        @change="handleCurrencyChange" />
-                </el-form-item>
-                <el-form-item label="付款金额">
-                    <el-input disabled="true" v-model="auditFormData.paymentAmount" placeholder="请输入付款金额" />
-                </el-form-item>
-                <el-form-item label="支付方式">
-                    <el-select disabled="true" v-model="auditFormData.payType" :items="paytypeOptions"
-                        placeholder="请选择支付方式" />
-                </el-form-item>
-                <el-form-item label="到账地区">
-                    <el-select disabled="true" v-model="auditFormData.receivedMarket" placeholder="到账地区" />
-                </el-form-item>
-                <el-form-item label="付款时间">
-                    <el-date-picker disabled="true" type="datetime" v-model="auditFormData.payTime"
-                        placeholder="请选择付款时间" />
-                </el-form-item>
-                <el-form-item label="转账凭证">
-                    <div class="pic">
-                        <el-upload disabled="true" ref="uploadRef" class="uploader" :show-file-list="false"
-                            list-type="picture-card" :auto-upload="false" :before-upload="beforeUpload"
-                            :on-error="handelImgErr" :on-change="handleImageChange" :http-request="customUpload">
-                            <img v-if="auditFormData.voucher" :src="auditFormData.voucher" class="avatar"
-                                style="height: 100%; width: 100%;  object-fit: cover;" />
-                            <el-icon v-else class="avatar-uploader-icon">
-                                <Plus />
-                            </el-icon>
-                        </el-upload>
-                        <el-text class="picText">
-                            仅支持.jpg .png格式文件≤ 2 MB
-                        </el-text>
-                    </div>
-                </el-form-item>
-                <el-form-item label="备注">
-                    <el-input disabled="true" v-model="auditFormData.remark" type="textarea" :rows="3" maxlength="100"
-                        show-word-limit />
-                </el-form-item>
-                <el-form-item label="驳回理由" v-if="ifReject" required>
-                    <el-input v-model="auditFormData.rejectReason" type="textarea" :rows="3" placeholder="请输入驳回理由"
-                        maxlength="100" show-word-limit />
-                </el-form-item>
-            </el-form>
-            <template #footer>
+            <el-input disabled="true"
+                      style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
+                      v-model="auditFormData.freeGold" />
+          </div>
+        </div>
+        <el-form-item label="付款币种">
+          <el-select disabled="true" v-model="auditFormData.paymentCurrency" placeholder="请选择付款币种"
+                     @change="handleCurrencyChange" />
+        </el-form-item>
+        <el-form-item label="付款金额">
+          <el-input disabled="true" v-model="auditFormData.paymentAmount" placeholder="请输入付款金额" />
+        </el-form-item>
+        <el-form-item label="支付方式">
+          <el-select disabled="true" v-model="auditFormData.payType" :items="paytypeOptions"
+                     placeholder="请选择支付方式" />
+        </el-form-item>
+        <el-form-item label="到账地区">
+          <el-select disabled="true" v-model="auditFormData.receivedMarket" placeholder="到账地区" />
+        </el-form-item>
+        <el-form-item label="付款时间">
+          <el-date-picker disabled="true" type="datetime" v-model="auditFormData.payTime"
+                          placeholder="请选择付款时间" />
+        </el-form-item>
+        <el-form-item label="转账凭证">
+          <div class="pic">
+            <el-upload disabled="true" ref="uploadRef" class="uploader" :show-file-list="false"
+                       list-type="picture-card" :auto-upload="false" :before-upload="beforeUpload"
+                       :on-error="handelImgErr" :on-change="handleImageChange" :http-request="customUpload">
+              <img v-if="auditFormData.voucher" :src="auditFormData.voucher" class="avatar"
+                   style="height: 100%; width: 100%;  object-fit: cover;" />
+              <el-icon v-else class="avatar-uploader-icon">
+                <Plus />
+              </el-icon>
+            </el-upload>
+            <el-text class="picText">
+              仅支持.jpg .png格式文件≤ 2 MB
+            </el-text>
+          </div>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input disabled="true" v-model="auditFormData.remark" type="textarea" :rows="3" maxlength="100"
+                    show-word-limit />
+        </el-form-item>
+        <el-form-item label="驳回理由" v-if="ifReject" required>
+          <el-input v-model="auditFormData.rejectReason" type="textarea" :rows="3" placeholder="请输入驳回理由"
+                    maxlength="100" show-word-limit />
+        </el-form-item>
+      </el-form>
+      <template #footer>
                 <span class="dialog-footer" v-if="!ifReject">
                     <el-button style="background-color: #7E91FF;" @click="ifReject = true">驳回</el-button>
                     <el-button :style="{
@@ -370,118 +370,118 @@
                         color: isBtnDisabled ? '#8A8A8A' : '#F3FAFE'
                     }" @click="handelAudit" :disabled="isBtnDisabled">{{ btnText }}</el-button>
                 </span>
-                <span class="dialog-footer" v-if="ifReject">
+        <span class="dialog-footer" v-if="ifReject">
                     <el-button style="background-color: #7E91FF;" @click="closeAuditForm">取消</el-button>
                     <el-button style="background-color: #2741DE; margin-left: 2.5vw;" type="primary"
-                        @click="throttledhandelAuditReject">确定</el-button>
+                               @click="throttledhandelAuditReject">确定</el-button>
                 </span>
-            </template>
-        </el-dialog>
-
-        <!-- 编辑填手续费弹窗 -->
-        <el-dialog class="editdialog" v-model="editFormisible" width="20vw" :before-close="closeEditForm">
-            <div class="content">
-                <div class="left">
-                    <el-form class="editForm" label-width="4.5vw" label-position="left">
-                        <el-form-item label="精网号">
-                            <el-input disabled="true" v-model="editFormData.jwcode" placeholder="精网号" />
-                        </el-form-item>
-                        <el-form-item label="客户姓名">
-                            <el-input disabled="true" v-model="editFormData.name" placeholder="客户姓名" />
-                        </el-form-item>
-                        <el-form-item label="所属地区">
-                            <el-input disabled="true" v-model="editFormData.marketName" placeholder="所属地区" />
-                        </el-form-item>
-                        <el-form-item label="活动名称">
-                            <el-input disabled="true" v-model="editFormData.activity" placeholder="活动名称" />
-                        </el-form-item>
-                        <el-form-item label="产品名称">
-                            <el-select disabled="true" v-model="editFormData.goodsName" placeholder="产品名称"
-                                clearable></el-select>
-                        </el-form-item>
-                        <!-- 金币产品特殊显示 -->
-                        <el-form-item v-show="!isEditGold" label="产品数量">
-                            <div style="display: flex;">
-                                <el-input disabled="true" style="padding-right: 30px; flex: 3;"
-                                    v-model="editFormData.goodNum" placeholder="请输入产品数量" />
-                                <CurrencySelect disabled="true" v-model="editFormData.numUnit" :items="numUnitList"
-                                    style="flex: 1.5;" placeholder="单位" @change="handleCurrencyChange" />
-                            </div>
-                        </el-form-item>
-                        <div v-show="isEditGold" style="margin-bottom: 15px;  display: flex;">
-                            <div style=" display: flex; margin-right: 10px;">
+      </template>
+    </el-dialog>
+
+    <!-- 编辑填手续费弹窗 -->
+    <el-dialog class="editdialog" v-model="editFormisible" width="20vw" :before-close="closeEditForm">
+      <div class="content">
+        <div class="left">
+          <el-form class="editForm" label-width="4.5vw" label-position="left">
+            <el-form-item label="精网号">
+              <el-input disabled="true" v-model="editFormData.jwcode" placeholder="精网号" />
+            </el-form-item>
+            <el-form-item label="客户姓名">
+              <el-input disabled="true" v-model="editFormData.name" placeholder="客户姓名" />
+            </el-form-item>
+            <el-form-item label="所属地区">
+              <el-input disabled="true" v-model="editFormData.marketName" placeholder="所属地区" />
+            </el-form-item>
+            <el-form-item label="活动名称">
+              <el-input disabled="true" v-model="editFormData.activity" placeholder="活动名称" />
+            </el-form-item>
+            <el-form-item label="产品名称">
+              <el-select disabled="true" v-model="editFormData.goodsName" placeholder="产品名称"
+                         clearable></el-select>
+            </el-form-item>
+            <!-- 金币产品特殊显示 -->
+            <el-form-item v-show="!isEditGold" label="产品数量">
+              <div style="display: flex;">
+                <el-input disabled="true" style="padding-right: 30px; flex: 3;"
+                          v-model="editFormData.goodNum" placeholder="请输入产品数量" />
+                <CurrencySelect disabled="true" v-model="editFormData.numUnit" :items="numUnitList"
+                                style="flex: 1.5;" placeholder="单位" @change="handleCurrencyChange" />
+              </div>
+            </el-form-item>
+            <div v-show="isEditGold" style="margin-bottom: 15px;  display: flex;">
+              <div style=" display: flex; margin-right: 10px;">
                                 <span
                                     style="color: #999999; display: flex; white-space: nowrap;align-items: center;">永久金币：</span>
-                                <el-input disabled="true"
-                                    style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
-                                    v-model="editFormData.permanentGold" />
-                            </div>
-                            <div style="padding-right: 5px; display: flex;">
+                <el-input disabled="true"
+                          style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
+                          v-model="editFormData.permanentGold" />
+              </div>
+              <div style="padding-right: 5px; display: flex;">
                                 <span
                                     style="color: #999999; display: flex; white-space: nowrap;align-items: center;">免费金币：</span>
-                                <el-input disabled="true"
-                                    style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
-                                    v-model="editFormData.freeGold" />
-                            </div>
-                        </div>
-                        <el-form-item label="付款币种">
-                            <CurrencySelect :disabled="!ifOnline" v-model="editFormData.paymentCurrency"
-                                :items="customOptions" placeholder="付款币种" />
-                        </el-form-item>
-                        <el-form-item label="付款金额">
-                            <el-input :disabled="!ifOnline" v-model="editFormData.paymentAmount" placeholder="付款金额" />
-                        </el-form-item>
-                        <el-form-item label="支付方式">
-                            <el-select disabled="true" v-model="editFormData.payType" placeholder="支付方式"
-                                clearable></el-select>
-                        </el-form-item>
-                        <el-form-item label="到账地区">
-                            <el-select disabled="true" v-model="editFormData.receivedMarket" placeholder="到账地区"
-                                clearable></el-select>
-                        </el-form-item>
-                        <el-form-item label="付款时间">
-                            <el-date-picker disabled="true" type="datetime" v-model="editFormData.payTime"
-                                placeholder="付款时间" />
-                        </el-form-item>
-                        <el-form-item label="转账凭证">
-                            <div class="pic">
-                                <el-upload disabled="true" ref="uploadRef" class="uploader" :show-file-list="false"
-                                    list-type="picture-card" :auto-upload="false" :before-upload="beforeUpload"
-                                    :on-error="handelImgErr" :on-change="handleImageChange"
-                                    :http-request="customUpload">
-                                    <img v-if="editFormData.voucher" :src="editFormData.voucher" class="avatar"
-                                        style="height: 100%; width: 100%;  object-fit: cover;" />
-                                    <el-icon v-else class="avatar-uploader-icon">
-                                        <Plus />
-                                    </el-icon>
-                                </el-upload>
-                                <el-text class="picText">仅支持.jpg .png格式文件≤ 2 MB</el-text>
-                            </div>
-                        </el-form-item>
-                        <el-form-item label="备注">
-                            <el-input disabled="true" v-model="editFormData.remark" type="textarea" :rows="4"
-                                placeholder="备注" maxlength="100" show-word-limit />
-                        </el-form-item>
-                    </el-form>
-                </div>
-                <div class="right">
-                    <el-form ref="editFormRef" :rules="editFormRule" :model="editFormData" class="editFormRighrt"
-                        label-width="4.5vw" label-position="left">
-                        <el-form-item label="到账货币">
-                            <CurrencySelect v-model="editFormData.receivedCurrency" :items="customOptions"
-                                placeholder="请选择到账货币" />
-                        </el-form-item>
-                        <el-form-item label="到账金额" prop="receivedAmount">
-                            <el-input v-model="editFormData.receivedAmount" placeholder="请输入到账金额" type="number" />
-                        </el-form-item>
-                        <el-form-item label="手续费" prop="handlingCharge">
-                            <el-input v-model="editFormData.handlingCharge" placeholder="请输入手续费" type="number" />
-                        </el-form-item>
-                        <el-form-item label="到账时间">
-                            <el-date-picker type="datetime" v-model="editFormData.receivedTime" placeholder="请选择到账时间" />
-                        </el-form-item>
-                    </el-form>
-                    <span class="editBtns">
+                <el-input disabled="true"
+                          style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
+                          v-model="editFormData.freeGold" />
+              </div>
+            </div>
+            <el-form-item label="付款币种">
+              <CurrencySelect :disabled="!ifOnline" v-model="editFormData.paymentCurrency"
+                              :items="customOptions" placeholder="付款币种" />
+            </el-form-item>
+            <el-form-item label="付款金额">
+              <el-input :disabled="!ifOnline" v-model="editFormData.paymentAmount" placeholder="付款金额" />
+            </el-form-item>
+            <el-form-item label="支付方式">
+              <el-select disabled="true" v-model="editFormData.payType" placeholder="支付方式"
+                         clearable></el-select>
+            </el-form-item>
+            <el-form-item label="到账地区">
+              <el-select disabled="true" v-model="editFormData.receivedMarket" placeholder="到账地区"
+                         clearable></el-select>
+            </el-form-item>
+            <el-form-item label="付款时间">
+              <el-date-picker disabled="true" type="datetime" v-model="editFormData.payTime"
+                              placeholder="付款时间" />
+            </el-form-item>
+            <el-form-item label="转账凭证">
+              <div class="pic">
+                <el-upload disabled="true" ref="uploadRef" class="uploader" :show-file-list="false"
+                           list-type="picture-card" :auto-upload="false" :before-upload="beforeUpload"
+                           :on-error="handelImgErr" :on-change="handleImageChange"
+                           :http-request="customUpload">
+                  <img v-if="editFormData.voucher" :src="editFormData.voucher" class="avatar"
+                       style="height: 100%; width: 100%;  object-fit: cover;" />
+                  <el-icon v-else class="avatar-uploader-icon">
+                    <Plus />
+                  </el-icon>
+                </el-upload>
+                <el-text class="picText">仅支持.jpg .png格式文件≤ 2 MB</el-text>
+              </div>
+            </el-form-item>
+            <el-form-item label="备注">
+              <el-input disabled="true" v-model="editFormData.remark" type="textarea" :rows="4"
+                        placeholder="备注" maxlength="100" show-word-limit />
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="right">
+          <el-form ref="editFormRef" :rules="editFormRule" :model="editFormData" class="editFormRighrt"
+                   label-width="4.5vw" label-position="left">
+            <el-form-item label="到账货币">
+              <CurrencySelect v-model="editFormData.receivedCurrency" :items="customOptions"
+                              placeholder="请选择到账货币" />
+            </el-form-item>
+            <el-form-item label="到账金额" prop="receivedAmount">
+              <el-input v-model="editFormData.receivedAmount" placeholder="请输入到账金额" type="number" />
+            </el-form-item>
+            <el-form-item label="手续费" prop="handlingCharge">
+              <el-input v-model="editFormData.handlingCharge" placeholder="请输入手续费" type="number" />
+            </el-form-item>
+            <el-form-item label="到账时间">
+              <el-date-picker type="datetime" v-model="editFormData.receivedTime" placeholder="请选择到账时间" />
+            </el-form-item>
+          </el-form>
+          <span class="editBtns">
                         <button class="editBtn1" @click="closeEditForm">
                             <text class="txt">取消</text>
                         </button>
@@ -489,125 +489,125 @@
                             <text class="txt">提交</text>
                         </button>
                     </span>
-                </div>
-            </div>
-        </el-dialog>
-
-        <!-- 新增退款 -->
-        <el-dialog v-model="refundDialog" title="退款" class="refundDialog" overflow draggable style="width: 40vw;"
-            :before-close="closeRefundForm">
-            <div style="display: flex;">
-                <div class="left">
-                    <div class="add-item">
-                        <el-text style="width:4vw;">精网号</el-text>
-                        <el-input v-model="refundFormData.jwcode" style="width:10vw;" disabled />
-                    </div>
-                    <div class="add-item">
-                        <el-text style="width:4vw;">客户姓名</el-text>
-                        <el-input v-model="refundFormData.name" style="width:10vw;" disabled />
-                    </div>
-                    <div class="add-item">
-                        <el-text style="width:4vw;">所属地区</el-text>
-                        <el-input v-model="refundFormData.marketName" style="width:10vw;" disabled />
-                    </div>
-                    <div class="add-item">
-                        <el-text style="width:4vw;">活动名称</el-text>
-                        <el-input v-model="refundFormData.activity" style="width:10vw;" disabled />
-                    </div>
-                    <div class="add-item">
-                        <el-text style="width:4vw;">产品名称</el-text>
-                        <el-input v-model="refundFormData.goodsName" style="width:10vw;" disabled />
-                    </div>
-                    <div v-show="!isRefundGold" class="add-item">
-                        <el-text style="width:4vw;">产品数量</el-text>
-                        <el-input style="padding-right: 10px; width:6.5vw;" v-model="refundFormData.goodNum"
-                            placeholder="请输入产品数量" disabled />
-                        <CurrencySelect disabled="true" v-model="refundFormData.numUnit" :items="numUnitList"
+        </div>
+      </div>
+    </el-dialog>
+
+    <!-- 新增退款 -->
+    <el-dialog v-model="refundDialog" title="退款" class="refundDialog" overflow draggable style="width: 40vw;"
+               :before-close="closeRefundForm">
+      <div style="display: flex;">
+        <div class="left">
+          <div class="add-item">
+            <el-text style="width:4vw;">精网号</el-text>
+            <el-input v-model="refundFormData.jwcode" style="width:10vw;" disabled />
+          </div>
+          <div class="add-item">
+            <el-text style="width:4vw;">客户姓名</el-text>
+            <el-input v-model="refundFormData.name" style="width:10vw;" disabled />
+          </div>
+          <div class="add-item">
+            <el-text style="width:4vw;">所属地区</el-text>
+            <el-input v-model="refundFormData.marketName" style="width:10vw;" disabled />
+          </div>
+          <div class="add-item">
+            <el-text style="width:4vw;">活动名称</el-text>
+            <el-input v-model="refundFormData.activity" style="width:10vw;" disabled />
+          </div>
+          <div class="add-item">
+            <el-text style="width:4vw;">产品名称</el-text>
+            <el-input v-model="refundFormData.goodsName" style="width:10vw;" disabled />
+          </div>
+          <div v-show="!isRefundGold" class="add-item">
+            <el-text style="width:4vw;">产品数量</el-text>
+            <el-input style="padding-right: 10px; width:6.5vw;" v-model="refundFormData.goodNum"
+                      placeholder="请输入产品数量" disabled />
+            <CurrencySelect disabled="true" v-model="refundFormData.numUnit" :items="numUnitList"
                             style=" width: 3.5vw;" placeholder="单位" @change="handleCurrencyChange" />
-                    </div>
-                    <div v-show="isRefundGold" style="display: flex; margin-bottom: 10px;">
-                        <div style=" display: flex; align-items: center;justify-content: center; ">
-                            <span style="color: #999999;  white-space: nowrap;">永久金币：</span>
-                            <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
-                                v-model="refundFormData.permanentGold" disabled />
-                        </div>
-                        <div style=" display: flex; align-items: center;justify-content: center; ">
-                            <span style="color: #999999;  white-space: nowrap;">免费金币：</span>
-                            <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
-                                v-model="refundFormData.freeGold" disabled />
-                        </div>
-                    </div>
-                    <div class="add-item">
-                        <el-text style="width:4vw;">付款币种</el-text>
-                        <el-input v-model="refundFormData.paymentCurrency" style="width:10vw;" disabled />
-                    </div>
-                    <div class="add-item">
-                        <el-text style="width:4vw;">付款金额</el-text>
-                        <el-input v-model="refundFormData.paymentAmount" style="width:10vw;" disabled />
-                    </div>
-                    <div class="add-item">
-                        <el-text style="width:4vw;">支付方式</el-text>
-                        <el-input v-model="refundFormData.payType" style="width:10vw;" disabled />
-                    </div>
-                    <div class="add-item">
-                        <el-text style="width:4vw;">付款时间</el-text>
-                        <el-date-picker v-model="refundFormData.payTime" type="datetime" style="width:10vw;" disabled />
-                    </div>
-                    <div class="add-item">
-                        <el-text style="width:4vw;" size="small">转账凭证</el-text>
-                        <el-form-item :rules="{ required: true, message: '请上传图片', trigger: 'change' }">
-                            <el-upload ref="uploadRef" :auto-upload="false" list-type="picture-card"
-                                :show-file-list="false">
-                                <template #default>
-                                    <img v-if="refundFormData.voucher" :src="refundFormData.voucher"
-                                        style="width: 100%; height: 100%; object-fit: cover;">
-                                    <el-icon v-else>
-                                        <Plus />
-                                    </el-icon>
-                                </template>
-                            </el-upload>
-                        </el-form-item>
-                    </div>
-                    <div class="add-item">
-                        <el-text style="width:4vw;">备注</el-text>
-                        <el-input v-model="refundFormData.remark" style="width:10vw;" :rows="2" type="textarea"
-                            maxLength="100" disabled show-word-limit />
-                    </div>
-                </div>
-                <div class="right">
-                    <div class="add-item">
-                        <el-text style="width:4vw;">退款模式</el-text>
-                        <el-radio-group v-model="refundFormData.refundModel">
-                            <el-radio value="0">全部退款</el-radio>
-                            <el-radio value="1">部分退款</el-radio>
-                        </el-radio-group>
-                    </div>
-                    <div v-show="refundFormData.refundModel == '1'" style="display: flex; margin-bottom: 10px;">
-                        <div style=" display: flex; align-items: center;justify-content: center; ">
-                            <span style="color: #999999;  white-space: nowrap;">永久金币：</span>
-                            <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
-                                v-model="refundFormData.partRefundGold" dsabled />
-                        </div>
-                        <div style=" display: flex; align-items: center;justify-content: center; ">
-                            <span style="color: #999999;  white-space: nowrap;">免费金币：</span>
-                            <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
-                                v-model="refundFormData.partRefundFree" />
-                        </div>
-                    </div>
-                    <div class="add-item">
-                        <el-text style="width:4vw;">退款理由</el-text>
-                        <el-input v-model="refundFormData.refundReason" style="width:10vw;" :rows="5" maxlength="150"
-                            show-word-limit type="textarea" />
-                    </div>
-                    <div>ps:请在退款理由表明用户的退款需求。</div>
-                    <div style="display:flex;justify-content: center;margin-top: 5vh;">
-                        <el-button type="default" @click="resetRefund">重置</el-button>
-                        <el-button type="primary" @click="throttledsubmitRefund">提交</el-button>
-                    </div>
-                </div>
+          </div>
+          <div v-show="isRefundGold" style="display: flex; margin-bottom: 10px;">
+            <div style=" display: flex; align-items: center;justify-content: center; ">
+              <span style="color: #999999;  white-space: nowrap;">永久金币：</span>
+              <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
+                        v-model="refundFormData.permanentGold" disabled />
             </div>
-        </el-dialog>
-    </div>
+            <div style=" display: flex; align-items: center;justify-content: center; ">
+              <span style="color: #999999;  white-space: nowrap;">免费金币：</span>
+              <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
+                        v-model="refundFormData.freeGold" disabled />
+            </div>
+          </div>
+          <div class="add-item">
+            <el-text style="width:4vw;">付款币种</el-text>
+            <el-input v-model="refundFormData.paymentCurrency" style="width:10vw;" disabled />
+          </div>
+          <div class="add-item">
+            <el-text style="width:4vw;">付款金额</el-text>
+            <el-input v-model="refundFormData.paymentAmount" style="width:10vw;" disabled />
+          </div>
+          <div class="add-item">
+            <el-text style="width:4vw;">支付方式</el-text>
+            <el-input v-model="refundFormData.payType" style="width:10vw;" disabled />
+          </div>
+          <div class="add-item">
+            <el-text style="width:4vw;">付款时间</el-text>
+            <el-date-picker v-model="refundFormData.payTime" type="datetime" style="width:10vw;" disabled />
+          </div>
+          <div class="add-item">
+            <el-text style="width:4vw;" size="small">转账凭证</el-text>
+            <el-form-item :rules="{ required: true, message: '请上传图片', trigger: 'change' }">
+              <el-upload ref="uploadRef" :auto-upload="false" list-type="picture-card"
+                         :show-file-list="false">
+                <template #default>
+                  <img v-if="refundFormData.voucher" :src="refundFormData.voucher"
+                       style="width: 100%; height: 100%; object-fit: cover;">
+                  <el-icon v-else>
+                    <Plus />
+                  </el-icon>
+                </template>
+              </el-upload>
+            </el-form-item>
+          </div>
+          <div class="add-item">
+            <el-text style="width:4vw;">备注</el-text>
+            <el-input v-model="refundFormData.remark" style="width:10vw;" :rows="2" type="textarea"
+                      maxLength="100" disabled show-word-limit />
+          </div>
+        </div>
+        <div class="right">
+          <div class="add-item">
+            <el-text style="width:4vw;">退款模式</el-text>
+            <el-radio-group v-model="refundFormData.refundModel">
+              <el-radio value="0">全部退款</el-radio>
+              <el-radio value="1">部分退款</el-radio>
+            </el-radio-group>
+          </div>
+          <div v-show="refundFormData.refundModel == '1'" style="display: flex; margin-bottom: 10px;">
+            <div style=" display: flex; align-items: center;justify-content: center; ">
+              <span style="color: #999999;  white-space: nowrap;">永久金币：</span>
+              <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
+                        v-model="refundFormData.partRefundGold" dsabled />
+            </div>
+            <div style=" display: flex; align-items: center;justify-content: center; ">
+              <span style="color: #999999;  white-space: nowrap;">免费金币：</span>
+              <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
+                        v-model="refundFormData.partRefundFree" />
+            </div>
+          </div>
+          <div class="add-item">
+            <el-text style="width:4vw;">退款理由</el-text>
+            <el-input v-model="refundFormData.refundReason" style="width:10vw;" :rows="5" maxlength="150"
+                      show-word-limit type="textarea" />
+          </div>
+          <div>ps:请在退款理由表明用户的退款需求。</div>
+          <div style="display:flex;justify-content: center;margin-top: 5vh;">
+            <el-button type="default" @click="resetRefund">重置</el-button>
+            <el-button type="primary" @click="throttledsubmitRefund">提交</el-button>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup>
@@ -622,9 +622,6 @@ import _ from 'lodash';
 import { Plus } from '@element-plus/icons-vue';
 import { startsWith } from './utils/util.js'
 import { isNumber } from 'lodash'
-// 筛选地区树
-const market = ref([])
-
 // 地区财务专属组件
 import CurrencySelect from '@/components/MoneyManage/CurrencySelect.vue';
 
@@ -649,6 +646,8 @@ const tableData = ref([]);
 const total = ref(0);
 const pageInfo = ref({ pageSize: 10, pageNum: 1 });
 
+// 筛选地区树
+const market = ref([])
 
 // 搜索条件
 const searchData = ref({});
@@ -690,23 +689,23 @@ const refundDialog = ref(false)
 const refundFormData = ref({})
 
 const openRefundDialog = () => {
-    refundDialog.value = true
-    closeConfirmRefund()
+  refundDialog.value = true
+  closeConfirmRefund()
 
 }
 const closeRefundForm = () => {
-    refundDialog.value = false
-    refundFormData.value = {}
+  refundDialog.value = false
+  refundFormData.value = {}
 }
 
 const isRefundGold = ref(false)
 const ifRefundGold = () => {
-    if (refundFormData.value.goodsName === '金币充值') {
-        isRefundGold.value = true
-        refundFormData.value.goodNum = 0
-    } else {
-        isRefundGold.value = false
-    }
+  if (refundFormData.value.goodsName === '金币充值') {
+    isRefundGold.value = true
+    refundFormData.value.goodNum = 0
+  } else {
+    isRefundGold.value = false
+  }
 }
 
 
@@ -722,17 +721,17 @@ const paytypeOptions = ref([...paytypeList]);
 
 //确认退款弹窗
 const openRefundConfirm = (row) => {
-    textContent.value = '将要对该订单退款!'
-    refundConfirmDialog.value = true
-    refundFormData.value = { ...row }
-    ifRefundGold()
-    console.log(row);
+  textContent.value = '将要对该订单退款!'
+  refundConfirmDialog.value = true
+  refundFormData.value = { ...row }
+  ifRefundGold()
+  console.log(row);
 
 }
 
 const closeConfirmRefund = () => {
-    refundConfirmDialog.value = false
-    textContent.value = ''
+  refundConfirmDialog.value = false
+  textContent.value = ''
 }
 
 //导出相关
@@ -741,929 +740,939 @@ const exportList = ref([])
 const exportListLoading = ref(false)
 const exportExcel = async function () {
 
-    let payCurrencySelect = '';
-    let goodsName = '';
-
-    // 处理时间范围
-    if (getTime.value && getTime.value.length === 2) {
-        searchData.value.startTime = moment(getTime.value[0]).format('YYYY-MM-DD HH:mm:ss');
-        searchData.value.endTime = moment(getTime.value[1]).format('YYYY-MM-DD HH:mm:ss');
-    } else {
-        searchData.value.startTime = '';
-        searchData.value.endTime = '';
-    }
-
-    // 处理产品名称（级联选择取最后一级）
-    if (searchData.value.goodsName) {
-        goodsName = searchData.value.goodsName[searchData.value.goodsName.length - 1];
-    }
-
-    // 处理付款币种（转ID）
-    if (searchData.value.paymentCurrency) {
-        payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency);
-    }
-
-    if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
-        ElMessage.error('精网号只能是数字')
-        return
-    }
-
-    const cashRoleId = '1';
-    const submitterMarket = adminData.value.markets;
-    searchData.value.status = 46;
-    const params = {
-        ...pageInfo.value,
-        cashCollection: {
-            ...searchData.value,
-            submitterId: adminData.value.id,
-            receivedMarket: MarketNameForId(submitterMarket),
-            cashRoleId: cashRoleId,
-            paymentCurrency: payCurrencySelect,
-            submitterMarket: submitterMarket,
-            goodsName: goodsName,
-            market: MarketNameForId(searchData.value.market)
-        }
-    }
-
-    const res = await API({ url: '/export/exportCash', data: params })
-    if (res.code === 200) {
-        ElMessage.success('导出成功')
-    } else {
-        ElMessage.error(res.msg || '导出失败')
+  let payCurrencySelect = '';
+  let goodsName = '';
+
+  // 处理时间范围
+  if (getTime.value && getTime.value.length === 2) {
+    searchData.value.startTime = moment(getTime.value[0]).format('YYYY-MM-DD HH:mm:ss');
+    searchData.value.endTime = moment(getTime.value[1]).format('YYYY-MM-DD HH:mm:ss');
+  } else {
+    searchData.value.startTime = '';
+    searchData.value.endTime = '';
+  }
+
+  // 处理产品名称（级联选择取最后一级）
+  if (searchData.value.goodsName) {
+    goodsName = searchData.value.goodsName[searchData.value.goodsName.length - 1];
+  }
+
+  // 处理付款币种（转ID）
+  if (searchData.value.paymentCurrency) {
+    payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency);
+  }
+
+  // if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
+  //     ElMessage.error('精网号只能是数字')
+  //     return
+  // }
+
+  const cashRoleId = '1';
+  const submitterMarket = adminData.value.markets;
+  searchData.value.status = 46;
+  const params = {
+    ...pageInfo.value,
+    cashCollection: {
+      ...searchData.value,
+      submitterId: adminData.value.id,
+      receivedMarket: MarketNameForId(submitterMarket),
+      cashRoleId: cashRoleId,
+      paymentCurrency: payCurrencySelect,
+      submitterMarket: submitterMarket,
+      goodsName: goodsName,
+      market: MarketNameForId(searchData.value.market)
     }
+  }
+
+  const res = await API({ url: '/export/exportCash', data: params })
+  if (res.code === 200) {
+    ElMessage.success('导出成功')
+  } else {
+    ElMessage.error(res.msg || '导出失败')
+  }
 }
 
 const openExportList = () => {
-    getExportList()
-    exportListVisible.value = true
+  getExportList()
+  exportListVisible.value = true
 }
 //获取导出列表
 const getExportList = async () => {
-    exportListLoading.value = true
-    try {
-        const result = await API({ url: '/export/export' })
-        if (result.code === 200) {
-            const filteredData = result.data.filter(item => {
-                return item.type === 13
-            })
-            exportList.value = filteredData
-        } else {
-            ElMessage.error(result.msg || '获取导出列表失败')
-        }
-    } catch (error) {
-        console.error('获取导出列表出错:', error)
-        ElMessage.error('获取导出列表失败，请稍后重试')
-    } finally {
-        exportListLoading.value = false
+  exportListLoading.value = true
+  try {
+    const result = await API({ url: '/export/export' })
+    if (result.code === 200) {
+      const filteredData = result.data.filter(item => {
+        return item.type === 13
+      })
+      exportList.value = filteredData
+    } else {
+      ElMessage.error(result.msg || '获取导出列表失败')
     }
+  } catch (error) {
+    console.error('获取导出列表出错:', error)
+    ElMessage.error('获取导出列表失败，请稍后重试')
+  } finally {
+    exportListLoading.value = false
+  }
 }
 const downloadExportFile = (item) => {
-    if (item.state === 2) {
-        const link = document.createElement('a')
-        link.href = item.url
-        link.download = item.fileName
-        link.click()
-    } else {
-        ElMessage.warning('文件还在导出中，请稍后再试')
-    }
+  if (item.state === 2) {
+    const link = document.createElement('a')
+    link.href = item.url
+    link.download = item.fileName
+    link.click()
+  } else {
+    ElMessage.warning('文件还在导出中，请稍后再试')
+  }
 }
 //根据状态返回对应的标签类型
 const getTagType = (state) => {
-    switch (state) {
-        case 0:
-            return 'info';
-        case 1:
-            return 'primary';
-        case 2:
-            return 'success';
-        case 3:
-            return 'danger';
-        default:
-            return 'info';
-    }
+  switch (state) {
+    case 0:
+      return 'info';
+    case 1:
+      return 'primary';
+    case 2:
+      return 'success';
+    case 3:
+      return 'danger';
+    default:
+      return 'info';
+  }
 }
 //根据状态返回对应的标签文案
 const getTagText = (state) => {
-    switch (state) {
-        case 0:
-            return '待执行';
-        case 1:
-            return '执行中';
-        case 2:
-            return '执行完成';
-        case 3:
-            return '执行出错';
-        default:
-            return '未知状态';
-    }
+  switch (state) {
+    case 0:
+      return '待执行';
+    case 1:
+      return '执行中';
+    case 2:
+      return '执行完成';
+    case 3:
+      return '执行出错';
+    default:
+      return '未知状态';
+  }
 }
 
 // 2.1 数据加载：获取地区财务订单列表
 const getlist = async () => {
-    try {
-        let payCurrencySelect = '';
-        let goodsName = '';
-
-        // 处理时间范围
-        if (getTime.value && getTime.value.length === 2) {
-            searchData.value.startTime = moment(getTime.value[0]).format('YYYY-MM-DD HH:mm:ss');
-            searchData.value.endTime = moment(getTime.value[1]).format('YYYY-MM-DD HH:mm:ss');
-        } else {
-            searchData.value.startTime = '';
-            searchData.value.endTime = '';
-        }
+  try {
+    let payCurrencySelect = '';
+    let goodsName = '';
 
-        // 处理产品名称（级联选择取最后一级）
-        if (searchData.value.goodsName) {
-            goodsName = searchData.value.goodsName[searchData.value.goodsName.length - 1];
-        }
+    // 处理时间范围
+    if (getTime.value && getTime.value.length === 2) {
+      searchData.value.startTime = moment(getTime.value[0]).format('YYYY-MM-DD HH:mm:ss');
+      searchData.value.endTime = moment(getTime.value[1]).format('YYYY-MM-DD HH:mm:ss');
+    } else {
+      searchData.value.startTime = '';
+      searchData.value.endTime = '';
+    }
 
-        // 处理付款币种（转ID）
-        if (searchData.value.paymentCurrency) {
-            payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency);
-        }
+    // 处理产品名称（级联选择取最后一级）
+    if (searchData.value.goodsName) {
+      goodsName = searchData.value.goodsName[searchData.value.goodsName.length - 1];
+    }
 
-        // 地区财务固定参数：角色ID=1，按标签页筛选状态
-        const cashRoleId = '1';
-        const receivedMarket = adminData.value.markets;
-        if (activeTab.value === 'wait') searchData.value.status = 0;
-        else if (activeTab.value === 'pass') searchData.value.status = 13;
-        else if (activeTab.value === 'done') searchData.value.status = 46;
-        else if (activeTab.value === 'reject') searchData.value.status = 2;
-
-        // 地区处理
-        const markets = ref(null)
-        if (searchData.value.markets) {
-            markets.value = searchData.value.markets[searchData.value.markets.length - 1]
-            console.log('地区转换', markets.value)
-        }
-        if (searchData.value.jwcode) {
-            const isPositiveInteger = /^[1-9]\d*$/.test(searchData.value.jwcode);
-            if (!isPositiveInteger) {
-                ElMessage.error('请输入正确的精网号')
-                return;
-            }
-        }
-        const result = await request({
-            url: '/cashCollection/selectCollection',
-            data: {
-                ...pageInfo.value,
-                cashCollection: {
-                    ...searchData.value,
-                    submitterId: adminData.value.id,
-                    receivedMarket: MarketNameForId(receivedMarket),
-                    cashRoleId: cashRoleId,
-                    paymentCurrency: payCurrencySelect,
-                    submitterMarket: receivedMarket,
-                    goodsName: goodsName,
-                    // market: MarketNameForId(searchData.value.market)
-                    market: markets.value
-                }
-            }
-        });
-
-        if (result.code === 200) {
-            tableData.value = result.data.list;
-            total.value = result.data.total;
-        } else {
-            ElMessage.error('订单数据加载失败');
+    // 处理付款币种（转ID）
+    if (searchData.value.paymentCurrency) {
+      payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency);
+    }
+
+    // if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
+    //     ElMessage.error('精网号只能是数字')
+    //     return
+    // }
+
+    // 地区财务固定参数：角色ID=1，按标签页筛选状态
+    const cashRoleId = '1';
+    const receivedMarket = adminData.value.markets;
+    if (activeTab.value === 'wait') searchData.value.status = 0;
+    else if (activeTab.value === 'pass') searchData.value.status = 13;
+    else if (activeTab.value === 'done') searchData.value.status = 46;
+    else if (activeTab.value === 'reject') searchData.value.status = 2;
+
+    // 地区处理
+    const markets = ref(null)
+    if (searchData.value.markets) {
+      markets.value = searchData.value.markets[searchData.value.markets.length - 1]
+      console.log('地区转换', markets.value)
+    }
+    if (searchData.value.jwcode) {
+      const isPositiveInteger = /^[1-9]\d*$/.test(searchData.value.jwcode);
+      if (!isPositiveInteger) {
+        ElMessage.error('请输入正确的精网号')
+        return;
+      }
+    }
+    const result = await request({
+      url: '/cashCollection/selectCollection',
+      data: {
+        ...pageInfo.value,
+        cashCollection: {
+          ...searchData.value,
+          submitterId: adminData.value.id,
+          receivedMarket: MarketNameForId(receivedMarket),
+          cashRoleId: cashRoleId,
+          paymentCurrency: payCurrencySelect,
+          submitterMarket: receivedMarket,
+          goodsName: goodsName,
+          // market: MarketNameForId(searchData.value.market)
+          market: markets.value
         }
-    } catch (error) {
-        console.error('地区财务订单列表请求异常：', error);
-        ElMessage.error('网络异常，请重试');
+      }
+    });
+
+    if (result.code === 200) {
+      tableData.value = result.data.list;
+      total.value = result.data.total;
+    } else {
+      ElMessage.error('订单数据加载失败');
     }
+  } catch (error) {
+    console.error('地区财务订单列表请求异常：', error);
+    ElMessage.error('网络异常，请重试');
+  }
 };
 
 //重置退款
 const resetRefund = () => {
-    refundFormData.value.refundModel = ''
-    refundFormData.value.refundReason = ''
+  refundFormData.value.refundModel = ''
+  refundFormData.value.refundReason = ''
 }
 //提交退款
 const submitRefund = async () => {
-    try {
-        if (refundFormData.value.goodsName != '金币充值') {
+  try {
+    if (refundFormData.value.goodsName != '金币充值') {
 
-            return ElMessage.error('线上数据仅支持金币充值退款');
-        }
-        if (!refundFormData.value.refundModel) {
-            return ElMessage.error('请选择退款方式');
-        }
-        if (!refundFormData.value.refundReason) {
-            return ElMessage.error('请输入退款原因');
-        }
-        if (refundFormData.value.refundModel == 0) {
-            refundFormData.value.partRefundGold = refundFormData.value.permanentGold,
-                refundFormData.value.partRefundFree = refundFormData.value.freeGold
-        }
-        const result = await request({
-            url: '/Money/addOnline',
-            data: {
-                jwcode: refundFormData.value.jwcode,
-                name: refundFormData.value.name,
-                market: refundFormData.value.marketName,
-                submitterId: adminData.value.id,
-                submitterMarket: adminData.value.markets,
-                remark: refundFormData.value.remark,
-                refundReason: refundFormData.value.refundReason,
-                refundModel: refundFormData.value.refundModel,
-                originalOrderId: refundFormData.value.id,
-                orderCode: refundFormData.value.orderCode,
-                permanentGold: (refundFormData.value.permanentGold) * 100 || 0,
-                freeGold: (refundFormData.value.freeGold) * 100 || 0,
-                partRefundGold: (refundFormData.value.partRefundGold) * 100 || 0,
-                partRefundFree: (refundFormData.value.partRefundFree) * 100 || 0,
-                handlingCharge: refundFormData.value.handlingCharge == null ? null : refundFormData.value.handlingCharge * 100,
-            }
-        })
-        if (result.code == 200) {
-            ElMessage.success('新增退款成功')
-            getlist()
-            closeRefundForm()
-        } else {
-            ElMessage.error(result.msg)
-            getlist()
-        }
-        console.log('返回参数：', result);
-    } catch (error) {
-        console.log(error);
+      return ElMessage.error('线上数据仅支持金币充值退款');
+    }
+    if (!refundFormData.value.refundModel) {
+      return ElMessage.error('请选择退款方式');
+    }
+    if (!refundFormData.value.refundReason) {
+      return ElMessage.error('请输入退款原因');
+    }
+    if (refundFormData.value.refundModel == 0) {
+      refundFormData.value.partRefundGold = refundFormData.value.permanentGold,
+          refundFormData.value.partRefundFree = refundFormData.value.freeGold
     }
+    const result = await request({
+      url: '/Money/addOnline',
+      data: {
+        jwcode: refundFormData.value.jwcode,
+        name: refundFormData.value.name,
+        market: refundFormData.value.marketName,
+        submitterId: adminData.value.id,
+        submitterMarket: adminData.value.markets,
+        remark: refundFormData.value.remark,
+        refundReason: refundFormData.value.refundReason,
+        refundModel: refundFormData.value.refundModel,
+        originalOrderId: refundFormData.value.id,
+        orderCode: refundFormData.value.orderCode,
+        permanentGold: (refundFormData.value.permanentGold) * 100 || 0,
+        freeGold: (refundFormData.value.freeGold) * 100 || 0,
+        partRefundGold: (refundFormData.value.partRefundGold) * 100 || 0,
+        partRefundFree: (refundFormData.value.partRefundFree) * 100 || 0,
+        handlingCharge: refundFormData.value.handlingCharge == null ? null : refundFormData.value.handlingCharge * 100,
+      }
+    })
+    if (result.code == 200) {
+      ElMessage.success('新增退款成功')
+      getlist()
+      closeRefundForm()
+    } else {
+      ElMessage.error(result.msg)
+      getlist()
+    }
+    console.log('返回参数：', result);
+  } catch (error) {
+    console.log(error);
+  }
 }
 
 // 2.2 搜索与重置
 const search = () => {
-    getlist();
-    ElMessage.success('查询成功');
+  getlist();
 };
 
 const reset = () => {
-    searchData.value = {};
-    // 重置页码
-    pageInfo.value.pageNum = 1;
-    getTime.value = []
-    getlist();
+  searchData.value = {};
+  // 重置页码
+  pageInfo.value.pageNum = 1;
+  getTime.value = []
+  getlist();
 };
 
 // 2.3 标签页切换
 const navigateTo = async (tab) => {
-    activeTab.value = tab;
-    await getlist();
+  activeTab.value = tab;
+  await getlist();
 };
 
 // 2.4 审核功能
 // 打开审核弹窗
 const openAuditForm = (row) => {
-    auditFormData.value = { ...row, market: row.marketName };
-    ifGold(auditFormData.value)
-    console.log('isGold', isGold.value);
+  auditFormData.value = {...row, market: row.marketName};
+  ifGold(auditFormData.value)
+  console.log('isGold', isGold.value);
 
-    auditFormisible.value = true;
+  auditFormisible.value = true;
 };
 
 // 关闭审核弹窗
 const closeAuditForm = () => {
-    ifReject.value = false;
-    auditFormisible.value = false;
-    auditFormData.value = {};
+  ifReject.value = false;
+  auditFormisible.value = false;
+  auditFormData.value = {};
 };
 
 // 审核通过
 const handelAudit = async () => {
-    try {
-        const result = await request({
-            url: '/cashAudit/collectionAudit',
-            data: {
-                orderCode: auditFormData.value.orderCode,
-                action: 1,
-                auditId: adminData.value.id
-            }
-        });
-
-        if (result.code === 200) {
-            ElMessage.success('审核通过');
-            getlist();
-            closeAuditForm();
-        } else {
-            ElMessage.error(result.msg || '审核失败');
-        }
-    } catch (error) {
-        console.error('审核通过请求异常：', error);
-        ElMessage.error('网络异常，请重试');
+  try {
+    const result = await request({
+      url: '/cashAudit/collectionAudit',
+      data: {
+        orderCode: auditFormData.value.orderCode,
+        action: 1,
+        auditId: adminData.value.id
+      }
+    });
+
+    if (result.code === 200) {
+      ElMessage.success('审核通过');
+      getlist();
+      closeAuditForm();
+    } else {
+      ElMessage.error(result.msg || '审核失败');
     }
+  } catch (error) {
+    console.error('审核通过请求异常：', error);
+    ElMessage.error('网络异常，请重试');
+  }
 };
 
 // 审核驳回
 const handelAuditReject = async () => {
-    if (!auditFormData.value.rejectReason) {
-        ElMessage.warning('请输入驳回理由');
-        return;
-    }
+  if (!auditFormData.value.rejectReason) {
+    ElMessage.warning('请输入驳回理由');
+    return;
+  }
+
+  try {
+    const result = await request({
+      url: '/cashAudit/collectionAudit',
+      data: {
+        orderCode: auditFormData.value.orderCode,
+        rejectReason: auditFormData.value.rejectReason,
+        action: 2,
+        auditId: adminData.value.id
+      }
+    });
 
-    try {
-        const result = await request({
-            url: '/cashAudit/collectionAudit',
-            data: {
-                orderCode: auditFormData.value.orderCode,
-                rejectReason: auditFormData.value.rejectReason,
-                action: 2,
-                auditId: adminData.value.id
-            }
-        });
-
-        if (result.code === 200) {
-            ElMessage.success('驳回成功');
-            getlist();
-            closeAuditForm();
-        } else {
-            ElMessage.error(result.msg || '驳回失败');
-        }
-    } catch (error) {
-        console.error('审核驳回请求异常：', error);
-        ElMessage.error('网络异常，请重试');
+    if (result.code === 200) {
+      ElMessage.success('驳回成功');
+      getlist();
+      closeAuditForm();
+    } else {
+      ElMessage.error(result.msg || '驳回失败');
     }
+  } catch (error) {
+    console.error('审核驳回请求异常：', error);
+    ElMessage.error('网络异常，请重试');
+  }
 };
 
 //判断产品类型
 const isGold = ref(false)
 const ifGold = (data) => {
-    console.log('data', data);
-    if (data.goodsName === '金币充值') {
-        isGold.value = true
-    } else {
-        isGold.value = false
-    }
+  console.log('data', data);
+  if (data.goodsName === '金币充值') {
+    isGold.value = true
+  } else {
+    isGold.value = false
+  }
 }
 
 // 审核按钮倒计时（防止误操作）
 watch(auditFormisible, (val) => {
-    if (val) {
-        countdown.value = 3;
-        isBtnDisabled.value = true;
-        btnText.value = `通过(${countdown.value})`;
-
-        const timer = setInterval(() => {
-            countdown.value--;
-            btnText.value = `通过(${countdown.value})`;
-
-            if (countdown.value <= 0) {
-                isBtnDisabled.value = false;
-                clearInterval(timer);
-                btnText.value = '通过';
-            }
-        }, 1000);
-    }
+  if (val) {
+    countdown.value = 3;
+    isBtnDisabled.value = true;
+    btnText.value = `通过(${countdown.value})`;
+
+    const timer = setInterval(() => {
+      countdown.value--;
+      btnText.value = `通过(${countdown.value})`;
+
+      if (countdown.value <= 0) {
+        isBtnDisabled.value = false;
+        clearInterval(timer);
+        btnText.value = '通过';
+      }
+    }, 1000);
+  }
 });
 
 // 2.5 编辑手续费功能
 // 打开编辑弹窗
 const openEditForm = (row) => {
-    console.log('row.aaa', row.handlingCharge);
+  console.log('row.aaa', row.handlingCharge);
 
-    editFormData.value = { ...row };
-    // 区分金币产品与普通产品
-    if (row.goodsName === '金币充值') isEditGold.value = true;
-    else isEditGold.value = false;
-    // 在线支付订单允许修改付款信息
-    if (row.status === 3) ifOnline.value = true;
-    else ifOnline.value = false;
+  editFormData.value = {...row};
+  // 区分金币产品与普通产品
+  if (row.goodsName === '金币充值') isEditGold.value = true;
+  else isEditGold.value = false;
+  // 在线支付订单允许修改付款信息
+  if (row.status === 3) ifOnline.value = true;
+  else ifOnline.value = false;
 
-    editFormisible.value = true;
+  editFormisible.value = true;
 };
 
 // 关闭编辑弹窗
 const closeEditForm = () => {
-    editFormisible.value = false;
-    editFormData.value = {};
-    editFormRef.value.resetFields();
+  editFormisible.value = false;
+  editFormData.value = {};
+  editFormRef.value.resetFields();
 };
 
 // 提交编辑（补充手续费）
 const submitEditForm = async () => {
-    try {
-        await editFormRef.value.validate();
+  try {
+    await editFormRef.value.validate();
 
-        // 处理时间格式
-        if (editFormData.value.receivedTime) {
-            editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss');
-        }
-        console.log('editFormData.value.handlingCharge', editFormData.value.handlingCharge);
-
-        const result = await request({
-            url: '/cashCollection/complete',
-            data: {
-                orderCode: editFormData.value.orderCode,
-                handlingCharge: editFormData.value.handlingCharge == null ? null : editFormData.value.handlingCharge * 100, // 转为分单位
-                paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency),
-                paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位
-                receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),
-                receivedAmount: editFormData.value.receivedAmount * 100 || null, // 转为分单位
-                receivedTime: editFormData.value.receivedTime,
-                receivedRemark: editFormData.value.receivedRemark || ''
-            }
-        });
-
-        if (result.code === 200) {
-            ElMessage.success('编辑提交成功');
-            getlist();
-            closeEditForm();
-        } else {
-            ElMessage.error(result.msg || '提交失败');
-        }
-    } catch (error) {
-        console.error('编辑提交请求异常：', error);
-        ElMessage.error('表单验证失败，请检查数据格式');
+    // 处理时间格式
+    if (editFormData.value.receivedTime) {
+      editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss');
     }
+    console.log('editFormData.value.handlingCharge', editFormData.value.handlingCharge);
+
+    const result = await request({
+      url: '/cashCollection/complete',
+      data: {
+        orderCode: editFormData.value.orderCode,
+        handlingCharge: editFormData.value.handlingCharge == null ? null : editFormData.value.handlingCharge * 100, // 转为分单位
+        paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency),
+        paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位
+        receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),
+        receivedAmount: editFormData.value.receivedAmount * 100 || null, // 转为分单位
+        receivedTime: editFormData.value.receivedTime,
+        receivedRemark: editFormData.value.receivedRemark || ''
+      }
+    });
+
+    if (result.code === 200) {
+      ElMessage.success('编辑提交成功');
+      getlist();
+      closeEditForm();
+    } else {
+      ElMessage.error(result.msg || '提交失败');
+    }
+  } catch (error) {
+    console.error('编辑提交请求异常：', error);
+    ElMessage.error('表单验证失败，请检查数据格式');
+  }
 };
 
 // 2.6 辅助功能
 // 图片预览
 const previewImage = (imageUrl) => {
-    if (!imageUrl) return;
-
-    const imageElement = document.createElement('img');
-    imageElement.src = imageUrl;
-    imageElement.style.maxWidth = '80vw';
-    imageElement.style.maxHeight = '80vh';
-    imageElement.style.objectFit = 'contain';
-
-    const viewer = document.createElement('div');
-    viewer.style.position = 'fixed';
-    viewer.style.top = '0';
-    viewer.style.left = '0';
-    viewer.style.width = '100vw';
-    viewer.style.height = '100vh';
-    viewer.style.backgroundColor = 'rgba(0, 0, 0, 0.7)';
-    viewer.style.display = 'flex';
-    viewer.style.justifyContent = 'center';
-    viewer.style.alignItems = 'center';
-    viewer.style.zIndex = '9999';
-    viewer.appendChild(imageElement);
-
-    // 点击关闭预览
-    viewer.addEventListener('click', () => {
-        document.body.removeChild(viewer);
-    });
-
-    document.body.appendChild(viewer);
+  if (!imageUrl) return;
+
+  const imageElement = document.createElement('img');
+  imageElement.src = imageUrl;
+  imageElement.style.maxWidth = '80vw';
+  imageElement.style.maxHeight = '80vh';
+  imageElement.style.objectFit = 'contain';
+
+  const viewer = document.createElement('div');
+  viewer.style.position = 'fixed';
+  viewer.style.top = '0';
+  viewer.style.left = '0';
+  viewer.style.width = '100vw';
+  viewer.style.height = '100vh';
+  viewer.style.backgroundColor = 'rgba(0, 0, 0, 0.7)';
+  viewer.style.display = 'flex';
+  viewer.style.justifyContent = 'center';
+  viewer.style.alignItems = 'center';
+  viewer.style.zIndex = '9999';
+  viewer.appendChild(imageElement);
+
+  // 点击关闭预览
+  viewer.addEventListener('click', () => {
+    document.body.removeChild(viewer);
+  });
+
+  document.body.appendChild(viewer);
 };
 
 // 驳回理由悬浮提示
 const handleMouseEnter = (e, content) => {
-    if (!content) return;
+  if (!content) return;
 
-    showTooltip.value = true;
-    tooltipContent.value = content;
-    handleMouseMove(e);
+  showTooltip.value = true;
+  tooltipContent.value = content;
+  handleMouseMove(e);
 };
 
 const handleMouseLeave = () => {
-    showTooltip.value = false;
-    tooltipContent.value = '';
+  showTooltip.value = false;
+  tooltipContent.value = '';
 };
 
 const handleMouseMove = (e) => {
-    // 提示框显示在鼠标左侧，避免遮挡
-    tooltipLeft.value = e.clientX - 210;
-    tooltipTop.value = e.clientY - 10;
+  // 提示框显示在鼠标左侧，避免遮挡
+  tooltipLeft.value = e.clientX - 210;
+  tooltipTop.value = e.clientY - 10;
 };
 
 // 2.7 基础数据加载（初始化）
 // 获取管理员信息
 const getAdminData = async () => {
-    try {
-        const result = await API({ url: '/admin/userinfo', data: {} });
-        adminData.value = result;
-
-        // 超级管理员判断（仅用于角色切换权限）
-        if (adminData.value.roleId === 2) {
-            superAdmin.value = true;
-            // 管理员所属地区提示
-            if (adminData.value.markets === '总部' || adminData.value.markets === '研发部') {
-                ElMessageBox.alert(
-                    '管理员账号仅显示所属地区的财务数据，请确认地区设置',
-                    '温馨提示',
-                    { type: 'warning' }
-                );
-            }
-        }
-    } catch (error) {
-        console.error('管理员信息获取失败：', error);
-        ElMessage.error('管理员信息加载异常');
-    }
+  try {
+    const result = await API({url: '/admin/userinfo', data: {}});
+    adminData.value = result;
+
+    // 超级管理员判断（仅用于角色切换权限）
+    // if (adminData.value.roleId === 2) {
+    //     superAdmin.value = true;
+    //     // 管理员所属地区提示
+    //     if (adminData.value.markets === '总部' || adminData.value.markets === '研发部') {
+    //         ElMessageBox.alert(
+    //             '管理员账号仅显示所属地区的财务数据，请确认地区设置',
+    //             '温馨提示',
+    //             { type: 'warning' }
+    //         );
+    //     }
+    // }
+  } catch (error) {
+    console.error('管理员信息获取失败：', error);
+    ElMessage.error('管理员信息加载异常');
+  }
 };
 
 // 获取活动列表
 const getActivitys = async () => {
-    try {
-        const result = await API({ url: '/cashCollection/getActivityList', data: {} });
-        if (result.code === 200) {
-            activityList.value = result.data;
-        } else {
-            ElMessage.error('活动列表加载失败');
-        }
-    } catch (error) {
-        console.error('活动列表获取失败：', error);
-        ElMessage.error('活动数据加载异常');
+  try {
+    const result = await API({url: '/cashCollection/getActivityList', data: {}});
+    if (result.code === 200) {
+      activityList.value = result.data;
+    } else {
+      ElMessage.error('活动列表加载失败');
     }
+  } catch (error) {
+    console.error('活动列表获取失败：', error);
+    ElMessage.error('活动数据加载异常');
+  }
 };
 
 // 2.8 节流函数（防止重复提交）
-const throttledhandelAuditReject = _.throttle(handelAuditReject, 3000, { trailing: false });
-const throttledsubmitEditForm = _.throttle(submitEditForm, 3000, { trailing: false });
+const throttledhandelAuditReject = _.throttle(handelAuditReject, 3000, {trailing: false});
+const throttledsubmitEditForm = _.throttle(submitEditForm, 3000, {trailing: false});
 const throttledsubmitRefund = _.throttle(submitRefund, 5000, {
-    trailing: false
+  trailing: false
 })
 // 2.9 页面初始化
 onMounted(async () => {
-    await getAdminData();
-    await getActivitys();
-    // 初始化加载地区财务订单数据
-    await getlist();
-
-    // if (!hasMenuPermission(menuTree.value, 67)) {
-    //     ElMessageBox.alert(
-    //         '您暂无该页面操作权限，请联系管理员',
-    //         '权限提示',
-    //         { type: 'error' }
-    //     ).then(() => {
-    //         window.history.back();
-    //     });
-    // }
-    //背景预加载
-    const bgImg = new Image();
-    bgImg.src = '/src/assets/receive-recall.png';
-    getMarket()
+  await getAdminData();
+  await getActivitys();
+  // 初始化加载地区财务订单数据
+  await getlist();
+
+  // if (!hasMenuPermission(menuTree.value, 67)) {
+  //     ElMessageBox.alert(
+  //         '您暂无该页面操作权限，请联系管理员',
+  //         '权限提示',
+  //         { type: 'error' }
+  //     ).then(() => {
+  //         window.history.back();
+  //     });
+  // }
+  //背景预加载
+  const bgImg = new Image();
+  bgImg.src = '/src/assets/receive-recall.png';
+  getMarket()
 });
 
 // 2.10 未使用函数占位（避免报错）
-const handleCurrencyChange = () => { };
+const handleCurrencyChange = () => {
+};
 const beforeUpload = () => true;
-const handelImgErr = () => { };
-const handleImageChange = () => { };
-const customUpload = () => { };
-const handleDatePickerChange = () => { };
+const handelImgErr = () => {
+};
+const handleImageChange = () => {
+};
+const customUpload = () => {
+};
+const handleDatePickerChange = () => {
+};
 const disabledDate = () => false;
-const handleSortChange = () => { };
+const handleSortChange = () => {
+};
 const getMarket = async function () {
-    try {
-        const result = await API({
-
-            url: '/market/selectMarket',
-        })
-        console.log('看看地区树', result)
-
-        const transformTree = (nodes) => {
-            const allChildren = nodes.flatMap(node => node.children || []);
-
-            return allChildren.map(child => {
-                const grandchildren = child.children && child.children.length
-                    ? transformTree([child])
-                    : null;
-
-                return {
-                    value: child.id,
-                    label: child.name,
-                    children: grandchildren
-                };
-            });
+  try {
+    const result = await API({
+
+      url: '/market/selectMarket',
+    })
+    console.log('看看地区树', result)
+
+    const transformTree = (nodes) => {
+      const allChildren = nodes.flatMap(node => node.children || []);
+
+      return allChildren.map(child => {
+        const grandchildren = child.children && child.children.length
+            ? transformTree([child])
+            : null;
+
+        return {
+          value: child.id,
+          label: child.name,
+          children: grandchildren
         };
-        market.value = transformTree(result.data)
-        console.log('转换后的地区树==============', market.value)
-    } catch (error) {
-        console.log('请求失败', error)
-    }
+      });
+    };
+    market.value = transformTree(result.data)
+    console.log('转换后的地区树==============', market.value)
+  } catch (error) {
+    console.log('请求失败', error)
+  }
 }
 const handlePagination = (type, val) => {
-    if (type === 'size') pageInfo.value.pageSize = val;
-    else pageInfo.value.pageNum = val;
-    getlist();
+  if (type === 'size') pageInfo.value.pageSize = val;
+  else pageInfo.value.pageNum = val;
+  getlist();
 };
 </script>
 
 <style scoped lang="scss">
 .content {
-    height: 100%;
-    width: 80vw;
+  height: 100%;
+  width: 80vw;
+
+  .card1 {
+    width: 100%;
+    background: #F3FAFE;
+
+    .rowItem {
+      display: flex;
+      width: 15vw;
+      align-items: center;
+      justify-content: center;
+      margin-right: 0.5vw;
+    }
 
-    .card1 {
-        width: 100%;
-        background: #F3FAFE;
+    el-button {
+      margin-left: 10px;
+    }
 
-        .rowItem {
-            display: flex;
-            width: 15vw;
-            align-items: center;
-            justify-content: center;
-            margin-right: 0.5vw;
-        }
+    .row1 {
+      height: 4vh;
+      width: 80vw;
+      display: flex;
+      min-height: 40px;
+    }
 
-        el-button {
-            margin-left: 10px;
-        }
+    .row2 {
+      height: 4vh;
+      width: 80vw;
+      display: flex;
+      align-items: center;
 
-        .row1 {
-            height: 4vh;
-            width: 80vw;
-            display: flex;
-            min-height: 40px;
-        }
+      min-height: 40px;
 
-        .row2 {
-            height: 4vh;
-            width: 80vw;
-            display: flex;
-            align-items: center;
+      .left {
+        height: 4vh;
+        width: 58vw;
+        display: flex;
+        min-height: 40px;
+      }
+    }
+  }
 
-            min-height: 40px;
 
-            .left {
-                height: 4vh;
-                width: 58vw;
-                display: flex;
-                min-height: 40px;
-            }
-        }
+  .div-card2 {
+    width: 100%;
+    margin-top: 2vh;
+
+    .card2 {
+      background: #E7F4FD;
     }
 
+    .btns {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding-bottom: 10px;
 
-    .div-card2 {
+      .tabs {
         width: 100%;
-        margin-top: 2vh;
+        min-width: 300px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+
+        .btnItem {
+          margin-left: 10px;
+          border-radius: 5px;
+        }
 
-        .card2 {
-            background: #E7F4FD;
+        .info-tooltip {
+          display: flex;
+          align-items: center;
         }
 
-        .btns {
-            width: 100%;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            padding-bottom: 10px;
-
-            .tabs {
-                width: 100%;
-                min-width: 300px;
-                display: flex;
-                align-items: center;
-                justify-content: space-between;
-
-                .btnItem {
-                    margin-left: 10px;
-                    border-radius: 5px;
-                }
-
-                .info-tooltip {
-                    display: flex;
-                    align-items: center;
-                }
-
-                .service-icon {
-                    color: #666;
-                    cursor: pointer;
-                    font-size: 18px;
-                    transition: all 0.3s ease;
-                    padding: 4px;
-                    border-radius: 50%;
-                }
-            }
+        .service-icon {
+          color: #666;
+          cursor: pointer;
+          font-size: 18px;
+          transition: all 0.3s ease;
+          padding: 4px;
+          border-radius: 50%;
         }
+      }
+    }
 
 
-        .table {
-            margin: 10px;
-            border-radius: 20px;
-
-            .ellipsis-container {
-                position: relative;
-                width: 100%;
-
-                .ellipsis-text {
-                    display: inline-block;
-                    width: 100%;
-                    white-space: nowrap;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    cursor: pointer;
-                }
-
-                .custom-tooltip {
-                    position: fixed;
-                    z-index: 9999;
-                    padding: 8px 12px;
-                    width: 200px;
-                    background-color: #E4F0FC;
-                    color: #333333;
-                    border: 1px solid #e5e7eb;
-                    border-radius: 4px;
-                    box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
-                    min-height: 30px;
-                    max-height: 300px;
-                    overflow-y: auto;
-                    font-size: 14px;
-                    line-height: 1.5;
-                }
-            }
+    .table {
+      margin: 10px;
+      border-radius: 20px;
+
+      .ellipsis-container {
+        position: relative;
+        width: 100%;
+
+        .ellipsis-text {
+          display: inline-block;
+          width: 100%;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          cursor: pointer;
         }
 
-        .pagination {
-            margin-top: 10px;
-            padding: 10px 10px;
+        .custom-tooltip {
+          position: fixed;
+          z-index: 9999;
+          padding: 8px 12px;
+          width: 200px;
+          background-color: #E4F0FC;
+          color: #333333;
+          border: 1px solid #e5e7eb;
+          border-radius: 4px;
+          box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
+          min-height: 30px;
+          max-height: 300px;
+          overflow-y: auto;
+          font-size: 14px;
+          line-height: 1.5;
         }
+      }
     }
 
-    :deep(.adddialog) {
-        min-width: 500px;
-        background-color: #F3FAFE !important;
-        margin-top: 8vh;
-        border-radius: 8px;
-
-        .addForm {
-            padding: 0 60px 1vh 60px;
-
-            .el-date-editor {
-                display: flex;
-                flex: 1;
-
-            }
-
-            .pic {
-                display: flex;
-                align-items: center;
-
-                .uploader {
-                    height: 80px;
-                    width: 80px;
-
-                    .el-upload {
-                        height: 100%;
-                        width: 100%;
-                    }
-                }
-
-                .picText {
-                    color: #999999;
-                    font-family: "PingFang SC";
-                    font-size: 10px;
-                    font-style: normal;
-                    font-weight: 400;
-                    line-height: 20px;
-                    margin-left: 10px;
-                }
-            }
+    .pagination {
+      margin-top: 10px;
+      padding: 10px 10px;
+    }
+  }
+
+  :deep(.adddialog) {
+    min-width: 500px;
+    background-color: #F3FAFE !important;
+    margin-top: 8vh;
+    border-radius: 8px;
+
+    .addForm {
+      padding: 0 60px 1vh 60px;
+
+      .el-date-editor {
+        display: flex;
+        flex: 1;
+
+      }
+
+      .pic {
+        display: flex;
+        align-items: center;
+
+        .uploader {
+          height: 80px;
+          width: 80px;
+
+          .el-upload {
+            height: 100%;
+            width: 100%;
+          }
         }
 
-        .dialog-footer {
-            display: flex;
-            justify-content: center;
-            padding-bottom: 1.5vh;
+        .picText {
+          color: #999999;
+          font-family: "PingFang SC";
+          font-size: 10px;
+          font-style: normal;
+          font-weight: 400;
+          line-height: 20px;
+          margin-left: 10px;
         }
+      }
     }
 
-    :deep(.editdialog) {
-        min-width: 990px;
-        background-color: #F3FAFE !important;
-        margin-top: 8vh;
-        border-radius: 8px;
-
-        .editForm {
-            padding: 0 60px 1vh 60px;
-
-            .el-date-editor {
-                display: flex;
-                flex: 1;
-            }
-
-            .pic {
-                display: flex;
-                align-items: center;
-
-                .uploader {
-                    height: 80px;
-                    width: 80px;
-
-                    .el-upload {
-                        height: 100%;
-                        width: 100%;
-                    }
-                }
-
-                .picText {
-                    color: #999999;
-                    font-family: "PingFang SC";
-                    font-size: 10px;
-                    font-style: normal;
-                    font-weight: 400;
-                    line-height: 20px;
-                    margin-left: 10px;
-                }
-            }
-        }
+    .dialog-footer {
+      display: flex;
+      justify-content: center;
+      padding-bottom: 1.5vh;
+    }
+  }
 
-        .content {
-            display: flex;
+  :deep(.editdialog) {
+    min-width: 990px;
+    background-color: #F3FAFE !important;
+    margin-top: 8vh;
+    border-radius: 8px;
+
+    .editForm {
+      padding: 0 60px 1vh 60px;
+
+      .el-date-editor {
+        display: flex;
+        flex: 1;
+      }
+
+      .pic {
+        display: flex;
+        align-items: center;
+
+        .uploader {
+          height: 80px;
+          width: 80px;
+
+          .el-upload {
             height: 100%;
             width: 100%;
+          }
+        }
 
-            .left {
-                min-width: 500px;
-            }
-
-            .right {
-                flex: 1;
-
-                .editFormRighrt {
-                    padding: 0 60px 0 40px;
-
-                    .el-date-editor {
-                        display: flex;
-                        flex: 1;
-                    }
-                }
-
-                .editBtns {
-                    display: flex;
-                    justify-content: center;
-                    margin-top: 60px;
-
-                    .txt {
-                        color: #f3fafe;
-                        text-align: center;
-                        font-family: "PingFang SC";
-                        font-size: 14px;
-                        font-style: normal;
-                        font-weight: 700;
-                        line-height: 22px;
-                    }
-
-                    .editBtn1 {
-                        min-width: 80px;
-                        padding: 5px 12px;
-                        justify-content: center;
-                        align-items: center;
-                        gap: 4px;
-                        border-radius: 4px;
-                        background: #7E91FF;
-                        border: none;
-                        box-shadow: 0 0 4px 0 #00000040;
-                    }
-
-                    .editBtn2 {
-                        display: flex;
-                        width: 80px;
-                        min-width: 80px;
-                        padding: 5px 12px;
-                        justify-content: center;
-                        align-items: center;
-                        gap: 4px;
-                        border-radius: 4px;
-                        background: #2741DE;
-                        border: none;
-                        box-shadow: 0 0 4px 0 #00000040;
-                        margin-left: 60px;
-                    }
-                }
-            }
+        .picText {
+          color: #999999;
+          font-family: "PingFang SC";
+          font-size: 10px;
+          font-style: normal;
+          font-weight: 400;
+          line-height: 20px;
+          margin-left: 10px;
         }
+      }
     }
 
-    :deep(.adddialog .el-form-item__label) {
-        min-width: 80px;
-        width: auto;
-        font-weight: 800;
-        padding-bottom: 15px;
-    }
+    .content {
+      display: flex;
+      height: 100%;
+      width: 100%;
+
+      .left {
+        min-width: 500px;
+      }
 
-    .refundDialog {
-        .left {
-            width: 50%;
-            height: 70vh;
-            min-height: 700px;
-            padding: 0 2vw;
-
-            .add-item {
-                display: flex;
-                align-items: center;
-                margin-bottom: 1vh;
-            }
-
-            .image {
-                width: 4vw !important;
-                height: 4vw !important;
-            }
+      .right {
+        flex: 1;
+
+        .editFormRighrt {
+          padding: 0 60px 0 40px;
+
+          .el-date-editor {
+            display: flex;
+            flex: 1;
+          }
         }
 
-        .right {
-            width: 50%;
-            height: 50vh;
+        .editBtns {
+          display: flex;
+          justify-content: center;
+          margin-top: 60px;
 
-            .add-item {
-                display: flex;
-                align-items: center;
-                margin-bottom: 1vh;
-            }
+          .txt {
+            color: #f3fafe;
+            text-align: center;
+            font-family: "PingFang SC";
+            font-size: 14px;
+            font-style: normal;
+            font-weight: 700;
+            line-height: 22px;
+          }
+
+          .editBtn1 {
+            min-width: 80px;
+            padding: 5px 12px;
+            justify-content: center;
+            align-items: center;
+            gap: 4px;
+            border-radius: 4px;
+            background: #7E91FF;
+            border: none;
+            box-shadow: 0 0 4px 0 #00000040;
+          }
+
+          .editBtn2 {
+            display: flex;
+            width: 80px;
+            min-width: 80px;
+            padding: 5px 12px;
+            justify-content: center;
+            align-items: center;
+            gap: 4px;
+            border-radius: 4px;
+            background: #2741DE;
+            border: none;
+            box-shadow: 0 0 4px 0 #00000040;
+            margin-left: 60px;
+          }
         }
+      }
+    }
+  }
+
+  :deep(.adddialog .el-form-item__label) {
+    min-width: 80px;
+    width: auto;
+    font-weight: 800;
+    padding-bottom: 15px;
+  }
+
+  .refundDialog {
+    .left {
+      width: 50%;
+      height: 70vh;
+      min-height: 700px;
+      padding: 0 2vw;
+
+      .add-item {
+        display: flex;
+        align-items: center;
+        margin-bottom: 1vh;
+      }
+
+      .image {
+        width: 4vw !important;
+        height: 4vw !important;
+      }
+    }
+
+    .right {
+      width: 50%;
+      height: 50vh;
+
+      .add-item {
+        display: flex;
+        align-items: center;
+        margin-bottom: 1vh;
+      }
     }
+  }
 }
 
 // 表格样式统一
@@ -1671,101 +1680,101 @@ const handlePagination = (type, val) => {
 :deep(.el-table__body-wrapper),
 :deep(.el-table__cell),
 :deep(.el-table__body td) {
-    background-color: #F3FAFE !important;
+  background-color: #F3FAFE !important;
 }
 
 :deep(.el-table__header th) {
-    background-color: #F3FAFE !important;
+  background-color: #F3FAFE !important;
 }
 
 :deep(.el-table__row:hover > .el-table__cell) {
-    background-color: #E5EBFE !important;
+  background-color: #E5EBFE !important;
 }
 
 // 驳回理由弹窗样式
 .reject-reason-box {
-    --el-message-box-height: 500px;
+  --el-message-box-height: 500px;
 }
 
 .reject-reason-box .el-message-box__content {
-    max-height: 350px;
-    overflow-y: auto;
-    white-space: pre-wrap;
+  max-height: 350px;
+  overflow-y: auto;
+  white-space: pre-wrap;
 }
 
 .recallDialog {
-    //撤回弹窗提示
-    height: 392px;
-    width: 700px;
-    background-image: url('/src/assets/receive-recall.png');
-    position: fixed; // 固定定位，相对于浏览器窗口
-    top: 50%; // 距离顶部50%
-    left: 50%; // 距离左侧50%
-    transform: translate(-50%, -50%); // 向左、向上平移自身宽高的50%，实现居中
-    z-index: 1000; // 确保在其他元素上层显示
-
-    .close {
-        position: absolute;
-        left: 625px;
-        top: 20px;
-        height: 38px;
-        width: 38px;
-        opacity: 0;
-
-        .Btn {
-            height: 100%;
-            width: 100%;
-            border-radius: 10px;
-        }
+  //撤回弹窗提示
+  height: 392px;
+  width: 700px;
+  background-image: url('/src/assets/receive-recall.png');
+  position: fixed; // 固定定位，相对于浏览器窗口
+  top: 50%; // 距离顶部50%
+  left: 50%; // 距离左侧50%
+  transform: translate(-50%, -50%); // 向左、向上平移自身宽高的50%，实现居中
+  z-index: 1000; // 确保在其他元素上层显示
+
+  .close {
+    position: absolute;
+    left: 625px;
+    top: 20px;
+    height: 38px;
+    width: 38px;
+    opacity: 0;
+
+    .Btn {
+      height: 100%;
+      width: 100%;
+      border-radius: 10px;
     }
-
-    .text {
-        position: absolute;
-        left: 185px;
-        top: 190px;
-        height: 67px;
-        width: 500px;
-
-        .txt {
-            height: 100%;
-            width: 100%;
-            color: #001a42;
-            font-family: "PingFang SC";
-            font-size: 48px;
-            font-style: normal;
-            font-weight: 900;
-            line-height: normal;
-        }
+  }
+
+  .text {
+    position: absolute;
+    left: 185px;
+    top: 190px;
+    height: 67px;
+    width: 500px;
+
+    .txt {
+      height: 100%;
+      width: 100%;
+      color: #001a42;
+      font-family: "PingFang SC";
+      font-size: 48px;
+      font-style: normal;
+      font-weight: 900;
+      line-height: normal;
     }
-
-    .cancle {
-        position: absolute;
-        left: 185px;
-        top: 304px;
-        height: 55px;
-        width: 150px;
-        opacity: 0;
-
-        .Btn {
-            height: 100%;
-            width: 100%;
-            border-radius: 20px;
-        }
+  }
+
+  .cancle {
+    position: absolute;
+    left: 185px;
+    top: 304px;
+    height: 55px;
+    width: 150px;
+    opacity: 0;
+
+    .Btn {
+      height: 100%;
+      width: 100%;
+      border-radius: 20px;
     }
-
-    .confirm {
-        position: absolute;
-        left: 375px;
-        top: 304px;
-        height: 55px;
-        width: 150px;
-        opacity: 0;
-
-        .Btn {
-            height: 100%;
-            width: 100%;
-            border-radius: 20px;
-        }
+  }
+
+  .confirm {
+    position: absolute;
+    left: 375px;
+    top: 304px;
+    height: 55px;
+    width: 150px;
+    opacity: 0;
+
+    .Btn {
+      height: 100%;
+      width: 100%;
+      border-radius: 20px;
     }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue
index 46b3bf2..7ce9682 100644
--- a/src/views/moneyManage/receiveDetail/receiveService.vue
+++ b/src/views/moneyManage/receiveDetail/receiveService.vue
@@ -527,10 +527,10 @@ const getlist = async () => {
             }
         }
 
-        if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
-            ElMessage.error('精网号只能是数字')
-            return
-        }
+        // if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
+        //     ElMessage.error('精网号只能是数字')
+        //     return
+        // }
 
         const result = await request({
             url: '/cashCollection/selectCollection',
diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue
index aa989b9..3389bd7 100644
--- a/src/views/moneyManage/refundDetail/refundCharge.vue
+++ b/src/views/moneyManage/refundDetail/refundCharge.vue
@@ -421,10 +421,17 @@ const getRefund = async function () {
         const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
             ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-        if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-            ElMessage.error('精网号必须为数字')
-            return
+        // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
+        //     ElMessage.error('精网号必须为数字')
+        //     return
+        // }
+      if (searchForm.value.jwcode) {
+        const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+        if (!isPositiveInteger) {
+          ElMessage.error('请输入正确的精网号')
+          return;
         }
+      }
 
         if (searchForm.value.paymentCurrency) {
             payCurrencySelect.value = CurrencyForId(searchForm.value.paymentCurrency)
@@ -592,10 +599,10 @@ const exportExcel = async function () {
     const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
         ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-    if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-        ElMessage.error('精网号必须为数字')
-        return
-    }
+    // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
+    //     ElMessage.error('精网号必须为数字')
+    //     return
+    // }
 
     if (searchForm.value.paymentCurrency) {
         payCurrencySelect.value = CurrencyForId(searchForm.value.paymentCurrency)
diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue
index 3d1c377..6fe8560 100644
--- a/src/views/moneyManage/refundDetail/refundFinance.vue
+++ b/src/views/moneyManage/refundDetail/refundFinance.vue
@@ -479,12 +479,19 @@ const getRefund = async function () {
         const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
             ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-        if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-            ElMessage.error('精网号必须为数字')
-            return
+        // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
+        //     ElMessage.error('精网号必须为数字')
+        //     return
+        // }
+      if (searchForm.value.jwcode) {
+        const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+        if (!isPositiveInteger) {
+          ElMessage.error('请输入正确的精网号')
+          return;
         }
+      }
 
-        const params = {
+      const params = {
             pageNum: pagination.value.pageNum,
             pageSize: pagination.value.pageSize,
             cashRecordDTO: {
@@ -647,12 +654,19 @@ const exportExcel = async function () {
     const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
         ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-    if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-        ElMessage.error('精网号必须为数字')
-        return
+    // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
+    //     ElMessage.error('精网号必须为数字')
+    //     return
+    // }
+  if (searchForm.value.jwcode) {
+    const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+    if (!isPositiveInteger) {
+      ElMessage.error('请输入正确的精网号')
+      return;
     }
+  }
 
-    const params = {
+  const params = {
         pageNum: pagination.value.pageNum,
         pageSize: pagination.value.pageSize,
         cashRecordDTO: {
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index 8623f93..a9e94c9 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -477,12 +477,19 @@ const getRefund = async function () {
         const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
             ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-        if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-            ElMessage.error('精网号必须为数字')
-            return
+        // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
+        //     ElMessage.error('精网号必须为数字')
+        //     return
+        // }
+      if (searchForm.value.jwcode) {
+        const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+        if (!isPositiveInteger) {
+          ElMessage.error('请输入正确的精网号')
+          return;
         }
+      }
 
-        const params = {
+      const params = {
             pageNum: pagination.value.pageNum,
             pageSize: pagination.value.pageSize,
             cashRecordDTO: {
@@ -624,10 +631,10 @@ const exportExcel = async function () {
     const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
         ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-    if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-        ElMessage.error('精网号必须为数字')
-        return
-    }
+    // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
+    //     ElMessage.error('精网号必须为数字')
+    //     return
+    // }
 
     const params = {
         pageNum: pagination.value.pageNum,
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue
index 666538f..dded353 100644
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@@ -287,12 +287,19 @@ const getRefund = async function () {
         const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
             ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-        if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-            ElMessage.error('精网号必须为数字')
-            return
+        // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
+        //     ElMessage.error('精网号必须为数字')
+        //     return
+        // }
+      if (searchForm.value.jwcode) {
+        const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+        if (!isPositiveInteger) {
+          ElMessage.error('请输入正确的精网号')
+          return;
         }
+      }
 
-        const params = {
+      const params = {
             pageNum: pagination.value.pageNum,
             pageSize: pagination.value.pageSize,
             cashRecordDTO: {

From a8278fe7dfb3ea5c669da669363870a469d5bd4c Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Sun, 23 Nov 2025 14:20:24 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=9C=B0=E5=8C=BA?=
 =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E6=B6=88=E6=81=AF=E4=B8=8D=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/home.vue b/src/views/home.vue
index 7d2f07a..2d35632 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -143,9 +143,9 @@ const selectStatusById = () => {
     status.push(0);
   }
   // 地区负责人收款待审核
-  else if (hasPermission(permissionMapping.area_manager_collection_pending)) {
-    status.push(0);
-  }
+  // else if (hasPermission(permissionMapping.area_manager_collection_pending)) {
+  //   status.push(0);
+  // }
 
  
   // ===== 退款流程状态 =====

From 47dcfcc9e30d03cac199d1eba74634c3f9ec18a1 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Sun, 23 Nov 2025 15:04:05 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=9C=B0=E5=8C=BA?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=E6=89=8B=E7=BB=AD=E8=B4=B9=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/moneyManage/receiveDetail/receiveFinance.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue
index e21b9f9..76e3427 100644
--- a/src/views/moneyManage/receiveDetail/receiveFinance.vue
+++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue
@@ -209,7 +209,7 @@
                                     @click="openAuditForm(scope.row)">审核
                                 </el-link>
                                 <el-link
-                                    v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4) && scope.row.receivedMarket == scope.row.submitterMarket"
+                                    v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4) && scope.row.receivedMarket == adminData.markets"
                                     style="color: #2741DE;" @click="openEditForm(scope.row)">编辑
                                 </el-link>
                                 <el-link

From 21cd51645ca2418553ab94ff0ce7a6326444898d Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Sun, 23 Nov 2025 15:10:34 +0800
Subject: [PATCH 04/12] =?UTF-8?q?finalReview=E5=8A=A0adminId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/moneyManage/refundDetail/refundHeader.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index a9e94c9..6401d72 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -535,7 +535,8 @@ const handlePass = async function () {
             permanentGold: auditRow.value.permanentGold * 100,
             freeGold: auditRow.value.freeGold * 100,
             orderCode: auditRow.value.orderCode,
-            jwcode: auditRow.value.jwcode
+            jwcode: auditRow.value.jwcode,
+            adminId: adminData.value.id
         }
         const result = await API({
             url: '/Money/finalReview',
@@ -564,7 +565,8 @@ const handleReject = async function () {
             rejectReason: addForm.value.remark,
             headFinance: adminData.value.adminName,
             auditId: auditRow.value.auditId,
-            orderCode: auditRow.value.orderCode
+            orderCode: auditRow.value.orderCode,
+            adminId: adminData.value.id
         }
         const result = await API({
             url: '/Money/finalReview',

From 49a8b80a3767684cf210fab40b5d20d6365029a5 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Sun, 23 Nov 2025 15:11:57 +0800
Subject: [PATCH 05/12] 1

---
 .../moneyManage/receiveDetail/receiveManage.vue    | 2814 ++++++++++----------
 1 file changed, 1404 insertions(+), 1410 deletions(-)

diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue
index 917d63b..76e3427 100644
--- a/src/views/moneyManage/receiveDetail/receiveManage.vue
+++ b/src/views/moneyManage/receiveDetail/receiveManage.vue
@@ -1,367 +1,367 @@
 <template>
-  <div class="content">
-    <div class="div-card1">
-      <el-card class="card1" style="margin-bottom: 0.5vh; min-height: 110px;">
-        <div class="row1">
-          <div class="rowItem">
-            <el-text style="width: 4vw;">精网号</el-text>
-            <el-input v-model="searchData.jwcode" placeholder="请输入精网号" style="width:10vw;"
-                      clearable></el-input>
-          </div>
-          <div class="rowItem">
-            <el-text style="width: 4vw;">客户姓名</el-text>
-            <el-input v-model="searchData.name" placeholder="请输入客户姓名" style="width:10vw;"
-                      clearable></el-input>
-          </div>
-          <div class="rowItem">
-            <el-text style="width: 4vw;">所属地区</el-text>
-            <el-cascader style="width: 9vw;" v-model="searchData.markets" :options="market"
-                         placeholder="请选择所属地区" clearable @change="handleMarketChange" />
-          </div>
-          <!-- 地区财务固定显示付款币种，删除客服的订单状态 -->
-          <div class="rowItem">
-            <el-text style="width: 4vw;">付款币种</el-text>
-            <el-select v-model="searchData.paymentCurrency" placeholder="请选择付款币种" style="width: 10vw;"
-                       clearable>
-              <el-option v-for="item in customOptions" :key="item" :label="item" :value="item" />
-            </el-select>
-          </div>
-          <div class="rowItem">
-            <el-text style="width: 4vw;">支付方式</el-text>
-            <el-select v-model="searchData.payType" placeholder="请选择支付方式" style="width: 10vw;" clearable>
-              <el-option v-for="item in paytypeList" :key="item" :label="item" :value="item" />
-            </el-select>
-          </div>
-        </div>
-        <div class="row2" style="margin-top: 10px;">
-          <div class="left">
-            <div class="rowItem">
-              <el-text style="width: 4vw;">活动名称</el-text>
-              <el-select v-model="searchData.activity" placeholder="请选择活动方式" style="width: 10vw;"
-                         clearable>
-                <el-option v-for="item in activityList" :key="item.id" :label="item.activityName"
-                           :value="item.id" />
-              </el-select>
-            </div>
-            <div class="rowItem">
-              <el-text style="width: 4vw;">产品名称</el-text>
-              <el-cascader v-model="searchData.goodsName" :options="productList" style="width: 10vw;"
-                           clearable />
-            </div>
-            <div class="rowItem" style="width: 25vw">
-              <el-text style="width: 4vw; margin-left: 0.5vw;">付款时间</el-text>
-              <el-date-picker v-model="getTime" type="datetimerange" range-separator="至"
-                              start-placeholder="起始时间" end-placeholder="结束时间" style="width: 22vw; "
-                              @change="handleDatePickerChange" :default-time="defaultTime"
-                              :disabled-date="disabledDate" />
-            </div>
-          </div>
-          <el-button style="width: 3vw;" type="primary" @click="search">查询</el-button>
-          <el-button style="width: 3vw;" type="success" @click="reset">重置</el-button>
-          <el-button v-if="activeTab == 'done'" style="width: 5vw;" type="warning"
-                     @click="exportExcel()">导出excel</el-button>
-          <el-button v-if="activeTab == 'done'" style="width: 6vw;" type="primary"
-                     @click="openExportList">查看导出列表</el-button>
+    <div class="content">
+        <div class="div-card1">
+            <el-card class="card1" style="margin-bottom: 0.5vh; min-height: 110px;">
+                <div class="row1">
+                    <div class="rowItem">
+                        <el-text style="width: 4vw;">精网号</el-text>
+                        <el-input v-model="searchData.jwcode" placeholder="请输入精网号" style="width:10vw;"
+                            clearable></el-input>
+                    </div>
+                    <div class="rowItem">
+                        <el-text style="width: 4vw;">客户姓名</el-text>
+                        <el-input v-model="searchData.name" placeholder="请输入客户姓名" style="width:10vw;"
+                            clearable></el-input>
+                    </div>
+                    <div class="rowItem">
+                        <el-text style="width: 4vw;">所属地区</el-text>
+                        <el-cascader style="width: 9vw;" v-model="searchData.markets" :options="market"
+                            placeholder="请选择所属地区" clearable @change="handleMarketChange" />
+                    </div>
+                    <!-- 地区财务固定显示付款币种，删除客服的订单状态 -->
+                    <div class="rowItem">
+                        <el-text style="width: 4vw;">付款币种</el-text>
+                        <el-select v-model="searchData.paymentCurrency" placeholder="请选择付款币种" style="width: 10vw;"
+                            clearable>
+                            <el-option v-for="item in customOptions" :key="item" :label="item" :value="item" />
+                        </el-select>
+                    </div>
+                    <div class="rowItem">
+                        <el-text style="width: 4vw;">支付方式</el-text>
+                        <el-select v-model="searchData.payType" placeholder="请选择支付方式" style="width: 10vw;" clearable>
+                            <el-option v-for="item in paytypeList" :key="item" :label="item" :value="item" />
+                        </el-select>
+                    </div>
+                </div>
+                <div class="row2" style="margin-top: 10px;">
+                    <div class="left">
+                        <div class="rowItem">
+                            <el-text style="width: 4vw;">活动名称</el-text>
+                            <el-select v-model="searchData.activity" placeholder="请选择活动方式" style="width: 10vw;"
+                                clearable>
+                                <el-option v-for="item in activityList" :key="item.id" :label="item.activityName"
+                                    :value="item.id" />
+                            </el-select>
+                        </div>
+                        <div class="rowItem">
+                            <el-text style="width: 4vw;">产品名称</el-text>
+                            <el-cascader v-model="searchData.goodsName" :options="productList" style="width: 10vw;"
+                                clearable />
+                        </div>
+                        <div class="rowItem" style="width: 25vw">
+                            <el-text style="width: 4vw; margin-left: 0.5vw;">付款时间</el-text>
+                            <el-date-picker v-model="getTime" type="datetimerange" range-separator="至"
+                                start-placeholder="起始时间" end-placeholder="结束时间" style="width: 22vw; "
+                                @change="handleDatePickerChange" :default-time="defaultTime"
+                                :disabled-date="disabledDate" />
+                        </div>
+                    </div>
+                    <el-button style="width: 3vw;" type="primary" @click="search">查询</el-button>
+                    <el-button style="width: 3vw;" type="success" @click="reset">重置</el-button>
+                    <el-button v-if="activeTab == 'done'" style="width: 5vw;" type="warning"
+                        @click="exportExcel()">导出excel</el-button>
+                    <el-button v-if="activeTab == 'done'" style="width: 6vw;" type="primary"
+                        @click="openExportList">查看导出列表</el-button>
+                </div>
+            </el-card>
         </div>
-      </el-card>
-    </div>
 
 
-    <div class="div-card2">
-      <el-card class="card2">
-        <div class="btns">
-          <!-- 地区财务专属标签页（待审核/已通过/已完成/已驳回） -->
-          <div class="tabs">
-            <el-button-group>
-              <el-button class="btnItem"
-                         :style="{ backgroundColor: activeTab === 'wait' ? '#2741DE' : '#E5EBFE', color: activeTab === 'wait' ? 'white' : '#666' }"
-                         @click="navigateTo('wait')">
-                待审核
-              </el-button>
-              <el-button class="btnItem"
-                         :style="{ backgroundColor: activeTab === 'pass' ? '#2741DE' : '#E5EBFE', color: activeTab === 'pass' ? 'white' : '#666' }"
-                         @click="navigateTo('pass')">
-                已通过
-              </el-button>
-              <el-button class="btnItem"
-                         :style="{ backgroundColor: activeTab === 'done' ? '#2741DE' : '#E5EBFE', color: activeTab === 'done' ? 'white' : '#666' }"
-                         @click="navigateTo('done')">
-                已完成
-              </el-button>
-              <el-button class="btnItem"
-                         :style="{ backgroundColor: activeTab === 'reject' ? '#2741DE' : '#E5EBFE', color: activeTab === 'reject' ? 'white' : '#666' }"
-                         @click="navigateTo('reject')">
-                已驳回
-              </el-button>
-            </el-button-group>
-            <div class="info-tooltip">
-              <el-popover placement="top" title="数据说明" :width="260" trigger="hover"
-                          content="收款的所有页面：订单记录默认按照付款时间降序排列" popper-class="custom-popover" :show-arrow="false">
-                <template #reference>
-                  <el-icon class="service-icon">
-                    <Warning />
-                  </el-icon>
-                </template>
-              </el-popover>
-            </div>
-          </div>
-          <!-- 删除客服的“添加收款”按钮 -->
-          <div class="btnAdd"></div>
-        </div>
-
-        <div class="table">
-          <el-table :data="tableData" style="width: 80vw;height:64vh;" @sort-change="handleSortChange"
-                    :row-style="{ height: '60px' }" :header-cell-style="{ textAlign: 'center' }"
-                    :cell-style="{ textAlign: 'center' }">
-            <el-table-column type="index" label="序号" width="100px" fixed="left">
-              <template #default="scope">
-                <span>{{ scope.$index + 1 + (pageInfo.pageNum - 1) * pageInfo.pageSize }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column fixed="left" prop="jwcode" label="Homily ID" width="110px" />
-            <el-table-column fixed="left" prop="name" label="姓名" width="110px" />
-            <el-table-column prop="marketName" label="所属地区" width="80px" />
-            <el-table-column prop="activity" label="活动名称" width="120px" show-overflow-tooltip />
-            <el-table-column prop="goodsName" label="产品名称" width="120px" />
-            <el-table-column prop="goodNum" label="产品数量" width="130px">
-              <template #default="scope">
-                <span v-if="scope.row.goodsName == '金币充值'">{{ scope.row.permanentGold }}</span>
-                <span v-else>{{ scope.row.goodNum }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="paymentCurrency" label="付款币种" width="100px" />
-            <el-table-column prop="paymentAmount" label="付款金额" width="120px" />
-            <!-- 地区财务显示到账币种/金额/手续费（已通过/已完成标签页） -->
-            <el-table-column prop="receivedCurrency" label="到账币种"
-                             v-if="activeTab == 'pass' || activeTab == 'done'" width="150px"></el-table-column>
-            <el-table-column prop="receivedAmount" label="到账金额"
-                             v-if="activeTab == 'pass' || activeTab == 'done'" width="150px">
-              <template #default="scope">
-                <div v-if="!scope.row.receivedAmount">
-                  <text style="color: #FA5A1E;">待补充</text>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column prop="handlingCharge" label="手续费"
-                             v-if="activeTab == 'pass' || activeTab == 'done'" width="150px">
-              <template #default="scope">
-                <div v-if="scope.row.handlingCharge == null">
-                  <text style="color: #FA5A1E;">待补充</text>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column prop="payType" label="支付方式" width="130px" />
-            <el-table-column prop="payTime" label="付款时间" width="180px" />
-            <el-table-column prop="voucher" label="转账凭证" width="110px">
-              <template #default="scope">
-                <div v-if="scope.row.voucher"
-                     style="display: flex; justify-content: center; align-items: center; cursor: pointer;"
-                     @click="previewImage(scope.row.voucher)">
-                  <img :src="scope.row.voucher" alt="支付凭证" style="width: auto; height: 40px;">
+        <div class="div-card2">
+            <el-card class="card2">
+                <div class="btns">
+                    <!-- 地区财务专属标签页（待审核/已通过/已完成/已驳回） -->
+                    <div class="tabs">
+                        <el-button-group>
+                            <el-button class="btnItem"
+                                :style="{ backgroundColor: activeTab === 'wait' ? '#2741DE' : '#E5EBFE', color: activeTab === 'wait' ? 'white' : '#666' }"
+                                @click="navigateTo('wait')">
+                                待审核
+                            </el-button>
+                            <el-button class="btnItem"
+                                :style="{ backgroundColor: activeTab === 'pass' ? '#2741DE' : '#E5EBFE', color: activeTab === 'pass' ? 'white' : '#666' }"
+                                @click="navigateTo('pass')">
+                                已通过
+                            </el-button>
+                            <el-button class="btnItem"
+                                :style="{ backgroundColor: activeTab === 'done' ? '#2741DE' : '#E5EBFE', color: activeTab === 'done' ? 'white' : '#666' }"
+                                @click="navigateTo('done')">
+                                已完成
+                            </el-button>
+                            <el-button class="btnItem"
+                                :style="{ backgroundColor: activeTab === 'reject' ? '#2741DE' : '#E5EBFE', color: activeTab === 'reject' ? 'white' : '#666' }"
+                                @click="navigateTo('reject')">
+                                已驳回
+                            </el-button>
+                        </el-button-group>
+                        <div class="info-tooltip">
+                            <el-popover placement="top" title="数据说明" :width="260" trigger="hover"
+                                content="收款的所有页面：订单记录默认按照付款时间降序排列" popper-class="custom-popover" :show-arrow="false">
+                                <template #reference>
+                                    <el-icon class="service-icon">
+                                        <Warning />
+                                    </el-icon>
+                                </template>
+                            </el-popover>
+                        </div>
+                    </div>
+                    <!-- 删除客服的“添加收款”按钮 -->
+                    <div class="btnAdd"></div>
                 </div>
-                <div v-else
-                     style="display: flex; justify-content: center; align-items: center; height: 40px;">
-                  ——
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column prop="submitterName" label="提交人" width="150px"
-                             show-overflow-tooltip></el-table-column>
-            <!-- 地区财务显示审核人（已通过/已驳回/已完成标签页） -->
-            <el-table-column prop="auditName" label="审核人"
-                             v-if="activeTab == 'pass' || activeTab == 'reject' || activeTab == 'done'" width="150px"
-                             show-overflow-tooltip></el-table-column>
-            <el-table-column prop="receivedTime" label="到账时间"
-                             v-if="activeTab == 'pass' || activeTab == 'done'" width="180px" />
-            <el-table-column prop="remark" label="备注" v-if="activeTab != 'reject'" width="150px"
-                             show-overflow-tooltip></el-table-column>
-            <el-table-column prop="status" fixed="right" label="订单状态" v-if="activeTab == 'done'"
-                             width="150px" show-overflow-tooltip>
-              <template #default="scope">
-                <span style="color: rgb(242, 84, 83);" v-if="scope.row.status == 6">退款</span>
-                <span style="color: rgb(127,204,133);" v-else>正常</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="auditTime" label="驳回时间" v-if="activeTab == 'reject'" width="180px"
-                             show-overflow-tooltip></el-table-column>
-            <el-table-column prop="rejectReason" label="驳回理由" v-if="activeTab == 'reject'" width="150px">
-              <template #default="scope">
-                <div class="ellipsis-container"
-                     @mouseenter="handleMouseEnter($event, scope.row.rejectReason)"
-                     @mouseleave="handleMouseLeave" @mousemove="handleMouseMove($event)">
+
+                <div class="table">
+                    <el-table :data="tableData" style="width: 80vw;height:64vh;" @sort-change="handleSortChange"
+                        :row-style="{ height: '60px' }" :header-cell-style="{ textAlign: 'center' }"
+                        :cell-style="{ textAlign: 'center' }">
+                        <el-table-column type="index" label="序号" width="100px" fixed="left">
+                            <template #default="scope">
+                                <span>{{ scope.$index + 1 + (pageInfo.pageNum - 1) * pageInfo.pageSize }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column fixed="left" prop="jwcode" label="Homily ID" width="110px" />
+                        <el-table-column fixed="left" prop="name" label="姓名" width="110px" />
+                        <el-table-column prop="marketName" label="所属地区" width="80px" />
+                        <el-table-column prop="activity" label="活动名称" width="120px" show-overflow-tooltip />
+                        <el-table-column prop="goodsName" label="产品名称" width="120px" />
+                        <el-table-column prop="goodNum" label="产品数量" width="130px">
+                            <template #default="scope">
+                                <span v-if="scope.row.goodsName == '金币充值'">{{ scope.row.permanentGold }}</span>
+                                <span v-else>{{ scope.row.goodNum }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="paymentCurrency" label="付款币种" width="100px" />
+                        <el-table-column prop="paymentAmount" label="付款金额" width="120px" />
+                        <!-- 地区财务显示到账币种/金额/手续费（已通过/已完成标签页） -->
+                        <el-table-column prop="receivedCurrency" label="到账币种"
+                            v-if="activeTab == 'pass' || activeTab == 'done'" width="150px"></el-table-column>
+                        <el-table-column prop="receivedAmount" label="到账金额"
+                            v-if="activeTab == 'pass' || activeTab == 'done'" width="150px">
+                            <template #default="scope">
+                                <div v-if="!scope.row.receivedAmount">
+                                    <text style="color: #FA5A1E;">待补充</text>
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="handlingCharge" label="手续费"
+                            v-if="activeTab == 'pass' || activeTab == 'done'" width="150px">
+                            <template #default="scope">
+                                <div v-if="scope.row.handlingCharge == null">
+                                    <text style="color: #FA5A1E;">待补充</text>
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="payType" label="支付方式" width="130px" />
+                        <el-table-column prop="payTime" label="付款时间" width="180px" />
+                        <el-table-column prop="voucher" label="转账凭证" width="110px">
+                            <template #default="scope">
+                                <div v-if="scope.row.voucher"
+                                    style="display: flex; justify-content: center; align-items: center; cursor: pointer;"
+                                    @click="previewImage(scope.row.voucher)">
+                                    <img :src="scope.row.voucher" alt="支付凭证" style="width: auto; height: 40px;">
+                                </div>
+                                <div v-else
+                                    style="display: flex; justify-content: center; align-items: center; height: 40px;">
+                                    ——
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="submitterName" label="提交人" width="150px"
+                            show-overflow-tooltip></el-table-column>
+                        <!-- 地区财务显示审核人（已通过/已驳回/已完成标签页） -->
+                        <el-table-column prop="auditName" label="审核人"
+                            v-if="activeTab == 'pass' || activeTab == 'reject' || activeTab == 'done'" width="150px"
+                            show-overflow-tooltip></el-table-column>
+                        <el-table-column prop="receivedTime" label="到账时间"
+                            v-if="activeTab == 'pass' || activeTab == 'done'" width="180px" />
+                        <el-table-column prop="remark" label="备注" v-if="activeTab != 'reject'" width="150px"
+                            show-overflow-tooltip></el-table-column>
+                        <el-table-column prop="status" fixed="right" label="订单状态" v-if="activeTab == 'done'"
+                            width="150px" show-overflow-tooltip>
+                            <template #default="scope">
+                                <span style="color: rgb(242, 84, 83);" v-if="scope.row.status == 6">退款</span>
+                                <span style="color: rgb(127,204,133);" v-else>正常</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="auditTime" label="驳回时间" v-if="activeTab == 'reject'" width="180px"
+                            show-overflow-tooltip></el-table-column>
+                        <el-table-column prop="rejectReason" label="驳回理由" v-if="activeTab == 'reject'" width="150px">
+                            <template #default="scope">
+                                <div class="ellipsis-container"
+                                    @mouseenter="handleMouseEnter($event, scope.row.rejectReason)"
+                                    @mouseleave="handleMouseLeave" @mousemove="handleMouseMove($event)">
                                     <span class="ellipsis-text">
                                         {{ scope.row.rejectReason || '—' }}
                                     </span>
-                  <!-- 自定义提示框 -->
-                  <div v-if="showTooltip && tooltipContent" class="custom-tooltip" :style="{
+                                    <!-- 自定义提示框 -->
+                                    <div v-if="showTooltip && tooltipContent" class="custom-tooltip" :style="{
                                         left: `${tooltipLeft}px`,
                                         top: `${tooltipTop}px`
                                     }">
-                    {{ tooltipContent }}
-                  </div>
+                                        {{ tooltipContent }}
+                                    </div>
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <!-- 地区财务表格操作（待审核→审核，已通过→编辑） -->
+                        <el-table-column fixed="right" label="操作" width="120px" v-if="activeTab != 'reject'">
+                            <template #default=scope>
+                                <el-link v-if="activeTab == 'wait'" style="color: #2741DE;"
+                                    @click="openAuditForm(scope.row)">审核
+                                </el-link>
+                                <el-link
+                                    v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4) && scope.row.receivedMarket == adminData.markets"
+                                    style="color: #2741DE;" @click="openEditForm(scope.row)">编辑
+                                </el-link>
+                                <el-link
+                                    v-else-if="activeTab == 'done' && scope.row.status == 4 && startsWith(scope.row.orderCode, 'GOLDCOIN')"
+                                    style="color: rgb(242, 84, 83);" @click="openRefundConfirm(scope.row)">退款
+                                </el-link>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+                <div class="pagination">
+                    <el-pagination background :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"
+                        :page-sizes="[5, 10, 20, 50, 100]" layout="total, sizes, prev, pager, next, jumper"
+                        :total="total" @size-change="handlePagination('size', $event)"
+                        @current-change="handlePagination('page', $event)"></el-pagination>
                 </div>
-              </template>
-            </el-table-column>
-            <!-- 地区财务表格操作（待审核→审核，已通过→编辑） -->
-            <el-table-column fixed="right" label="操作" width="120px" v-if="activeTab != 'reject'">
-              <template #default=scope>
-                <el-link v-if="activeTab == 'wait'" style="color: #2741DE;"
-                         @click="openAuditForm(scope.row)">审核
-                </el-link>
-                <el-link
-                    v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4) && scope.row.receivedMarket == scope.row.submitterMarket"
-                    style="color: #2741DE;" @click="openEditForm(scope.row)">编辑
-                </el-link>
-                <el-link
-                    v-else-if="activeTab == 'done' && scope.row.status == 4 && startsWith(scope.row.orderCode, 'GOLDCOIN')"
-                    style="color: rgb(242, 84, 83);" @click="openRefundConfirm(scope.row)">退款
-                </el-link>
-              </template>
-            </el-table-column>
-          </el-table>
+            </el-card>
         </div>
-        <div class="pagination">
-          <el-pagination background :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"
-                         :page-sizes="[5, 10, 20, 50, 100]" layout="total, sizes, prev, pager, next, jumper"
-                         :total="total" @size-change="handlePagination('size', $event)"
-                         @current-change="handlePagination('page', $event)"></el-pagination>
+        <!-- 退款确认弹窗 -->
+        <div class="recallDialog" v-show="refundConfirmDialog">
+            <div class="close">
+                <button @click="closeConfirmRefund" class="Btn">关闭</button>
+            </div>
+            <div class="text">
+                <text class="txt">{{ textContent }}</text>
+            </div>
+            <div class="cancle">
+                <button @click="closeConfirmRefund" class="Btn">取消</button>
+            </div>
+            <div class="confirm">
+                <button @click="openRefundDialog" class="Btn">确定</button>
+            </div>
         </div>
-      </el-card>
-    </div>
-    <!-- 退款确认弹窗 -->
-    <div class="recallDialog" v-show="refundConfirmDialog">
-      <div class="close">
-        <button @click="closeConfirmRefund" class="Btn">关闭</button>
-      </div>
-      <div class="text">
-        <text class="txt">{{ textContent }}</text>
-      </div>
-      <div class="cancle">
-        <button @click="closeConfirmRefund" class="Btn">取消</button>
-      </div>
-      <div class="confirm">
-        <button @click="openRefundDialog" class="Btn">确定</button>
-      </div>
-    </div>
 
-    <!-- 导出列表 -->
-    <el-dialog v-model="exportListVisible" title="导出列表" width="60vw">
-      <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">
-            <el-tag :type="getTagType(scope.row.state)" :effect="scope.row.state === 3 ? 'light' : 'plain'">
-              {{ getTagText(scope.row.state) }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="createTime" label="创建时间">
-          <template #default="scope">
-            {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作">
-          <template #default="scope">
-            <el-button type="primary" size="small" @click="downloadExportFile(scope.row)"
-                       :disabled="scope.row.state !== 2">
-              下载
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button text @click="exportListVisible = false">关闭</el-button>
-        </div>
-      </template>
-    </el-dialog>
-
-    <!-- 审核弹窗 -->
-    <el-dialog class="adddialog" v-model="auditFormisible" width="20vw" :before-close="closeAuditForm">
-      <el-form class="addForm" label-width="4vw" label-position="left">
-        <el-form-item label="精网号">
-          <el-input disabled="true" v-model="auditFormData.jwcode" placeholder="请输入驳回理由" />
-        </el-form-item>
-        <el-form-item label="客户姓名">
-          <el-input disabled="true" v-model="auditFormData.name" placeholder="请输入客户姓名" />
-        </el-form-item>
-        <el-form-item label="所属地区">
-          <el-input disabled="true" v-model="auditFormData.market" />
-        </el-form-item>
-        <el-form-item label="活动名称">
-          <el-input disabled="true" v-model="auditFormData.activity" placeholder="请输入活动名称" />
-        </el-form-item>
-        <el-form-item label="产品名称">
-          <el-select disabled="true" v-model="auditFormData.goodsName" />
-        </el-form-item>
-        <el-form-item v-if="!isGold" label="产品数量">
-          <div style="display: flex;">
-            <el-input disabled="true" style="padding-right: 30px; flex: 3;" v-model="auditFormData.goodNum"
-                      placeholder="请输入产品数量" />
-            <CurrencySelect disabled="true" v-model="auditFormData.numUnit" :items="numUnitList"
+        <!-- 导出列表 -->
+        <el-dialog v-model="exportListVisible" title="导出列表" width="60vw">
+            <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">
+                        <el-tag :type="getTagType(scope.row.state)" :effect="scope.row.state === 3 ? 'light' : 'plain'">
+                            {{ getTagText(scope.row.state) }}
+                        </el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="createTime" label="创建时间">
+                    <template #default="scope">
+                        {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作">
+                    <template #default="scope">
+                        <el-button type="primary" size="small" @click="downloadExportFile(scope.row)"
+                            :disabled="scope.row.state !== 2">
+                            下载
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button text @click="exportListVisible = false">关闭</el-button>
+                </div>
+            </template>
+        </el-dialog>
+
+        <!-- 审核弹窗 -->
+        <el-dialog class="adddialog" v-model="auditFormisible" width="20vw" :before-close="closeAuditForm">
+            <el-form class="addForm" label-width="4vw" label-position="left">
+                <el-form-item label="精网号">
+                    <el-input disabled="true" v-model="auditFormData.jwcode" placeholder="请输入驳回理由" />
+                </el-form-item>
+                <el-form-item label="客户姓名">
+                    <el-input disabled="true" v-model="auditFormData.name" placeholder="请输入客户姓名" />
+                </el-form-item>
+                <el-form-item label="所属地区">
+                    <el-input disabled="true" v-model="auditFormData.market" />
+                </el-form-item>
+                <el-form-item label="活动名称">
+                    <el-input disabled="true" v-model="auditFormData.activity" placeholder="请输入活动名称" />
+                </el-form-item>
+                <el-form-item label="产品名称">
+                    <el-select disabled="true" v-model="auditFormData.goodsName" />
+                </el-form-item>
+                <el-form-item v-if="!isGold" label="产品数量">
+                    <div style="display: flex;">
+                        <el-input disabled="true" style="padding-right: 30px; flex: 3;" v-model="auditFormData.goodNum"
+                            placeholder="请输入产品数量" />
+                        <CurrencySelect disabled="true" v-model="auditFormData.numUnit" :items="numUnitList"
                             style="flex: 1.5;" placeholder="单位" @change="handleCurrencyChange" />
-          </div>
-        </el-form-item>
-        <div v-show="isGold" style="margin-bottom: 15px;  display: flex;">
-          <div style=" display: flex; ">
+                    </div>
+                </el-form-item>
+                <div v-show="isGold" style="margin-bottom: 15px;  display: flex;">
+                    <div style=" display: flex; ">
                         <span
                             style="color: #999999; display: flex; white-space: nowrap;align-items: center;">永久金币：</span>
-            <el-input disabled="true"
-                      style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
-                      v-model="auditFormData.permanentGold" />
-          </div>
-          <div style="padding-right: 5px; display: flex;">
+                        <el-input disabled="true"
+                            style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
+                            v-model="auditFormData.permanentGold" />
+                    </div>
+                    <div style="padding-right: 5px; display: flex;">
                         <span
                             style="color: #999999; display: flex; white-space: nowrap;align-items: center;">免费金币：</span>
-            <el-input disabled="true"
-                      style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
-                      v-model="auditFormData.freeGold" />
-          </div>
-        </div>
-        <el-form-item label="付款币种">
-          <el-select disabled="true" v-model="auditFormData.paymentCurrency" placeholder="请选择付款币种"
-                     @change="handleCurrencyChange" />
-        </el-form-item>
-        <el-form-item label="付款金额">
-          <el-input disabled="true" v-model="auditFormData.paymentAmount" placeholder="请输入付款金额" />
-        </el-form-item>
-        <el-form-item label="支付方式">
-          <el-select disabled="true" v-model="auditFormData.payType" :items="paytypeOptions"
-                     placeholder="请选择支付方式" />
-        </el-form-item>
-        <el-form-item label="到账地区">
-          <el-select disabled="true" v-model="auditFormData.receivedMarket" placeholder="到账地区" />
-        </el-form-item>
-        <el-form-item label="付款时间">
-          <el-date-picker disabled="true" type="datetime" v-model="auditFormData.payTime"
-                          placeholder="请选择付款时间" />
-        </el-form-item>
-        <el-form-item label="转账凭证">
-          <div class="pic">
-            <el-upload disabled="true" ref="uploadRef" class="uploader" :show-file-list="false"
-                       list-type="picture-card" :auto-upload="false" :before-upload="beforeUpload"
-                       :on-error="handelImgErr" :on-change="handleImageChange" :http-request="customUpload">
-              <img v-if="auditFormData.voucher" :src="auditFormData.voucher" class="avatar"
-                   style="height: 100%; width: 100%;  object-fit: cover;" />
-              <el-icon v-else class="avatar-uploader-icon">
-                <Plus />
-              </el-icon>
-            </el-upload>
-            <el-text class="picText">
-              仅支持.jpg .png格式文件≤ 2 MB
-            </el-text>
-          </div>
-        </el-form-item>
-        <el-form-item label="备注">
-          <el-input disabled="true" v-model="auditFormData.remark" type="textarea" :rows="3" maxlength="100"
-                    show-word-limit />
-        </el-form-item>
-        <el-form-item label="驳回理由" v-if="ifReject" required>
-          <el-input v-model="auditFormData.rejectReason" type="textarea" :rows="3" placeholder="请输入驳回理由"
-                    maxlength="100" show-word-limit />
-        </el-form-item>
-      </el-form>
-      <template #footer>
+                        <el-input disabled="true"
+                            style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
+                            v-model="auditFormData.freeGold" />
+                    </div>
+                </div>
+                <el-form-item label="付款币种">
+                    <el-select disabled="true" v-model="auditFormData.paymentCurrency" placeholder="请选择付款币种"
+                        @change="handleCurrencyChange" />
+                </el-form-item>
+                <el-form-item label="付款金额">
+                    <el-input disabled="true" v-model="auditFormData.paymentAmount" placeholder="请输入付款金额" />
+                </el-form-item>
+                <el-form-item label="支付方式">
+                    <el-select disabled="true" v-model="auditFormData.payType" :items="paytypeOptions"
+                        placeholder="请选择支付方式" />
+                </el-form-item>
+                <el-form-item label="到账地区">
+                    <el-select disabled="true" v-model="auditFormData.receivedMarket" placeholder="到账地区" />
+                </el-form-item>
+                <el-form-item label="付款时间">
+                    <el-date-picker disabled="true" type="datetime" v-model="auditFormData.payTime"
+                        placeholder="请选择付款时间" />
+                </el-form-item>
+                <el-form-item label="转账凭证">
+                    <div class="pic">
+                        <el-upload disabled="true" ref="uploadRef" class="uploader" :show-file-list="false"
+                            list-type="picture-card" :auto-upload="false" :before-upload="beforeUpload"
+                            :on-error="handelImgErr" :on-change="handleImageChange" :http-request="customUpload">
+                            <img v-if="auditFormData.voucher" :src="auditFormData.voucher" class="avatar"
+                                style="height: 100%; width: 100%;  object-fit: cover;" />
+                            <el-icon v-else class="avatar-uploader-icon">
+                                <Plus />
+                            </el-icon>
+                        </el-upload>
+                        <el-text class="picText">
+                            仅支持.jpg .png格式文件≤ 2 MB
+                        </el-text>
+                    </div>
+                </el-form-item>
+                <el-form-item label="备注">
+                    <el-input disabled="true" v-model="auditFormData.remark" type="textarea" :rows="3" maxlength="100"
+                        show-word-limit />
+                </el-form-item>
+                <el-form-item label="驳回理由" v-if="ifReject" required>
+                    <el-input v-model="auditFormData.rejectReason" type="textarea" :rows="3" placeholder="请输入驳回理由"
+                        maxlength="100" show-word-limit />
+                </el-form-item>
+            </el-form>
+            <template #footer>
                 <span class="dialog-footer" v-if="!ifReject">
                     <el-button style="background-color: #7E91FF;" @click="ifReject = true">驳回</el-button>
                     <el-button :style="{
@@ -370,118 +370,118 @@
                         color: isBtnDisabled ? '#8A8A8A' : '#F3FAFE'
                     }" @click="handelAudit" :disabled="isBtnDisabled">{{ btnText }}</el-button>
                 </span>
-        <span class="dialog-footer" v-if="ifReject">
+                <span class="dialog-footer" v-if="ifReject">
                     <el-button style="background-color: #7E91FF;" @click="closeAuditForm">取消</el-button>
                     <el-button style="background-color: #2741DE; margin-left: 2.5vw;" type="primary"
-                               @click="throttledhandelAuditReject">确定</el-button>
+                        @click="throttledhandelAuditReject">确定</el-button>
                 </span>
-      </template>
-    </el-dialog>
-
-    <!-- 编辑填手续费弹窗 -->
-    <el-dialog class="editdialog" v-model="editFormisible" width="20vw" :before-close="closeEditForm">
-      <div class="content">
-        <div class="left">
-          <el-form class="editForm" label-width="4.5vw" label-position="left">
-            <el-form-item label="精网号">
-              <el-input disabled="true" v-model="editFormData.jwcode" placeholder="精网号" />
-            </el-form-item>
-            <el-form-item label="客户姓名">
-              <el-input disabled="true" v-model="editFormData.name" placeholder="客户姓名" />
-            </el-form-item>
-            <el-form-item label="所属地区">
-              <el-input disabled="true" v-model="editFormData.marketName" placeholder="所属地区" />
-            </el-form-item>
-            <el-form-item label="活动名称">
-              <el-input disabled="true" v-model="editFormData.activity" placeholder="活动名称" />
-            </el-form-item>
-            <el-form-item label="产品名称">
-              <el-select disabled="true" v-model="editFormData.goodsName" placeholder="产品名称"
-                         clearable></el-select>
-            </el-form-item>
-            <!-- 金币产品特殊显示 -->
-            <el-form-item v-show="!isEditGold" label="产品数量">
-              <div style="display: flex;">
-                <el-input disabled="true" style="padding-right: 30px; flex: 3;"
-                          v-model="editFormData.goodNum" placeholder="请输入产品数量" />
-                <CurrencySelect disabled="true" v-model="editFormData.numUnit" :items="numUnitList"
-                                style="flex: 1.5;" placeholder="单位" @change="handleCurrencyChange" />
-              </div>
-            </el-form-item>
-            <div v-show="isEditGold" style="margin-bottom: 15px;  display: flex;">
-              <div style=" display: flex; margin-right: 10px;">
+            </template>
+        </el-dialog>
+
+        <!-- 编辑填手续费弹窗 -->
+        <el-dialog class="editdialog" v-model="editFormisible" width="20vw" :before-close="closeEditForm">
+            <div class="content">
+                <div class="left">
+                    <el-form class="editForm" label-width="4.5vw" label-position="left">
+                        <el-form-item label="精网号">
+                            <el-input disabled="true" v-model="editFormData.jwcode" placeholder="精网号" />
+                        </el-form-item>
+                        <el-form-item label="客户姓名">
+                            <el-input disabled="true" v-model="editFormData.name" placeholder="客户姓名" />
+                        </el-form-item>
+                        <el-form-item label="所属地区">
+                            <el-input disabled="true" v-model="editFormData.marketName" placeholder="所属地区" />
+                        </el-form-item>
+                        <el-form-item label="活动名称">
+                            <el-input disabled="true" v-model="editFormData.activity" placeholder="活动名称" />
+                        </el-form-item>
+                        <el-form-item label="产品名称">
+                            <el-select disabled="true" v-model="editFormData.goodsName" placeholder="产品名称"
+                                clearable></el-select>
+                        </el-form-item>
+                        <!-- 金币产品特殊显示 -->
+                        <el-form-item v-show="!isEditGold" label="产品数量">
+                            <div style="display: flex;">
+                                <el-input disabled="true" style="padding-right: 30px; flex: 3;"
+                                    v-model="editFormData.goodNum" placeholder="请输入产品数量" />
+                                <CurrencySelect disabled="true" v-model="editFormData.numUnit" :items="numUnitList"
+                                    style="flex: 1.5;" placeholder="单位" @change="handleCurrencyChange" />
+                            </div>
+                        </el-form-item>
+                        <div v-show="isEditGold" style="margin-bottom: 15px;  display: flex;">
+                            <div style=" display: flex; margin-right: 10px;">
                                 <span
                                     style="color: #999999; display: flex; white-space: nowrap;align-items: center;">永久金币：</span>
-                <el-input disabled="true"
-                          style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
-                          v-model="editFormData.permanentGold" />
-              </div>
-              <div style="padding-right: 5px; display: flex;">
+                                <el-input disabled="true"
+                                    style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
+                                    v-model="editFormData.permanentGold" />
+                            </div>
+                            <div style="padding-right: 5px; display: flex;">
                                 <span
                                     style="color: #999999; display: flex; white-space: nowrap;align-items: center;">免费金币：</span>
-                <el-input disabled="true"
-                          style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
-                          v-model="editFormData.freeGold" />
-              </div>
-            </div>
-            <el-form-item label="付款币种">
-              <CurrencySelect :disabled="!ifOnline" v-model="editFormData.paymentCurrency"
-                              :items="customOptions" placeholder="付款币种" />
-            </el-form-item>
-            <el-form-item label="付款金额">
-              <el-input :disabled="!ifOnline" v-model="editFormData.paymentAmount" placeholder="付款金额" />
-            </el-form-item>
-            <el-form-item label="支付方式">
-              <el-select disabled="true" v-model="editFormData.payType" placeholder="支付方式"
-                         clearable></el-select>
-            </el-form-item>
-            <el-form-item label="到账地区">
-              <el-select disabled="true" v-model="editFormData.receivedMarket" placeholder="到账地区"
-                         clearable></el-select>
-            </el-form-item>
-            <el-form-item label="付款时间">
-              <el-date-picker disabled="true" type="datetime" v-model="editFormData.payTime"
-                              placeholder="付款时间" />
-            </el-form-item>
-            <el-form-item label="转账凭证">
-              <div class="pic">
-                <el-upload disabled="true" ref="uploadRef" class="uploader" :show-file-list="false"
-                           list-type="picture-card" :auto-upload="false" :before-upload="beforeUpload"
-                           :on-error="handelImgErr" :on-change="handleImageChange"
-                           :http-request="customUpload">
-                  <img v-if="editFormData.voucher" :src="editFormData.voucher" class="avatar"
-                       style="height: 100%; width: 100%;  object-fit: cover;" />
-                  <el-icon v-else class="avatar-uploader-icon">
-                    <Plus />
-                  </el-icon>
-                </el-upload>
-                <el-text class="picText">仅支持.jpg .png格式文件≤ 2 MB</el-text>
-              </div>
-            </el-form-item>
-            <el-form-item label="备注">
-              <el-input disabled="true" v-model="editFormData.remark" type="textarea" :rows="4"
-                        placeholder="备注" maxlength="100" show-word-limit />
-            </el-form-item>
-          </el-form>
-        </div>
-        <div class="right">
-          <el-form ref="editFormRef" :rules="editFormRule" :model="editFormData" class="editFormRighrt"
-                   label-width="4.5vw" label-position="left">
-            <el-form-item label="到账货币">
-              <CurrencySelect v-model="editFormData.receivedCurrency" :items="customOptions"
-                              placeholder="请选择到账货币" />
-            </el-form-item>
-            <el-form-item label="到账金额" prop="receivedAmount">
-              <el-input v-model="editFormData.receivedAmount" placeholder="请输入到账金额" type="number" />
-            </el-form-item>
-            <el-form-item label="手续费" prop="handlingCharge">
-              <el-input v-model="editFormData.handlingCharge" placeholder="请输入手续费" type="number" />
-            </el-form-item>
-            <el-form-item label="到账时间">
-              <el-date-picker type="datetime" v-model="editFormData.receivedTime" placeholder="请选择到账时间" />
-            </el-form-item>
-          </el-form>
-          <span class="editBtns">
+                                <el-input disabled="true"
+                                    style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
+                                    v-model="editFormData.freeGold" />
+                            </div>
+                        </div>
+                        <el-form-item label="付款币种">
+                            <CurrencySelect :disabled="!ifOnline" v-model="editFormData.paymentCurrency"
+                                :items="customOptions" placeholder="付款币种" />
+                        </el-form-item>
+                        <el-form-item label="付款金额">
+                            <el-input :disabled="!ifOnline" v-model="editFormData.paymentAmount" placeholder="付款金额" />
+                        </el-form-item>
+                        <el-form-item label="支付方式">
+                            <el-select disabled="true" v-model="editFormData.payType" placeholder="支付方式"
+                                clearable></el-select>
+                        </el-form-item>
+                        <el-form-item label="到账地区">
+                            <el-select disabled="true" v-model="editFormData.receivedMarket" placeholder="到账地区"
+                                clearable></el-select>
+                        </el-form-item>
+                        <el-form-item label="付款时间">
+                            <el-date-picker disabled="true" type="datetime" v-model="editFormData.payTime"
+                                placeholder="付款时间" />
+                        </el-form-item>
+                        <el-form-item label="转账凭证">
+                            <div class="pic">
+                                <el-upload disabled="true" ref="uploadRef" class="uploader" :show-file-list="false"
+                                    list-type="picture-card" :auto-upload="false" :before-upload="beforeUpload"
+                                    :on-error="handelImgErr" :on-change="handleImageChange"
+                                    :http-request="customUpload">
+                                    <img v-if="editFormData.voucher" :src="editFormData.voucher" class="avatar"
+                                        style="height: 100%; width: 100%;  object-fit: cover;" />
+                                    <el-icon v-else class="avatar-uploader-icon">
+                                        <Plus />
+                                    </el-icon>
+                                </el-upload>
+                                <el-text class="picText">仅支持.jpg .png格式文件≤ 2 MB</el-text>
+                            </div>
+                        </el-form-item>
+                        <el-form-item label="备注">
+                            <el-input disabled="true" v-model="editFormData.remark" type="textarea" :rows="4"
+                                placeholder="备注" maxlength="100" show-word-limit />
+                        </el-form-item>
+                    </el-form>
+                </div>
+                <div class="right">
+                    <el-form ref="editFormRef" :rules="editFormRule" :model="editFormData" class="editFormRighrt"
+                        label-width="4.5vw" label-position="left">
+                        <el-form-item label="到账货币">
+                            <CurrencySelect v-model="editFormData.receivedCurrency" :items="customOptions"
+                                placeholder="请选择到账货币" />
+                        </el-form-item>
+                        <el-form-item label="到账金额" prop="receivedAmount">
+                            <el-input v-model="editFormData.receivedAmount" placeholder="请输入到账金额" type="number" />
+                        </el-form-item>
+                        <el-form-item label="手续费" prop="handlingCharge">
+                            <el-input v-model="editFormData.handlingCharge" placeholder="请输入手续费" type="number" />
+                        </el-form-item>
+                        <el-form-item label="到账时间">
+                            <el-date-picker type="datetime" v-model="editFormData.receivedTime" placeholder="请选择到账时间" />
+                        </el-form-item>
+                    </el-form>
+                    <span class="editBtns">
                         <button class="editBtn1" @click="closeEditForm">
                             <text class="txt">取消</text>
                         </button>
@@ -489,125 +489,125 @@
                             <text class="txt">提交</text>
                         </button>
                     </span>
-        </div>
-      </div>
-    </el-dialog>
-
-    <!-- 新增退款 -->
-    <el-dialog v-model="refundDialog" title="退款" class="refundDialog" overflow draggable style="width: 40vw;"
-               :before-close="closeRefundForm">
-      <div style="display: flex;">
-        <div class="left">
-          <div class="add-item">
-            <el-text style="width:4vw;">精网号</el-text>
-            <el-input v-model="refundFormData.jwcode" style="width:10vw;" disabled />
-          </div>
-          <div class="add-item">
-            <el-text style="width:4vw;">客户姓名</el-text>
-            <el-input v-model="refundFormData.name" style="width:10vw;" disabled />
-          </div>
-          <div class="add-item">
-            <el-text style="width:4vw;">所属地区</el-text>
-            <el-input v-model="refundFormData.marketName" style="width:10vw;" disabled />
-          </div>
-          <div class="add-item">
-            <el-text style="width:4vw;">活动名称</el-text>
-            <el-input v-model="refundFormData.activity" style="width:10vw;" disabled />
-          </div>
-          <div class="add-item">
-            <el-text style="width:4vw;">产品名称</el-text>
-            <el-input v-model="refundFormData.goodsName" style="width:10vw;" disabled />
-          </div>
-          <div v-show="!isRefundGold" class="add-item">
-            <el-text style="width:4vw;">产品数量</el-text>
-            <el-input style="padding-right: 10px; width:6.5vw;" v-model="refundFormData.goodNum"
-                      placeholder="请输入产品数量" disabled />
-            <CurrencySelect disabled="true" v-model="refundFormData.numUnit" :items="numUnitList"
-                            style=" width: 3.5vw;" placeholder="单位" @change="handleCurrencyChange" />
-          </div>
-          <div v-show="isRefundGold" style="display: flex; margin-bottom: 10px;">
-            <div style=" display: flex; align-items: center;justify-content: center; ">
-              <span style="color: #999999;  white-space: nowrap;">永久金币：</span>
-              <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
-                        v-model="refundFormData.permanentGold" disabled />
-            </div>
-            <div style=" display: flex; align-items: center;justify-content: center; ">
-              <span style="color: #999999;  white-space: nowrap;">免费金币：</span>
-              <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
-                        v-model="refundFormData.freeGold" disabled />
-            </div>
-          </div>
-          <div class="add-item">
-            <el-text style="width:4vw;">付款币种</el-text>
-            <el-input v-model="refundFormData.paymentCurrency" style="width:10vw;" disabled />
-          </div>
-          <div class="add-item">
-            <el-text style="width:4vw;">付款金额</el-text>
-            <el-input v-model="refundFormData.paymentAmount" style="width:10vw;" disabled />
-          </div>
-          <div class="add-item">
-            <el-text style="width:4vw;">支付方式</el-text>
-            <el-input v-model="refundFormData.payType" style="width:10vw;" disabled />
-          </div>
-          <div class="add-item">
-            <el-text style="width:4vw;">付款时间</el-text>
-            <el-date-picker v-model="refundFormData.payTime" type="datetime" style="width:10vw;" disabled />
-          </div>
-          <div class="add-item">
-            <el-text style="width:4vw;" size="small">转账凭证</el-text>
-            <el-form-item :rules="{ required: true, message: '请上传图片', trigger: 'change' }">
-              <el-upload ref="uploadRef" :auto-upload="false" list-type="picture-card"
-                         :show-file-list="false">
-                <template #default>
-                  <img v-if="refundFormData.voucher" :src="refundFormData.voucher"
-                       style="width: 100%; height: 100%; object-fit: cover;">
-                  <el-icon v-else>
-                    <Plus />
-                  </el-icon>
-                </template>
-              </el-upload>
-            </el-form-item>
-          </div>
-          <div class="add-item">
-            <el-text style="width:4vw;">备注</el-text>
-            <el-input v-model="refundFormData.remark" style="width:10vw;" :rows="2" type="textarea"
-                      maxLength="100" disabled show-word-limit />
-          </div>
-        </div>
-        <div class="right">
-          <div class="add-item">
-            <el-text style="width:4vw;">退款模式</el-text>
-            <el-radio-group v-model="refundFormData.refundModel">
-              <el-radio value="0">全部退款</el-radio>
-              <el-radio value="1">部分退款</el-radio>
-            </el-radio-group>
-          </div>
-          <div v-show="refundFormData.refundModel == '1'" style="display: flex; margin-bottom: 10px;">
-            <div style=" display: flex; align-items: center;justify-content: center; ">
-              <span style="color: #999999;  white-space: nowrap;">永久金币：</span>
-              <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
-                        v-model="refundFormData.partRefundGold" dsabled />
+                </div>
             </div>
-            <div style=" display: flex; align-items: center;justify-content: center; ">
-              <span style="color: #999999;  white-space: nowrap;">免费金币：</span>
-              <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
-                        v-model="refundFormData.partRefundFree" />
+        </el-dialog>
+
+        <!-- 新增退款 -->
+        <el-dialog v-model="refundDialog" title="退款" class="refundDialog" overflow draggable style="width: 40vw;"
+            :before-close="closeRefundForm">
+            <div style="display: flex;">
+                <div class="left">
+                    <div class="add-item">
+                        <el-text style="width:4vw;">精网号</el-text>
+                        <el-input v-model="refundFormData.jwcode" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">客户姓名</el-text>
+                        <el-input v-model="refundFormData.name" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">所属地区</el-text>
+                        <el-input v-model="refundFormData.marketName" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">活动名称</el-text>
+                        <el-input v-model="refundFormData.activity" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">产品名称</el-text>
+                        <el-input v-model="refundFormData.goodsName" style="width:10vw;" disabled />
+                    </div>
+                    <div v-show="!isRefundGold" class="add-item">
+                        <el-text style="width:4vw;">产品数量</el-text>
+                        <el-input style="padding-right: 10px; width:6.5vw;" v-model="refundFormData.goodNum"
+                            placeholder="请输入产品数量" disabled />
+                        <CurrencySelect disabled="true" v-model="refundFormData.numUnit" :items="numUnitList"
+                            style=" width: 3.5vw;" placeholder="单位" @change="handleCurrencyChange" />
+                    </div>
+                    <div v-show="isRefundGold" style="display: flex; margin-bottom: 10px;">
+                        <div style=" display: flex; align-items: center;justify-content: center; ">
+                            <span style="color: #999999;  white-space: nowrap;">永久金币：</span>
+                            <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
+                                v-model="refundFormData.permanentGold" disabled />
+                        </div>
+                        <div style=" display: flex; align-items: center;justify-content: center; ">
+                            <span style="color: #999999;  white-space: nowrap;">免费金币：</span>
+                            <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
+                                v-model="refundFormData.freeGold" disabled />
+                        </div>
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">付款币种</el-text>
+                        <el-input v-model="refundFormData.paymentCurrency" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">付款金额</el-text>
+                        <el-input v-model="refundFormData.paymentAmount" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">支付方式</el-text>
+                        <el-input v-model="refundFormData.payType" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">付款时间</el-text>
+                        <el-date-picker v-model="refundFormData.payTime" type="datetime" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;" size="small">转账凭证</el-text>
+                        <el-form-item :rules="{ required: true, message: '请上传图片', trigger: 'change' }">
+                            <el-upload ref="uploadRef" :auto-upload="false" list-type="picture-card"
+                                :show-file-list="false">
+                                <template #default>
+                                    <img v-if="refundFormData.voucher" :src="refundFormData.voucher"
+                                        style="width: 100%; height: 100%; object-fit: cover;">
+                                    <el-icon v-else>
+                                        <Plus />
+                                    </el-icon>
+                                </template>
+                            </el-upload>
+                        </el-form-item>
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">备注</el-text>
+                        <el-input v-model="refundFormData.remark" style="width:10vw;" :rows="2" type="textarea"
+                            maxLength="100" disabled show-word-limit />
+                    </div>
+                </div>
+                <div class="right">
+                    <div class="add-item">
+                        <el-text style="width:4vw;">退款模式</el-text>
+                        <el-radio-group v-model="refundFormData.refundModel">
+                            <el-radio value="0">全部退款</el-radio>
+                            <el-radio value="1">部分退款</el-radio>
+                        </el-radio-group>
+                    </div>
+                    <div v-show="refundFormData.refundModel == '1'" style="display: flex; margin-bottom: 10px;">
+                        <div style=" display: flex; align-items: center;justify-content: center; ">
+                            <span style="color: #999999;  white-space: nowrap;">永久金币：</span>
+                            <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
+                                v-model="refundFormData.partRefundGold" dsabled />
+                        </div>
+                        <div style=" display: flex; align-items: center;justify-content: center; ">
+                            <span style="color: #999999;  white-space: nowrap;">免费金币：</span>
+                            <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
+                                v-model="refundFormData.partRefundFree" />
+                        </div>
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">退款理由</el-text>
+                        <el-input v-model="refundFormData.refundReason" style="width:10vw;" :rows="5" maxlength="150"
+                            show-word-limit type="textarea" />
+                    </div>
+                    <div>ps:请在退款理由表明用户的退款需求。</div>
+                    <div style="display:flex;justify-content: center;margin-top: 5vh;">
+                        <el-button type="default" @click="resetRefund">重置</el-button>
+                        <el-button type="primary" @click="throttledsubmitRefund">提交</el-button>
+                    </div>
+                </div>
             </div>
-          </div>
-          <div class="add-item">
-            <el-text style="width:4vw;">退款理由</el-text>
-            <el-input v-model="refundFormData.refundReason" style="width:10vw;" :rows="5" maxlength="150"
-                      show-word-limit type="textarea" />
-          </div>
-          <div>ps:请在退款理由表明用户的退款需求。</div>
-          <div style="display:flex;justify-content: center;margin-top: 5vh;">
-            <el-button type="default" @click="resetRefund">重置</el-button>
-            <el-button type="primary" @click="throttledsubmitRefund">提交</el-button>
-          </div>
-        </div>
-      </div>
-    </el-dialog>
-  </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script setup>
@@ -689,23 +689,23 @@ const refundDialog = ref(false)
 const refundFormData = ref({})
 
 const openRefundDialog = () => {
-  refundDialog.value = true
-  closeConfirmRefund()
+    refundDialog.value = true
+    closeConfirmRefund()
 
 }
 const closeRefundForm = () => {
-  refundDialog.value = false
-  refundFormData.value = {}
+    refundDialog.value = false
+    refundFormData.value = {}
 }
 
 const isRefundGold = ref(false)
 const ifRefundGold = () => {
-  if (refundFormData.value.goodsName === '金币充值') {
-    isRefundGold.value = true
-    refundFormData.value.goodNum = 0
-  } else {
-    isRefundGold.value = false
-  }
+    if (refundFormData.value.goodsName === '金币充值') {
+        isRefundGold.value = true
+        refundFormData.value.goodNum = 0
+    } else {
+        isRefundGold.value = false
+    }
 }
 
 
@@ -721,17 +721,17 @@ const paytypeOptions = ref([...paytypeList]);
 
 //确认退款弹窗
 const openRefundConfirm = (row) => {
-  textContent.value = '将要对该订单退款!'
-  refundConfirmDialog.value = true
-  refundFormData.value = { ...row }
-  ifRefundGold()
-  console.log(row);
+    textContent.value = '将要对该订单退款!'
+    refundConfirmDialog.value = true
+    refundFormData.value = { ...row }
+    ifRefundGold()
+    console.log(row);
 
 }
 
 const closeConfirmRefund = () => {
-  refundConfirmDialog.value = false
-  textContent.value = ''
+    refundConfirmDialog.value = false
+    textContent.value = ''
 }
 
 //导出相关
@@ -740,146 +740,26 @@ const exportList = ref([])
 const exportListLoading = ref(false)
 const exportExcel = async function () {
 
-  let payCurrencySelect = '';
-  let goodsName = '';
-
-  // 处理时间范围
-  if (getTime.value && getTime.value.length === 2) {
-    searchData.value.startTime = moment(getTime.value[0]).format('YYYY-MM-DD HH:mm:ss');
-    searchData.value.endTime = moment(getTime.value[1]).format('YYYY-MM-DD HH:mm:ss');
-  } else {
-    searchData.value.startTime = '';
-    searchData.value.endTime = '';
-  }
-
-  // 处理产品名称（级联选择取最后一级）
-  if (searchData.value.goodsName) {
-    goodsName = searchData.value.goodsName[searchData.value.goodsName.length - 1];
-  }
-
-  // 处理付款币种（转ID）
-  if (searchData.value.paymentCurrency) {
-    payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency);
-  }
-
-  // if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
-  //     ElMessage.error('精网号只能是数字')
-  //     return
-  // }
-
-  const cashRoleId = '1';
-  const submitterMarket = adminData.value.markets;
-  searchData.value.status = 46;
-  const params = {
-    ...pageInfo.value,
-    cashCollection: {
-      ...searchData.value,
-      submitterId: adminData.value.id,
-      receivedMarket: MarketNameForId(submitterMarket),
-      cashRoleId: cashRoleId,
-      paymentCurrency: payCurrencySelect,
-      submitterMarket: submitterMarket,
-      goodsName: goodsName,
-      market: MarketNameForId(searchData.value.market)
-    }
-  }
-
-  const res = await API({ url: '/export/exportCash', data: params })
-  if (res.code === 200) {
-    ElMessage.success('导出成功')
-  } else {
-    ElMessage.error(res.msg || '导出失败')
-  }
-}
-
-const openExportList = () => {
-  getExportList()
-  exportListVisible.value = true
-}
-//获取导出列表
-const getExportList = async () => {
-  exportListLoading.value = true
-  try {
-    const result = await API({ url: '/export/export' })
-    if (result.code === 200) {
-      const filteredData = result.data.filter(item => {
-        return item.type === 13
-      })
-      exportList.value = filteredData
-    } else {
-      ElMessage.error(result.msg || '获取导出列表失败')
-    }
-  } catch (error) {
-    console.error('获取导出列表出错:', error)
-    ElMessage.error('获取导出列表失败，请稍后重试')
-  } finally {
-    exportListLoading.value = false
-  }
-}
-const downloadExportFile = (item) => {
-  if (item.state === 2) {
-    const link = document.createElement('a')
-    link.href = item.url
-    link.download = item.fileName
-    link.click()
-  } else {
-    ElMessage.warning('文件还在导出中，请稍后再试')
-  }
-}
-//根据状态返回对应的标签类型
-const getTagType = (state) => {
-  switch (state) {
-    case 0:
-      return 'info';
-    case 1:
-      return 'primary';
-    case 2:
-      return 'success';
-    case 3:
-      return 'danger';
-    default:
-      return 'info';
-  }
-}
-//根据状态返回对应的标签文案
-const getTagText = (state) => {
-  switch (state) {
-    case 0:
-      return '待执行';
-    case 1:
-      return '执行中';
-    case 2:
-      return '执行完成';
-    case 3:
-      return '执行出错';
-    default:
-      return '未知状态';
-  }
-}
-
-// 2.1 数据加载：获取地区财务订单列表
-const getlist = async () => {
-  try {
     let payCurrencySelect = '';
     let goodsName = '';
 
     // 处理时间范围
     if (getTime.value && getTime.value.length === 2) {
-      searchData.value.startTime = moment(getTime.value[0]).format('YYYY-MM-DD HH:mm:ss');
-      searchData.value.endTime = moment(getTime.value[1]).format('YYYY-MM-DD HH:mm:ss');
+        searchData.value.startTime = moment(getTime.value[0]).format('YYYY-MM-DD HH:mm:ss');
+        searchData.value.endTime = moment(getTime.value[1]).format('YYYY-MM-DD HH:mm:ss');
     } else {
-      searchData.value.startTime = '';
-      searchData.value.endTime = '';
+        searchData.value.startTime = '';
+        searchData.value.endTime = '';
     }
 
     // 处理产品名称（级联选择取最后一级）
     if (searchData.value.goodsName) {
-      goodsName = searchData.value.goodsName[searchData.value.goodsName.length - 1];
+        goodsName = searchData.value.goodsName[searchData.value.goodsName.length - 1];
     }
 
     // 处理付款币种（转ID）
     if (searchData.value.paymentCurrency) {
-      payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency);
+        payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency);
     }
 
     // if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
@@ -887,792 +767,906 @@ const getlist = async () => {
     //     return
     // }
 
-    // 地区财务固定参数：角色ID=1，按标签页筛选状态
     const cashRoleId = '1';
-    const receivedMarket = adminData.value.markets;
-    if (activeTab.value === 'wait') searchData.value.status = 0;
-    else if (activeTab.value === 'pass') searchData.value.status = 13;
-    else if (activeTab.value === 'done') searchData.value.status = 46;
-    else if (activeTab.value === 'reject') searchData.value.status = 2;
-
-    // 地区处理
-    const markets = ref(null)
-    if (searchData.value.markets) {
-      markets.value = searchData.value.markets[searchData.value.markets.length - 1]
-      console.log('地区转换', markets.value)
-    }
-    if (searchData.value.jwcode) {
-      const isPositiveInteger = /^[1-9]\d*$/.test(searchData.value.jwcode);
-      if (!isPositiveInteger) {
-        ElMessage.error('请输入正确的精网号')
-        return;
-      }
-    }
-    const result = await request({
-      url: '/cashCollection/selectCollection',
-      data: {
+    const submitterMarket = adminData.value.markets;
+    searchData.value.status = 46;
+    const params = {
         ...pageInfo.value,
         cashCollection: {
-          ...searchData.value,
-          submitterId: adminData.value.id,
-          receivedMarket: MarketNameForId(receivedMarket),
-          cashRoleId: cashRoleId,
-          paymentCurrency: payCurrencySelect,
-          submitterMarket: receivedMarket,
-          goodsName: goodsName,
-          // market: MarketNameForId(searchData.value.market)
-          market: markets.value
+            ...searchData.value,
+            submitterId: adminData.value.id,
+            receivedMarket: MarketNameForId(submitterMarket),
+            cashRoleId: cashRoleId,
+            paymentCurrency: payCurrencySelect,
+            submitterMarket: submitterMarket,
+            goodsName: goodsName,
+            market: MarketNameForId(searchData.value.market)
         }
-      }
-    });
+    }
 
-    if (result.code === 200) {
-      tableData.value = result.data.list;
-      total.value = result.data.total;
+    const res = await API({ url: '/export/exportCash', data: params })
+    if (res.code === 200) {
+        ElMessage.success('导出成功')
+    } else {
+        ElMessage.error(res.msg || '导出失败')
+    }
+}
+
+const openExportList = () => {
+    getExportList()
+    exportListVisible.value = true
+}
+//获取导出列表
+const getExportList = async () => {
+    exportListLoading.value = true
+    try {
+        const result = await API({ url: '/export/export' })
+        if (result.code === 200) {
+            const filteredData = result.data.filter(item => {
+                return item.type === 13
+            })
+            exportList.value = filteredData
+        } else {
+            ElMessage.error(result.msg || '获取导出列表失败')
+        }
+    } catch (error) {
+        console.error('获取导出列表出错:', error)
+        ElMessage.error('获取导出列表失败，请稍后重试')
+    } finally {
+        exportListLoading.value = false
+    }
+}
+const downloadExportFile = (item) => {
+    if (item.state === 2) {
+        const link = document.createElement('a')
+        link.href = item.url
+        link.download = item.fileName
+        link.click()
     } else {
-      ElMessage.error('订单数据加载失败');
+        ElMessage.warning('文件还在导出中，请稍后再试')
+    }
+}
+//根据状态返回对应的标签类型
+const getTagType = (state) => {
+    switch (state) {
+        case 0:
+            return 'info';
+        case 1:
+            return 'primary';
+        case 2:
+            return 'success';
+        case 3:
+            return 'danger';
+        default:
+            return 'info';
+    }
+}
+//根据状态返回对应的标签文案
+const getTagText = (state) => {
+    switch (state) {
+        case 0:
+            return '待执行';
+        case 1:
+            return '执行中';
+        case 2:
+            return '执行完成';
+        case 3:
+            return '执行出错';
+        default:
+            return '未知状态';
+    }
+}
+
+// 2.1 数据加载：获取地区财务订单列表
+const getlist = async () => {
+    try {
+        let payCurrencySelect = '';
+        let goodsName = '';
+
+        // 处理时间范围
+        if (getTime.value && getTime.value.length === 2) {
+            searchData.value.startTime = moment(getTime.value[0]).format('YYYY-MM-DD HH:mm:ss');
+            searchData.value.endTime = moment(getTime.value[1]).format('YYYY-MM-DD HH:mm:ss');
+        } else {
+            searchData.value.startTime = '';
+            searchData.value.endTime = '';
+        }
+
+        // 处理产品名称（级联选择取最后一级）
+        if (searchData.value.goodsName) {
+            goodsName = searchData.value.goodsName[searchData.value.goodsName.length - 1];
+        }
+
+        // 处理付款币种（转ID）
+        if (searchData.value.paymentCurrency) {
+            payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency);
+        }
+
+        // if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
+        //     ElMessage.error('精网号只能是数字')
+        //     return
+        // }
+
+        // 地区财务固定参数：角色ID=1，按标签页筛选状态
+        const cashRoleId = '1';
+        const receivedMarket = adminData.value.markets;
+        if (activeTab.value === 'wait') searchData.value.status = 0;
+        else if (activeTab.value === 'pass') searchData.value.status = 13;
+        else if (activeTab.value === 'done') searchData.value.status = 46;
+        else if (activeTab.value === 'reject') searchData.value.status = 2;
+
+        // 地区处理
+        const markets = ref(null)
+        if (searchData.value.markets) {
+            markets.value = searchData.value.markets[searchData.value.markets.length - 1]
+            console.log('地区转换', markets.value)
+        }
+        if (searchData.value.jwcode) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(searchData.value.jwcode);
+            if (!isPositiveInteger) {
+                ElMessage.error('请输入正确的精网号')
+                return;
+            }
+        }
+        const result = await request({
+            url: '/cashCollection/selectCollection',
+            data: {
+                ...pageInfo.value,
+                cashCollection: {
+                    ...searchData.value,
+                    submitterId: adminData.value.id,
+                    receivedMarket: MarketNameForId(receivedMarket),
+                    cashRoleId: cashRoleId,
+                    paymentCurrency: payCurrencySelect,
+                    submitterMarket: receivedMarket,
+                    goodsName: goodsName,
+                    // market: MarketNameForId(searchData.value.market)
+                    market: markets.value
+                }
+            }
+        });
+
+        if (result.code === 200) {
+            tableData.value = result.data.list;
+            total.value = result.data.total;
+        } else {
+            ElMessage.error('订单数据加载失败');
+        }
+    } catch (error) {
+        console.error('地区财务订单列表请求异常：', error);
+        ElMessage.error('网络异常，请重试');
     }
-  } catch (error) {
-    console.error('地区财务订单列表请求异常：', error);
-    ElMessage.error('网络异常，请重试');
-  }
 };
 
 //重置退款
 const resetRefund = () => {
-  refundFormData.value.refundModel = ''
-  refundFormData.value.refundReason = ''
+    refundFormData.value.refundModel = ''
+    refundFormData.value.refundReason = ''
 }
 //提交退款
 const submitRefund = async () => {
-  try {
-    if (refundFormData.value.goodsName != '金币充值') {
+    try {
+        if (refundFormData.value.goodsName != '金币充值') {
 
-      return ElMessage.error('线上数据仅支持金币充值退款');
-    }
-    if (!refundFormData.value.refundModel) {
-      return ElMessage.error('请选择退款方式');
-    }
-    if (!refundFormData.value.refundReason) {
-      return ElMessage.error('请输入退款原因');
-    }
-    if (refundFormData.value.refundModel == 0) {
-      refundFormData.value.partRefundGold = refundFormData.value.permanentGold,
-          refundFormData.value.partRefundFree = refundFormData.value.freeGold
-    }
-    const result = await request({
-      url: '/Money/addOnline',
-      data: {
-        jwcode: refundFormData.value.jwcode,
-        name: refundFormData.value.name,
-        market: refundFormData.value.marketName,
-        submitterId: adminData.value.id,
-        submitterMarket: adminData.value.markets,
-        remark: refundFormData.value.remark,
-        refundReason: refundFormData.value.refundReason,
-        refundModel: refundFormData.value.refundModel,
-        originalOrderId: refundFormData.value.id,
-        orderCode: refundFormData.value.orderCode,
-        permanentGold: (refundFormData.value.permanentGold) * 100 || 0,
-        freeGold: (refundFormData.value.freeGold) * 100 || 0,
-        partRefundGold: (refundFormData.value.partRefundGold) * 100 || 0,
-        partRefundFree: (refundFormData.value.partRefundFree) * 100 || 0,
-        handlingCharge: refundFormData.value.handlingCharge == null ? null : refundFormData.value.handlingCharge * 100,
-      }
-    })
-    if (result.code == 200) {
-      ElMessage.success('新增退款成功')
-      getlist()
-      closeRefundForm()
-    } else {
-      ElMessage.error(result.msg)
-      getlist()
+            return ElMessage.error('线上数据仅支持金币充值退款');
+        }
+        if (!refundFormData.value.refundModel) {
+            return ElMessage.error('请选择退款方式');
+        }
+        if (!refundFormData.value.refundReason) {
+            return ElMessage.error('请输入退款原因');
+        }
+        if (refundFormData.value.refundModel == 0) {
+            refundFormData.value.partRefundGold = refundFormData.value.permanentGold,
+                refundFormData.value.partRefundFree = refundFormData.value.freeGold
+        }
+        const result = await request({
+            url: '/Money/addOnline',
+            data: {
+                jwcode: refundFormData.value.jwcode,
+                name: refundFormData.value.name,
+                market: refundFormData.value.marketName,
+                submitterId: adminData.value.id,
+                submitterMarket: adminData.value.markets,
+                remark: refundFormData.value.remark,
+                refundReason: refundFormData.value.refundReason,
+                refundModel: refundFormData.value.refundModel,
+                originalOrderId: refundFormData.value.id,
+                orderCode: refundFormData.value.orderCode,
+                permanentGold: (refundFormData.value.permanentGold) * 100 || 0,
+                freeGold: (refundFormData.value.freeGold) * 100 || 0,
+                partRefundGold: (refundFormData.value.partRefundGold) * 100 || 0,
+                partRefundFree: (refundFormData.value.partRefundFree) * 100 || 0,
+                handlingCharge: refundFormData.value.handlingCharge == null ? null : refundFormData.value.handlingCharge * 100,
+            }
+        })
+        if (result.code == 200) {
+            ElMessage.success('新增退款成功')
+            getlist()
+            closeRefundForm()
+        } else {
+            ElMessage.error(result.msg)
+            getlist()
+        }
+        console.log('返回参数：', result);
+    } catch (error) {
+        console.log(error);
     }
-    console.log('返回参数：', result);
-  } catch (error) {
-    console.log(error);
-  }
 }
 
 // 2.2 搜索与重置
 const search = () => {
-  getlist();
+    getlist();
 };
 
 const reset = () => {
-  searchData.value = {};
-  // 重置页码
-  pageInfo.value.pageNum = 1;
-  getTime.value = []
-  getlist();
+    searchData.value = {};
+    // 重置页码
+    pageInfo.value.pageNum = 1;
+    getTime.value = []
+    getlist();
 };
 
 // 2.3 标签页切换
 const navigateTo = async (tab) => {
-  activeTab.value = tab;
-  await getlist();
+    activeTab.value = tab;
+    await getlist();
 };
 
 // 2.4 审核功能
 // 打开审核弹窗
 const openAuditForm = (row) => {
-  auditFormData.value = {...row, market: row.marketName};
-  ifGold(auditFormData.value)
-  console.log('isGold', isGold.value);
+    auditFormData.value = { ...row, market: row.marketName };
+    ifGold(auditFormData.value)
+    console.log('isGold', isGold.value);
 
-  auditFormisible.value = true;
+    auditFormisible.value = true;
 };
 
 // 关闭审核弹窗
 const closeAuditForm = () => {
-  ifReject.value = false;
-  auditFormisible.value = false;
-  auditFormData.value = {};
+    ifReject.value = false;
+    auditFormisible.value = false;
+    auditFormData.value = {};
 };
 
 // 审核通过
 const handelAudit = async () => {
-  try {
-    const result = await request({
-      url: '/cashAudit/collectionAudit',
-      data: {
-        orderCode: auditFormData.value.orderCode,
-        action: 1,
-        auditId: adminData.value.id
-      }
-    });
-
-    if (result.code === 200) {
-      ElMessage.success('审核通过');
-      getlist();
-      closeAuditForm();
-    } else {
-      ElMessage.error(result.msg || '审核失败');
+    try {
+        const result = await request({
+            url: '/cashAudit/collectionAudit',
+            data: {
+                orderCode: auditFormData.value.orderCode,
+                action: 1,
+                auditId: adminData.value.id
+            }
+        });
+
+        if (result.code === 200) {
+            ElMessage.success('审核通过');
+            getlist();
+            closeAuditForm();
+        } else {
+            ElMessage.error(result.msg || '审核失败');
+        }
+    } catch (error) {
+        console.error('审核通过请求异常：', error);
+        ElMessage.error('网络异常，请重试');
     }
-  } catch (error) {
-    console.error('审核通过请求异常：', error);
-    ElMessage.error('网络异常，请重试');
-  }
 };
 
 // 审核驳回
 const handelAuditReject = async () => {
-  if (!auditFormData.value.rejectReason) {
-    ElMessage.warning('请输入驳回理由');
-    return;
-  }
-
-  try {
-    const result = await request({
-      url: '/cashAudit/collectionAudit',
-      data: {
-        orderCode: auditFormData.value.orderCode,
-        rejectReason: auditFormData.value.rejectReason,
-        action: 2,
-        auditId: adminData.value.id
-      }
-    });
+    if (!auditFormData.value.rejectReason) {
+        ElMessage.warning('请输入驳回理由');
+        return;
+    }
 
-    if (result.code === 200) {
-      ElMessage.success('驳回成功');
-      getlist();
-      closeAuditForm();
-    } else {
-      ElMessage.error(result.msg || '驳回失败');
+    try {
+        const result = await request({
+            url: '/cashAudit/collectionAudit',
+            data: {
+                orderCode: auditFormData.value.orderCode,
+                rejectReason: auditFormData.value.rejectReason,
+                action: 2,
+                auditId: adminData.value.id
+            }
+        });
+
+        if (result.code === 200) {
+            ElMessage.success('驳回成功');
+            getlist();
+            closeAuditForm();
+        } else {
+            ElMessage.error(result.msg || '驳回失败');
+        }
+    } catch (error) {
+        console.error('审核驳回请求异常：', error);
+        ElMessage.error('网络异常，请重试');
     }
-  } catch (error) {
-    console.error('审核驳回请求异常：', error);
-    ElMessage.error('网络异常，请重试');
-  }
 };
 
 //判断产品类型
 const isGold = ref(false)
 const ifGold = (data) => {
-  console.log('data', data);
-  if (data.goodsName === '金币充值') {
-    isGold.value = true
-  } else {
-    isGold.value = false
-  }
+    console.log('data', data);
+    if (data.goodsName === '金币充值') {
+        isGold.value = true
+    } else {
+        isGold.value = false
+    }
 }
 
 // 审核按钮倒计时（防止误操作）
 watch(auditFormisible, (val) => {
-  if (val) {
-    countdown.value = 3;
-    isBtnDisabled.value = true;
-    btnText.value = `通过(${countdown.value})`;
-
-    const timer = setInterval(() => {
-      countdown.value--;
-      btnText.value = `通过(${countdown.value})`;
-
-      if (countdown.value <= 0) {
-        isBtnDisabled.value = false;
-        clearInterval(timer);
-        btnText.value = '通过';
-      }
-    }, 1000);
-  }
+    if (val) {
+        countdown.value = 3;
+        isBtnDisabled.value = true;
+        btnText.value = `通过(${countdown.value})`;
+
+        const timer = setInterval(() => {
+            countdown.value--;
+            btnText.value = `通过(${countdown.value})`;
+
+            if (countdown.value <= 0) {
+                isBtnDisabled.value = false;
+                clearInterval(timer);
+                btnText.value = '通过';
+            }
+        }, 1000);
+    }
 });
 
 // 2.5 编辑手续费功能
 // 打开编辑弹窗
 const openEditForm = (row) => {
-  console.log('row.aaa', row.handlingCharge);
+    console.log('row.aaa', row.handlingCharge);
 
-  editFormData.value = {...row};
-  // 区分金币产品与普通产品
-  if (row.goodsName === '金币充值') isEditGold.value = true;
-  else isEditGold.value = false;
-  // 在线支付订单允许修改付款信息
-  if (row.status === 3) ifOnline.value = true;
-  else ifOnline.value = false;
+    editFormData.value = { ...row };
+    // 区分金币产品与普通产品
+    if (row.goodsName === '金币充值') isEditGold.value = true;
+    else isEditGold.value = false;
+    // 在线支付订单允许修改付款信息
+    if (row.status === 3) ifOnline.value = true;
+    else ifOnline.value = false;
 
-  editFormisible.value = true;
+    editFormisible.value = true;
 };
 
 // 关闭编辑弹窗
 const closeEditForm = () => {
-  editFormisible.value = false;
-  editFormData.value = {};
-  editFormRef.value.resetFields();
+    editFormisible.value = false;
+    editFormData.value = {};
+    editFormRef.value.resetFields();
 };
 
 // 提交编辑（补充手续费）
 const submitEditForm = async () => {
-  try {
-    await editFormRef.value.validate();
-
-    // 处理时间格式
-    if (editFormData.value.receivedTime) {
-      editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss');
-    }
-    console.log('editFormData.value.handlingCharge', editFormData.value.handlingCharge);
-
-    const result = await request({
-      url: '/cashCollection/complete',
-      data: {
-        orderCode: editFormData.value.orderCode,
-        handlingCharge: editFormData.value.handlingCharge == null ? null : editFormData.value.handlingCharge * 100, // 转为分单位
-        paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency),
-        paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位
-        receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),
-        receivedAmount: editFormData.value.receivedAmount * 100 || null, // 转为分单位
-        receivedTime: editFormData.value.receivedTime,
-        receivedRemark: editFormData.value.receivedRemark || ''
-      }
-    });
+    try {
+        await editFormRef.value.validate();
 
-    if (result.code === 200) {
-      ElMessage.success('编辑提交成功');
-      getlist();
-      closeEditForm();
-    } else {
-      ElMessage.error(result.msg || '提交失败');
+        // 处理时间格式
+        if (editFormData.value.receivedTime) {
+            editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss');
+        }
+        console.log('editFormData.value.handlingCharge', editFormData.value.handlingCharge);
+
+        const result = await request({
+            url: '/cashCollection/complete',
+            data: {
+                orderCode: editFormData.value.orderCode,
+                handlingCharge: editFormData.value.handlingCharge == null ? null : editFormData.value.handlingCharge * 100, // 转为分单位
+                paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency),
+                paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位
+                receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),
+                receivedAmount: editFormData.value.receivedAmount * 100 || null, // 转为分单位
+                receivedTime: editFormData.value.receivedTime,
+                receivedRemark: editFormData.value.receivedRemark || ''
+            }
+        });
+
+        if (result.code === 200) {
+            ElMessage.success('编辑提交成功');
+            getlist();
+            closeEditForm();
+        } else {
+            ElMessage.error(result.msg || '提交失败');
+        }
+    } catch (error) {
+        console.error('编辑提交请求异常：', error);
+        ElMessage.error('表单验证失败，请检查数据格式');
     }
-  } catch (error) {
-    console.error('编辑提交请求异常：', error);
-    ElMessage.error('表单验证失败，请检查数据格式');
-  }
 };
 
 // 2.6 辅助功能
 // 图片预览
 const previewImage = (imageUrl) => {
-  if (!imageUrl) return;
-
-  const imageElement = document.createElement('img');
-  imageElement.src = imageUrl;
-  imageElement.style.maxWidth = '80vw';
-  imageElement.style.maxHeight = '80vh';
-  imageElement.style.objectFit = 'contain';
-
-  const viewer = document.createElement('div');
-  viewer.style.position = 'fixed';
-  viewer.style.top = '0';
-  viewer.style.left = '0';
-  viewer.style.width = '100vw';
-  viewer.style.height = '100vh';
-  viewer.style.backgroundColor = 'rgba(0, 0, 0, 0.7)';
-  viewer.style.display = 'flex';
-  viewer.style.justifyContent = 'center';
-  viewer.style.alignItems = 'center';
-  viewer.style.zIndex = '9999';
-  viewer.appendChild(imageElement);
-
-  // 点击关闭预览
-  viewer.addEventListener('click', () => {
-    document.body.removeChild(viewer);
-  });
-
-  document.body.appendChild(viewer);
+    if (!imageUrl) return;
+
+    const imageElement = document.createElement('img');
+    imageElement.src = imageUrl;
+    imageElement.style.maxWidth = '80vw';
+    imageElement.style.maxHeight = '80vh';
+    imageElement.style.objectFit = 'contain';
+
+    const viewer = document.createElement('div');
+    viewer.style.position = 'fixed';
+    viewer.style.top = '0';
+    viewer.style.left = '0';
+    viewer.style.width = '100vw';
+    viewer.style.height = '100vh';
+    viewer.style.backgroundColor = 'rgba(0, 0, 0, 0.7)';
+    viewer.style.display = 'flex';
+    viewer.style.justifyContent = 'center';
+    viewer.style.alignItems = 'center';
+    viewer.style.zIndex = '9999';
+    viewer.appendChild(imageElement);
+
+    // 点击关闭预览
+    viewer.addEventListener('click', () => {
+        document.body.removeChild(viewer);
+    });
+
+    document.body.appendChild(viewer);
 };
 
 // 驳回理由悬浮提示
 const handleMouseEnter = (e, content) => {
-  if (!content) return;
+    if (!content) return;
 
-  showTooltip.value = true;
-  tooltipContent.value = content;
-  handleMouseMove(e);
+    showTooltip.value = true;
+    tooltipContent.value = content;
+    handleMouseMove(e);
 };
 
 const handleMouseLeave = () => {
-  showTooltip.value = false;
-  tooltipContent.value = '';
+    showTooltip.value = false;
+    tooltipContent.value = '';
 };
 
 const handleMouseMove = (e) => {
-  // 提示框显示在鼠标左侧，避免遮挡
-  tooltipLeft.value = e.clientX - 210;
-  tooltipTop.value = e.clientY - 10;
+    // 提示框显示在鼠标左侧，避免遮挡
+    tooltipLeft.value = e.clientX - 210;
+    tooltipTop.value = e.clientY - 10;
 };
 
 // 2.7 基础数据加载（初始化）
 // 获取管理员信息
 const getAdminData = async () => {
-  try {
-    const result = await API({url: '/admin/userinfo', data: {}});
-    adminData.value = result;
-
-    // 超级管理员判断（仅用于角色切换权限）
-    // if (adminData.value.roleId === 2) {
-    //     superAdmin.value = true;
-    //     // 管理员所属地区提示
-    //     if (adminData.value.markets === '总部' || adminData.value.markets === '研发部') {
-    //         ElMessageBox.alert(
-    //             '管理员账号仅显示所属地区的财务数据，请确认地区设置',
-    //             '温馨提示',
-    //             { type: 'warning' }
-    //         );
-    //     }
-    // }
-  } catch (error) {
-    console.error('管理员信息获取失败：', error);
-    ElMessage.error('管理员信息加载异常');
-  }
+    try {
+        const result = await API({ url: '/admin/userinfo', data: {} });
+        adminData.value = result;
+
+        // 超级管理员判断（仅用于角色切换权限）
+        // if (adminData.value.roleId === 2) {
+        //     superAdmin.value = true;
+        //     // 管理员所属地区提示
+        //     if (adminData.value.markets === '总部' || adminData.value.markets === '研发部') {
+        //         ElMessageBox.alert(
+        //             '管理员账号仅显示所属地区的财务数据，请确认地区设置',
+        //             '温馨提示',
+        //             { type: 'warning' }
+        //         );
+        //     }
+        // }
+    } catch (error) {
+        console.error('管理员信息获取失败：', error);
+        ElMessage.error('管理员信息加载异常');
+    }
 };
 
 // 获取活动列表
 const getActivitys = async () => {
-  try {
-    const result = await API({url: '/cashCollection/getActivityList', data: {}});
-    if (result.code === 200) {
-      activityList.value = result.data;
-    } else {
-      ElMessage.error('活动列表加载失败');
+    try {
+        const result = await API({ url: '/cashCollection/getActivityList', data: {} });
+        if (result.code === 200) {
+            activityList.value = result.data;
+        } else {
+            ElMessage.error('活动列表加载失败');
+        }
+    } catch (error) {
+        console.error('活动列表获取失败：', error);
+        ElMessage.error('活动数据加载异常');
     }
-  } catch (error) {
-    console.error('活动列表获取失败：', error);
-    ElMessage.error('活动数据加载异常');
-  }
 };
 
 // 2.8 节流函数（防止重复提交）
-const throttledhandelAuditReject = _.throttle(handelAuditReject, 3000, {trailing: false});
-const throttledsubmitEditForm = _.throttle(submitEditForm, 3000, {trailing: false});
+const throttledhandelAuditReject = _.throttle(handelAuditReject, 3000, { trailing: false });
+const throttledsubmitEditForm = _.throttle(submitEditForm, 3000, { trailing: false });
 const throttledsubmitRefund = _.throttle(submitRefund, 5000, {
-  trailing: false
+    trailing: false
 })
 // 2.9 页面初始化
 onMounted(async () => {
-  await getAdminData();
-  await getActivitys();
-  // 初始化加载地区财务订单数据
-  await getlist();
-
-  // if (!hasMenuPermission(menuTree.value, 67)) {
-  //     ElMessageBox.alert(
-  //         '您暂无该页面操作权限，请联系管理员',
-  //         '权限提示',
-  //         { type: 'error' }
-  //     ).then(() => {
-  //         window.history.back();
-  //     });
-  // }
-  //背景预加载
-  const bgImg = new Image();
-  bgImg.src = '/src/assets/receive-recall.png';
-  getMarket()
+    await getAdminData();
+    await getActivitys();
+    // 初始化加载地区财务订单数据
+    await getlist();
+
+    // if (!hasMenuPermission(menuTree.value, 67)) {
+    //     ElMessageBox.alert(
+    //         '您暂无该页面操作权限，请联系管理员',
+    //         '权限提示',
+    //         { type: 'error' }
+    //     ).then(() => {
+    //         window.history.back();
+    //     });
+    // }
+    //背景预加载
+    const bgImg = new Image();
+    bgImg.src = '/src/assets/receive-recall.png';
+    getMarket()
 });
 
 // 2.10 未使用函数占位（避免报错）
-const handleCurrencyChange = () => {
-};
+const handleCurrencyChange = () => { };
 const beforeUpload = () => true;
-const handelImgErr = () => {
-};
-const handleImageChange = () => {
-};
-const customUpload = () => {
-};
-const handleDatePickerChange = () => {
-};
+const handelImgErr = () => { };
+const handleImageChange = () => { };
+const customUpload = () => { };
+const handleDatePickerChange = () => { };
 const disabledDate = () => false;
-const handleSortChange = () => {
-};
+const handleSortChange = () => { };
 const getMarket = async function () {
-  try {
-    const result = await API({
-
-      url: '/market/selectMarket',
-    })
-    console.log('看看地区树', result)
-
-    const transformTree = (nodes) => {
-      const allChildren = nodes.flatMap(node => node.children || []);
-
-      return allChildren.map(child => {
-        const grandchildren = child.children && child.children.length
-            ? transformTree([child])
-            : null;
-
-        return {
-          value: child.id,
-          label: child.name,
-          children: grandchildren
+    try {
+        const result = await API({
+
+            url: '/market/selectMarket',
+        })
+        console.log('看看地区树', result)
+
+        const transformTree = (nodes) => {
+            const allChildren = nodes.flatMap(node => node.children || []);
+
+            return allChildren.map(child => {
+                const grandchildren = child.children && child.children.length
+                    ? transformTree([child])
+                    : null;
+
+                return {
+                    value: child.id,
+                    label: child.name,
+                    children: grandchildren
+                };
+            });
         };
-      });
-    };
-    market.value = transformTree(result.data)
-    console.log('转换后的地区树==============', market.value)
-  } catch (error) {
-    console.log('请求失败', error)
-  }
+        market.value = transformTree(result.data)
+        console.log('转换后的地区树==============', market.value)
+    } catch (error) {
+        console.log('请求失败', error)
+    }
 }
 const handlePagination = (type, val) => {
-  if (type === 'size') pageInfo.value.pageSize = val;
-  else pageInfo.value.pageNum = val;
-  getlist();
+    if (type === 'size') pageInfo.value.pageSize = val;
+    else pageInfo.value.pageNum = val;
+    getlist();
 };
 </script>
 
 <style scoped lang="scss">
 .content {
-  height: 100%;
-  width: 80vw;
-
-  .card1 {
-    width: 100%;
-    background: #F3FAFE;
-
-    .rowItem {
-      display: flex;
-      width: 15vw;
-      align-items: center;
-      justify-content: center;
-      margin-right: 0.5vw;
-    }
+    height: 100%;
+    width: 80vw;
 
-    el-button {
-      margin-left: 10px;
-    }
-
-    .row1 {
-      height: 4vh;
-      width: 80vw;
-      display: flex;
-      min-height: 40px;
-    }
+    .card1 {
+        width: 100%;
+        background: #F3FAFE;
 
-    .row2 {
-      height: 4vh;
-      width: 80vw;
-      display: flex;
-      align-items: center;
+        .rowItem {
+            display: flex;
+            width: 15vw;
+            align-items: center;
+            justify-content: center;
+            margin-right: 0.5vw;
+        }
 
-      min-height: 40px;
+        el-button {
+            margin-left: 10px;
+        }
 
-      .left {
-        height: 4vh;
-        width: 58vw;
-        display: flex;
-        min-height: 40px;
-      }
-    }
-  }
+        .row1 {
+            height: 4vh;
+            width: 80vw;
+            display: flex;
+            min-height: 40px;
+        }
 
+        .row2 {
+            height: 4vh;
+            width: 80vw;
+            display: flex;
+            align-items: center;
 
-  .div-card2 {
-    width: 100%;
-    margin-top: 2vh;
+            min-height: 40px;
 
-    .card2 {
-      background: #E7F4FD;
+            .left {
+                height: 4vh;
+                width: 58vw;
+                display: flex;
+                min-height: 40px;
+            }
+        }
     }
 
-    .btns {
-      width: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding-bottom: 10px;
 
-      .tabs {
+    .div-card2 {
         width: 100%;
-        min-width: 300px;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-
-        .btnItem {
-          margin-left: 10px;
-          border-radius: 5px;
-        }
+        margin-top: 2vh;
 
-        .info-tooltip {
-          display: flex;
-          align-items: center;
+        .card2 {
+            background: #E7F4FD;
         }
 
-        .service-icon {
-          color: #666;
-          cursor: pointer;
-          font-size: 18px;
-          transition: all 0.3s ease;
-          padding: 4px;
-          border-radius: 50%;
+        .btns {
+            width: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            padding-bottom: 10px;
+
+            .tabs {
+                width: 100%;
+                min-width: 300px;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+
+                .btnItem {
+                    margin-left: 10px;
+                    border-radius: 5px;
+                }
+
+                .info-tooltip {
+                    display: flex;
+                    align-items: center;
+                }
+
+                .service-icon {
+                    color: #666;
+                    cursor: pointer;
+                    font-size: 18px;
+                    transition: all 0.3s ease;
+                    padding: 4px;
+                    border-radius: 50%;
+                }
+            }
         }
-      }
-    }
-
-
-    .table {
-      margin: 10px;
-      border-radius: 20px;
 
-      .ellipsis-container {
-        position: relative;
-        width: 100%;
 
-        .ellipsis-text {
-          display: inline-block;
-          width: 100%;
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          cursor: pointer;
+        .table {
+            margin: 10px;
+            border-radius: 20px;
+
+            .ellipsis-container {
+                position: relative;
+                width: 100%;
+
+                .ellipsis-text {
+                    display: inline-block;
+                    width: 100%;
+                    white-space: nowrap;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    cursor: pointer;
+                }
+
+                .custom-tooltip {
+                    position: fixed;
+                    z-index: 9999;
+                    padding: 8px 12px;
+                    width: 200px;
+                    background-color: #E4F0FC;
+                    color: #333333;
+                    border: 1px solid #e5e7eb;
+                    border-radius: 4px;
+                    box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
+                    min-height: 30px;
+                    max-height: 300px;
+                    overflow-y: auto;
+                    font-size: 14px;
+                    line-height: 1.5;
+                }
+            }
         }
 
-        .custom-tooltip {
-          position: fixed;
-          z-index: 9999;
-          padding: 8px 12px;
-          width: 200px;
-          background-color: #E4F0FC;
-          color: #333333;
-          border: 1px solid #e5e7eb;
-          border-radius: 4px;
-          box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
-          min-height: 30px;
-          max-height: 300px;
-          overflow-y: auto;
-          font-size: 14px;
-          line-height: 1.5;
+        .pagination {
+            margin-top: 10px;
+            padding: 10px 10px;
         }
-      }
-    }
-
-    .pagination {
-      margin-top: 10px;
-      padding: 10px 10px;
     }
-  }
-
-  :deep(.adddialog) {
-    min-width: 500px;
-    background-color: #F3FAFE !important;
-    margin-top: 8vh;
-    border-radius: 8px;
-
-    .addForm {
-      padding: 0 60px 1vh 60px;
-
-      .el-date-editor {
-        display: flex;
-        flex: 1;
 
-      }
-
-      .pic {
-        display: flex;
-        align-items: center;
-
-        .uploader {
-          height: 80px;
-          width: 80px;
-
-          .el-upload {
-            height: 100%;
-            width: 100%;
-          }
+    :deep(.adddialog) {
+        min-width: 500px;
+        background-color: #F3FAFE !important;
+        margin-top: 8vh;
+        border-radius: 8px;
+
+        .addForm {
+            padding: 0 60px 1vh 60px;
+
+            .el-date-editor {
+                display: flex;
+                flex: 1;
+
+            }
+
+            .pic {
+                display: flex;
+                align-items: center;
+
+                .uploader {
+                    height: 80px;
+                    width: 80px;
+
+                    .el-upload {
+                        height: 100%;
+                        width: 100%;
+                    }
+                }
+
+                .picText {
+                    color: #999999;
+                    font-family: "PingFang SC";
+                    font-size: 10px;
+                    font-style: normal;
+                    font-weight: 400;
+                    line-height: 20px;
+                    margin-left: 10px;
+                }
+            }
         }
 
-        .picText {
-          color: #999999;
-          font-family: "PingFang SC";
-          font-size: 10px;
-          font-style: normal;
-          font-weight: 400;
-          line-height: 20px;
-          margin-left: 10px;
+        .dialog-footer {
+            display: flex;
+            justify-content: center;
+            padding-bottom: 1.5vh;
         }
-      }
     }
 
-    .dialog-footer {
-      display: flex;
-      justify-content: center;
-      padding-bottom: 1.5vh;
-    }
-  }
-
-  :deep(.editdialog) {
-    min-width: 990px;
-    background-color: #F3FAFE !important;
-    margin-top: 8vh;
-    border-radius: 8px;
-
-    .editForm {
-      padding: 0 60px 1vh 60px;
-
-      .el-date-editor {
-        display: flex;
-        flex: 1;
-      }
-
-      .pic {
-        display: flex;
-        align-items: center;
-
-        .uploader {
-          height: 80px;
-          width: 80px;
+    :deep(.editdialog) {
+        min-width: 990px;
+        background-color: #F3FAFE !important;
+        margin-top: 8vh;
+        border-radius: 8px;
+
+        .editForm {
+            padding: 0 60px 1vh 60px;
+
+            .el-date-editor {
+                display: flex;
+                flex: 1;
+            }
+
+            .pic {
+                display: flex;
+                align-items: center;
+
+                .uploader {
+                    height: 80px;
+                    width: 80px;
+
+                    .el-upload {
+                        height: 100%;
+                        width: 100%;
+                    }
+                }
+
+                .picText {
+                    color: #999999;
+                    font-family: "PingFang SC";
+                    font-size: 10px;
+                    font-style: normal;
+                    font-weight: 400;
+                    line-height: 20px;
+                    margin-left: 10px;
+                }
+            }
+        }
 
-          .el-upload {
+        .content {
+            display: flex;
             height: 100%;
             width: 100%;
-          }
-        }
 
-        .picText {
-          color: #999999;
-          font-family: "PingFang SC";
-          font-size: 10px;
-          font-style: normal;
-          font-weight: 400;
-          line-height: 20px;
-          margin-left: 10px;
+            .left {
+                min-width: 500px;
+            }
+
+            .right {
+                flex: 1;
+
+                .editFormRighrt {
+                    padding: 0 60px 0 40px;
+
+                    .el-date-editor {
+                        display: flex;
+                        flex: 1;
+                    }
+                }
+
+                .editBtns {
+                    display: flex;
+                    justify-content: center;
+                    margin-top: 60px;
+
+                    .txt {
+                        color: #f3fafe;
+                        text-align: center;
+                        font-family: "PingFang SC";
+                        font-size: 14px;
+                        font-style: normal;
+                        font-weight: 700;
+                        line-height: 22px;
+                    }
+
+                    .editBtn1 {
+                        min-width: 80px;
+                        padding: 5px 12px;
+                        justify-content: center;
+                        align-items: center;
+                        gap: 4px;
+                        border-radius: 4px;
+                        background: #7E91FF;
+                        border: none;
+                        box-shadow: 0 0 4px 0 #00000040;
+                    }
+
+                    .editBtn2 {
+                        display: flex;
+                        width: 80px;
+                        min-width: 80px;
+                        padding: 5px 12px;
+                        justify-content: center;
+                        align-items: center;
+                        gap: 4px;
+                        border-radius: 4px;
+                        background: #2741DE;
+                        border: none;
+                        box-shadow: 0 0 4px 0 #00000040;
+                        margin-left: 60px;
+                    }
+                }
+            }
         }
-      }
     }
 
-    .content {
-      display: flex;
-      height: 100%;
-      width: 100%;
-
-      .left {
-        min-width: 500px;
-      }
-
-      .right {
-        flex: 1;
-
-        .editFormRighrt {
-          padding: 0 60px 0 40px;
+    :deep(.adddialog .el-form-item__label) {
+        min-width: 80px;
+        width: auto;
+        font-weight: 800;
+        padding-bottom: 15px;
+    }
 
-          .el-date-editor {
-            display: flex;
-            flex: 1;
-          }
+    .refundDialog {
+        .left {
+            width: 50%;
+            height: 70vh;
+            min-height: 700px;
+            padding: 0 2vw;
+
+            .add-item {
+                display: flex;
+                align-items: center;
+                margin-bottom: 1vh;
+            }
+
+            .image {
+                width: 4vw !important;
+                height: 4vw !important;
+            }
         }
 
-        .editBtns {
-          display: flex;
-          justify-content: center;
-          margin-top: 60px;
+        .right {
+            width: 50%;
+            height: 50vh;
 
-          .txt {
-            color: #f3fafe;
-            text-align: center;
-            font-family: "PingFang SC";
-            font-size: 14px;
-            font-style: normal;
-            font-weight: 700;
-            line-height: 22px;
-          }
-
-          .editBtn1 {
-            min-width: 80px;
-            padding: 5px 12px;
-            justify-content: center;
-            align-items: center;
-            gap: 4px;
-            border-radius: 4px;
-            background: #7E91FF;
-            border: none;
-            box-shadow: 0 0 4px 0 #00000040;
-          }
-
-          .editBtn2 {
-            display: flex;
-            width: 80px;
-            min-width: 80px;
-            padding: 5px 12px;
-            justify-content: center;
-            align-items: center;
-            gap: 4px;
-            border-radius: 4px;
-            background: #2741DE;
-            border: none;
-            box-shadow: 0 0 4px 0 #00000040;
-            margin-left: 60px;
-          }
+            .add-item {
+                display: flex;
+                align-items: center;
+                margin-bottom: 1vh;
+            }
         }
-      }
-    }
-  }
-
-  :deep(.adddialog .el-form-item__label) {
-    min-width: 80px;
-    width: auto;
-    font-weight: 800;
-    padding-bottom: 15px;
-  }
-
-  .refundDialog {
-    .left {
-      width: 50%;
-      height: 70vh;
-      min-height: 700px;
-      padding: 0 2vw;
-
-      .add-item {
-        display: flex;
-        align-items: center;
-        margin-bottom: 1vh;
-      }
-
-      .image {
-        width: 4vw !important;
-        height: 4vw !important;
-      }
     }
-
-    .right {
-      width: 50%;
-      height: 50vh;
-
-      .add-item {
-        display: flex;
-        align-items: center;
-        margin-bottom: 1vh;
-      }
-    }
-  }
 }
 
 // 表格样式统一
@@ -1680,101 +1674,101 @@ const handlePagination = (type, val) => {
 :deep(.el-table__body-wrapper),
 :deep(.el-table__cell),
 :deep(.el-table__body td) {
-  background-color: #F3FAFE !important;
+    background-color: #F3FAFE !important;
 }
 
 :deep(.el-table__header th) {
-  background-color: #F3FAFE !important;
+    background-color: #F3FAFE !important;
 }
 
 :deep(.el-table__row:hover > .el-table__cell) {
-  background-color: #E5EBFE !important;
+    background-color: #E5EBFE !important;
 }
 
 // 驳回理由弹窗样式
 .reject-reason-box {
-  --el-message-box-height: 500px;
+    --el-message-box-height: 500px;
 }
 
 .reject-reason-box .el-message-box__content {
-  max-height: 350px;
-  overflow-y: auto;
-  white-space: pre-wrap;
+    max-height: 350px;
+    overflow-y: auto;
+    white-space: pre-wrap;
 }
 
 .recallDialog {
-  //撤回弹窗提示
-  height: 392px;
-  width: 700px;
-  background-image: url('/src/assets/receive-recall.png');
-  position: fixed; // 固定定位，相对于浏览器窗口
-  top: 50%; // 距离顶部50%
-  left: 50%; // 距离左侧50%
-  transform: translate(-50%, -50%); // 向左、向上平移自身宽高的50%，实现居中
-  z-index: 1000; // 确保在其他元素上层显示
-
-  .close {
-    position: absolute;
-    left: 625px;
-    top: 20px;
-    height: 38px;
-    width: 38px;
-    opacity: 0;
-
-    .Btn {
-      height: 100%;
-      width: 100%;
-      border-radius: 10px;
+    //撤回弹窗提示
+    height: 392px;
+    width: 700px;
+    background-image: url('/src/assets/receive-recall.png');
+    position: fixed; // 固定定位，相对于浏览器窗口
+    top: 50%; // 距离顶部50%
+    left: 50%; // 距离左侧50%
+    transform: translate(-50%, -50%); // 向左、向上平移自身宽高的50%，实现居中
+    z-index: 1000; // 确保在其他元素上层显示
+
+    .close {
+        position: absolute;
+        left: 625px;
+        top: 20px;
+        height: 38px;
+        width: 38px;
+        opacity: 0;
+
+        .Btn {
+            height: 100%;
+            width: 100%;
+            border-radius: 10px;
+        }
     }
-  }
-
-  .text {
-    position: absolute;
-    left: 185px;
-    top: 190px;
-    height: 67px;
-    width: 500px;
-
-    .txt {
-      height: 100%;
-      width: 100%;
-      color: #001a42;
-      font-family: "PingFang SC";
-      font-size: 48px;
-      font-style: normal;
-      font-weight: 900;
-      line-height: normal;
+
+    .text {
+        position: absolute;
+        left: 185px;
+        top: 190px;
+        height: 67px;
+        width: 500px;
+
+        .txt {
+            height: 100%;
+            width: 100%;
+            color: #001a42;
+            font-family: "PingFang SC";
+            font-size: 48px;
+            font-style: normal;
+            font-weight: 900;
+            line-height: normal;
+        }
     }
-  }
-
-  .cancle {
-    position: absolute;
-    left: 185px;
-    top: 304px;
-    height: 55px;
-    width: 150px;
-    opacity: 0;
-
-    .Btn {
-      height: 100%;
-      width: 100%;
-      border-radius: 20px;
+
+    .cancle {
+        position: absolute;
+        left: 185px;
+        top: 304px;
+        height: 55px;
+        width: 150px;
+        opacity: 0;
+
+        .Btn {
+            height: 100%;
+            width: 100%;
+            border-radius: 20px;
+        }
     }
-  }
-
-  .confirm {
-    position: absolute;
-    left: 375px;
-    top: 304px;
-    height: 55px;
-    width: 150px;
-    opacity: 0;
-
-    .Btn {
-      height: 100%;
-      width: 100%;
-      border-radius: 20px;
+
+    .confirm {
+        position: absolute;
+        left: 375px;
+        top: 304px;
+        height: 55px;
+        width: 150px;
+        opacity: 0;
+
+        .Btn {
+            height: 100%;
+            width: 100%;
+            border-radius: 20px;
+        }
     }
-  }
 }
 </style>
\ No newline at end of file

From 3f355bdd4b574e40721836f9e1ef8dd73f53aa71 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Sun, 23 Nov 2025 15:16:49 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E5=AE=A2=E6=9C=8D?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home.vue | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/home.vue b/src/views/home.vue
index 2d35632..3ca66e0 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -142,6 +142,11 @@ const selectStatusById = () => {
   if (hasPermission(permissionMapping.area_finance_collection_pending)) {
     status.push(0);
   }
+
+  //地区客服收款
+   if (hasPermission(permissionMapping.collection_area_customer_service)) {
+    status.push(2);
+  }
   // 地区负责人收款待审核
   // else if (hasPermission(permissionMapping.area_manager_collection_pending)) {
   //   status.push(0);
@@ -154,17 +159,21 @@ const selectStatusById = () => {
     status.push(10);
   }
   // 地区负责人退款审核
-  else if (hasPermission(permissionMapping.audit_area_manager_refund)) {
+   if (hasPermission(permissionMapping.audit_area_manager_refund)) {
     status.push(20);
   }
   // 总部财务退款审核
-  else if (hasPermission(permissionMapping.audit_headquarters_refund)) {
+   if (hasPermission(permissionMapping.audit_headquarters_refund)) {
     status.push(30);
   }
   // 执行人待处理
-  else if (hasPermission(permissionMapping.view_execution_details)) {
+   if (hasPermission(permissionMapping.view_execution_details)) {
     status.push(40);
   }
+  //地区客服退款审核驳回
+   if (hasPermission(permissionMapping.refund_area_customer_service)) {
+    status.push(12,22,32);
+  }
 
   // 去重并返回结果（单一角色下实际不会有重复）
   return [...new Set(status)];

From fdd0625cc7b39dbfc655dcbb8cd6142977d7385f Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Sun, 23 Nov 2025 15:39:20 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E6=94=B6=E6=AC=BEjwcode=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/moneyManage/receiveDetail/receiveFinance.vue | 15 +++++++++++++++
 src/views/moneyManage/receiveDetail/receiveHead.vue    | 16 +++++++++++++++-
 src/views/moneyManage/receiveDetail/receiveManage.vue  |  5 +++++
 src/views/moneyManage/receiveDetail/receiveService.vue | 18 ++++++++++++++++++
 4 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue
index 76e3427..d69eb51 100644
--- a/src/views/moneyManage/receiveDetail/receiveFinance.vue
+++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue
@@ -907,6 +907,11 @@ const getlist = async () => {
                 ElMessage.error('请输入正确的精网号')
                 return;
             }
+            // 增加精网号长度限制，防止后端400错误
+            if (searchData.value.jwcode.length > 8) {
+                ElMessage.error('精网号长度不能超过8位')
+                return;
+            }
         }
         const result = await request({
             url: '/cashCollection/selectCollection',
@@ -956,6 +961,16 @@ const submitRefund = async () => {
         if (!refundFormData.value.refundReason) {
             return ElMessage.error('请输入退款原因');
         }
+        // 验证精网号格式和长度
+        if (refundFormData.value.jwcode) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(refundFormData.value.jwcode);
+            if (!isPositiveInteger) {
+                return ElMessage.error('请输入正确的精网号');
+            }
+            if (refundFormData.value.jwcode.length > 8) {
+                return ElMessage.error('精网号长度不能超过8位');
+            }
+        }
         if (refundFormData.value.refundModel == 0) {
             refundFormData.value.partRefundGold = refundFormData.value.permanentGold,
                 refundFormData.value.partRefundFree = refundFormData.value.freeGold
diff --git a/src/views/moneyManage/receiveDetail/receiveHead.vue b/src/views/moneyManage/receiveDetail/receiveHead.vue
index 4224f4c..eee4d63 100644
--- a/src/views/moneyManage/receiveDetail/receiveHead.vue
+++ b/src/views/moneyManage/receiveDetail/receiveHead.vue
@@ -783,6 +783,11 @@ const getlist = async () => {
                 ElMessage.error('请输入正确的精网号')
                 return;
             }
+            // 添加长度验证，超过8位提示错误
+            if (searchData.value.jwcode.length > 8) {
+                ElMessage.error('精网号长度不能超过8位')
+                return;
+            }
         }
 
         // if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
@@ -829,7 +834,6 @@ const resetRefund = () => {
 const submitRefund = async () => {
     try {
         if (refundFormData.value.goodsName != '金币充值') {
-
             return ElMessage.error('线上数据仅支持金币充值退款');
         }
         if (!refundFormData.value.refundModel) {
@@ -838,6 +842,16 @@ const submitRefund = async () => {
         if (!refundFormData.value.refundReason) {
             return ElMessage.error('请输入退款原因');
         }
+        // 添加精网号验证
+        if (refundFormData.value.jwcode) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(refundFormData.value.jwcode);
+            if (!isPositiveInteger) {
+                return ElMessage.error('精网号格式不正确，必须为正整数');
+            }
+            if (refundFormData.value.jwcode.length > 20) {
+                return ElMessage.error('精网号长度不能超过20位');
+            }
+        }
         if (refundFormData.value.refundModel == 0) {
             refundFormData.value.partRefundGold = refundFormData.value.permanentGold,
                 refundFormData.value.partRefundFree = refundFormData.value.freeGold
diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue
index 76e3427..159d089 100644
--- a/src/views/moneyManage/receiveDetail/receiveManage.vue
+++ b/src/views/moneyManage/receiveDetail/receiveManage.vue
@@ -907,6 +907,11 @@ const getlist = async () => {
                 ElMessage.error('请输入正确的精网号')
                 return;
             }
+            // 添加长度验证，超过8位提示错误
+            if (searchData.value.jwcode.length > 8) {
+                ElMessage.error('精网号长度不能超过8位')
+                return;
+            }
         }
         const result = await request({
             url: '/cashCollection/selectCollection',
diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue
index 7ce9682..46fec5f 100644
--- a/src/views/moneyManage/receiveDetail/receiveService.vue
+++ b/src/views/moneyManage/receiveDetail/receiveService.vue
@@ -525,6 +525,11 @@ const getlist = async () => {
                 ElMessage.error('请输入正确的精网号')
                 return;
             }
+            // 添加精网号长度验证
+            if (searchData.value.jwcode.length > 8) {
+                ElMessage.error('精网号长度不能超过8位')
+                return;
+            }
         }
 
         // if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
@@ -984,6 +989,19 @@ const submitRefund = async () => {
                 return
             }
         }
+        
+        // 添加精网号验证
+        if (refundFormData.value.jwcode) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(refundFormData.value.jwcode);
+            if (!isPositiveInteger) {
+                ElMessage.error('请输入正确的精网号')
+                return;
+            }
+            if (refundFormData.value.jwcode.length > 8) {
+                ElMessage.error('精网号长度不能超过8位')
+                return;
+            }
+        }
         const result = await request({
             url: '/Money/add',
             data: {

From 8d944a595cea068cb4fc03804a6d91c9ae24d879 Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Sun, 23 Nov 2025 17:29:03 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E7=B2=BE=E7=BD=91=E5=8F=B7=E6=9C=80?=
 =?UTF-8?q?=E9=95=BF8=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/moneyManage/executor/executor.vue        | 48 +++++++++++--------
 .../moneyManage/refundDetail/refundCharge.vue      | 37 +++++++++------
 .../moneyManage/refundDetail/refundFinance.vue     | 53 +++++++++++----------
 .../moneyManage/refundDetail/refundHeader.vue      | 42 ++++++++++-------
 .../moneyManage/refundDetail/refundService.vue     | 54 +++++++++++-----------
 5 files changed, 134 insertions(+), 100 deletions(-)

diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue
index 242a742..f7ff3ec 100644
--- a/src/views/moneyManage/executor/executor.vue
+++ b/src/views/moneyManage/executor/executor.vue
@@ -41,8 +41,8 @@
       <div class="search2" style="width: 25.5vw;">
         <el-text size="large" style="width:4vw;">退款时间</el-text>
         <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="起始时间"
-          end-placeholder="结束时间" style="width:18vw;" clearable
-          :disabled-date="disabledDate" :default-time="defaultTime" />
+          end-placeholder="结束时间" style="width:18vw;" clearable :disabled-date="disabledDate"
+          :default-time="defaultTime" />
       </div>
       <div>
         <el-button type="primary" size="medium" @click="getRefund">查询</el-button>
@@ -54,10 +54,10 @@
   <el-card style="background-color: rgb(231,244,253);height:80vh;">
     <el-table :data="tableData" style="height:70vh;width:82vw;">
       <el-table-column type="index" label="序号" width="60" fixed="left">
-                <template #default="scope">
-                    {{ scope.$index + 1 + (pagination.pageNum - 1) * pagination.pageSize }}
-                </template>
-            </el-table-column>
+        <template #default="scope">
+          {{ scope.$index + 1 + (pagination.pageNum - 1) * pagination.pageSize }}
+        </template>
+      </el-table-column>
       <el-table-column prop="jwcode" label="Homily ID" width="120" fixed="left" />
       <el-table-column prop="name" label="姓名" width="120" fixed="left" show-overflow-tooltip />
       <el-table-column prop="marketName" label="所属地区" width="120" />
@@ -123,11 +123,12 @@
       </el-table-column>
     </el-table>
     <el-pagination v-model:current-page="pagination.pageNum" v-model:page-size="pagination.pageSize"
-    @size-change="handlePageSizeChange" @current-change="handleCurrentChange"
+      @size-change="handlePageSizeChange" @current-change="handleCurrentChange"
       layout="total, sizes, prev, pager, next, jumper" :total="pagination.total" style="margin-top: 1vh;" />
   </el-card>
 
-  <el-dialog v-model="showEdit" class="edit" overflow draggable style="width: 40vw; background-color: #F3FAFE !important;">
+  <el-dialog v-model="showEdit" class="edit" overflow draggable
+    style="width: 40vw; background-color: #F3FAFE !important;">
     <div style="display: flex;">
       <div class="left">
         <div class="dialog-item">
@@ -175,7 +176,8 @@
         </div>
         <div class="dialog-item">
           <el-text style="width:4vw;">转账凭证</el-text>
-          <img v-if="editRow.payVoucher" :src="editRow.payVoucher" style="width: 80px; height: 80px; object-fit: cover;">
+          <img v-if="editRow.payVoucher" :src="editRow.payVoucher"
+            style="width: 80px; height: 80px; object-fit: cover;">
           <div v-else>
             无转账凭证
           </div>
@@ -282,12 +284,20 @@ const getRefund = async function () {
     }
 
     const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
-            ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
+      ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-    if(searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)){
-            ElMessage.error('精网号必须为数字')
-            return
-        }
+    if (searchForm.value.jwcode) {
+      const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+      if (!isPositiveInteger) {
+        ElMessage.error('请输入正确的精网号')
+        return;
+      }
+    }
+    // 增加精网号长度限制，防止后端400错误
+    if (searchForm.value.jwcode.length > 8) {
+      ElMessage.error('精网号长度不能超过8位')
+      return;
+    }
 
     const params = {
       pageNum: pagination.value.pageNum,
@@ -295,7 +305,7 @@ const getRefund = async function () {
       cashRecordDTO: {
         jwcode: searchForm.value.jwcode,
         name: searchForm.value.name,
-        markets: searchForm.value.markets && searchForm.value.markets.length > 0 ? [searchForm.value.markets[searchForm.value.markets.length - 1]] : [],  
+        markets: searchForm.value.markets && searchForm.value.markets.length > 0 ? [searchForm.value.markets[searchForm.value.markets.length - 1]] : [],
         goodsName: goodsName,
         statuses: statusesParam.value,//10：地区财务待审核；12：地区财务驳回；
         // 20：地区负责人待审核；22：地区负责人驳回；
@@ -495,12 +505,12 @@ const reset = function () {
   getRefund()
 }
 const handlePageSizeChange = function (val) {
-    pagination.value.pageSize = val
-    getRefund()
+  pagination.value.pageSize = val
+  getRefund()
 }
 const handleCurrentChange = function (val) {
-    pagination.value.pageNum = val
-    getRefund()
+  pagination.value.pageNum = val
+  getRefund()
 }
 onMounted(() => {
   console.log('???????????????????', adminData.value)
diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue
index 3389bd7..5a64898 100644
--- a/src/views/moneyManage/refundDetail/refundCharge.vue
+++ b/src/views/moneyManage/refundDetail/refundCharge.vue
@@ -421,17 +421,18 @@ const getRefund = async function () {
         const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
             ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-        // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-        //     ElMessage.error('精网号必须为数字')
-        //     return
-        // }
-      if (searchForm.value.jwcode) {
-        const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
-        if (!isPositiveInteger) {
-          ElMessage.error('请输入正确的精网号')
-          return;
+        if (searchForm.value.jwcode) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+            if (!isPositiveInteger) {
+                ElMessage.error('请输入正确的精网号')
+                return;
+            }
+        }
+        // 增加精网号长度限制，防止后端400错误
+        if (searchForm.value.jwcode.length > 8) {
+            ElMessage.error('精网号长度不能超过8位')
+            return;
         }
-      }
 
         if (searchForm.value.paymentCurrency) {
             payCurrencySelect.value = CurrencyForId(searchForm.value.paymentCurrency)
@@ -599,10 +600,18 @@ const exportExcel = async function () {
     const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
         ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-    // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-    //     ElMessage.error('精网号必须为数字')
-    //     return
-    // }
+    if (searchForm.value.jwcode) {
+        const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+        if (!isPositiveInteger) {
+            ElMessage.error('请输入正确的精网号')
+            return
+        }
+    }
+    // 增加精网号长度限制，防止后端400错误
+    if (searchForm.value.jwcode.length > 8) {
+        ElMessage.error('精网号长度不能超过8位')
+        return;
+    }
 
     if (searchForm.value.paymentCurrency) {
         payCurrencySelect.value = CurrencyForId(searchForm.value.paymentCurrency)
diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue
index 6fe8560..7a4b1de 100644
--- a/src/views/moneyManage/refundDetail/refundFinance.vue
+++ b/src/views/moneyManage/refundDetail/refundFinance.vue
@@ -103,7 +103,8 @@
             style="margin-top: 1vh;"></el-pagination>
     </el-card>
 
-    <el-dialog v-model="showAudit" title="审核" class="audit" width="35vw" overflow draggable style="background-color: #F3FAFE !important;">
+    <el-dialog v-model="showAudit" title="审核" class="audit" width="35vw" overflow draggable
+        style="background-color: #F3FAFE !important;">
         <div class="top">
             <el-button @click="" class="smallTitle" size="small">退款申请信息</el-button>
             <div class="top-item">
@@ -479,19 +480,20 @@ const getRefund = async function () {
         const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
             ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-        // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-        //     ElMessage.error('精网号必须为数字')
-        //     return
-        // }
-      if (searchForm.value.jwcode) {
-        const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
-        if (!isPositiveInteger) {
-          ElMessage.error('请输入正确的精网号')
-          return;
+        if (searchForm.value.jwcode) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+            if (!isPositiveInteger) {
+                ElMessage.error('请输入正确的精网号')
+                return;
+            }
+        }
+        // 增加精网号长度限制，防止后端400错误
+        if (searchForm.value.jwcode.length > 8) {
+            ElMessage.error('精网号长度不能超过8位')
+            return;
         }
-      }
 
-      const params = {
+        const params = {
             pageNum: pagination.value.pageNum,
             pageSize: pagination.value.pageSize,
             cashRecordDTO: {
@@ -652,21 +654,22 @@ const exportExcel = async function () {
     }
 
     const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
-        ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
-
-    // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-    //     ElMessage.error('精网号必须为数字')
-    //     return
-    // }
-  if (searchForm.value.jwcode) {
-    const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
-    if (!isPositiveInteger) {
-      ElMessage.error('请输入正确的精网号')
-      return;
+        ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : '';
+
+    if (searchForm.value.jwcode) {
+        const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+        if (!isPositiveInteger) {
+            ElMessage.error('请输入正确的精网号')
+            return;
+        }
+    }
+    // 增加精网号长度限制，防止后端400错误
+    if (searchForm.value.jwcode.length > 8) {
+        ElMessage.error('精网号长度不能超过8位')
+        return;
     }
-  }
 
-  const params = {
+    const params = {
         pageNum: pagination.value.pageNum,
         pageSize: pagination.value.pageSize,
         cashRecordDTO: {
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index 6401d72..fd0d6cb 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -104,7 +104,8 @@
             style="margin-top: 1vh;"></el-pagination>
     </el-card>
 
-    <el-dialog v-model="showAudit2" title="审核" class="audit2" width="35vw" overflow draggable style="background-color: #F3FAFE !important;">
+    <el-dialog v-model="showAudit2" title="审核" class="audit2" width="35vw" overflow draggable
+        style="background-color: #F3FAFE !important;">
         <div class="top">
             <el-button @click="" class="smallTitle" size="small">退款申请信息</el-button>
             <div class="top-item">
@@ -477,19 +478,20 @@ const getRefund = async function () {
         const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
             ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-        // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-        //     ElMessage.error('精网号必须为数字')
-        //     return
-        // }
-      if (searchForm.value.jwcode) {
-        const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
-        if (!isPositiveInteger) {
-          ElMessage.error('请输入正确的精网号')
-          return;
+        if (searchForm.value.jwcode) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+            if (!isPositiveInteger) {
+                ElMessage.error('请输入正确的精网号')
+                return;
+            }
+        }
+        // 增加精网号长度限制，防止后端400错误
+        if (searchForm.value.jwcode.length > 8) {
+            ElMessage.error('精网号长度不能超过8位')
+            return;
         }
-      }
 
-      const params = {
+        const params = {
             pageNum: pagination.value.pageNum,
             pageSize: pagination.value.pageSize,
             cashRecordDTO: {
@@ -633,10 +635,18 @@ const exportExcel = async function () {
     const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
         ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-    // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-    //     ElMessage.error('精网号必须为数字')
-    //     return
-    // }
+    if (searchForm.value.jwcode) {
+        const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+        if (!isPositiveInteger) {
+            ElMessage.error('请输入正确的精网号')
+            return;
+        }
+    }
+    // 增加精网号长度限制，防止后端400错误
+    if (searchForm.value.jwcode.length > 8) {
+        ElMessage.error('精网号长度不能超过8位')
+        return;
+    }
 
     const params = {
         pageNum: pagination.value.pageNum,
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue
index dded353..e763ee4 100644
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@@ -115,7 +115,8 @@
             style="margin-top: 1vh;"></el-pagination>
     </el-card>
 
-    <el-dialog v-model="showEdit" title="退款" class="editDialog" overflow draggable style="width: 40vw; background-color: #F3FAFE !important;">
+    <el-dialog v-model="showEdit" title="退款" class="editDialog" overflow draggable
+        style="width: 40vw; background-color: #F3FAFE !important;">
         <div style="display: flex;">
             <div class="left">
                 <div class="add-item">
@@ -287,25 +288,26 @@ const getRefund = async function () {
         const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
             ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-        // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-        //     ElMessage.error('精网号必须为数字')
-        //     return
-        // }
-      if (searchForm.value.jwcode) {
-        const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
-        if (!isPositiveInteger) {
-          ElMessage.error('请输入正确的精网号')
-          return;
+        if (searchForm.value.jwcode) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+            if (!isPositiveInteger) {
+                ElMessage.error('请输入正确的精网号')
+                return;
+            }
+        }        
+        // 增加精网号长度限制，防止后端400错误
+        if (searchForm.value.jwcode.length > 8) {
+            ElMessage.error('精网号长度不能超过8位')
+            return;
         }
-      }
 
-      const params = {
+        const params = {
             pageNum: pagination.value.pageNum,
             pageSize: pagination.value.pageSize,
             cashRecordDTO: {
                 jwcode: searchForm.value.jwcode,//精网号
                 name: searchForm.value.name,//姓名
-                markets: searchForm.value.market && searchForm.value.market.length > 0 ? [searchForm.value.market[searchForm.value.market.length - 1]] : [],  
+                markets: searchForm.value.market && searchForm.value.market.length > 0 ? [searchForm.value.market[searchForm.value.market.length - 1]] : [],
                 goodsName: goodsName,//商品名
                 statuses: statusParam.value,//10：地区财务待审核；12：地区财务驳回；
                 // 20：地区负责人待审核；22：地区负责人驳回；
@@ -375,25 +377,25 @@ const submitEdit = async function () {
             jwcode: editRow.value.jwcode,
             paymentAmount: editRow.value.paymentAmount,
             paymentCurrency: editRow.value.paymentCurrency,
-            newRefundGold: (editForm.value.partRefundGold*100),
-            newRefundFree: (editForm.value.partRefundFree)*100
+            newRefundGold: (editForm.value.partRefundGold * 100),
+            newRefundFree: (editForm.value.partRefundFree) * 100
 
         }
         console.log(editRow.value.goodsName);
-        
+
         if (editRow.value.goodsName != '金币充值') {
             params.newRefundGold = ''
-            params.newRefundFree = ''  
+            params.newRefundFree = ''
         }
-        if(editRow.value.goodsName == '金币充值'){
-            if(editForm.value.partRefundGold>editRow.value.gold){
-               ElMessage.error('退款金币数不能大于原金币数')
-               return
-            } 
-            if(editForm.value.partRefundFree>editRow.value.free){
-               ElMessage.error('退款免费金币数不能大于原免费金币数')
-               return
-            }       
+        if (editRow.value.goodsName == '金币充值') {
+            if (editForm.value.partRefundGold > editRow.value.gold) {
+                ElMessage.error('退款金币数不能大于原金币数')
+                return
+            }
+            if (editForm.value.partRefundFree > editRow.value.free) {
+                ElMessage.error('退款免费金币数不能大于原免费金币数')
+                return
+            }
         }
         const result = await API({
             url: '/Money/update',

From 3aef566c83d3aea0f89fcc4980fd743404463a59 Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Wed, 26 Nov 2025 09:26:58 +0800
Subject: [PATCH 09/12] bug

---
 src/views/moneyManage/refundDetail/refundCharge.vue |  4 ++--
 .../moneyManage/refundDetail/refundFinance.vue      |  4 ++--
 src/views/moneyManage/refundDetail/refundHeader.vue |  4 ++--
 .../moneyManage/refundDetail/refundService.vue      | 21 +++++++++++++++++++++
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue
index 5a64898..865886b 100644
--- a/src/views/moneyManage/refundDetail/refundCharge.vue
+++ b/src/views/moneyManage/refundDetail/refundCharge.vue
@@ -117,11 +117,11 @@
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">永久金币</el-text>
-                <el-input v-model="auditRow.permanentGold" size="small" style="width:10vw;" disabled />&nbsp;个
+                <el-input v-model="auditRow.gold" size="small" style="width:10vw;" disabled />&nbsp;个
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">免费金币</el-text>
-                <el-input v-model="auditRow.freeGold" size="small" style="width:10vw;" disabled />&nbsp;个
+                <el-input v-model="auditRow.free" size="small" style="width:10vw;" disabled />&nbsp;个
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款理由</el-text>
diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue
index 7a4b1de..5a5eb87 100644
--- a/src/views/moneyManage/refundDetail/refundFinance.vue
+++ b/src/views/moneyManage/refundDetail/refundFinance.vue
@@ -116,11 +116,11 @@
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">永久金币</el-text>
-                <el-input v-model="auditRow.permanentGold" size="small" style="width:10vw;" disabled />&nbsp;个
+                <el-input v-model="auditRow.gold" size="small" style="width:10vw;" disabled />&nbsp;个
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">免费金币</el-text>
-                <el-input v-model="auditRow.freeGold" size="small" style="width:10vw;" disabled />&nbsp;个
+                <el-input v-model="auditRow.free" size="small" style="width:10vw;" disabled />&nbsp;个
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款理由</el-text>
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index fd0d6cb..734000e 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -117,11 +117,11 @@
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">永久金币</el-text>
-                <el-input v-model="auditRow.permanentGold" size="small" style="width:10vw;" disabled />&nbsp;个
+                <el-input v-model="auditRow.gold" size="small" style="width:10vw;" disabled />&nbsp;个
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">免费金币</el-text>
-                <el-input v-model="auditRow.freeGold" size="small" style="width:10vw;" disabled />&nbsp;个
+                <el-input v-model="auditRow.free" size="small" style="width:10vw;" disabled />&nbsp;个
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款理由</el-text>
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue
index e763ee4..bac3cf2 100644
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@@ -369,6 +369,27 @@ const submitEdit = async function () {
     }
     try {
         console.log(editRow.value)
+        if(!editForm.value.refundModel) {
+            ElMessage.error('请选择退款方式')
+            return
+        }else if(!editForm.value.refundReason) {
+            ElMessage.error('请输入退款理由')
+            return
+        }else if(editForm.value.refundModel == 1 && (!editForm.value.partRefundGold || !editForm.value.partRefundFree)) {
+            ElMessage.error('请输入退款金币数和免费金币数')
+            return
+        }else if (editForm.value.refundModel == 1 && (editForm.value.partRefundGold || editForm.value.partRefundFree)) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(editForm.value.partRefundGold)
+            if (!isPositiveInteger) {
+                ElMessage.error('请输入正确的永久金币数')
+                return
+            }
+            const isPositiveInteger1 = /^[1-9]\d*$/.test(editForm.value.partRefundFree)
+            if (!isPositiveInteger1) {
+                ElMessage.error('请输入正确的免费金币数')
+                return
+            }
+        }
         let params = {
             id: editRow.value.id,
             status: editRow.value.status,

From 1f777f76a41dbcd4a98bc7882417ce554b4b9300 Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Thu, 27 Nov 2025 11:34:16 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activityManage/activity.vue | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/views/activityManage/activity.vue b/src/views/activityManage/activity.vue
index bc74406..13c5c28 100644
--- a/src/views/activityManage/activity.vue
+++ b/src/views/activityManage/activity.vue
@@ -193,6 +193,10 @@ const editForm = ref({
 })
 const marketOptions = ref([])
 const getActivity = async function () {
+    if (!hasMenuPermission(permissionMapping.view_activity)) {
+        ElMessage.error('无此权限')
+        return
+    }
     const rechargeActivity = {
         activityName: searchForm.value.activityName,
         businessBelong: searchForm.value.businessBelong,
@@ -219,6 +223,10 @@ const getActivity = async function () {
     }
 }
 const handleAdd = async function () {
+    if (!hasMenuPermission(permissionMapping.add_activity)) {
+        ElMessage.error('无此权限')
+        return
+    }
     const activityName = addForm.value.activityName
     if (!validateActivityName(activityName)) return
 
@@ -274,6 +282,10 @@ const handleAdd = async function () {
 // 新增节流
 const throttleGetActivity = _.throttle(handleAdd, 5000, { trailing: false });
 const handleEdit = async function () {
+    if (!hasMenuPermission(permissionMapping.edit_activity)) {
+        ElMessage.error('无此权限')
+        return
+    }
     const activityName = editForm.value.activityName
     if (!validateActivityName(activityName)) return
 
@@ -323,6 +335,10 @@ const handleEdit = async function () {
     }
 }
 const handleDel = async function (row) {
+    if (!hasMenuPermission(permissionMapping.delete_activity)) {
+        ElMessage.error('无此权限')
+        return
+    }
     if (!currentDelRow.value) {
         ElMessage.error('当前选择无数据')
         return

From b33c9f01378311f44871b8034cbcd129fdc82a01 Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Thu, 27 Nov 2025 13:19:06 +0800
Subject: [PATCH 11/12] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=20?=
 =?UTF-8?q?=E9=87=91=E5=B8=81=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E7=9A=84?=
 =?UTF-8?q?=E9=93=81=E7=B2=89=E5=92=8C=E7=9B=B4=E6=92=AD=E6=B2=A1=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/consume/bean/articleVideo.vue |   6 +-
 src/views/consume/bean/dieHardFan.vue   |   5 +-
 src/views/consume/bean/liveStream.vue   | 102 ++--
 src/views/workspace/index_.vue          | 911 --------------------------------
 4 files changed, 63 insertions(+), 961 deletions(-)
 delete mode 100644 src/views/workspace/index_.vue

diff --git a/src/views/consume/bean/articleVideo.vue b/src/views/consume/bean/articleVideo.vue
index 5e3e238..5ea2851 100644
--- a/src/views/consume/bean/articleVideo.vue
+++ b/src/views/consume/bean/articleVideo.vue
@@ -195,7 +195,9 @@ const ConsumeSelectBy = async function (val) {
           endTime: beanConsumeArticle.value.endTime,
           sortField: beanConsumeArticle.value.sortField,
           sortOrder: beanConsumeArticle.value.sortOrder,
-          flag: flag.value 
+          flag: flag.value ,
+          roleId: adminData.value.roleId
+
         }
       }
     })
@@ -394,6 +396,8 @@ const exportExcel = async function () {
       ...beanConsumeArticle.value,
       sortField: sortField.value,
       sortOrder: sortOrder.value,
+      roleId: adminData.value.roleId
+
     },
   }
   const res = await API({ url: '/export/exportArticle', data: params })
diff --git a/src/views/consume/bean/dieHardFan.vue b/src/views/consume/bean/dieHardFan.vue
index 1984a67..8e6fbf9 100644
--- a/src/views/consume/bean/dieHardFan.vue
+++ b/src/views/consume/bean/dieHardFan.vue
@@ -196,7 +196,8 @@ const ConsumeSelectBy = async function (val) {
           endTime: beanConsumeFan.value.endTime || '',
           sortField: beanConsumeFan.value.sortField || 'consumeTime',
           sortOrder: beanConsumeFan.value.sortOrder || 'desc',
-          flag: flag.value 
+          flag: flag.value,
+          roleId: adminData.value.roleId
         }
       }
     })
@@ -398,6 +399,8 @@ const exportExcel = async function () {
       ...beanConsumeFan.value,
       sortField: sortField.value,
       sortOrder: sortOrder.value,
+      roleId: adminData.value.roleId
+
     },
   }
   const res = await API({ url: '/export/exportFan', data: params })
diff --git a/src/views/consume/bean/liveStream.vue b/src/views/consume/bean/liveStream.vue
index b700ae2..9dd6326 100644
--- a/src/views/consume/bean/liveStream.vue
+++ b/src/views/consume/bean/liveStream.vue
@@ -1,16 +1,17 @@
 <script setup>
-import { computed, onMounted, ref, watch } from 'vue'
-import { dayjs, ElMessage } from 'element-plus'
+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 { useAdminStore } from "@/store/index.js";
-import { storeToRefs } from "pinia";
+import {useAdminStore} from "@/store/index.js";
+import {storeToRefs} from "pinia";
+
 const adminStore = useAdminStore();
-const { flag } = storeToRefs(adminStore);
+const {flag} = storeToRefs(adminStore);
 
 // 监听全局flag状态变化
- watch(flag, (newFlag, oldFlag) => {
+watch(flag, (newFlag, oldFlag) => {
   // 当flag状态改变时，重新发送请求
   if (newFlag !== oldFlag) {
     selectLiveBy()
@@ -62,7 +63,7 @@ const getGift = async function () {
   try {
     const result = await request({
       url: '/beanConsume/getLiveGift', // todo 换成实际接口地址
-      data: { account: adminData.value.account }
+      data: {account: adminData.value.account}
     })
     console.log('请求礼物列表成功', result)
     // 存储礼物数据
@@ -84,7 +85,7 @@ const getChannel = async function () {
   try {
     const result = await request({
       url: '/beanConsume/getLiveChannel', // todo 换成实际接口地址
-      data: { account: adminData.value.account }
+      data: {account: adminData.value.account}
     })
     console.log('请求频道列表成功', result)
     // 存储频道数据
@@ -101,12 +102,12 @@ const getChannel = async function () {
 
 // 抽离类型选项到响应式数组
 const consumeTypes = ref([
-  { label: '发礼物', value: 1 },
-  { label: '发红包', value: 2 },
-  { label: '发福袋', value: 3 },
-  { label: '付费直播', value: 4 },
-  { label: '加入粉丝团', value: 5 },
-  { label: '发弹幕', value: 6 }
+  {label: '发礼物', value: 1},
+  {label: '发红包', value: 2},
+  {label: '发福袋', value: 3},
+  {label: '付费直播', value: 4},
+  {label: '加入粉丝团', value: 5},
+  {label: '发弹幕', value: 6}
 ])
 // 处理类型选择变化
 const handleTypeChange = (value) => {
@@ -149,7 +150,7 @@ const getDept = async function () {
       // url: '/general/dept',
 
       url: '/beanConsume/getDept', // todo 换成实际接口地址
-      data: { account: adminData.value.account }
+      data: {account: adminData.value.account}
     })
     console.log('请求地区列表成功', result)
     // 存储地区数据
@@ -237,7 +238,8 @@ const selectLiveBy = async function (val) {
           endTime: beanConsumeLive.value.endTime || '',
           sortField: beanConsumeLive.value.sortField || 'consumeTime',
           sortOrder: beanConsumeLive.value.sortOrder || 'desc',
-          flag: flag.value 
+          flag: flag.value,
+          roleId: adminData.value.roleId
         }
       }
     })
@@ -253,7 +255,7 @@ const selectLiveBy = async function (val) {
       payType: 1, // 固定传入 payType 值 1 是直播
       beanConsumeLive: {
         ...beanConsumeLive.value,
-        flag: flag.value 
+        flag: flag.value
       }
     };
 
@@ -418,7 +420,9 @@ const exportExcel = async function () {
       startTime: beanConsumeLive.value.startTime || '',
       endTime: beanConsumeLive.value.endTime || '',
       sortField: sortField.value || 'consumeTime',
-      sortOrder: sortOrder.value || 'desc'
+      sortOrder: sortOrder.value || 'desc',
+      roleId: adminData.value.roleId
+
     }
   }
   // 打印请求参数，方便调试
@@ -426,7 +430,7 @@ const exportExcel = async function () {
 
   try {
     console.log('2')
-    const res = await API({ url: '/export/exportLive', data: params });
+    const res = await API({url: '/export/exportLive', data: params});
     console.log('导出请求响应:', res);
     if (res.code === 200) {
       ElMessage.success('导出成功');
@@ -455,7 +459,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 === 6; //6是直播
@@ -520,31 +524,32 @@ const getTagText = (state) => {
       <div class="select">
         <div class="selectRow">
           <el-text class="text">精网号：</el-text>
-          <el-input class="selectContent" v-model="beanConsumeLive.jwcode" placeholder="请输入精网号" clearable />
+          <el-input class="selectContent" v-model="beanConsumeLive.jwcode" placeholder="请输入精网号" clearable/>
         </div>
         <div class="selectRow">
           <el-text class="text">地区：</el-text>
           <el-select class="selectContent" v-model="beanConsumeLive.dept" placeholder="请选择地区" clearable>
-            <el-option v-for="(item, index) in dept" :key="index" :label="item" :value="item" />
+            <el-option v-for="(item, index) in dept" :key="index" :label="item" :value="item"/>
           </el-select>
         </div>
         <div class="selectRow" style="width: 14vw;">
           <el-text class="text">礼物名称：</el-text>
-          <el-select class="selectContent" v-model="beanConsumeLive.gift" placeholder="请选择礼物名称" clearable filterable
-            allow-create default-first-option>
-            <el-option v-for="(item, index) in gifts" :key="index" :label="item" :value="item" />
+          <el-select class="selectContent" v-model="beanConsumeLive.gift" placeholder="请选择礼物名称" clearable
+                     filterable
+                     allow-create default-first-option>
+            <el-option v-for="(item, index) in gifts" :key="index" :label="item" :value="item"/>
           </el-select>
         </div>
         <div class="selectRow" style="width: 12vw;">
           <el-text class="textB" size="large">频道：</el-text>
           <el-select class="selectContent" v-model="beanConsumeLive.liveChannel" placeholder="请选择频道" clearable
-            filterable allow-create default-first-option>
-            <el-option v-for="(item, index) in channels" :key="index" :label="item" :value="item" />
+                     filterable allow-create default-first-option>
+            <el-option v-for="(item, index) in channels" :key="index" :label="item" :value="item"/>
           </el-select>
         </div>
         <div class="selectRow" style="width: 12vw;">
           <el-text class="textB" size="large">直播间：</el-text>
-          <el-input class="selectContent" v-model="beanConsumeLive.liveName" placeholder="请输入直播间" clearable />
+          <el-input class="selectContent" v-model="beanConsumeLive.liveName" placeholder="请输入直播间" clearable/>
         </div>
       </div>
     </el-col>
@@ -553,8 +558,8 @@ const getTagText = (state) => {
         <div class="selectRow" style="width: 31.4vw;">
           <el-text class="text">消费时间：</el-text>
           <el-date-picker class="selectContent" v-model="getTime" type="datetimerange" range-separator="至"
-            start-placeholder="起始时间" end-placeholder="结束时间" style="margin-right:1vw;width:480px"
-            @change="handleDatePickerChange" :default-time="defaultTime" />
+                          start-placeholder="起始时间" end-placeholder="结束时间" style="margin-right:1vw;width:480px"
+                          @change="handleDatePickerChange" :default-time="defaultTime"/>
           <div v-if="false">
             <el-button @click="getToday()" :type="activeTimeRange === 'today' ? 'primary' : ''"> 今</el-button>
             <el-button @click="getYesterday()" :type="activeTimeRange === 'yesterday' ? 'primary' : ''"> 昨</el-button>
@@ -578,43 +583,44 @@ const getTagText = (state) => {
     </div>
     <div style="overflow-y: auto">
       <el-table :data="tableData" style="width: 82vw" height="56vh" @sort-change="handleSortChange"
-      :row-style="{ height: '50px' }">
+                :row-style="{ height: '50px' }">
         <el-table-column type="index" label="序号" width="80px" fixed="left">
           <template #default="scope">
             <span>{{
-              scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
-            }}</span>
+                scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+              }}</span>
           </template>
         </el-table-column>
         <!-- 固定姓名列 -->
-        <el-table-column prop="name" label="姓名" width="150px" fixed="left" show-overflow-tooltip />
+        <el-table-column prop="name" label="姓名" width="150px" fixed="left" show-overflow-tooltip/>
         <!-- 固定精网号列 -->
-        <el-table-column prop="jwcode" label="精网号" width="110px" fixed="left" />
-        <el-table-column prop="dept" label="地区" width="110px" />
+        <el-table-column prop="jwcode" label="精网号" width="110px" fixed="left"/>
+        <el-table-column prop="dept" label="地区" width="110px"/>
         <el-table-column prop="gift" label="礼物" width="140px">
         </el-table-column>
-        <el-table-column prop="beanNum" label="金豆数量" sortable="custom" width="120px" />
+        <el-table-column prop="beanNum" label="金豆数量" sortable="custom" width="120px"/>
         <el-table-column prop="isBackpack" label="背包礼物" width="120px">
           <template #default="scope">
             {{ scope.row.isBackpack == 1 ? '是' : '否' }}
           </template>
         </el-table-column>
-        <el-table-column prop="buyBean" label="付费金豆数" sortable="custom" width="120px" />
-        <el-table-column prop="freeBean" label="免费金豆数" sortable="custom" width="120px" />
-        <el-table-column prop="liveChannel" label="频道" width="120px" show-overflow-tooltip />
-        <el-table-column prop="liveName" label="直播间名称" width="160px" show-overflow-tooltip />
-        <el-table-column prop="consumeTime" label="消费时间" sortable="custom" width="180px" />
+        <el-table-column prop="buyBean" label="付费金豆数" sortable="custom" width="120px"/>
+        <el-table-column prop="freeBean" label="免费金豆数" sortable="custom" width="120px"/>
+        <el-table-column prop="liveChannel" label="频道" width="120px" show-overflow-tooltip/>
+        <el-table-column prop="liveName" label="直播间名称" width="160px" show-overflow-tooltip/>
+        <el-table-column prop="consumeTime" label="消费时间" sortable="custom" width="180px"/>
       </el-table>
     </div>
-    <el-pagination background :current-page="getObj.pageNum" :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]" style="margin-top: 20px;"
-      layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
-      @current-change="handleCurrentChange"></el-pagination>
+    <el-pagination background :current-page="getObj.pageNum" :page-size="getObj.pageSize"
+                   :page-sizes="[5, 10, 20, 50, 100]" style="margin-top: 20px;"
+                   layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
+                   @current-change="handleCurrentChange"></el-pagination>
   </el-card>
 
   <!-- 导出弹窗 -->
   <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'">
@@ -630,7 +636,7 @@ const getTagText = (state) => {
       <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>
@@ -671,7 +677,7 @@ const getTagText = (state) => {
 :deep(.el-table__header-wrapper),
 :deep(.el-table__body-wrapper),
 :deep(.el-table__cell),
-/* 表格 */
+  /* 表格 */
 :deep(.el-table__body td) {
   background-color: #F3FAFE !important;
 }
diff --git a/src/views/workspace/index_.vue b/src/views/workspace/index_.vue
deleted file mode 100644
index 190e23c..0000000
--- a/src/views/workspace/index_.vue
+++ /dev/null
@@ -1,911 +0,0 @@
-<template>
-  <div class="top">
-    <el-card style="width:10vw" class="center-card">数据总览</el-card>
-    <span class="text">
-      最后更新时间：{{
-        workDataUpdateTime && workDataUpdateTime !== '1970-01-01 08:00:00' ? workDataUpdateTime : '该地区暂无数据'
-      }}
-    </span>
-  </div>
-
-  <div class="card">
-    <!-- 第一个卡片 -->
-    <el-card class="card-item">
-      <template #header>
-        <div class="card-title">当前金币余量</div>
-        <div>
-          <span style="font-weight: bold">{{ currentGold / 100
-            }}</span>&nbsp;&nbsp;&nbsp;&nbsp;较前一日
-          {{ dailyChange / 100 }}
-          <template v-if="dailyChange > 0">
-            <el-icon style="color:red">
-              <ArrowUpBold />
-            </el-icon>
-          </template>
-          <template v-else-if="dailyChange < 0">
-            <el-icon style="color:forestgreen">
-              <ArrowDownBold />
-            </el-icon>
-          </template>
-          <template v-else>
-            <el-icon style="color:grey">
-              <SemiSelect />
-            </el-icon>
-          </template>
-        </div>
-      </template>
-      <div>
-        <div class="margin-bottom">永久金币：{{ currentPermanent / 100 }}</div>
-        <div class="margin-bottom">免费金币：{{ currentFree / 100 }}</div>
-        <div class="margin-bottom">[六月到期|{{ currentFreeJune / 100 }}]&nbsp;&nbsp;
-          [十二月到期|{{ currentFreeDecember / 100 }}]
-        </div>
-        <div>任务金币：{{ currentTask / 100 }}</div>
-      </div>
-    </el-card>
-
-    <!-- 第二个卡片 -->
-    <el-card class="card-item">
-      <div class="card-title">全年累计充值金币数</div>
-      <div class="card-title">{{ yearlyRecharge / 100 }}</div>
-      <div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-      <div class="center-card">折合新币累计金额:{{ yearlyMoney / 100 }}</div>
-      <template #footer>
-        <el-col class="margin-bottom center-card">昨日新增金币：{{ recharge / 100 }}</el-col>
-        <el-col class="margin-bottom center-card">其中永久金币：{{ money / 100 }}</el-col>
-      </template>
-    </el-card>
-
-    <!-- 第三个卡片 -->
-    <el-card class="card-item">
-      <div class="card-title">全年累计消费金币数</div>
-      <div class="card-title">{{ yearlyReduce / 100 }}</div>
-      <div style="padding-left: 30%;">消耗：{{ yearlyConsume / 100 }}</div>
-      <div style="padding-left: 30%;">退款：{{ yearlyRefund / 100 }}</div>
-      <template #footer>
-        <div style="margin-bottom:0.5%;padding-left: 30%;">昨日新增消费：{{ dailyConsume / 100 }}</div>
-        <div style="margin-bottom:0.5%;padding-left: 30%;">昨日新增消耗：{{ dailyReduce / 100 }}</div>
-        <div style="margin-bottom:0.5%;padding-left: 30%;">昨日新增退款：{{ dailyRefund / 100 }}</div>
-      </template>
-    </el-card>
-
-    <!-- 第四个卡片 -->
-    <el-card class="card-item">
-      <el-col class="card-title">全年累计充值人头数</el-col>
-      <el-col class="card-title">{{ yearlyRechargeNum }}</el-col>
-      <el-col style="padding-left: 35%;">周同比:{{ sumWow }}%&nbsp;&nbsp;&nbsp;&nbsp;
-        <template v-if="sumWow > 0">
-          <el-icon style="color:red">
-            <ArrowUpBold />
-          </el-icon>
-        </template>
-        <template v-else-if="sumWow < 0">
-          <el-icon style="color:forestgreen">
-            <ArrowDownBold />
-          </el-icon>
-        </template>
-        <template v-else>
-          <el-icon style="color:grey">
-            <SemiSelect />
-          </el-icon>
-        </template>
-      </el-col>
-      <el-col style="padding-left: 35%;">日环比:{{ sumDaily }}%&nbsp;&nbsp;&nbsp;&nbsp;
-        <template v-if="sumDaily > 0">
-          <el-icon style="color:red">
-            <ArrowUpBold />
-          </el-icon>
-        </template>
-        <template v-else-if="sumDaily < 0">
-          <el-icon style="color:forestgreen">
-            <ArrowDownBold />
-          </el-icon>
-        </template>
-        <template v-else>
-          <el-icon style="color:grey">
-            <SemiSelect />
-          </el-icon>
-        </template>
-      </el-col>
-      <template #footer>
-        <el-col style="padding-left: 35%;margin-bottom:0.5%">昨日充值人数：{{ ydayRechargeNum }}</el-col>
-        <el-col style="padding-left: 35%;">其中首充：{{ firstRecharge }}</el-col>
-      </template>
-    </el-card>
-  </div>
-
-  <div class="graph">
-    <el-card style="width:84vw;">
-      <div>
-        <el-tabs v-model="activeTab" @tab-change="handleTabChange">
-          <el-tab-pane label="金币充值" name="recharge"></el-tab-pane>
-          <el-tab-pane label="金币消费" name="consume"></el-tab-pane>
-        </el-tabs>
-      </div>
-      <div class="condition">
-        <div class="stats">
-          <div v-if="activeTab === 'consume'">合计：{{ sumConsume / 100 }}</div>&nbsp;&nbsp;
-          永久金币: {{ activeTab === 'recharge' ? sumRechargePermanent / 100 : sumConsumePermanent / 100 }}&nbsp;&nbsp;
-          免费金币: {{ activeTab === 'recharge' ? sumRechargeFree / 100 : sumConsumeFree / 100 }}&nbsp;&nbsp;
-          任务金币: {{ activeTab === 'recharge' ? sumRechargeTask / 100 : sumConsumeTask / 100 }}&nbsp;&nbsp;
-        </div>
-        <div>
-          <el-button @click="getYes()" size="small" :type="activeTimeRange === 'yes' ? 'primary' : ''">昨天
-          </el-button>
-          <el-button @click="getToday()" size="small" :type="activeTimeRange === 'today' ? 'primary' : ''">今天
-          </el-button>
-          <el-button @click="getWeek()" size="small" :type="activeTimeRange === 'week' ? 'primary' : ''">本周
-          </el-button>
-          <el-button @click="getMonth()" size="small" :type="activeTimeRange === 'month' ? 'primary' : ''">本月
-          </el-button>
-          <el-button @click="getYear()" size="small" :type="activeTimeRange === 'year' ? 'primary' : ''">本年
-          </el-button>
-        </div>
-        <div>
-          <el-date-picker size="small" v-model="dateRange" type="datetimerange" range-separator="→"
-                          start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD HH:mm:ss"
-                          style="width:20vw;margin-left:0.5vw;" value-format="YYYY-MM-DD HH:mm:ss" :default-time="defaultTime"
-                          :disabled-date="disabledDate" @change="handleDatePickerChange" />
-          <el-button type="primary" size="small" style="margin-left: 0.5vw" @click="getChartData">查询</el-button>
-        </div>
-      </div>
-
-      <div class="graph-content">
-        <div ref="chartRef" class="left"></div>
-        <div class="right">
-          <el-card>
-            <div class="card-large">金币{{ activeTab === 'recharge' ? '充值' : '消费' }}排名</div>
-            <el-select v-model="selectedType" style="width: 100%; margin-bottom: 15px">
-              <el-option label="全部类型" value="all"></el-option>
-              <el-option label="永久金币" value="permanent"></el-option>
-              <el-option label="免费金币" value="free"></el-option>
-              <el-option label="任务金币" value="task"></el-option>
-            </el-select>
-            <el-table :data="tableData" height="320px">
-              <el-table-column prop="rank" label="排名" width="60" align="center"></el-table-column>
-              <el-table-column prop="market" label="地区" align="center">
-                <template #default="scope">
-                  <span>{{ marketMapping[scope.row.market] || scope.row.market }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column prop="coinAmount" label="金币数量" align="center">
-                <template #default="{ row }">
-                  {{ row.coinAmount.toLocaleString() }}
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-card>
-        </div>
-      </div>
-    </el-card>
-  </div>
-</template>
-
-<script setup>
-import * as echarts from 'echarts'
-import { ref, onMounted, nextTick, watch, onUnmounted } from 'vue'
-import API from '@/util/http'
-import { ElMessage } from 'element-plus'
-import dayjs from 'dayjs';
-import utc from 'dayjs-plugin-utc'
-import weekday from 'dayjs/plugin/weekday'
-dayjs.extend(utc)
-import { ArrowUpBold, ArrowDownBold, SemiSelect } from '@element-plus/icons-vue'
-import { marketMapping } from "@/utils/marketMap.js";
-
-const defaultTime = [
-  new Date(2000, 1, 1, 0, 0, 0),
-  new Date(2000, 2, 1, 23, 59, 59),
-]
-
-// 地区数据
-const markets = ref([])
-// 图表相关
-const dateRange = ref([])
-const activeTab = ref('recharge')
-const selectedType = ref('all')
-const tableData = ref([])
-const chartRef = ref(null)
-let chartInstance = null
-// 图表合计数
-const sumRechargePermanent = ref(0)
-const sumRechargeFree = ref(0)
-const sumRechargeTask = ref(0)
-const sumConsumePermanent = ref(0)
-const sumConsumeFree = ref(0)
-const sumConsumeTask = ref(0)
-const sumConsume = ref(0)
-// 用户信息
-const adminData = ref({})
-// 卡片数据相关
-const currentGold = ref(0)
-const dailyChange = ref(0)
-const currentPermanent = ref(0)
-const currentFree = ref(0)
-const currentFreeJune = ref(0)
-const currentFreeDecember = ref(0)
-const currentTask = ref(0)
-const yearlyRecharge = ref(0)
-const yearlyMoney = ref(0)
-const recharge = ref(0)
-const money = ref(0)
-const yearlyReduce = ref(0)
-const yearlyConsume = ref(0)
-const yearlyRefund = ref(0)
-const dailyReduce = ref(0)
-const dailyConsume = ref(0)
-const dailyRefund = ref(0)
-const yearlyRechargeNum = ref(0)
-const sumWow = ref(0)
-const sumDaily = ref(0)
-const rechargeNum = ref(0)
-const ydayRechargeNum = ref(0)
-const firstRecharge = ref(0)
-const length = ref(0)
-//  加载状态
-const chartLoading = ref(true)
-
-const handleResize = () => {
-  if (chartInstance.value) {
-    try {
-      chartInstance.value.resize()
-      console.log('resize一下')
-    } catch (error) {
-      console.error('图表resize失败:', error)
-    }
-  }
-}
-// 初始化图表
-const initChart = () => {
-  if (!chartInstance && chartRef.value) {
-    chartInstance = echarts.init(chartRef.value)
-    window.addEventListener('resize', handleResize)
-  }
-}
-// 销毁图表
-const destroyChart = () => {
-  if (chartInstance.value) {
-    try {
-      chartInstance.value.dispose()
-    } catch (error) {
-      console.error('图表销毁失败:', error)
-    }
-    chartInstance.value = null
-  }
-  window.removeEventListener('resize', handleResize)
-}
-const formatDate = function (date) {
-  const year = date.getFullYear();
-  const month = String(date.getMonth() + 1).padStart(2, '0');
-  const day = String(date.getDate()).padStart(2, '0');
-  const hours = String(date.getHours()).padStart(2, '0');
-  const minutes = String(date.getMinutes()).padStart(2, '0');
-  const seconds = String(date.getSeconds()).padStart(2, '0');
-  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-}
-// 昨天
-const getYes = function () {
-  const yesterday = dayjs().subtract(1, 'day')
-  const startTime = yesterday.startOf('day').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = yesterday.endOf('day').format('YYYY-MM-DD HH:mm:ss')
-  dateRange.value = [startTime, endTime]
-  console.log('看看dateRange', dateRange.value)
-  activeTimeRange.value = 'yes' // 标记当前激活状态
-
-  getChartData()
-}
-// 今天
-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.add(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
-  dateRange.value = [startTime, endTime]
-  console.log('看看dateRange', dateRange.value)
-  activeTimeRange.value = 'today' // 标记当前激活状态
-
-  getChartData()
-}
-// 本周
-const getWeek = function () {
-  const today = dayjs();
-  // 获取今天是星期几（0是周日，1是周一，...，6是周六）
-  const day = today.day();
-
-  // 计算本周一（如果今天是周一，就取今天；如果是周日，就减6天）
-  let monday = today.subtract(day === 0 ? 6 : day - 1, 'day');
-  // 计算本周日（如果今天是周日，就取今天；否则就加(7 - day)天）
-  let sunday = today.add(day === 0 ? 0 : 7 - day, 'day');
-
-  // 设置时间为起始和结束
-  const startTime = monday.startOf('day').format('YYYY-MM-DD HH:mm:ss');
-  const endTime = sunday.endOf('day').format('YYYY-MM-DD HH:mm:ss');
-
-  dateRange.value = [startTime, endTime];
-  console.log('本周时间范围（周一到周日）：', dateRange.value);
-  activeTimeRange.value = 'week';
-
-  getChartData();
-};
-// 本月
-const getMonth = function () {
-  const today = dayjs()
-  const startTime = today.startOf('month').format('YYYY-MM-DD HH:mm:ss')
-  // const endTime = today.add(1, 'month').startOf('month').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = today.endOf('month').format('YYYY-MM-DD HH:mm:ss')
-  dateRange.value = [startTime, endTime]
-  console.log('看看dateRange', dateRange.value)
-  activeTimeRange.value = 'month' // 标记当前激活状态
-
-  getChartData()
-}
-// 本年
-const getYear = function () {
-  const today = dayjs()
-  const startTime = today.startOf('year').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = today.endOf('year').format('YYYY-MM-DD HH:mm:ss')
-  // const endTime = today.add(1, 'year').startOf('year').format('YYYY-MM-DD HH:mm:ss')
-  dateRange.value = [startTime, endTime]
-  console.log('看看dateRange', dateRange.value)
-  activeTimeRange.value = 'year' // 标记当前激活状态
-
-  getChartData()
-}
-
-// 要加上所有市场的，还有额外计算的(总数 = 永久 + 6月 + 12月 + 免费 + 任务)
-const processData = (data) => {
-  const summary = {
-    currentGold: 0,
-    dailyChange: 0,
-    currentPermanent: 0,
-    currentFreeJune: 0,
-    currentFreeDecember: 0,
-    currentTask: 0,
-    currentFree: 0,
-    recharge: 0,
-    money: 0,
-    yearlyRecharge: 0,
-    yearlyMoney: 0,
-    consumePermanent: 0,
-    consumeFreeJune: 0,
-    consumeFreeDecember: 0,
-    consumeTask: 0,
-    refundPermanent: 0,
-    refundFreeJune: 0,
-    refundFreeDecember: 0,
-    refundTask: 0,
-    dailyReduce: 0,
-    yearlyConsume: 0,
-    yearlyRefund: 0,
-    yearlyReduce: 0,
-    rechargeNum: 0,
-    ydayRechargeNum: 0,
-    firstRecharge: 0,
-    sumWow: 0,
-    sumDaily: 0,
-    yearlyRechargeNum: 0
-  }
-
-  // 遍历市场
-  data.marketCards.forEach(market => {
-    for (const i in summary) {
-      if (market[i] !== undefined && market[i] !== null) { // 其实还应该卡一个number
-        summary[i] += market[i]
-      }
-    }
-  })
-
-  // wow和daily除一下
-  length.value = data.markets.length
-  console.log(length.value)
-
-  // 计算昨日新增消费和退款
-  const yesterdayConsume = summary.consumePermanent + summary.consumeFreeJune + summary.consumeFreeDecember + summary.consumeTask
-  const yesterdayRefund = summary.refundPermanent + summary.refundFreeJune + summary.refundFreeDecember + summary.refundTask
-
-  // 更新卡片数据
-  currentGold.value = summary.currentGold.toFixed(2)
-  dailyChange.value = summary.dailyChange.toFixed(2)
-  currentPermanent.value = summary.currentPermanent.toFixed(2)
-  currentFree.value = summary.currentFree.toFixed(2)
-  currentFreeJune.value = summary.currentFreeJune.toFixed(2)
-  currentFreeDecember.value = summary.currentFreeDecember.toFixed(2)
-  currentTask.value = summary.currentTask.toFixed(2)
-
-  yearlyRecharge.value = summary.yearlyRecharge.toFixed(2)
-  yearlyMoney.value = summary.yearlyMoney.toFixed(2)
-  recharge.value = summary.recharge.toFixed(2)
-  money.value = summary.money.toFixed(2)
-
-  yearlyReduce.value = summary.yearlyReduce.toFixed(2)
-  yearlyConsume.value = summary.yearlyConsume.toFixed(2)
-  yearlyRefund.value = summary.yearlyRefund.toFixed(2)
-  dailyReduce.value = summary.dailyReduce.toFixed(2)
-  dailyConsume.value = yesterdayConsume.toFixed(2)
-  dailyRefund.value = yesterdayRefund.toFixed(2)
-
-  yearlyRechargeNum.value = summary.yearlyRechargeNum
-
-  // // 周同比
-  // sumWow.value = (marketCards.sumWow / length.value).toFixed(2)
-  // // 日环比
-  // sumDaily.value = (marketCards.sumDaily / length.value).toFixed(2)
-
-  // rechargeNum.value = summary.rechargeNum
-  ydayRechargeNum.value = summary.ydayRechargeNum
-  firstRecharge.value = summary.firstRecharge
-}
-
-//无法选择的时间
-const disabledDate = (time) => {
-  const limitDate = new Date(2025, 0, 1);
-  return time.getTime() < limitDate.getTime();
-}
-
-// 获取市场列表
-const getMarkets = async () => {
-  console.log("adminData", adminData.value.account)
-  try {
-    const response = await API({
-      url: '/general/adminMarkets',
-      data: {
-        account: adminData.value.account
-      }
-    })
-    if (Array.isArray(response.data)) {
-      // markets.value = response.data.filter(data => data !== "1")
-      markets.value = response.data
-      console.log('市场列表获取成功:', markets.value)
-    } else {
-      console.error('获取市场列表失败', response)
-      ElMessage.error('获取市场列表失败')
-    }
-  } catch (error) {
-    console.error('获取市场列表失败:', error)
-    ElMessage.error('获取市场列表失败')
-  }
-}
-
-// 获取图表数据
-const getChartData = async () => {
-  try {
-    // 校验市场数据到底有没有
-    if (!markets.value || markets.value.length === 0) {
-      await getMarkets()
-    }
-    // 本年
-    if (!dateRange.value || dateRange.value.length === 0) {
-      getYear()
-    }
-    const params = {
-      markets: markets.value,
-      startDate: dateRange.value[0],
-      endDate: dateRange.value[1]
-    };
-
-
-    const response = await API({
-      url: '/workbench/getGraph',
-      data: params
-    })
-    console.log('看看params', params)
-    if (Array.isArray(response.marketGraphs)) {
-      // const filteredGraphs = response.marketGraphs.filter(data => data.market !== "1");
-      // 处理图表数据
-      processChartData(response.marketGraphs)
-      // 处理排名数据
-      processRankingData(response.marketGraphs)
-    } else {
-      console.error('获取图表数据失败:', response)
-      ElMessage.error('获取图表数据失败')
-    }
-  } catch (error) {
-    console.error('获取图表数据失败:', error)
-    ElMessage.error('获取图表数据失败')
-  }
-}
-// 处理图表数据
-const processChartData = (marketCards) => {
-  const chartData = {
-    rechargePermanent: [],
-    rechargeFree: [],
-    rechargeTask: [],
-    consumePermanent: [],
-    consumeFree: [],
-    consumeTask: [],
-    sumConsume: []
-  }
-  // 这是图表的合计数，怎样遍历？？？？？
-  const sumRechargePermanent1 = ref(0)
-  const sumRechargeFree1 = ref(0)
-  const sumRechargeTask1 = ref(0)
-  const sumConsumePermanent1 = ref(0)
-  const sumConsumeFree1 = ref(0)
-  const sumConsumeTask1 = ref(0)
-  const sumConsume1 = ref(0)
-
-
-  marketCards.forEach(market => {
-    chartData.rechargePermanent.push(market.sumRechargePermanent / 100 || 0)
-    chartData.rechargeFree.push(market.sumRechargeFree / 100 || 0)
-    chartData.rechargeTask.push(market.sumRechargeTask / 100 || 0)
-    chartData.consumePermanent.push(market.sumConsumePermanent / 100 || 0)
-    chartData.consumeFree.push(market.sumConsumeFree / 100 || 0)
-    chartData.consumeTask.push(market.sumConsumeTask / 100 || 0)
-    chartData.sumConsume.push(market.sumConsume / 100 || 0)
-
-    // 合计数合计数合计数咋算
-    sumRechargePermanent1.value += (market.sumRechargePermanent || 0)
-    sumRechargeFree1.value += (market.sumRechargeFree || 0)
-    //sumRechargeTask1.value += (market.sumRechargeTask || 0)
-    sumConsumePermanent1.value += (market.sumConsumePermanent || 0)
-    sumConsumeFree1.value += (market.sumConsumeFree || 0)
-    sumConsumeTask1.value += (market.sumConsumeTask || 0)
-    sumConsume1.value += (market.sumConsume || 0)
-  })
-  sumRechargePermanent.value = sumRechargePermanent1.value
-  sumRechargeFree.value = sumRechargeFree1.value
-  sumRechargeTask.value = 0
-  sumConsumePermanent.value = sumConsumePermanent1.value
-  sumConsumeFree.value = sumConsumeFree1.value
-  sumConsumeTask.value = sumConsumeTask1.value
-  sumConsume.value = sumConsume1.value
-
-  updateChart(chartData)
-}
-
-const processRankingData = (marketCards) => {
-  // 每个市场的总金币数
-  const rankingData = marketCards.map(market => {
-    let coinAmount = 0;
-    if (activeTab.value === 'recharge') {
-      // 充值排名
-      switch (selectedType.value) {
-        case 'all':
-          coinAmount = (market.sumRechargePermanent / 100 || 0) + (market.sumRechargeFree / 100 || 0) + (market.sumRechargeTask / 100 || 0);
-          break;
-        case 'permanent':
-          coinAmount = market.sumRechargePermanent / 100 || 0;
-          break;
-        case 'free':
-          coinAmount = market.sumRechargeFree / 100 || 0;
-          break;
-        case 'task':
-          coinAmount = market.sumRechargeTask / 100 || 0;
-          break;
-      }
-    } else {
-      // 消费排名
-      switch (selectedType.value) {
-        case 'all':
-          coinAmount = (market.sumConsumePermanent / 100 || 0) + (market.sumConsumeFree / 100 || 0) + (market.sumConsumeTask / 100 || 0);
-          break;
-        case 'permanent':
-          coinAmount = market.sumConsumePermanent / 100 || 0;
-          break;
-        case 'free':
-          coinAmount = market.sumConsumeFree / 100 || 0;
-          break;
-        case 'task':
-          coinAmount = market.sumConsumeTask / 100 || 0;
-          break;
-      }
-    }
-    return {
-      market: market.market,
-      coinAmount: coinAmount
-    };
-  });
-
-  // 按金币数量排序
-  rankingData.sort((a, b) => b.coinAmount - a.coinAmount);
-
-  // 排名序号
-  tableData.value = rankingData.map((item, index) => ({
-    rank: index + 1,
-    ...item
-  }));
-}
-
-watch(selectedType, () => {
-  getChartData();
-});
-// 更新图表
-const updateChart = (chartData) => {
-  if (!chartInstance) {
-    initChart()
-  }
-  chartLoading.value = true
-  try {
-    let series = []
-    let legend = []
-
-    if (activeTab.value === 'recharge') {
-      series = [
-        {
-          name: '永久金币',
-          type: 'bar',
-          stack: 'recharge',
-          data: chartData.rechargePermanent,
-          itemStyle: { color: '#5470c6' },
-          barWidth: 30
-        },
-        {
-          name: '免费金币',
-          type: 'bar',
-          stack: 'recharge',
-          data: chartData.rechargeFree,
-          itemStyle: { color: '#91cc75' },
-          barWidth: 30
-        },
-        {
-          name: '任务金币',
-          type: 'bar',
-          stack: 'recharge',
-          data: chartData.rechargeTask,
-          itemStyle: { color: '#fac858' },
-          barWidth: 30
-        }
-      ]
-      legend = ['永久金币', '免费金币', '任务金币']
-    } else {
-      series = [
-        {
-          name: '永久金币',
-          type: 'bar',
-          stack: 'consume',
-          data: chartData.consumePermanent,
-          itemStyle: { color: '#5470c6' },
-          barWidth: 30
-        },
-        {
-          name: '免费金币',
-          type: 'bar',
-          stack: 'consume',
-          data: chartData.consumeFree,
-          itemStyle: { color: '#91cc75' },
-          barWidth: 30
-        },
-        {
-          name: '任务金币',
-          type: 'bar',
-          stack: 'consume',
-          data: chartData.consumeTask,
-          itemStyle: { color: '#fac858' },
-          barWidth: 30
-        }
-      ]
-      legend = ['永久金币', '免费金币', '任务金币']
-    }
-
-    const option = {
-      tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-          type: 'shadow'
-        },
-        formatter: function (params) {
-          let result = params[0].name + '<br/>'
-          let total = 0;
-          params.forEach(param => {
-            result += `${param.seriesName}: ${param.value.toLocaleString()}<br/>`;
-            total += param.value;
-          })
-          result += `总${activeTab.value === 'recharge' ? '充值' : '消费'}: ${total.toLocaleString()}`;
-          return result
-        }
-      },
-      legend: {
-        data: legend,
-        bottom: 10
-      },
-      grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '10%',
-        containLabel: true
-      },
-      xAxis: {
-        type: 'category',
-        data: markets.value,
-        axisLabel: {
-          interval: 0,
-          rotate: 30
-        }
-      },
-      yAxis: {
-        type: 'value',
-        axisLabel: {
-          formatter: function (value) {
-            return value.toLocaleString()
-          }
-        }
-      },
-      series: series,
-      // dataZoom: [
-      //   {
-      //     type: 'slider',
-      //     show: true,
-      //     start: 0,
-      //     end: 100,
-      //     maxSpan: 100,
-      //     minSpan: 100,
-      //
-      //     height: 2,
-      //   },
-      // ]
-    }
-
-    chartInstance.setOption(option)
-  } catch (error) {
-    console.error('图表更新失败:', error)
-    ElMessage.error('图表渲染失败')
-  } finally {
-    setTimeout(() => {
-      chartLoading.value = false
-    }, 300)
-  }
-}
-
-// 处理标签切换
-const handleTabChange = () => {
-  getChartData()
-  console.log('标签切换调用图表')
-}
-
-const getAdminData = async function () {
-  try {
-    const result = await API({ url: '/admin/userinfo', data: {} })
-    adminData.value = result
-    console.log('用户信息', adminData.value)
-  } catch (error) {
-    console.log('请求失败', error)
-  }
-}
-// 获取卡片数据
-const getCardData = async () => {
-  try {
-    const response = await API({ url: '/workbench/getCard', data: {} })
-    workDataUpdateTime.value = response.updateTime
-    // 周同比
-    sumWow.value = response.sumWow.toFixed(2)
-    // 日环比
-    sumDaily.value = response.sumDaily.toFixed(2)
-
-    if (response && response.data) {
-      processData(response.data)
-    } else if (Array.isArray(response?.marketCards)) {
-      processData(response)
-    } else {
-      console.error('无效的API响应结构:', response)
-    }
-  } catch (error) {
-    console.error('获取卡片数据失败:', error)
-  }
-}
-const workDataUpdateTime = ref(null)
-
-// 标记当前激活的时间范围按钮
-const activeTimeRange = ref('')
-// 日期选择器变化时清除按钮激活状态
-const handleDatePickerChange = () => {
-  activeTimeRange.value = ''
-}
-
-onMounted(async () => {
-  await getAdminData()
-  await getCardData()
-  await getMarkets()
-  getYear()
-  window.addEventListener('resize', () => {
-    chartInstance.resize()
-  })
-})
-onUnmounted(() => {
-  destroyChart()
-})
-</script>
-
-<style scoped>
-.top {
-  height: 5.5vh;
-  width: 80vw;
-  display: flex;
-  margin-bottom: 0.5vh;
-
-  .text {
-    margin-left: 2vw;
-    width: 20vw;
-    display: flex;
-    align-items: center;
-    font-size: 18px;
-  }
-}
-
-.card {
-  height: 28vh;
-  margin-bottom: 0.5vh;
-  display: flex;
-  justify-content: center;
-}
-
-.graph {
-  width: 100%;
-  display: flex;
-  height: 64%;
-
-  .condition {
-    width: 100%;
-    height: 1%;
-    display: flex;
-    align-items: center;
-
-    .stats {
-      display: flex;
-      align-items: center;
-      width: 35vw;
-      font-size: 15px;
-    }
-  }
-
-  .graph-content {
-    flex: 1;
-    height: auto;
-    display: flex;
-
-    .left {
-      width: 70%;
-      height: auto;
-    }
-
-    .right {
-      flex: 1;
-      padding: 0.5vw 2vh;
-    }
-  }
-}
-
-.center-card {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.margin-bottom {
-  margin-bottom: 0.5vh;
-}
-
-.card-item {
-  width: 25%;
-  height: 28vh;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  margin-right: 0.25vw;
-}
-
-.card-title {
-  font-weight: bold;
-  margin-bottom: 1vh;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.card-large {
-  font-weight: bold;
-  font-size: 16px;
-  text-align: center;
-  margin-bottom: 15px;
-}
-
-@keyframes spin {
-  0% {
-    transform: rotate(0deg);
-  }
-
-  100% {
-    transform: rotate(360deg);
-  }
-}
-</style>
\ No newline at end of file

From 52dd3354ff1f50184ac3d0c76ae9483d869e4eba Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Thu, 27 Nov 2025 13:28:59 +0800
Subject: [PATCH 12/12] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=20?=
 =?UTF-8?q?=E9=A2=91=E9=81=93=E7=AE=A1=E7=90=86=E7=9A=84=E9=93=81=E7=B2=89?=
 =?UTF-8?q?=E5=92=8C=E7=9B=B4=E6=92=AD=E6=B2=A1=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/channelManage/cart/cart.vue     | 3 +++
 src/views/channelManage/fans/fans.vue     | 2 ++
 src/views/channelManage/reward/reward.vue | 4 +++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/channelManage/cart/cart.vue b/src/views/channelManage/cart/cart.vue
index 67c097e..c5f02a4 100644
--- a/src/views/channelManage/cart/cart.vue
+++ b/src/views/channelManage/cart/cart.vue
@@ -156,6 +156,7 @@ const searchCart = async function () {
           ...beanCart.value,
           sortField: sortField.value,
           sortOrder: sortOrder.value,
+          roleId: adminData.value.roleId
         }
       }
     })
@@ -282,6 +283,8 @@ const exportExcel = async function () {
       ...beanCart.value,
       sortField: sortField.value,
       sortOrder: sortOrder.value,
+      roleId: adminData.value.roleId
+
     },
   }
   const res = await API({ url: '/export/exportArticle', data: params })
diff --git a/src/views/channelManage/fans/fans.vue b/src/views/channelManage/fans/fans.vue
index 7d66e1d..7d57c14 100644
--- a/src/views/channelManage/fans/fans.vue
+++ b/src/views/channelManage/fans/fans.vue
@@ -399,6 +399,8 @@ const exportExcel = async function () {
       ...beanConsumeFan.value,
       sortField: sortField.value,
       sortOrder: sortOrder.value,
+      roleId: adminData.value.roleId
+
     },
   }
   const res = await API({ url: '/export/exportFan', data: params })
diff --git a/src/views/channelManage/reward/reward.vue b/src/views/channelManage/reward/reward.vue
index 697e9c9..c954418 100644
--- a/src/views/channelManage/reward/reward.vue
+++ b/src/views/channelManage/reward/reward.vue
@@ -419,7 +419,9 @@ const exportExcel = async function () {
       startTime: beanConsumeLive.value.startTime || '',
       endTime: beanConsumeLive.value.endTime || '',
       sortField: sortField.value || 'consumeTime',
-      sortOrder: sortOrder.value || 'desc'
+      sortOrder: sortOrder.value || 'desc',
+      roleId: adminData.value.roleId
+
     }
   }
   // 打印请求参数，方便调试