diff --git a/src/components/MoneyManage/CurrencySelect.vue b/src/components/MoneyManage/CurrencySelect.vue
index d149303..056cde6 100644
--- a/src/components/MoneyManage/CurrencySelect.vue
+++ b/src/components/MoneyManage/CurrencySelect.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="dropdown" ref="dropdownRef">
     <!-- 下拉框触发器 -->
-    <div class="dropdown-toggle" @click="toggleMenu" :class="{ 'active': isOpen }">
+    <div class="dropdown-toggle" @click="toggleMenu" :class="{ 'active': isOpen,'disabled': props.disabled }">
       <div class="search">
-        <input type="text" class="search-input" :placeholder="placeholder" :value="isOpen ? searchData : selectedItem"
+        <input type="text" class="search-input" :placeholder="placeholder" :value="isOpen ? searchData : selectedItem" 
           @focus="handleSearchFocus" @blur="handleSearchBlur" @input="handleInput">
         <el-icon class="clear-icon" v-if="searchData" @click="clearSearch">
           <CircleClose />
@@ -50,6 +50,10 @@ const props = defineProps({
   modelValue: {
     type: String,
     default: ''
+  },
+  disabled: {
+    type: Boolean,
+    default: false
   }
 })
 
@@ -57,6 +61,7 @@ const emit = defineEmits(['update:modelValue', 'change'])
 
 // 切换下拉菜单
 const toggleMenu = () => {
+  if (props.disabled) return
   isOpen.value = !isOpen.value
   searchData.value = ''
 }
diff --git a/src/router/index.js b/src/router/index.js
index 8694147..8fdbb28 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -316,21 +316,21 @@ const routes = [
                                 path: 'receiveService',
                                 name: "receiveService",
                                 component: () => import("../views/moneyManage/receiveDetail/receiveDetail.vue"),
-                                meta: { permissionId: 75 }
+                                meta: { permissionId: 77 }
                             },
                             // 地区财务及地区负责人页面
                             {
                                 path: 'receiveArea',
                                 name: "receiveArea",
                                 component: () => import("../views/moneyManage/receiveDetail/receiveDetail.vue"),
-                                meta: { permissionId: 75 }
+                                meta: { permissionId: 78 }
                             },
                             //总部管理员及财务
                             {
                                 path: 'receiveHead',
                                 name: "receiveHead",
                                 component: () => import("../views/moneyManage/receiveDetail/receiveDetail.vue"),
-                                meta: { permissionId: 75 }
+                                meta: { permissionId: 79 }
                             },
                         ]
                     },
diff --git a/src/views/moneyManage/receiveDetail/receiveDetail.vue b/src/views/moneyManage/receiveDetail/receiveDetail.vue
index e2d20df..4b6c348 100644
--- a/src/views/moneyManage/receiveDetail/receiveDetail.vue
+++ b/src/views/moneyManage/receiveDetail/receiveDetail.vue
@@ -15,30 +15,33 @@
                     </div>
                     <div class="rowItem">
                         <el-text style="width: 4vw;">所属地区</el-text>
-                        <el-select v-model="searchData.market" placeholder="请选择所属地区" style="width:10vw;"
-                            clearable></el-select>
+                        <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.status" placeholder="请选择订单状态" style="width: 10vw;"
-                            clearable></el-select>
+                        <el-select v-model="searchData.status" placeholder="请选择订单状态" style="width: 10vw;" clearable>
+                            <el-option v-for="item in statusList" :key="item.name" :label="item.name"
+                                :value="item.value" /></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-select>
+                        <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" placeholdert="请选择活动方式" style="width: 10vw;"
-                            clearable></el-select>
+                        <el-select v-model="searchData.activity" placeholdert="请选择活动方式" style="width: 10vw;" clearable>
+                            <el-option v-for="item in activityList" :key="item" :label="item" :value="item" />
+                        </el-select>
                     </div>
                     <div class="rowItem">
                         <el-text style="width: 4vw;">产品名称</el-text>
-                        <el-select v-model="searchData.goodsName" placeholder="请选择产品名称" style="width: 10vw;"
-                            clearable></el-select>
+                        <ProductSelect style="width: 190px;" v-model="searchData.goodsName"></ProductSelect>
                     </div>
                     <div class="rowItem" style="width: 30vw">
                         <el-text style="width: 4vw; margin-left: 0.5vw;">付款时间</el-text>
@@ -51,11 +54,12 @@
                 <div class="row" style="margin-top: 10px;">
                     <div class="buttons">
                         <el-button type="primary" @click="search">查询</el-button>
-                        <el-button type="success">重置</el-button>
+                        <el-button type="success" @click="reset">重置</el-button>
                         <el-button type="primary">导出excel</el-button>
                         <el-button type="primary" style="background-color: #5870FF;">导出列表</el-button>
-                        <el-button type="primary" @click="checkKefu">切换客服</el-button>
-                        <el-button type="success" @click="checkCaiwu">切换财务</el-button>
+                        <el-button v-if="superAdmin" type="primary" @click="checkKefu">切换客服</el-button>
+                        <el-button v-if="superAdmin" type="success" @click="checkCaiwu">切换地区财务</el-button>
+                        <el-button v-if="superAdmin" type="success" @click="checkHqCaiwu">切换总部财务</el-button>
                     </div>
                 </div>
             </el-card>
@@ -65,9 +69,9 @@
         <div class="div-card2">
             <el-card class="card2">
                 <div class="btns">
-                    <div class="tabs" v-if="caiwu">
+                    <div class="tabs" v-if="caiwu || HQcaiwu">
                         <el-button-group>
-                            <el-button class="btnItem"
+                            <el-button class="btnItem" v-if="caiwu"
                                 :style="{ backgroundColor: activeTab === 'wait' ? '#2741DE' : '#E5EBFE', color: activeTab === 'wait' ? 'white' : '#666' }"
                                 @click="navigateTo('wait')">
                                 待审核
@@ -77,7 +81,7 @@
                                 @click="navigateTo('pass')">
                                 已通过
                             </el-button>
-                            <el-button class="btnItem"
+                            <el-button class="btnItem" v-if="caiwu"
                                 :style="{ backgroundColor: activeTab === 'reject' ? '#2741DE' : '#E5EBFE', color: activeTab === 'reject' ? 'white' : '#666' }"
                                 @click="navigateTo('reject')">
                                 已驳回
@@ -100,7 +104,7 @@
                         </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="market" label="所属地区" width="80px" />
+                        <el-table-column prop="marketName" label="所属地区" width="80px" />
                         <el-table-column prop="activity" label="活动名称" width="120px" />
                         <el-table-column prop="goodsName" label="产品名称" width="120px" />
                         <el-table-column prop="goodNum" label="产品数量" width="120px" />
@@ -113,7 +117,7 @@
                         <el-table-column prop="receivedAmount" label="到账金额" v-if="caiwu && activeTab == 'pass'"
                             width="150px">
                             <template #default="scope">
-                                <div v-if="!scope.row.getMoney">
+                                <div v-if="!scope.row.receivedAmount">
                                     <text style="color: #FA5A1E;">待补充</text>
                                 </div>
                             </template>
@@ -121,7 +125,7 @@
                         <el-table-column prop="handlingCharge" label="手续费" v-if="caiwu && activeTab == 'pass'"
                             width="150px">
                             <template #default="scope">
-                                <div v-if="!scope.row.shouxufei">
+                                <div v-if="!scope.row.handlingCharge">
                                     <text style="color: #FA5A1E;">待补充</text>
                                 </div>
                             </template>
@@ -146,12 +150,22 @@
                             width="150px" show-overflow-tooltip></el-table-column>
                         <el-table-column prop="submitterName" label="提交人" width="150px"
                             show-overflow-tooltip></el-table-column>
-                        <el-table-column prop="auditor" label="审核人"
+                        <el-table-column prop="auditName" label="审核人"
                             v-if="caiwu && activeTab == 'pass' || activeTab == 'reject'" width="150px"
                             show-overflow-tooltip></el-table-column>
+                        <el-table-column prop="receivedTime" label="到账时间" v-if="caiwu && activeTab == 'pass'"
+                            width="150px">
+                        </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="rejectTime" label="驳回时间" v-if="activeTab == 'reject' && !kefu"
+                        <el-table-column prop="status" label="订单状态" v-if="activeTab == 'pass' && !kefu" 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' && !kefu"
                             width="150px" show-overflow-tooltip></el-table-column>
                         <el-table-column prop="rejectReason" label="驳回理由" v-if="activeTab == 'reject' && !kefu"
                             width="150px">
@@ -173,33 +187,32 @@
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="getMoneyTime" label="到账时间" v-if="caiwu && activeTab == 'pass'"
-                            width="150px">
-                        </el-table-column>
                         <el-table-column v-if="kefu" fixed="right" prop="status" label="订单状态" width="100px">
                             <template #default="scope">
                                 <span v-if="scope.row.status == 0">待审核</span>
                                 <span v-else-if="scope.row.status == 1 || scope.row.status == 4">已通过</span>
                                 <span v-else-if="scope.row.status == 2">已驳回</span>
                                 <span v-else-if="scope.row.status == 5">已撤回</span>
+                                <span v-else-if="scope.row.status == 6">退款</span>
                                 <span v-else></span>
                             </template>
                         </el-table-column>
                         <el-table-column fixed="right" label="操作" width="120px" v-if="activeTab != 'reject'">
                             <template #default=scope>
                                 <span v-if="kefu && scope.row.status == 4" style="color: #FA5A1E;"
-                                    @click="openRecall('refund')">退款</span>
+                                    @click="openConfirm('refund', scope.row)">退款</span>
                                 <span v-else-if="kefu && scope.row.status == 1" style="color: #2741DE;">待填写手续费</span>
                                 <span v-else-if="kefu && scope.row.status == 5" style="color: #2741DE;"
                                     @click="openAddForm(scope.row)">编辑</span>
                                 <span v-else-if="kefu && scope.row.status == 0" style="color: #FA5A1E;"
-                                    @click="openRecall('recall')">撤回</span>
+                                    @click="openConfirm('recall')">撤回</span>
                                 <span v-else-if="kefu && scope.row.status == 2" style="color: #FA5A1E;"
                                     @click="openRejectReason(scope.row.rejectReason)">查看驳回理由</span>
                                 <span v-else-if="activeTab == 'wait' && !kefu" style="color: #2741DE;"
                                     @click="openAuditForm(scope.row)">审核</span>
-                                <span v-else-if="activeTab == 'pass' && !kefu" style="color: #2741DE;"
-                                    @click="openEditForm(scope.row)">编辑</span>
+                                <span
+                                    v-else-if="activeTab == 'pass' && !kefu && !(scope.row.status == 6 || scope.row.status == 4)"
+                                    style="color: #2741DE;" @click="openEditForm(scope.row)">编辑</span>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -212,6 +225,7 @@
                 </div>
             </el-card>
         </div>
+        <!-- 撤回确认 -->
         <div class="recallDialog" v-show="recallDialog">
             <div class="close">
                 <button @click="closeRecall" class="Btn">关闭</button>
@@ -223,7 +237,22 @@
                 <button @click="closeRecall" class="Btn">取消</button>
             </div>
             <div class="confirm">
-                <button class="Btn">确定</button>
+                <button @click="" class="Btn">确定</button>
+            </div>
+        </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>
         <!-- 客服新增弹窗 -->
@@ -242,15 +271,29 @@
                 <el-form-item label="活动名称" required>
                     <el-input v-model="addFormData.activity" placeholder="请输入活动名称" />
                 </el-form-item>
-                <el-form-item label="产品名称" required>
+                <el-form-item label="产品名称" required @change="ifGold">
                     <ProductSelect v-model="addFormData.goodsName"></ProductSelect>
                 </el-form-item>
-                <el-form-item label="产品数量" required>
+                <el-form-item v-show="!isGold" label="产品数量" required>
                     <div style="padding-right: 50px; display: flex;">
                         <el-input style="padding-right: 10px;" v-model="addFormData.goodNum" placeholder="请输入产品数量" />
                         <span style="color: #999999;">个</span>
                     </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 style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
+                            v-model="addFormData.permanentGold" />
+                    </div>
+                    <div style="padding-right: 5px; display: flex;">
+                        <span
+                            style="color: #999999; display: flex; white-space: nowrap;align-items: center;">免费金币：</span>
+                        <el-input style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
+                            v-model="addFormData.freeGold" />
+                    </div>
+                </div>
                 <el-form-item label="付款币种" required>
                     <CurrencySelect v-model="addFormData.paymentCurrency" :items="customOptions" placeholder="请选择付款币种"
                         @change="handleCurrencyChange" />
@@ -259,12 +302,13 @@
                     <el-input v-model="addFormData.paymentAmount" placeholder="请输入付款金额" />
                 </el-form-item>
                 <el-form-item label="支付方式" required>
-                    <CurrencySelect v-model="addFormData.payType" :items="paytypeOptions" placeholder="请选择支付方式">
+                    <CurrencySelect v-model="addFormData.payType" :items="paytypeOptions" placeholder="请选择支付方式"
+                        @change="ifGroup">
                     </CurrencySelect>
                 </el-form-item>
                 <el-form-item label="到账地区" required>
                     <CurrencySelect v-model="addFormData.receivedMarket" :items="MoneyAddressOptions"
-                        placeholder="请选择支付方式">
+                        :disabled="isGroup" placeholder="请选择到账地区">
                     </CurrencySelect>
                 </el-form-item>
                 <el-form-item label="付款时间" required>
@@ -315,19 +359,18 @@
                     <el-input disabled="true" v-model="auditFormData.activity" placeholder="请输入活动名称" />
                 </el-form-item>
                 <el-form-item label="产品名称" required>
-                    <ProductSelect disabled="true" v-model="auditFormData.goodsName"></ProductSelect>
+                    <el-select disabled="true" v-model="auditFormData.goodsName" />
                 </el-form-item>
                 <el-form-item label="付款币种" required>
-                    <CurrencySelect disabled="true" v-model="auditFormData.paymentCurrency" :items="customOptions"
-                        placeholder="请选择付款币种" @change="handleCurrencyChange" />
+                    <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="支付方式" required>
-                    <CurrencySelect disabled="true" v-model="auditFormData.payType" :items="paytypeOptions"
-                        placeholder="请选择支付方式">
-                    </CurrencySelect>
+                    <el-select disabled="true" v-model="auditFormData.payType" :items="paytypeOptions"
+                        placeholder="请选择支付方式" />
                 </el-form-item>
                 <el-form-item label="付款时间">
                     <el-date-picker disabled="true" type="datetime" v-model="auditFormData.payTime"
@@ -350,8 +393,8 @@
                     </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-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="请输入驳回理由"
@@ -370,52 +413,56 @@
                 <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="handleReject">确定</el-button>
+                        @click="handelAuditReject">确定</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 v-model="editFormData.jwcode" placeholder="请输入驳回理由" />
+                            <el-input disabled="true" v-model="editFormData.jwcode" placeholder="请输入驳回理由" />
                         </el-form-item>
                         <el-form-item label="客户姓名">
-                            <el-input v-model="editFormData.name" placeholder="请输入客户姓名" />
+                            <el-input disabled="true" v-model="editFormData.name" placeholder="请输入客户姓名" />
                         </el-form-item>
                         <el-form-item label="所属地区">
-                            <el-input disabled="true" v-model="editFormData.market" placeholder="请输入所属地区" />
+                            <el-input disabled="true" v-model="editFormData.marketName" placeholder="请输入所属地区" />
                         </el-form-item>
                         <el-form-item label="活动名称">
-                            <el-input v-model="editFormData.jwcode" placeholder="请输入活动名称" />
+                            <el-input disabled="true" v-model="editFormData.activity" placeholder="请输入活动名称" />
                         </el-form-item>
                         <el-form-item label="产品名称">
-                            <el-select placeholder="请选择产品名称" clearable></el-select>
+                            <el-select disabled="true" v-model="editFormData.goodsName" placeholder="请选择产品名称"
+                                clearable></el-select>
                         </el-form-item>
                         <el-form-item label="付款币种">
-                            <el-select placeholder="请选择付款币种" clearable>
+                            <el-select disabled="true" v-model="editFormData.paymentCurrency" placeholder="请选择付款币种"
+                                clearable>
                                 <el-option v-for="item in payModel" :key="item.value" :label="item.label"
                                     :value="item.value" />
                             </el-select>
                         </el-form-item>
                         <el-form-item label="付款金额">
-                            <el-input v-model="editFormData.jwcode" placeholder="请输入付款金额" />
+                            <el-input disabled="true" v-model="editFormData.paymentAmount" placeholder="请输入付款金额" />
                         </el-form-item>
                         <el-form-item label="支付方式">
-                            <el-select placeholder="请选择支付方式" clearable></el-select>
+                            <el-select disabled="true" v-model="editFormData.payType" placeholder="请选择支付方式"
+                                clearable></el-select>
                         </el-form-item>
                         <el-form-item label="付款时间">
-                            <el-date-picker type="datetime" v-model="editFormData.time" placeholder="请选择付款时间" />
+                            <el-date-picker disabled="true" type="datetime" v-model="editFormData.payTime"
+                                placeholder="请选择付款时间" />
                         </el-form-item>
                         <el-form-item label="转账凭证">
                             <div class="pic">
-                                <el-upload ref="uploadRef" class="uploader" :show-file-list="false"
+                                <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.imageUrl" :src="editFormData.imageUrl" class="avatar"
+                                    <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 />
@@ -427,27 +474,32 @@
                             </div>
                         </el-form-item>
                         <el-form-item label="驳回理由">
-                            <el-input v-model="addFormData.mask" type="textarea" :rows="4" placeholder="请输入驳回理由"
-                                maxlength="100" show-word-limit />
+                            <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 class="editFormRighrt" label-width="4.5vw" label-position="left">
                         <el-form-item label="到账货币">
-                            <el-select placeholder="请选择产品名称" clearable></el-select>
+                            <CurrencySelect v-model="editFormData.receivedCurrency" :items="customOptions"
+                                placeholder="请选择到账货币" />
                         </el-form-item>
                         <el-form-item label="到账金额">
-                            <el-input v-model="addFormData.userName" placeholder="请输入到账金额" />
+                            <el-input v-model="editFormData.receivedAmount" placeholder="请输入到账金额" />
                         </el-form-item>
                         <el-form-item label="手续费">
-                            <el-input disabled="true" v-model="addFormData.market" placeholder="请输入手续费" />
-                        </el-form-item>
-                        <el-form-item label="银行流水订单号">
-                            <el-input v-model="addFormData.jwcode" placeholder="请输入银行流水订单号" />
+                            <el-input v-model="editFormData.handlingCharge" placeholder="请输入手续费" />
                         </el-form-item>
+                        <!-- <el-form-item label="银行流水订单号">
+                            <el-input v-model="editFormData.jwcode" placeholder="请输入银行流水订单号" />
+                        </el-form-item> -->
                         <el-form-item label="到账时间">
-                            <el-input v-model="addFormData.jwcode" placeholder="请输入到账时间" />
+                            <el-date-picker type="datetime" v-model="editFormData.receivedTime" placeholder="请输入到账时间" />
+                        </el-form-item>
+                        <el-form-item label="收款备注">
+                            <el-input v-model="editFormData.receivedRemark" type="textarea" :rows="4"
+                                placeholder="请输入备注" maxlength="100" show-word-limit />
                         </el-form-item>
                     </el-form>
                     <span class="editBtns">
@@ -465,10 +517,99 @@
                 </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 class="add-item">
+                        <el-text style="width:4vw;">产品数量</el-text>
+                        <el-input v-model="refundFormData.goodNum" style="width:10vw;" disabled />
+                        &nbsp;个
+                    </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="3" 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 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="">重置</el-button>
+                        <el-button type="primary" @click="submitRefund">提交</el-button>
+                    </div>
+                </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 { color } from 'echarts';
@@ -478,6 +619,11 @@ import ProductSelect from '@/components/MoneyManage/ProductSelect.vue'
 import { Search } from '@element-plus/icons-vue';
 import request from '@/util/http.js'
 import moment from 'moment'
+import { useAdminStore } from '@/store/index.js'
+import { hasMenuPermission } from '@/utils/menuTreePermission.js'
+const adminStore = useAdminStore();
+const { menuTree } = storeToRefs(adminStore);
+console.log('menutree', menuTree.value);
 //=====================   查询相关        =================================
 const tableData = ref([])
 const searchData = ref({
@@ -493,24 +639,51 @@ const search = () => {
     getlist()
     ElMessage.success('查询成功')
 }
-
+const reset = () => {
+    searchData.value = {}
+}
 //获得表格数据接口
 const getlist = async () => {
     try {
+        //角色id 0：客服 1：地方财务 2:总部财务
+        let cashRoleId = ''
+        let receivedMarket = adminData.value.markets
+        if (kefu.value) {
+            cashRoleId = '0'
+            receivedMarket = ''
+        } else if (caiwu.value) {
+            cashRoleId = '1'
+            if (activeTab.value == 'wait') {
+                searchData.value.status = 0
+            } else if (activeTab.value == 'pass') {
+                searchData.value.status = 1346
+            } else if (activeTab.value == 'reject') {
+                searchData.value.status = 2
+            }
+        } else if (HQcaiwu.value) {
+            cashRoleId = '2'
+        }
         const result = await request({
             url: '/cashCollection/selectCollection',
             data: {
                 ...pageInfo.value,
                 cashCollection: {
                     ...searchData.value,
-                    ...getTime.value
+                    ...getTime.value,
+                    submitterId: adminData.value.id,
+                    receivedMarket: receivedMarket,
+                    cashRoleId: cashRoleId
                 }
             }
         })
-
-        console.log('返回参数：', result);
-        tableData.value = result.data.list
-        total.value = result.data.total
+        if (result.code == 200) {
+            console.log('返回参数：', result);
+            tableData.value = result.data.list
+            total.value = result.data.total
+        } else {
+            ElMessage.error('数据异常')
+            console.log(result.msg);
+        }
     } catch (error) {
         console.log(error);
     }
@@ -518,32 +691,77 @@ const getlist = async () => {
 //====================   标签切换  =========================
 const activeTab = ref('wait')
 
-const navigateTo = (tab) => {
+const navigateTo = async (tab) => {
     if (tab === 'wait') {
         activeTab.value = 'wait'
+        await getlist()
     } else if (tab === 'pass') {
         activeTab.value = 'pass'
+        await getlist()
     }
     else if (tab === 'reject') {
         activeTab.value = 'reject'
+        await getlist()
     }
 }
-
+//角色id 0：客服 1：地方财务 2:总部财务
+const cashRoleId = ref('')
 const kefu = ref(true)
-const caiwu = ref(true)
+const caiwu = ref(false)
+const HQcaiwu = ref(false)
+const superAdmin = ref(false)
 const checkKefu = () => {
     kefu.value = true
     caiwu.value = false
+    HQcaiwu.value = false
+    getlist()
 }
 const checkCaiwu = () => {
     kefu.value = false
     caiwu.value = true
+    HQcaiwu.value = false
+    activeTab.value = 'wait'
+    getlist()
+}
+const checkHqCaiwu = () => {
+    kefu.value = false
+    caiwu.value = false
+    HQcaiwu.value = true
+    activeTab.value = 'pass'
+    getlist()
 }
 //=================  客服新增弹窗   ==================
 const addFormData = ref({
     name: '',
-    market: ''
+    market: '',
+    permanentGold: 0,
+    freeGold: 0,
 })
+const isGold = ref(false)
+const ifGold = () => {
+    if (addFormData.value.goodsName == '金币充值') {
+        isGold.value = true
+    } else {
+        isGold.value = false
+    }
+}
+
+//是否为默认归属平台
+const isGroup = ref(false)
+const ifGroup = () => {
+    if (addFormData.value.payType == 'Stripe-链接收款') {
+        isGroup.value = true
+        addFormData.value.receivedMarket = '香港'
+    } else if (addFormData.value.payType == 'PaymentAsia-链接收款') {
+        isGroup.value = true
+        addFormData.value.receivedMarket = '香港'
+    } else if (addFormData.value.payType == 'Ipay88-链接收款') {
+        isGroup.value = true
+        addFormData.value.receivedMarket = '马来西亚'
+    } else {
+        isGroup.value = false
+    }
+}
 const addFormisible = ref(false)
 const jwcodeSeachMarket = async () => {
     try {
@@ -551,9 +769,9 @@ const jwcodeSeachMarket = async () => {
             url: '/cashCollection/getNameAndMarket',
             data: addFormData.value.jwcode
         })
-        addFormData.value.market = result.market
-        addFormData.value.marketName = result.marketName
-        addFormData.value.name = result.name
+        addFormData.value.market = result.data.market
+        addFormData.value.marketName = result.data.marketName
+        addFormData.value.name = result.data.name
         console.log('返回参数：', result);
     } catch (error) {
         console.log(error);
@@ -569,21 +787,24 @@ const openRejectReason = (reason) => {
 const uploadRef = ref()
 const addOrEdit = ref(0)  // 1 为新增   2 为编辑
 const openAddForm = (row) => {
-    console.log('编辑回显数据', row);
     if (row.jwcode) {
+        console.log('编辑回显数据', row);
         addOrEdit.value = 2
         addFormData.value = { ...row };
         jwcodeSeachMarket()
+        addFormisible.value = true
+
     } else {
         addOrEdit.value = 1
         addFormData.value = {}
+        addFormisible.value = true
     }
-    addFormisible.value = true
 }
 const closeAddForm = () => {
     addFormisible.value = false
     addFormData.value = {}
     addOrEdit.value = 0
+    isGold.value = false
 }
 //客服新增
 const handleAddForm = async () => {
@@ -596,13 +817,20 @@ const handleAddForm = async () => {
             url: '/cashCollection/add',
             data: {
                 ...addFormData.value,
-                submitterId: adminData.value.id
+                submitterId: adminData.value.id,
+                permanentGold: (addFormData.value.permanentGold || 0) * 100,
+                freeGold: (addFormData.value.freeGold || 0) * 100,
+                goodNum: addFormData.value.goodNum || 0,
+                paymentCurrency: CurrencyForId(addFormData.value.paymentCurrency) || '',
+                receivedMarket: MarketNameForId(addFormData.value.receivedMarket) || ''
             }
         })
         if (result.code == 200) {
             ElMessage.success('添加成功')
             getlist()
             closeAddForm()
+        } else {
+
         }
         console.log('返回参数：', result);
     } catch (error) {
@@ -635,32 +863,15 @@ const handleEditForm = async () => {
 }
 //付款币种
 const selectedCurrency = ref('');
-const customOptions = ref(['新币', '马币', '港币', '美元', '英镑', '越南盾']);
-
+const customOptions = ref(['美元(USD)', '港币(HKD)', '新币(SGD)', '马币(MYR)', '泰铢(THB)', '加币(CAD)', '越南盾(VDN)', '韩元(KRW)']);
 
 //支付方式
-const paytypeOptions = ref(["银行转账", "刷卡", "现金", "支票", "Grabpay", "Nets", "E-Transfer", "Paypal", "Stripe-链接收款", "PaymentAsia-链接收款", "Ipay88-链接收款"])
-const MoneyAddressOptions = ref(['马来西亚', '香港', '新加坡'])
+const paytypeOptions = ref(["Stripe-链接收款", "PaymentAsia-链接收款", "Ipay88-链接收款", "银行转账", "刷卡", "现金", "支票", "Grabpay", "Nets", "E-Transfer", "Paypal"])
+const MoneyAddressOptions = ref(['马来西亚', '香港', '新加坡', '泰国', '越南HCM', '加拿大'])
 const handleCurrencyChange = (option) => {
     console.log('选中的币种:', option);
 };
-//撤回弹窗
-const textContent = ref('')
-const recallDialog = ref(false)
-const openRecall = (val) => {
-    console.log('打开弹窗', val);
-    if (val == 'refund') {
-        textContent.value = '将要对该订单退款!'
-    }
-    if (val == 'recall') {
-        textContent.value = '将要撤回该信息!'
-    }
-    recallDialog.value = true
-}
-const closeRecall = () => {
-    recallDialog.value = false
-    textContent.value = ''
-}
+
 //图片上传
 const handleImgSuccess = (response, uploadFile) => {
     try {
@@ -717,7 +928,87 @@ const customUpload = async (options) => {
         ElMessage.error(`上传失败: ${error.msg || error.message || '网络异常'}`)
     }
 }
+//========= 客服新增 退款/撤回 相关 ===============
+const refundFormData = ref({
+
+})
+const refundDialog = ref(false)
+const openRefundDialog = () => {
+    refundDialog.value = true
+    closeConfirmRefund()
+}
+const closeRefundForm = () => {
+    refundDialog.value = false
+    refundFormData.value = {}
+}
+
+const submitRefund = async () => {
+    try {
+        const result = await request({
+            url: '/Money/add',
+            data: {
+                jwcode: refundFormData.value.jwcode, // 精网号（必填）
+                name: refundFormData.value.name,  // 姓名（必填）
+                market: refundFormData.value.marketName,  // 所属地区（必填）
+                activity: refundFormData.value.activity, // 活动名称（可选）
+                bankCode: refundFormData.value.bankCode,  // 银行流水订单号（必填）
+                goodsName: refundFormData.value.goodsName, // 商品名称（必填）
+                goodNum: refundFormData.value.goodNum,  // 商品数量（必填，默认0）
+                paymentCurrency: refundFormData.value.paymentCurrency,  // 付款币种（必填）
+                paymentAmount: refundFormData.value.paymentAmount,  // 付款金额（必填）
+                receivedCurrency: refundFormData.value.receivedCurrency,  // 到账币种（必填）
+                receivedAmount: refundFormData.value.receivedAmount,  // 到账金额（必填）
+                handlingCharge: refundFormData.value.handlingCharge,  // 手续费（可选）
+                receivedMarket: refundFormData.value.receivedMarket, // 到账地区（可选）
+                payType: refundFormData.value.payType,  // 支付方式（必填）
+                payTime: refundFormData.value.payTime,  // 付款时间，格式：yyyy-MM-dd HH:mm:ss（可选）
+                receivedTime: refundFormData.value.receivedTime,  // 到账时间，格式：yyyy-MM-dd HH:mm:ss（可选）
+                submitterId: refundFormData.value.submitterId,  // 提交人ID（可选）
+                voucher: refundFormData.value.voucher,  // 转账凭证URL（可选）
+                remark: refundFormData.value.remark,  // 备注信息（可选）
+                refundReason: refundFormData.value.refundReason,  // 退款备注-客服填写（可选）
+                refundModel: refundFormData.value.refundModel,  // 退款方式：0-全额，1-部分（可选）
+                id: refundFormData.value.id                      //订单id
+            }
+        })
+        if (result.code == 200) {
+            ElMessage.success('新增退款成功')
+            getlist()
+            closeRefundForm()
+        } else {
+            ElMessage.error(result.msg)
+            getlist()
+        }
+        console.log('返回参数：', result);
+    } catch (error) {
+        console.log(error);
+    }
+}
 
+//撤回弹窗
+const textContent = ref('')
+const recallDialog = ref(false)
+const refundConfirmDialog = ref(false)
+const openConfirm = (val, row) => {
+    console.log('打开弹窗', val, row);
+    if (val == 'refund') {
+        textContent.value = '将要对该订单退款!'
+        refundConfirmDialog.value = true
+        refundFormData.value = { ...row }
+    }
+    if (val == 'recall') {
+        textContent.value = '将要撤回该信息!'
+        recallDialog.value = true
+    }
+}
+const closeRecall = () => {
+    recallDialog.value = false
+    textContent.value = ''
+}
+const closeConfirmRefund = () => {
+    refundConfirmDialog.value = false
+    textContent.value = ''
+}
 //==================  财务编辑相关     =========================
 const editFormData = ref({
 
@@ -733,31 +1024,56 @@ const closeEditForm = () => {
     editFormData.value = {}
 }
 //提交编辑
-const submitEditForm = () => {
-
+const submitEditForm = async () => {
+    try {
+        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: editFormData.value.paymentCurrency,
+                paymentAmount: editFormData.value.paymentAmount,
+                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()
+        }
+        console.log('返回参数：', result);
+    } catch (error) {
+        console.log(error);
+    }
 }
 //==================  审核相关     =========================
 const auditFormData = ref({
 
 })
 //财务通过审核请求
-const handelAudit = async() => {
+const handelAudit = async () => {
     try {
         const result = await request({
             url: '/cashAudit/collectionAudit',
             data: {
-                orderCode:auditFormData.value.orderCode,
-                action:1,
-                auditId:adminData.value.id
+                orderCode: auditFormData.value.orderCode,
+                action: 1,
+                auditId: adminData.value.id
             }
         })
         if (result.code == 200) {
             ElMessage.success('审核成功')
             getlist()
             closeAuditForm()
-        }else{
+        } else {
             ElMessage.error(result.msg)
-             getlist()
+            getlist()
         }
         console.log('返回参数：', result);
     } catch (error) {
@@ -766,15 +1082,15 @@ const handelAudit = async() => {
 }
 
 //财务驳回审核请求
-const handelAuditReject = async() => {
+const handelAuditReject = async () => {
     try {
         const result = await request({
             url: '/cashAudit/collectionAudit',
             data: {
-                orderCode:auditFormData.value.orderCode,
-                orderCode:auditFormData.value.orderCode,
-                action:2,
-                auditId:adminData.value.id
+                orderCode: auditFormData.value.orderCode,
+                rejectReason: auditFormData.value.rejectReason,
+                action: 2,
+                auditId: adminData.value.id
             }
         })
         if (result.code == 200) {
@@ -792,12 +1108,17 @@ const auditFormisible = ref(false)
 const ifReject = ref(false)
 
 const openAuditForm = (row) => {
-    auditFormData.value = {...row}
+    console.log('这是审核的数据', row);
+
+    auditFormData.value = {
+        ...row,
+        market: row.marketName
+    }
     auditFormisible.value = true
 }
-const countdown = ref(0);          // 倒计时秒数（示例设为 5 秒）
+const countdown = ref(0);          // 倒计时秒数
 const isBtnDisabled = ref(false);  // 按钮是否禁用
-const btnText = ref('通过(3)');    // 按钮显示的文字（含倒计时）
+const btnText = ref('通过(3)');    // 按钮显示的文字
 
 const closeAuditForm = () => {
     ifReject.value = false
@@ -832,6 +1153,15 @@ const pageInfo = ref({
 })
 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);
@@ -873,14 +1203,105 @@ const getAdminData = async function () {
         })
         adminData.value = result
         console.log('请求成功', result)
-        console.log('用户信息', user.value)
     } catch (error) {
         console.log('请求失败', error)
     }
 }
+const statusList = [
+    {
+        name: '待审核',
+        value: 0
+    },
+    {
+        name: '已通过',
+        value: 134
+    },
+    {
+        name: '已撤回',
+        value: 5
+    }, {
+        name: '退款',
+        value: 6
+    }, {
+        name: '已驳回',
+        value: 2
+    },
+]
+const paytypeList = ["Stripe-链接收款", "PaymentAsia-链接收款", "Ipay88-链接收款", "银行转账", "刷卡", "现金", "支票", "Grabpay", "Nets", "E-Transfer", "Paypal"]
+const activityList = ref([])
+const marketList = ['马来西亚', '香港', '新加坡', '泰国', '越南HCM', '加拿大']
+// 获取活动信息
+const getActivitys = async function () {
+    try {
+        const result = await API({
+            url: '/cashCollection/getActivityList',
+            data: {}
+        })
+        if (result.code == 200) {
+            activityList.value = result.data
+            console.log('请求成功', result)
+        } else {
+            ElMessage.error('活动列表获取失败')
+            console.log('活动列表获取失败', result.msg);
+
+        }
+    } catch (error) {
+        console.log('请求失败', error)
+    }
+}
+
+
+const MarketNameForId = (name) => {
+    if (name == '新加坡') {
+        return 4
+    } else if (name == '加拿大') {
+        return 24016
+    } else if (name == '马来西亚') {
+        return 5
+    } else if (name == '香港') {
+        return 13
+    } else if (name == '泰国') {
+        return 24018
+    } else if (name == '越南HCM') {
+        return 24022
+    } else {
+        return name
+    }
+}
+const CurrencyForId = (name) => {
+    if (name == '美元(USD)') {
+        return 1
+    } else if (name == '港币(HKD)') {
+        return 2
+    } else if (name == '新币(SGD)') {
+        return 3
+    } else if (name == '马币(MYR)') {
+        return 4
+    } else if (name == '泰铢(THB)') {
+        return 5
+    } else if (name == '加币(CAD)') {
+        return 6
+    } else if (name == '越南盾(VDN)') {
+        return 7
+    } else if (name == '越南盾(VDN)') {
+        return 8
+    } else {
+        return name
+    }
+}
 onMounted(async function () {
     await getAdminData()
-    await getlist()
+    await getActivitys()
+    if (hasMenuPermission(menuTree.value, 77) && hasMenuPermission(menuTree.value, 78) && hasMenuPermission(menuTree.value, 79)) {
+        superAdmin.value = true
+    }
+    else if (hasMenuPermission(menuTree.value, 77)) {
+        checkKefu()
+    } else if (hasMenuPermission(menuTree.value, 78)) {
+        checkCaiwu()
+    } else if (hasMenuPermission(menuTree.value, 79)) {
+        checkHqCaiwu()
+    }
 })
 </script>
 <style scoped lang="scss">
@@ -1264,6 +1685,37 @@ onMounted(async function () {
 
     }
 
+    .refundDialog {
+        .left {
+            width: 50%;
+            height: 70vh;
+            min-height: 650px;
+            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;
+            }
+        }
+    }
+
     :deep(.adddialog .el-form-item__label) {
         //设置新增弹窗表头
         min-width: 80px;