diff --git a/src/router/index.js b/src/router/index.js
index 4c20539..87df00a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -319,7 +319,7 @@ const routes = [
                             {
                                 path: 'receiveManager',
                                 name: "receiveManager",
-                                component: () => import("../views/moneyManage/receiveDetail/receiveManage.vue"),
+                                component: () => import("../views/moneyManage/receiveDetail/receiveFinance.vue"),
                                 meta: { permissionId: [67, 79] }
                             },
                             {//地区财务
diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue
index 68da10d..34cc35f 100644
--- a/src/views/moneyManage/receiveDetail/receiveFinance.vue
+++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue
@@ -454,12 +454,11 @@
                         <el-text style="width:4vw;">产品数量</el-text>
                         <el-input style="padding-right: 10px; width:10.5vw;" v-model="refundFormData.goodNum"
                             placeholder="请输入产品数量" disabled />
-                        <span style="color: #999999;">{{ productUnit }}</span>
                     </div>
-                    <div v-show="isRefundGold" style="display: flex;">
+                    <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; margin-bottom: 10px"
+                            <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; ">
diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue
deleted file mode 100644
index 539f8c8..0000000
--- a/src/views/moneyManage/receiveDetail/receiveManage.vue
+++ /dev/null
@@ -1,1174 +0,0 @@
-<template>
-  <div class="content">
-    <div class="div-card1">
-      <el-card class="card1" style="margin-bottom: 0.5vh; min-height: 110px;">
-        <div class="row">
-          <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-select v-model="searchData.market" placeholder="请选择所属地区" style="width:10vw;" clearable>
-              <el-option v-for="item in marketList" :key="item" :label="item" :value="item"/>
-            </el-select>
-          </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="row" style="margin-top: 10px;">
-          <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: 30vw">
-            <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 class="buttons">
-            <el-button type="primary" @click="search">查询</el-button>
-            <el-button type="success" @click="reset">重置</el-button>
-          </div>
-        </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>
-          <!-- 移除客服专属“添加收款”按钮 -->
-        </div>
-
-        <div class="table">
-          <el-table :data="tableData" style="width: 80vw;height:54vh;" @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>
-            <el-table-column prop="paymentAmount" label="付款金额" width="120px"></el-table-column>
-            <!-- 地区财务专属：已通过/已完成标签显示到账信息 -->
-            <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>
-            <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>
-            <el-table-column prop="remark" label="备注" v-if="activeTab != 'reject'" width="150px"
-                             show-overflow-tooltip></el-table-column>
-            <el-table-column prop="status" label="订单状态" v-if="activeTab == 'done'" width="150px"
-                             show-overflow-tooltip>
-              <template #default="scope">
-                <span v-if="scope.row.status == 6">退款</span>
-                <span 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="{
-                                        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' && activeTab != 'done'">
-              <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)"
-                    style="color: #2741DE;" @click="openEditForm(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>
-      </el-card>
-    </div>
-
-    <!-- 移除客服专属：撤回确认弹窗、退款确认弹窗、新增弹窗 -->
-
-    <!-- 地区财务专属：审核弹窗 -->
-    <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 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格式文件≤ 1 MB
-            </el-text>
-          </div>
-        </el-form-item>
-        <el-form-item label="备注">
-          <el-input disabled="true" v-model="auditFormData.remark" type="textarea" :rows="3"
-                    placeholder="请输入备注" 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="{
-                        backgroundColor: isBtnDisabled ? '#E5E5E5FF' : '#2741DEFF',
-                        marginLeft: '60px',
-                        color: isBtnDisabled ? '#8A8A8A' : '#F3FAFE'
-                    }" @click="handelAudit" :disabled="isBtnDisabled">{{ btnText }}</el-button>
-                </span>
-        <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>
-                </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="padding-right: 50px; display: flex;">
-                <el-input disabled="true" style="padding-right: 10px;" v-model="editFormData.goodNum"
-                          placeholder="请输入产品数量"/>
-                <span style="color: #999999;">个</span>
-              </div>
-            </el-form-item>
-            <div v-show="isEditGold" 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="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格式文件≤ 1 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="请输入到账金额"/>
-            </el-form-item>
-            <el-form-item label="手续费" prop="handlingCharge">
-              <el-input v-model="editFormData.handlingCharge" placeholder="请输入手续费"/>
-            </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>
-                        <button class="editBtn2" @click="throttledsubmitEditForm">
-                            <text class="txt">
-                                提交
-                            </text>
-                        </button>
-                    </span>
-        </div>
-      </div>
-    </el-dialog>
-
-    <!-- 移除客服专属：退款弹窗 -->
-  </div>
-</template>
-<script setup>
-import {ref, watch, computed, onMounted} from 'vue';
-import {storeToRefs} from 'pinia';
-import {ElMessage, ElMessageBox} from 'element-plus'
-import API from '@/util/http.js'
-import request from '@/util/http.js'
-import moment from 'moment'
-import {useAdminStore} from '@/store/index.js'
-import {hasMenuPermission} from '@/utils/menuTreePermission.js'
-
-import _ from 'lodash'
-import {editFormRule} from './utils/recriveFormRules.js'
-import {productList, MarketNameForId, CurrencyForId, marketList, statusList} from './utils/staticData.js'
-import CurrencySelect from '@/components/MoneyManage/CurrencySelect.vue'
-import {Plus} from '@element-plus/icons-vue';
-
-
-// ===================== 1. 核心状态管理（仅地区财务） =====================
-const adminStore = useAdminStore();
-const {menuTree} = storeToRefs(adminStore);
-
-
-//=====================   查询相关        =================================
-const tableData = ref([])
-const searchData = ref({})
-const defaultTime = [
-  new Date(2000, 1, 1, 0, 0, 0),
-  new Date(2000, 2, 1, 23, 59, 59),
-]
-const getTime = ref([])
-
-// 空函数占位（原模板引用但未定义，避免报错）
-const handleDatePickerChange = ref(() => {
-})
-const disabledDate = ref(() => {
-})
-const handleSortChange = ref(() => {
-})
-
-const search = () => {
-  getlist()
-  ElMessage.success('查询成功')
-}
-const reset = () => {
-  searchData.value = {}
-  getTime.value = []
-  // 重置页码
-  pageInfo.value.pageNum = 1
-  getlist()
-}
-
-//获得表格数据接口（仅保留地区财务逻辑）
-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]
-    }
-    if (searchData.value.paymentCurrency) {
-      payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency)
-    }
-
-    // 地区财务固定角色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 result = await request({
-      url: '/cashCollection/selectCollection',
-      data: {
-        ...pageInfo.value,
-        cashCollection: {
-          ...searchData.value,
-          ...getTime.value,
-          submitterId: adminData.value.id,
-          receivedMarket: MarketNameForId(receivedMarket),
-          cashRoleId: cashRoleId,
-          paymentCurrency: payCurrencySelect,
-          submitterMarket: receivedMarket,
-          goodsName: goodsName,
-          market: MarketNameForId(searchData.value.market)
-        }
-      }
-    })
-    if (result.code == 200) {
-      tableData.value = result.data.list
-      total.value = result.data.total
-    } else {
-      ElMessage.error('数据异常')
-      console.log(result.msg);
-    }
-  } catch (error) {
-    console.log(error);
-  }
-}
-
-//====================   标签切换  =========================
-const activeTab = ref('wait')
-
-const navigateTo = async (tab) => {
-  activeTab.value = tab
-  await getlist()
-}
-
-// 固定地区财务角色标识（移除客服、总部财务相关变量）
-const caiwu = ref(true)
-
-//=================  图片上传相关（审核弹窗复用）   ==================
-const uploadRef = ref()
-
-// 图片上传回调（审核弹窗查看凭证用，无实际上传操作）
-const handleImgSuccess = (response, uploadFile) => {
-  try {
-    ElMessage.success('上传成功')
-  } catch (error) {
-    ElMessage.error(response.msg || '图片上传失败')
-  }
-}
-
-const handelImgErr = (err) => {
-  ElMessage.error("图片上传失败")
-}
-
-const beforeUpload = (rawFile) => {
-  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png') {
-    ElMessage.error('图片必须是jpg或png类型!')
-    return false
-  } else if (rawFile.size / 1024 / 1024 > 2) {
-    ElMessage.error('图片大小不能超过 2MB!')
-    return false
-  }
-  return true
-}
-
-const handleImageChange = (file) => {
-  uploadRef.value.submit()
-}
-
-const customUpload = async (options) => {
-  try {
-    const formData = new FormData()
-    formData.append('file', options.file)
-
-    const response = await API({
-      url: 'https://api.homilychart.com/hljw/api/aws/upload',
-      method: 'POST',
-      data: formData,
-      headers: {
-        'Content-Type': 'multipart/form-data'
-      }
-    })
-    if (response.code === 200 && response.data) {
-      handleImgSuccess(response, options.file)
-    } else {
-      options.onError(response)
-      ElMessage.error(response.msg || '上传失败')
-    }
-  } catch (error) {
-    ElMessage.error(`上传失败: ${error.msg || error.message || '网络异常'}`)
-  }
-}
-
-// 预览图片函数
-const previewImage = (imageUrl) => {
-  const imageElement = document.createElement('img');
-  imageElement.src = imageUrl;
-  imageElement.style.maxWidth = '80vw';
-  imageElement.style.maxHeight = '80vh';
-  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.style.overflow = 'auto';
-  viewer.appendChild(imageElement);
-  document.body.appendChild(viewer);
-  viewer.addEventListener('click', () => {
-    document.body.removeChild(viewer);
-  });
-};
-
-//==================  财务编辑相关     =========================
-const editFormData = ref({})
-const ifOnline = ref(false)
-const editFormisible = ref(false)
-const editFormRef = ref(null)
-
-// 判断是否为金币产品
-const isEditGold = ref(false)
-const EditifGold = () => {
-  if (editFormData.value.goodsName === '金币充值') {
-    isEditGold.value = true
-  } else {
-    isEditGold.value = false
-  }
-}
-
-const openEditForm = (row) => {
-  editFormData.value = row
-  EditifGold()
-  // 仅在线支付可编辑付款信息
-  if (row.status == 3) {
-    ifOnline.value = true
-  } else {
-    ifOnline.value = false
-  }
-  editFormisible.value = true
-}
-
-const closeEditForm = () => {
-  editFormisible.value = false
-  editFormData.value = {}
-  getlist()
-}
-
-//提交编辑（地区财务补充手续费）
-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')
-    }
-    const result = await request({
-      url: '/cashCollection/complete',
-      data: {
-        orderCode: editFormData.value.orderCode,
-        handlingCharge: editFormData.value.handlingCharge * 100,
-        paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency),
-        paymentAmount: (editFormData.value.paymentAmount) * 100,
-        receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),
-        receivedAmount: editFormData.value.receivedAmount * 100,
-        receivedTime: editFormData.value.receivedTime,
-        receivedRemark: editFormData.value.receivedRemark,
-      }
-    })
-    if (result.code == 200) {
-      ElMessage.success('提交成功')
-      getlist()
-      closeEditForm()
-    }
-  } catch (error) {
-    ElMessage.error('请检查表单数据格式');
-  }
-}
-
-//==================  审核相关     =========================
-const auditFormData = ref({})
-//财务通过审核请求
-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)
-      getlist()
-    }
-  } catch (error) {
-    console.log(error);
-  }
-}
-
-//财务驳回审核请求
-const handelAuditReject = async () => {
-  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()
-    }
-  } catch (error) {
-    console.log(error);
-  }
-}
-
-const auditFormisible = ref(false)
-//判断弹窗中是否展示驳回
-const ifReject = ref(false)
-
-const openAuditForm = (row) => {
-  auditFormData.value = {
-    ...row,
-    market: row.marketName
-  }
-  auditFormisible.value = true
-}
-
-//审核按钮倒计时控制
-const countdown = ref(0);
-const isBtnDisabled = ref(false);
-const btnText = ref('通过(3)');
-
-const closeAuditForm = () => {
-  ifReject.value = false
-  auditFormisible.value = false
-  auditFormData.value = {}
-}
-
-// 审核弹窗打开时启动倒计时
-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);
-  }
-})
-
-//========================分页相关==================
-const pageInfo = ref({
-  pageSize: 10,
-  pageNum: 1
-})
-const total = ref(0)
-
-const handlePagination = (type, val) => {
-  if (type === 'size') {
-    pageInfo.value.pageSize = val
-  } else {
-    pageInfo.value.pageNum = val
-  }
-  getlist()
-}
-
-// ============   已驳回相关（提示框）      ===========================
-const showTooltip = ref(false);
-const tooltipContent = ref('');
-const tooltipLeft = ref(0);
-const tooltipTop = ref(0);
-const tooltipWidth = 200;
-
-// 鼠标悬浮显示完整驳回理由
-const handleMouseEnter = (e, content) => {
-  if (content) {
-    showTooltip.value = true;
-    tooltipContent.value = content;
-    handleMouseMove(e);
-  }
-};
-
-const handleMouseLeave = () => {
-  showTooltip.value = false;
-  tooltipContent.value = '';
-};
-
-const handleMouseMove = (e) => {
-  tooltipLeft.value = e.clientX - tooltipWidth - 10;
-  tooltipTop.value = e.clientY - 10;
-};
-
-//=====================  基础数据加载  =========================
-const adminData = ref({})
-// 获取管理员信息
-const getAdminData = async function () {
-  try {
-    const result = await API({
-      url: '/admin/userinfo',
-      data: {}
-    })
-    adminData.value = result
-  } catch (error) {
-    console.log('管理员信息请求失败', error)
-  }
-}
-
-// 支付方式列表（固定数据）
-const paytypeList = ["Stripe-链接收款", "PaymentAsia-链接收款", "Ipay88-链接收款", "银行转账", "刷卡", "现金", "支票", "Grabpay", "Nets", "E-Transfer", "Paypal"]
-const activityList = ref([])
-
-// 获取活动列表
-const getActivitys = async function () {
-  try {
-    const result = await API({
-      url: '/cashCollection/getActivityList',
-      data: {}
-    })
-    if (result.code == 200) {
-      activityList.value = result.data
-    } else {
-      ElMessage.error('活动列表获取失败')
-    }
-  } catch (error) {
-    console.log('活动列表请求失败', error)
-  }
-}
-
-//=====================  节流控制（防止重复提交）  =========================
-const throttledhandelAuditReject = _.throttle(handelAuditReject, 5000, {
-  trailing: false
-})
-const throttledsubmitEditForm = _.throttle(submitEditForm, 5000, {
-  trailing: false
-})
-
-//=====================  页面初始化  =========================
-onMounted(async function () {
-  await getAdminData()
-  await getActivitys()
-
-  // 地区财务权限校验（菜单ID：78）
-  if (hasMenuPermission(menuTree.value, 78)) {
-    // 管理员账号所属地区提示
-    if (adminData.value.roleId == 2 && (adminData.value.markets == '总部' || adminData.value.markets == '研发部')) {
-      ElMessageBox.alert('管理员账号只能看到所属地区对应地区财务数据，请注意设置所属地区', '注意', {
-        type: 'warning'
-      })
-    }
-    getlist()
-  }
-})
-</script>
-<style scoped lang="scss">
-.content {
-  height: 100%;
-  width: 80vw;
-
-  .card1 {
-    width: 100%;
-    background: #F3FAFE;
-
-    .row {
-      height: 4vh;
-      width: 80vw;
-      display: flex;
-      min-height: 40px;
-
-      .rowItem {
-        display: flex;
-        width: 15vw;
-        align-items: center;
-        justify-content: center;
-        margin-right: 0.5vw;
-      }
-
-      .buttons {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin-left: 10px;
-      }
-    }
-  }
-
-
-  .div-card2 {
-    width: 100%;
-    margin-top: 2vh;
-
-    .card2 {
-      background: #E7F4FD;
-    }
-
-    .btns {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding-bottom: 10px;
-
-      .tabs {
-        min-width: 300px;
-
-        .btnItem {
-          margin-left: 10px;
-          border-radius: 5px;
-        }
-      }
-    }
-
-
-    .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;
-        }
-      }
-    }
-
-    .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%;
-          }
-        }
-
-        .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;
-    }
-  }
-
-  :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;
-        }
-      }
-    }
-
-    .content {
-      display: flex;
-      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;
-          }
-        }
-      }
-    }
-  }
-
-  :deep(.adddialog .el-form-item__label) {
-    min-width: 80px;
-    width: auto;
-    font-weight: 800;
-    padding-bottom: 15px;
-  }
-}
-
-// 表格样式统一
-:deep(.el-table__header-wrapper),
-:deep(.el-table__body-wrapper),
-:deep(.el-table__cell),
-:deep(.el-table__body td) {
-  background-color: #F3FAFE !important;
-}
-
-:deep(.el-table__header th) {
-  background-color: #F3FAFE !important;
-}
-
-:deep(.el-table__row:hover > .el-table__cell) {
-  background-color: #E5EBFE !important;
-}
-
-// 驳回理由弹窗样式
-.reject-reason-box {
-  --el-message-box-height: 500px;
-}
-
-.reject-reason-box .el-message-box__content {
-  max-height: 350px;
-  overflow-y: auto;
-  white-space: pre-wrap;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/permissions/rolePermission.vue b/src/views/permissions/rolePermission.vue
index d38cdcc..341a6b0 100644
--- a/src/views/permissions/rolePermission.vue
+++ b/src/views/permissions/rolePermission.vue
@@ -198,7 +198,7 @@ const handleAddRole = async function () {
         "menuIds": finalCheckedKeys,
         "fatherId": addRole.value.parentId,
         "market": addRole.value.market,
-        channel:addRole.value.channel
+        channel: addRole.value.channel
       }
     })
     if (res.code === 200) {
@@ -319,7 +319,7 @@ const handleEditRolePermissionCheck = (checkedNodes, checkedInfo) => {
   // 判断是否有选中的节点
   if (allCheckedNodes.length === 0) {
     permissionEditRoleObj.value.checkedKeys = []
-     ifHasChannel.value = false
+    ifHasChannel.value = false
     return
   }
 
@@ -329,7 +329,7 @@ const handleEditRolePermissionCheck = (checkedNodes, checkedInfo) => {
 
   console.log('编辑角色选中的权限ID:', checkedKeys)
   console.log('选中的节点数量:', allCheckedNodes.length)
-  if (checkedKeys.includes(124)||checkedKeys.includes(125)||checkedKeys.includes(126)||checkedKeys.includes(127)) {
+  if (checkedKeys.includes(124) || checkedKeys.includes(125) || checkedKeys.includes(126) || checkedKeys.includes(127)) {
     ifHasChannel.value = true
   } else {
     ifHasChannel.value = false
@@ -431,18 +431,38 @@ const collectIds2 = (tree) => {
   return ids
 }
 
+const collectIdsAll = (tree) => {
+  let ids = []
+  tree.forEach((node) => {
+    ids.push(node.id)
+    // 如果当前节点没有 children 或 children 为空，说明是叶子节点
+    if (node.children || node.children.length === 0) {
+      ids = ids.concat(collectIdsAll(node.children))
+    }
+  })
+  return ids
+}
+
 
 // 编辑角色初始化
 const permissionEditRoleInit = async function (row) {
   console.log('row', row)
   console.log('row.tree', row.tree)
+  let EditIds = collectIdsAll(row.tree)
+  console.log(EditIds);
+
   permissionEditRoleObj.value = {}
   permissionEditRoleObj.value.id = row.id
   permissionEditRoleObj.value.roleName = row.roleName
   permissionEditRoleObj.value.market = row.market
   permissionEditRoleObj.value.parentId = row.fatherId
   permissionEditRoleObj.value.parentName = row.fatherName
-
+  permissionEditRoleObj.value.channel = row.channel
+  if (EditIds.includes(124)) {
+    ifHasChannel.value = true
+  } else {
+    ifHasChannel.value = false
+  }
   try {
     let roleId = permissionEditRoleObj.value.parentId;
     // 如果没有上级角色，设置为管理员的id