diff --git a/src/components/workspace/CashManagement.vue b/src/components/workspace/CashManagement.vue
index e0864da..177c436 100644
--- a/src/components/workspace/CashManagement.vue
+++ b/src/components/workspace/CashManagement.vue
@@ -17,7 +17,7 @@
       <div class="market-data">
         <div v-for="market in cashData.markets" :key="market.name" class="market-item">
           <span class="market-name">{{ market.name }}:</span>
-          <span class="market-value">{{ market.value.toLocaleString() }}新币</span>
+          <span class="market-value">{{ market.value.toLocaleString() }}</span>
         </div>
       </div>
 
diff --git a/src/utils/menuTreePermission.js b/src/utils/menuTreePermission.js
index e11f59e..4c48619 100644
--- a/src/utils/menuTreePermission.js
+++ b/src/utils/menuTreePermission.js
@@ -135,7 +135,7 @@ export const permissionMapping = {
     refundHeaderProgShow:113,      // 退款-总部财务/管理员进度查看
 
     // 特殊，5级
-    updateData:114,                // 手动拉取数据
+    updateData:115,                // 手动拉取数据
 }
 
 // 递归查找菜单中是否存在目标id
diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue
index 37bf450..7d3d43e 100644
--- a/src/views/moneyManage/executor/executor.vue
+++ b/src/views/moneyManage/executor/executor.vue
@@ -1,23 +1,23 @@
 <template>
     <el-card style="margin-bottom: 0.5vh;">
         <div class="condition1">
-            <div class="condition-item">
+            <div class="search">
                 <el-text size="large" style="width:4vw;">姓名</el-text>
-                <el-input v-model="searchForm.username" placeholder="请输入姓名" style="width:9vw;" clearable />
+                <el-input v-model="searchForm.name" placeholder="请输入姓名" style="width:9vw;" clearable />
             </div>
-            <div class="condition-item">
+            <div class="search">
                 <el-text size="large" style="width:4vw;">精网号</el-text>
                 <el-input v-model="searchForm.jwcode" placeholder="请输入精网号" style="width:9vw;" clearable />
             </div>
-            <div class="condition-item">
+            <div class="search">
                 <el-text size="large" style="width:4vw;">所属地区</el-text>
-                <el-input v-model="searchForm.area" placeholder="请输入所属地区" style="width:9vw;" clearable />
+                <el-input v-model="searchForm.marketName" placeholder="请输入所属地区" style="width:9vw;" clearable />
             </div>
-            <div class="condition-item">
+            <div class="search">
                 <el-text size="large" style="width:4vw;">产品名称</el-text>
-                <el-input v-model="searchForm.productName" placeholder="请输入产品名称" style="width:9vw;" clearable />
+                <el-input v-model="searchForm.goodsName" placeholder="请输入产品名称" style="width:9vw;" clearable />
             </div>
-            <div class="condition-item">
+            <div class="search">
                 <el-text size="large" style="width:4vw;">退款币种</el-text>
                 <el-select v-model="searchForm.payType" style="width:9vw;">
                     <el-option v-for="item in payments" :key="item" :label="item" :value="item" />
@@ -25,68 +25,71 @@
             </div>
         </div>
         <div class="condition1">
-            <div class="condition-item2">
+            <div class="search2">
                 <el-text size="large" style="width:4vw;">退款途径</el-text>
-                <el-select v-model="searchForm.auditStatus" style="width:9vw;">
-                    <el-option v-for="item in auditStatusOptions" :key="item.value" :label="item.label"
+                <el-select v-model="searchForm.refundChannels" style="width:9vw;">
+                    <el-option v-for="item in channelOptions" :key="item.value" :label="item.label"
                         :value="item.value" />
                 </el-select>
             </div>
-            <div class="condition-item2">
+            <div class="search2">
                 <el-text size="large" style="width:4vw;">订单状态</el-text>
-                <el-input v-model="searchForm.productName" placeholder="请输入订单状态" style="width:9vw;" clearable />
+                <el-select v-model="searchForm.statuses" style="width:9vw;">
+                    <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
             </div>
-            <div class="condition-item2" style="width: 28vw;">
-                <el-text size="large" style="width:4vw;">付款时间</el-text>
+            <div class="search2" style="width: 28vw;">
+                <el-text size="large" style="width:4vw;">退款时间</el-text>
                 <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="起始时间"
                     end-placeholder="结束时间" style="width:22vw;" @change="handleDatePickerChange"
                     :disabled-date="disabledDate" />
             </div>
             <div>
-                <el-button type="success">重置</el-button>
-                <el-button type="primary">查询</el-button>
+                <el-button type="primary" @click="getRefund">查询</el-button>
+                <el-button type="editRow" @click="reset">重置</el-button>
                 <el-button type="warning">导出excel</el-button>
                 <el-button type="primary">查看导出列表</el-button>
             </div>
         </div>
     </el-card>
-    <div style="height:4vh;">
-        <el-button type="primary" @click="showEdit = true">新增</el-button>
-    </div>
+
     <el-card>
         <el-table :data="tableData" style="height:60vh;width:82vw">
             <el-table-column type="index" label="序号" width="60" fixed="left" />
             <el-table-column prop="name" label="Homily ID" width="120" fixed="left" />
             <el-table-column prop="jwcode" label="姓名" width="120" fixed="left" show-overflow-tooltip />
-            <el-table-column prop="market" label="所属地区" width="120" />
-            <el-table-column prop="refundType" label="产品名称" width="120" />
-            <el-table-column prop="refundType" label="退款类型" width="120" />
-            <el-table-column prop="refundType" label="退款币种" width="120" />
-            <el-table-column prop="refundType" label="退款金额" width="120" />
-            <el-table-column prop="refundType" label="退款途径" width="120" />
-            <el-table-column prop="refundType" label="退款截图" width="120" />
-            <el-table-column prop="refundType" label="退款时间" width="120" />
-            <el-table-column prop="adminName" label="订单状态" width="120" />
-            <el-table-column prop="operation" label="操作" fixed="right" width="150px">
+            <el-table-column prop="marketName" label="所属地区" width="120" />
+            <el-table-column prop="goodsName" label="产品名称" width="120" />
+            <el-table-column prop="goodNum" label="产品数量" width="120" />
+            <el-table-column prop="refundType" label="退款方式" width="120">
+                <template #default="scope">
+                    {{ scope.row.refundType === 1 ? '部分退款' : '全部退款' }}
+                </template>
+            </el-table-column>
+            <el-table-column prop="refundCurrency" label="退款币种" width="120" />
+            <el-table-column prop="refundAmount" label="退款金额" width="120" />
+            <el-table-column prop="refundChannels" label="退款途径" width="120" />
+            <el-table-column prop="refundVoucher" label="退款截图" width="120" show-overflow-tooltip>
+                    <template #default="scope">
+                        <img v-if="scope.row.refundVoucher" :src="scope.row.refundVoucher" style="width: 40px; height: 40px;" />
+                        <span v-else>无退款截图</span>
+                    </template>
+            </el-table-column>
+            <el-table-column prop="refundTime" label="退款时间" width="180" />
+            <el-table-column prop="status" label="订单状态" width="120">
+                <template #default="scope">
+                    {{ scope.row.status === 41 ? '已完成' : '待处理' }}
+                </template>
+            </el-table-column>
+            <el-table-column prop="operation" label="操作" fixed="right" width="100px">
                 <template #default="scope">
                     <div class="operation">
-                        <el-popconfirm title="确定要通过此条记录吗？" @confirm="handleApprove(scope.row)">
-                            <template #reference>
-                                <el-button v-if="hasrefundWaitThough" :disabled="clicked || cancelClicked"
-                                    type="primary" text>
-                                    通过
-                                </el-button>
-                            </template>
-                            <template #actions="{ confirm, cancel }">
-                                <el-button size="small" @click="cancel">取消</el-button>
-                                <el-button type="primary" size="small" :disabled="clicked" @click="confirm">
-                                    确认
-                                </el-button>
-                            </template>
-                        </el-popconfirm>
-                        <el-button v-if="hasrefundWaitReject" :disabled="clicked || cancelClicked" type="primary" text
-                            @click="showRejectDialog(scope.row)">
-                            驳回
+                        <el-button v-if="scope.row.status === 40" type="primary" text
+                            @click="showEditDialog(scope.row)">
+                            提交
+                        </el-button>
+                        <el-button v-else type="primary" text @click="showEditDialog(scope.row)">
+                            编辑
                         </el-button>
                     </div>
                 </template>
@@ -102,79 +105,66 @@
             <div class="left">
                 <div class="dialog-item">
                     <el-text style="width:4vw;">精网号</el-text>
-                    <el-input v-model="editForm.jwcode" placeholder="请输入精网号" style="width:10vw;" clearable />
+                    <el-input v-model="editRow.jwcode" style="width:10vw;" disabled />
                 </div>
                 <div class="dialog-item">
                     <el-text style="width:4vw;">客户姓名</el-text>
-                    <el-input v-model="editForm.name" placeholder="请输入客户姓名" style="width:10vw;" clearable />
+                    <el-input v-model="editRow.name" style="width:10vw;" disabled />
                 </div>
                 <div class="dialog-item">
                     <el-text style="width:4vw;">所属地区</el-text>
-                    <el-input v-model="editForm.market" placeholder="请输入所属地区" style="width:10vw;" clearable />
+                    <el-input v-model="editRow.marketName" style="width:10vw;" disabled />
                 </div>
                 <div class="dialog-item">
                     <el-text style="width:4vw;">产品名称</el-text>
-                    <el-input v-model="editForm.orderCode" placeholder="请输入产品名称" style="width:10vw;" clearable />
+                    <el-input v-model="editRow.goodsName" style="width:10vw;" disabled />
                 </div>
                 <div class="dialog-item">
                     <el-text style="width:4vw;">退款类型</el-text>
-                    <el-select v-model="editForm.refundType" placeholder="请选择退款类型" style="width:10vw;" clearable>
-                        <el-option v-for="item in products" :key="item.value" :label="item.label" :value="item.value" />
-                    </el-select>
+                    <el-input v-model="editRow.refundModel" style="width:10vw;" disabled>
+                        {{ scope.row.refundModel === 1 ? '部分退款' : '全部退款' }}
+                    </el-input>
                 </div>
                 <div class="dialog-item">
                     <el-text style="width:4vw;">付款币种</el-text>
-                    <el-select v-model="editForm.refundCurrency" placeholder="请选择付款币种" style="width:10vw;" clearable>
-                        <el-option v-for="item in currencies" :key="item.value" :label="item.label"
-                            :value="item.value" />
-                    </el-select>
+                    <el-input v-model="editRow.paymentCurrency" style="width:10vw;" disabled />
                 </div>
                 <div class="dialog-item">
                     <el-text style="width:4vw;">付款金额</el-text>
-                    <el-input v-model="editForm.refundAmount" placeholder="请输入付款金额" style="width:10vw;" clearable />
+                    <el-input v-model="editRow.paymentAmount" style="width:10vw;" disabled />
                 </div>
                 <div class="dialog-item">
                     <el-text style="width:4vw;">支付方式</el-text>
-                    <el-select v-model="editForm.paymentMethod" placeholder="请选择支付方式" style="width:10vw;">
-                        <el-option v-for="item in payments" :key="item.value" :label="item.label" :value="item.value" />
-                    </el-select>
+                    <el-input v-model="editRow.payType" style="width:10vw;" disabled />
                 </div>
                 <div class="dialog-item">
                     <el-text style="width:4vw;">付款时间</el-text>
-                    <el-date-picker v-model="editForm.payTime" type="datetime" placeholder="请选择付款时间" style="width:10vw;" clearable />
+                    <el-date-picker v-model="editRow.payTime" type="datetime" style="width:10vw;" disabled />
                 </div>
                 <div class="dialog-item">
                     <el-text style="width:4vw;">提交人</el-text>
-                    <el-input v-model="editForm.submitter" placeholder="请输入提交人" style="width:10vw;" clearable />
+                    <el-input v-model="editRow.submitterName" style="width:10vw;" disabled />
                 </div>
                 <div class="dialog-item">
                     <el-text style="width:4vw;">转账凭证</el-text>
-                    <el-form-item :rules="{ required: true, message: '请上传图片', trigger: 'change' }">
-                        <el-upload ref="uploadRef" list-type="picture-card" :auto-upload="false"
-                            :http-request="customUpload" :on-change="handleImageChange"
-                            :on-success="handleUploadSuccess" :on-error="handleUploadError"
-                            :before-upload="beforeUpload" :show-file-list="false">
-                            <template #default>
-                                <img v-if="editForm.imageUrl" :src="editForm.imageUrl"
-                                    style="width: 100%; height: 100%; object-fit: cover;">
-                                <el-icon v-else>
-                                    <Plus />
-                                </el-icon>
-                            </template>
-                        </el-upload>
-                    </el-form-item>
+                    <img v-if="editRow.voucher" :src="editRow.voucher"
+                        style="width: 100%; height: 100%; object-fit: cover;">
+                    <div v-else>
+                        无转账凭证
+                    </div>
                 </div>
                 <div class="dialog-item">
                     <el-text style="width:4vw;">备注</el-text>
-                    <el-input v-model="editForm.remark" placeholder="请输入备注" style="width:10vw;" :row="3" 
-                        maxlength="100" type="textarea" show-word-limit clearable />
+                    <el-input v-model="editForm.remark" style="width:10vw;" :row="3" disabled maxlength="100"
+                        type="textarea" show-word-limit clearable />
                 </div>
             </div>
             <div class="right">
                 <div class="dialog-item">
                     <el-text style="width:4vw;">退款币种</el-text>
                     <el-select v-model="editForm.refundCurrency" placeholder="请选择退款币种" style="width:10vw;">
-                        <el-option v-for="item in currencies" :key="item.value" :label="item.label" :value="item.value" />
+                        <el-option v-for="item in currencies" :key="item.value" :label="item.label"
+                            :value="item.value" />
                     </el-select>
                 </div>
                 <div class="dialog-item">
@@ -183,38 +173,65 @@
                 </div>
                 <div class="dialog-item">
                     <el-text style="width:4vw;">退款途径</el-text>
-                    <el-select v-model="editForm.refundWay" placeholder="请选择退款途径" style="width:10vw;">
-                        <el-option v-for="item in refundWays" :key="item.value" :label="item.label" :value="item.value" />
+                    <el-select v-model="editForm.refundChannels" placeholder="请选择退款途径" style="width:10vw;">
+                        <el-option v-for="item in channelOptions" :key="item.value" :label="item.label"
+                            :value="item.value" />
                     </el-select>
                 </div>
                 <div class="dialog-item">
                     <el-text style="width:4vw;">退款时间</el-text>
-                    <el-date-picker v-model="editForm.refundTime" type="datetime" placeholder="请选择退款时间" style="width:10vw;" clearable />
+                    <el-date-picker v-model="editForm.refundTime" type="datetime" placeholder="请选择退款时间"
+                        style="width:10vw;" clearable />
+                </div>
+                <div class="dialog-item">
+                    <el-text style="width:4vw;">支付凭证</el-text>
+                    <el-upload ref="uploadRef" :http-request="customUpload" list-type="picture-card"
+                        :auto-upload="false" :on-change="handleImageChange" :before-upload="beforeUpload"
+                        :show-file-list="false">
+                        <template #default>
+                            <img v-if="editForm.imageUrl" :src="editForm.imageUrl"
+                                style="width: 100%; height: 100%; object-fit: cover;">
+                            <el-icon v-else>
+                                <Plus />
+                            </el-icon>
+                        </template>
+                    </el-upload>
                 </div>
                 <div class="dialog-item">
                     <el-text style="width:4vw;">备注</el-text>
-                    <el-input v-model="editForm.remark" placeholder="请输入备注" style="width:10vw;" :rows="3"
+                    <el-input v-model="editForm.refundRemark" placeholder="请输入备注" style="width:10vw;" :rows="3"
                         maxlength="100" show-word-limit type="textarea" clearable />
                 </div>
                 <div style="display:flex;justify-content: center;margin-top: 5vh;">
-                    <el-button type="default" @click="" style="margin-right: 2vw;">取消</el-button>
-                    <el-button type="primary" @click="">提交</el-button>
+                    <el-button type="default" @click="hideEditDialog" style="margin-right: 2vw;">取消</el-button>
+                    <el-button type="primary" @click="submitRefund">提交</el-button>
                 </div>
             </div>
         </div>
     </el-dialog>
 </template>
 <script setup>
-import { ref } from 'vue'
+import { ref, onMounted } from 'vue'
 import { ElMessage } from 'element-plus'
 import API from '@/util/http.js'
+import dayjs from 'dayjs'
+import { useAdminStore } from "@/store/index.js"
+import { storeToRefs } from "pinia"
+import { Delete, Download, Plus, ZoomIn } from '@element-plus/icons-vue'
+const adminStore = useAdminStore()
+const { adminData, menuTree } = storeToRefs(adminStore)
+import { permissionMapping, findMenuById } from "@/utils/menuTreePermission.js"
 
+const uploadUrl = 'https://api.homilychart.com/hljw/api/aws/upload'
+const dateRange = ref([])
 const tableData = ref([])
+const editRow = ref({})// 编辑回显
 const pagination = ref({
     pageNum: 1,
     pageSize: 50,
     total: 0
 })
+const uploadRef = ref(null)
 const searchForm = ref({
     jwcode: ''
 })
@@ -222,6 +239,225 @@ const showEdit = ref(false)
 const editForm = ref({
     jwcode: ''
 })
+// 查全部
+const getRefund = async function () {
+    try {
+        searchForm.value.statuses = [40, 41] // 默认：看不到进度没到这里的
+
+        const params = {
+            pageNum: pagination.value.pageNum,
+            pageSize: pagination.value.pageSize,
+            cashRecordDone: {
+                jwcode: searchForm.value.jwcode,
+                name: searchForm.value.name,
+                markets: searchForm.value.markets,
+                goodsName: searchForm.value.goodsName,
+                statuses: searchForm.value.statuses,//10：地区财务待审核；12：地区财务驳回；
+                // 20：地区负责人待审核；22：地区负责人驳回；
+                // 30：总部财务待审核；32：总部财务驳回；
+                // 40：执行人待处理；41：执行人已处理，退款完成；
+                paymentCurrency: searchForm.value.paymentCurrency,
+                payType: searchForm.value.payType,
+                startTime: dateRange.value && dateRange.value[0] ? moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
+                endtime: dateRange.value && dateRange.value[1] ? moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
+                adminId: adminData.value.id,
+                account: adminData.value.account
+            }
+        }
+
+        const result = await API({
+            url: '/Money/select',
+            method: 'POST',
+            data: params
+        })
+
+        tableData.value = result.data.list || []
+    } catch (error) {
+        ElMessage.error(error.message || '查询失败')
+    }
+}
+// 提交
+const submitRefund = async function () {
+    try {
+        const params = {
+            refundVoucher: editForm.value.imageUrl,
+            refundTime: editForm.value.refundTime ? dayjs(editForm.value.refundTime).format('YYYY-MM-DD HH:mm:ss') : "",
+            refundRemark: editForm.value.refundRemark,
+            id: editRow.value.id,
+            refundCurrency: editForm.value.refundCurrency,
+            refundAmount: editForm.value.refundAmount,
+            refundChannels: editForm.value.refundChannels,
+            status: 41
+
+        }
+        const result = await API({
+            url: '/Money/executor',
+            data: params
+        })
+        if (result.code === 200) {
+            ElMessage.success('提交成功')
+            hideEditDialog()
+            getRefund()
+        } else {
+            ElMessage.error(result.data.msg || '提交失败')
+        }
+    } catch (error) {
+        ElMessage.error(error.message || '提交失败')
+    }
+}
+const showEditDialog = (row) => {
+    editRow.value = row
+    showEdit.value = true
+}
+const hideEditDialog = () => {
+    showEdit.value = false
+    editForm.value = {
+        jwcode: ''
+    }
+}
+
+const statusList = ref([
+    {
+        value: 40,
+        label: '待处理',
+    },
+    {
+        value: 41,
+        label: '退款完成'
+    }
+])
+const channelOptions = ref([{
+    value: '银行转账',
+    label: '银行转账'
+},
+{
+    value: '现金',
+    label: '现金'
+},
+{
+    value: '支票',
+    label: '支票'
+},
+{
+    value: '刷卡',
+    label: '刷卡'
+},
+{
+    value: 'Grabpay',
+    label: 'Grabpay'
+},
+{
+    value: 'Nets',
+    label: 'Nets'
+},
+{
+    value: 'PayPal',
+    label: 'PayPal'
+},
+{
+    value: 'Stripe-链接收款',
+    label: 'Stripe-链接收款'
+},
+{
+    value: 'Ipay88-链接收款',
+    label: 'Ipay88-链接收款'
+},
+{
+    value: 'PaymentAsia-链接收款',
+    label: 'PaymentAsia-链接收款'
+},
+{
+    value: 'Stripe-Link平台',
+    label: 'Stripe-Link平台'
+},
+{
+    value: 'PaymentAsia-Link平台',
+    label: 'PaymentAsia-Link平台'
+},
+{
+    value: 'FirstData-Link平台-Link平台',
+    label: 'FirstData-Link平台-Link平台'
+},
+{
+    value: 'IOS-Link平台',
+    label: 'IOS-Link平台'
+},
+{
+    value: 'Ipay88-Link平台',
+    label: 'Ipay88-Link平台'
+}
+])
+const currencies = ref([
+    {
+        value: '新币',
+        label: '新币'
+    },
+    {
+        value: '港币',
+        label: '港币'
+    },
+    {
+        value: '马币',
+        label: '马币'
+    },
+    {
+        value: '加币',
+        label: '加币'
+    },
+    {
+        value: '泰铢',
+        label: '泰铢'
+    },
+    {
+        value: '越南盾',
+        label: '越南盾'
+    }
+])
+const handleImageChange = (file) => {
+    uploadRef.value.submit()
+}
+const beforeUpload = (file) => {
+    const isJPG = file.type === 'image/jpeg'
+    const isPNG = file.type === 'image/png'
+    const isLt1 = file.size / 1024 < 1024
+    if (!isJPG && !isPNG) {
+        ElMessage.error('上传图片只能是 JPG 或 PNG 格式')
+        return false
+    }
+    if (!isLt1) {
+        ElMessage.error('上传图片大小不能超过1MB')
+        return false
+    }
+    return true
+}
+const customUpload = async (options) => {
+    try {
+        const formData = new FormData()
+        formData.append('file', options.file)
+        const response = await API({
+            url: uploadUrl,
+            method: 'POST',
+            data: formData,
+            headers: {
+                'Content-Type': 'multipart/form-data'
+            }
+        })
+        if (response.code === 200 && response.data) {
+            editForm.value.imageUrl = response.data.url
+            ElMessage.success(response.msg || '上传成功')
+        } else {
+            ElMessage.error(response.msg || '上传失败')
+        }
+    } catch (error) {
+        console.error('上传错误:', error)
+        ElMessage.error(`上传失败: ${error.msg || error.message || '网络异常'}`)
+    }
+}
+
+onMounted(() => {
+    console.log('???????????????????', adminData.value)
+    getRefund()
+})
 </script>
 <style scoped>
 .condition1 {
@@ -230,7 +466,7 @@ const editForm = ref({
     align-items: center;
     height: 4vh;
 
-    .condition-item {
+    .search {
         width: 18%;
         display: flex;
         align-items: center;
@@ -238,7 +474,7 @@ const editForm = ref({
         margin-right: 0.5vw;
     }
 
-    .condition-item2 {
+    .search2 {
         width: 18%;
         display: flex;
         align-items: center;
diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue
index 0edaec5..1bab621 100644
--- a/src/views/moneyManage/refundDetail/refundCharge.vue
+++ b/src/views/moneyManage/refundDetail/refundCharge.vue
@@ -20,7 +20,7 @@
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">订单状态</el-text>
-                <el-select v-model="searchForm.status" style="width:9vw;">
+                <el-select v-model="searchForm.statuses" style="width:9vw;">
                     <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </div>
@@ -49,16 +49,12 @@
         </div>
     </el-card>
 
-    <div style="display: flex;">
-        <el-button type="primary" @click="showSteps = true">看看步骤条</el-button>
-    </div>
-
     <el-card style="margin-top: 0.5vh;">
         <el-table :data="tableData" style="height:64vh;width:82vw">
             <el-table-column type="index" label="序号" width="60" fixed="left" />
             <el-table-column prop="name" label="Homily ID" width="120" fixed="left" />
             <el-table-column prop="jwcode" label="姓名" width="120" fixed="left" show-overflow-tooltip />
-            <el-table-column prop="markets" label="所属地区" width="120" />
+            <el-table-column prop="marketName" label="所属地区" width="120" />
             <el-table-column prop="goodsName" label="产品名称" width="120" />
             <el-table-column prop="goodNum" label="产品数量" width="120" />
             <el-table-column prop="refundType" label="退款方式" width="120">
@@ -69,14 +65,22 @@
             <el-table-column prop="submitterName" label="提交人" width="120" />
             <el-table-column prop="refundReason" label="退款理由" width="120" />
             <el-table-column prop="remark" label="备注" width="150" show-overflow-tooltip />
-            <el-table-column prop="status" label="订单状态" width="120" />
-            <el-table-column prop="operation" label="操作" fixed="right" width="150px" >
+            <el-table-column prop="status" label="订单状态" width="120">
+                <template #default="scope">
+                    {{
+                        [20,30, 40].includes(scope.row.status) ? '审核中' :
+                        [22,32].includes(scope.row.status) ? '审核驳回' :
+                        scope.row.status === 41 ? '退款完成' : scope.row.status
+                    }}
+                </template>
+            </el-table-column>
+            <el-table-column prop="operation" label="操作" fixed="right" width="100px" >
                 <template #default="scope">
                     <div class="operation">
                         <el-button v-if="scope.row.status === 20" type="primary" text  @click="showAudit(scope.row)">
                             审核
                         </el-button>
-                        <el-button v-else type="primary" text @click="">
+                        <el-button v-else type="primary" text @click="showSteps = true">
                             查看进度
                         </el-button>
                     </div>
@@ -117,7 +121,7 @@
                 </div>
                 <div class="center-item">
                     <el-text style="width:4vw;" size="small">所属地区</el-text>
-                    <el-input v-model="auditRow.markets" size="small" style="width:10vw;" disabled />
+                    <el-input v-model="auditRow.marketName" size="small" style="width:10vw;" disabled />
                 </div>
                 <div class="center-item">
                     <el-text style="width:4vw;" size="small">产品名称</el-text>
@@ -136,19 +140,11 @@
                     <el-input v-model="auditRow.payType" size="small" style="width:10vw;" disabled />
                 </div>
                 <div class="center-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" class="image"
-                            :show-file-list="false">
-                            <template #default>
-                                <img v-if="auditRow.voucher" :src="auditRow.voucher"
-                                    style="width: 100%; height: 100%; object-fit: cover;">
-                                <el-icon v-else>
-                                    <Plus />
-                                </el-icon>
-                            </template>
-                        </el-upload>
-                    </el-form-item>
+                    <el-text style="width:4vw;">转账凭证</el-text>
+                    <img v-if="auditRow.voucher" :src="auditRow.voucher" style="width: 100%; height: 100%; object-fit: cover;">
+                    <div v-else>
+                        无转账凭证
+                    </div>
                 </div>
             </div>
             <div class="center-right">
@@ -203,8 +199,8 @@
                 <el-button type="primary" @click="handlePass">通过</el-button>
             </div>
             <div style="text-align: center;" v-show="showReject">
-                <el-button type="default" @click="">取消</el-button>
-                <el-button type="primary">确定</el-button>
+                <el-button type="default" @click="hideReject">取消</el-button>
+                <el-button type="primary" @click="handleReject">确定</el-button>
             </div>
         </div>
     </el-dialog>
@@ -374,10 +370,11 @@ const statusList = ref([
 // 查全部
 const getRefund = async function () {
     try {
-        if(searchForm.value.status === '审核通过'){
-            searchForm.value.status = [30,40]
-        }else if(searchForm.value.status === '审核驳回'){
-            searchForm.value.status = [22,32]
+        searchForm.value.statuses = [20,22,30,32,40,41] // 看不到进度没到这里的
+        if(searchForm.value.statuses === '审核通过'){
+            statuses = [30,40]
+        }else if(searchForm.value.statuses === '审核驳回'){
+            statuses = [22,32]
         }
         const params = {
             pageNum: pagination.value.pageNum,
@@ -431,6 +428,31 @@ const handlePass = async function () {
         ElMessage.error(error.message || '审核失败')
     }
 }
+// 审核驳回
+const handleReject = async function () {
+    try {
+        const params = {
+            id: auditRow.value.id,
+            status: 22,
+            rejectReason: addForm.value.remark
+        }
+        const result = await API({
+            url: '/Money/review',
+            data: params
+        })
+        if (result.code === 200) {
+            ElMessage.success('审核驳回')
+            showAudit.value = false
+            getRefund()
+        }
+    } catch (error) {
+        ElMessage.error(error.message || '审核失败')
+    }
+}
+const hideReject = function () {
+    showReject.value = false
+    addForm.value.remark = ''
+}
 const reset = function () {
     searchForm.value = {
         jwcode: ''
diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue
index cbf8497..47bc513 100644
--- a/src/views/moneyManage/refundDetail/refundFinance.vue
+++ b/src/views/moneyManage/refundDetail/refundFinance.vue
@@ -20,7 +20,7 @@
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">订单状态</el-text>
-                <el-select v-model="searchForm.status" style="width:9vw;">
+                <el-select v-model="searchForm.statuses" style="width:9vw;">
                     <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </div>
@@ -41,24 +41,20 @@
                     :disabled-date="disabledDate" />
             </div>
             <div>
-                <el-button type="primary">查询</el-button>
-                <el-button type="success">重置</el-button>
+                <el-button type="primary" @click="getRefund">查询</el-button>
+                <el-button type="success" @click="reset">重置</el-button>
                 <el-button type="warning">导出excel</el-button>
                 <el-button type="primary">查看导出列表</el-button>
             </div>
         </div>
     </el-card>
 
-    <div style="display: flex;">
-        <el-button type="primary" @click="showSteps = true">看看步骤条</el-button>
-    </div>
-
     <el-card style="margin-top: 0.5vh;">
         <el-table :data="tableData" style="height:64vh;width:82vw">
             <el-table-column type="index" label="序号" width="60" fixed="left" />
             <el-table-column prop="jwcode" label="Homily ID" width="120" fixed="left" />
             <el-table-column prop="name" label="姓名" width="120" fixed="left" show-overflow-tooltip />
-            <el-table-column prop="market" label="所属地区" width="120" />
+            <el-table-column prop="marketName" label="所属地区" width="120" />
             <el-table-column prop="activity" label="活动名称" width="120px" show-overflow-tooltip />
             <el-table-column prop="goodsName" label="产品名称" width="120" />
             <el-table-column prop="goodNum" label="产品数量" width="120" />
@@ -70,14 +66,22 @@
             <el-table-column prop="submitterName" label="提交人" width="120" />
             <el-table-column prop="refundReason" label="退款理由" width="120" />
             <el-table-column prop="remark" label="备注" width="150" show-overflow-tooltip />
-            <el-table-column prop="status" label="订单状态" width="120" />
-            <el-table-column prop="operation" label="操作" fixed="right" width="150px">
+            <el-table-column prop="status" label="订单状态" width="120">
+                <template #default="scope">
+                    {{
+                        [10,20, 30, 40].includes(scope.row.status) ? '审核中' :
+                        [12,22, 32].includes(scope.row.status) ? '审核驳回' :
+                        scope.row.status === 41 ? '退款完成' : scope.row.status
+                    }}
+                </template>
+            </el-table-column>
+            <el-table-column prop="operation" label="操作" fixed="right" width="100px">
                 <template #default="scope">
                     <div class="operation">
                         <el-button v-if="scope.row.status === 10" type="primary" text @click="showAudit2(scope.row)">
                             审核
                         </el-button>
-                        <el-button v-else type="primary" text @click="">
+                        <el-button v-else type="primary" text @click="showSteps = true">
                             查看进度
                         </el-button>
                     </div>
@@ -120,7 +124,7 @@
                 </div>
                 <div class="center-item">
                     <el-text style="width:4vw;" size="small">所属地区</el-text>
-                    <el-input v-model="auditRow.market" size="small" style="width:10vw;" disabled />
+                    <el-input v-model="auditRow.marketName" size="small" style="width:10vw;" disabled />
                 </div>
                 <div class="center-item">
                     <el-text style="width:4vw;" size="small">产品名称</el-text>
@@ -139,19 +143,11 @@
                     <el-input v-model="auditRow.payType" size="small" style="width:10vw;" disabled />
                 </div>
                 <div class="center-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" class="image"
-                            :show-file-list="false">
-                            <template #default>
-                                <img v-if="auditRow.voucher" :src="auditRow.voucher"
-                                    style="width: 100%; height: 100%; object-fit: cover;">
-                                <el-icon v-else>
-                                    <Plus />
-                                </el-icon>
-                            </template>
-                        </el-upload>
-                    </el-form-item>
+                    <el-text style="width:4vw;">转账凭证</el-text>
+                    <img v-if="auditRow.voucher" :src="auditRow.voucher" style="width: 100%; height: 100%; object-fit: cover;">
+                    <div v-else>
+                        无转账凭证
+                    </div>
                 </div>
             </div>
             <div class="center-right">
@@ -206,8 +202,8 @@
                 <el-button type="primary" @click="handlePass">通过</el-button>
             </div>
             <div style="text-align: center;" v-show="showReject">
-                <el-button type="default" @click="">取消</el-button>
-                <el-button type="primary">确定</el-button>
+                <el-button type="default" @click="hideReject">取消</el-button>
+                <el-button type="primary" @click="handleReject">确定</el-button>
             </div>
         </div>
     </el-dialog>
@@ -381,10 +377,10 @@ const statusList = ref([
 // 查全部
 const getRefund = async function () {
     try {
-        if(searchForm.value.status === '审核通过'){
-            searchForm.value.status = [20,30,40]
-        }else if(searchForm.value.status === '审核驳回'){
-            searchForm.value.status = [12,22,32]
+        if(searchForm.value.statuses === '审核通过'){
+            searchForm.value.statuses = [20,30,40]
+        }else if(searchForm.value.statuses === '审核驳回'){
+            searchForm.value.statuses = [12,22,32]
         }
         const params = {
             pageNum: pagination.value.pageNum,
@@ -422,8 +418,7 @@ const handlePass = async function () {
     try {
         const params = {
             id: auditRow.value.id,
-            status: 20,
-            rejectReason: addForm.value.remark
+            status: 20
         }
         const result = await API({
             url: '/Money/review',
@@ -438,6 +433,114 @@ const handlePass = async function () {
         ElMessage.error(error.message || '审核失败')
     }
 }
+// 审核驳回
+const handleReject = async function () {
+    try {
+        const params = {
+            id: auditRow.value.id,
+            status: 12,
+            rejectReason: addForm.value.remark
+        }
+        const result = await API({
+            url: '/Money/review',
+            data: params
+        })
+        if (result.code === 200) {
+            ElMessage.success('审核驳回')
+            showAudit.value = false
+            getRefund()
+        }
+    } catch (error) {
+        ElMessage.error(error.message || '审核失败')
+    }
+}
+const currencies = ref([
+    {
+        value: '新币',
+        label: '新币'
+    },
+    {
+        value: '港币',
+        label: '港币'
+    },
+    {
+        value: '马币',
+        label: '马币'
+    },
+    {
+        value: '加币',
+        label: '加币'
+    },
+    {
+        value: '泰铢',
+        label: '泰铢'
+    },
+    {
+        value: '越南盾',
+        label: '越南盾'
+    }
+])
+const channelOptions = ref([{
+    value: '银行转账',
+    label: '银行转账'
+},
+{
+    value: '现金',
+    label: '现金'
+},
+{
+    value: '支票',
+    label: '支票'
+},
+{
+    value: '刷卡',
+    label: '刷卡'
+},
+{
+    value: 'Grabpay',
+    label: 'Grabpay'
+},
+{
+    value: 'Nets',
+    label: 'Nets'
+},
+{
+    value: 'PayPal',
+    label: 'PayPal'
+},
+{
+    value: 'Stripe-链接收款',
+    label: 'Stripe-链接收款'
+},
+{
+    value: 'Ipay88-链接收款',
+    label: 'Ipay88-链接收款'
+},
+{
+    value: 'PaymentAsia-链接收款',
+    label: 'PaymentAsia-链接收款'
+},
+{
+    value: 'Stripe-Link平台',
+    label: 'Stripe-Link平台'
+},
+{
+    value: 'PaymentAsia-Link平台',
+    label: 'PaymentAsia-Link平台'
+},
+{
+    value: 'FirstData-Link平台-Link平台',
+    label: 'FirstData-Link平台-Link平台'
+},
+{
+    value: 'IOS-Link平台',
+    label: 'IOS-Link平台'
+},
+{
+    value: 'Ipay88-Link平台',
+    label: 'Ipay88-Link平台'
+}
+])
 const showAudit2 = function (row) {
     auditRow.value = row
     showAudit.value = true
@@ -449,7 +552,10 @@ const reset = function () {
     dateRange.value = []
     getRefund()
 }
-
+const hideReject = function () {
+    showReject.value = false
+    addForm.value.remark = ''
+}
 onMounted(() => {
     console.log('???????????????????', adminData.value)
     getRefund()
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index 1a9d172..a985d02 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -20,7 +20,7 @@
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">订单状态</el-text>
-                <el-select v-model="searchForm.status" style="width:9vw;">
+                <el-select v-model="searchForm.statuses" style="width:9vw;">
                     <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </div>
@@ -49,16 +49,12 @@
         </div>
     </el-card>
 
-    <div style="display: flex;">
-        <el-button type="primary" @click="showSteps = true">看看步骤条</el-button>
-    </div>
-
     <el-card style="margin-top: 0.5vh;">
         <el-table :data="tableData" style="height:64vh;width:82vw">
             <el-table-column type="index" label="序号" width="60" fixed="left" />
             <el-table-column prop="name" label="Homily ID" width="120" fixed="left" />
             <el-table-column prop="jwcode" label="姓名" width="120" fixed="left" show-overflow-tooltip />
-            <el-table-column prop="markets" label="所属地区" width="120" />
+            <el-table-column prop="marketName" label="所属地区" width="120" />
             <el-table-column prop="goodsName" label="产品名称" width="120" />
             <el-table-column prop="goodNum" label="产品数量" width="120" />
             <el-table-column prop="refundType" label="退款方式" width="120">
@@ -69,14 +65,22 @@
             <el-table-column prop="submitterName" label="提交人" width="120" />
             <el-table-column prop="refundReason" label="退款理由" width="120" />
             <el-table-column prop="remark" label="备注" width="150" show-overflow-tooltip />
-            <el-table-column prop="status" label="订单状态" width="120" />
-            <el-table-column prop="operation" label="操作" fixed="right" width="150px" >
+            <el-table-column prop="status" label="订单状态" width="120">
+                <template #default="scope">
+                    {{
+                        [30, 40].includes(scope.row.status) ? '审核中' :
+                        scope.row.status === 32 ? '审核驳回' :
+                        scope.row.status === 41 ? '退款完成' : scope.row.status
+                    }}
+                </template>
+            </el-table-column>
+            <el-table-column prop="operation" label="操作" fixed="right" width="100px">
                 <template #default="scope">
                     <div class="operation">
-                        <el-button v-if="scope.row.status === 30" type="primary" text  @click="showAudit(scope.row)">
+                        <el-button v-if="scope.row.status === 30" type="primary" text @click="showAudit(scope.row)">
                             审核
                         </el-button>
-                        <el-button v-else type="primary" text @click="">
+                        <el-button v-else type="primary" text @click="showSteps = true">
                             查看进度
                         </el-button>
                     </div>
@@ -117,7 +121,7 @@
                 </div>
                 <div class="center-item">
                     <el-text style="width:4vw;" size="small">所属地区</el-text>
-                    <el-input v-model="auditRow.markets" size="small" style="width:10vw;" disabled />
+                    <el-input v-model="auditRow.marketName" size="small" style="width:10vw;" disabled />
                 </div>
                 <div class="center-item">
                     <el-text style="width:4vw;" size="small">产品名称</el-text>
@@ -136,19 +140,11 @@
                     <el-input v-model="auditRow.payType" size="small" style="width:10vw;" disabled />
                 </div>
                 <div class="center-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" class="image"
-                            :show-file-list="false">
-                            <template #default>
-                                <img v-if="auditRow.voucher" :src="auditRow.voucher"
-                                    style="width: 100%; height: 100%; object-fit: cover;">
-                                <el-icon v-else>
-                                    <Plus />
-                                </el-icon>
-                            </template>
-                        </el-upload>
-                    </el-form-item>
+                    <el-text style="width:4vw;">转账凭证</el-text>
+                    <img v-if="auditRow.voucher" :src="auditRow.voucher" style="width: 100%; height: 100%; object-fit: cover;">
+                    <div v-else>
+                        无转账凭证
+                    </div>
                 </div>
             </div>
             <div class="center-right">
@@ -198,13 +194,23 @@
                 <el-input v-model="addForm.remark" placeholder="请输入驳回备注" size="small" style="width:10vw;" :row="3"
                     maxlength="100" type="textarea" show-word-limit clearable />
             </div>
-            <div style="text-align: center;" v-show="!showReject">
+            <div class="bottom-item" v-show="showExecutor">
+                <el-text style="width:4vw;" size="small">执行人</el-text>
+                <el-select v-model="addForm.executor" style="width:9vw;">
+                    <el-option v-for="item in executorList" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+            </div>
+            <div style="text-align: center;" v-show="!showReject && !showExecutor">
                 <el-button type="default" @click="showReject = true">驳回</el-button>
-                <el-button type="primary" @click="handlePass">通过</el-button>
+                <el-button type="primary" @click="showExecutor = true">通过</el-button>
             </div>
             <div style="text-align: center;" v-show="showReject">
-                <el-button type="default" @click="">取消</el-button>
-                <el-button type="primary">确定</el-button>
+                <el-button type="default" @click="hideReject">取消</el-button>
+                <el-button type="primary" @click="handleReject">确定</el-button>
+            </div>
+            <div style="text-align: center;" v-show="showExecutor">
+                <el-button type="default" @click="hideExecutor">取消</el-button>
+                <el-button type="primary" @click="handlePass">确定</el-button>
             </div>
         </div>
     </el-dialog>
@@ -275,12 +281,14 @@ import { permissionMapping, findMenuById } from "@/utils/menuTreePermission.js"
 
 const searchForm = ref({
     jwcode: '',
-    markets:[]
+    markets: [],
+    statuses: []
 })
 const addForm = ref({
     remark: ''
 })
 const showReject = ref(false)
+const showExecutor = ref(false)
 const auditRow = ref({})// 审核回显
 const dateRange = ref([])
 const pagination = ref({
@@ -354,45 +362,64 @@ const payments = ref([{
 }
 ])
 const statusList = ref([
-{
-    value: 30,
-    label: '待审核',
-  },
-  {
-    value: 40, 
-    label: '审核通过'
-  },
-  {
-    value: [32], 
-    label: '审核驳回'
-  },
-  {
-    value: 41,
-    label: '退款完成'
-  }
+    { value: 30, label: '待审核' },
+    { value: 40, label: '审核通过' },
+    { value: 32, label: '审核驳回' },
+    { value: 41, label: '退款完成' }
+])
+const executorList = ref([
+    {
+        value: '305485',
+        label: '新:Zoe'
+    },
+    {
+        value: '200723',
+        label: '马:Jennifer'
+    },
+    {
+        value: '301388',
+        label: '港:林育平'
+    },
+    {
+        value: '839448',
+        label: '加:Mandy'
+    },
+    {
+        value: '304904',
+        label: '泰:杨丽娇'
+    },
+    {
+        value: '315915',
+        label: '越:范秋霞'
+    },
+    {
+        value: '90047681',
+        label: '李慧琳演示机'
+    },
+    {
+        value: '90047947',
+        label: '宋彤彤'
+    }
 ])
 // 查全部
 const getRefund = async function () {
     try {
-        if(searchForm.value.status === '审核通过'){
-            searchForm.value.status = [30,40]
-        }else if(searchForm.value.status === '审核驳回'){
-            searchForm.value.status = [22,32]
-        }
+        searchForm.value.statuses = [30, 32, 40, 41] // 默认：看不到进度没到这里的
+
         const params = {
             pageNum: pagination.value.pageNum,
             pageSize: pagination.value.pageSize,
             cashRecordDone: {
-                jwcode: searchForm.value.jwcode,//精网号
-                name: searchForm.value.name,//姓名
-                markets: searchForm.value.markets,//地区
-                goodsName: searchForm.value.goodsName,//商品名
+                jwcode: searchForm.value.jwcode,
+                name: searchForm.value.name,
+                markets: searchForm.value.markets,
+                goodsName: searchForm.value.goodsName,
                 statuses: searchForm.value.statuses,//10：地区财务待审核；12：地区财务驳回；
                 // 20：地区负责人待审核；22：地区负责人驳回；
                 // 30：总部财务待审核；32：总部财务驳回；
                 // 40：执行人待处理；41：执行人已处理，退款完成；
-                paymentCurrency: searchForm.value.paymentCurrency,//付款币种
-                payType: searchForm.value.payType,//支付方式
+                paymentCurrency: searchForm.value.paymentCurrency,
+                payType: searchForm.value.payType,
                 startTime: dateRange.value && dateRange.value[0] ? moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
                 endtime: dateRange.value && dateRange.value[1] ? moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
                 adminId: adminData.value.id
@@ -415,8 +442,9 @@ const handlePass = async function () {
     try {
         const params = {
             id: auditRow.value.id,
+            executor: addForm.value.executor,
             status: 40,
-            rejectReason: addForm.value.remark
+            adminId: adminData.value.id
         }
         const result = await API({
             url: '/Money/review',
@@ -431,6 +459,32 @@ const handlePass = async function () {
         ElMessage.error(error.message || '审核失败')
     }
 }
+// 审核驳回
+const handleReject = async function () {
+    try {
+        const params = {
+            id: auditRow.value.id,
+            status: 32,
+            rejectReason: addForm.value.remark,
+            adminId: adminData.value.id
+        }
+        const result = await API({
+            url: '/Money/review',
+            data: params
+        })
+        if (result.code === 200) {
+            ElMessage.success('审核驳回')
+            showAudit2.value = false
+            getRefund()
+        }
+    } catch (error) {
+        ElMessage.error(error.message || '审核失败')
+    }
+}
+const hideReject = function () {
+    showReject.value = false
+    addForm.value.remark = ''
+}
 const reset = function () {
     searchForm.value = {
         jwcode: ''
@@ -549,7 +603,7 @@ onMounted(() => {
 
     .bottom {
         width: 30vw;
-        height: 5vh;
+        height: 7vh;
 
         .bottom-item {
             display: flex;
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue
index 487589b..af5db5a 100644
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@@ -28,11 +28,15 @@
         <div class="condition">
             <div class="item2">
                 <el-text size="large" style="width:4vw;">付款币种</el-text>
-                <el-input v-model="searchForm.paymentCurrency" placeholder="请输入付款币种" style="width:9vw;" clearable />
+                <el-select v-model="searchForm.paymentCurrency" style="width:9vw;">
+                    <el-option v-for="item in currencies" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
             </div>
             <div class="item2">
                 <el-text size="large" style="width:4vw;">支付方式</el-text>
-                <el-input v-model="searchForm.payType" placeholder="请输入支付方式" style="width:9vw;" clearable />
+                <el-select v-model="searchForm.payType" style="width:9vw;">
+                    <el-option v-for="item in channelOptions" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
             </div>
             <div class="item2" style="width: 28.5vw;">
                 <el-text size="large" style="width:4vw;">付款时间</el-text>
@@ -48,17 +52,12 @@
         </div>
     </el-card>
 
-    <div style="display: flex;">
-        <el-button type="primary" @click="showSteps = true">看看步骤条</el-button>
-        <el-button type="primary" @click="showError = true">退款金额有误</el-button>
-    </div>
-
     <el-card style="margin-top: 0.5vh;">
         <el-table :data="tableData" style="height:64vh;width:82vw">
             <el-table-column type="index" label="序号" width="60" fixed="left" />
             <el-table-column prop="jwcode" label="Homily ID" width="120" fixed="left" />
             <el-table-column prop="name" label="姓名" width="120" fixed="left" show-overflow-tooltip />
-            <el-table-column prop="market" label="所属地区" width="120" />
+            <el-table-column prop="marketName" label="所属地区" width="120" />
             <el-table-column prop="activity" label="活动名称" width="120px" show-overflow-tooltip />
             <el-table-column prop="goodsName" label="产品名称" width="120" />
             <el-table-column prop="goodNum" label="产品数量" width="120" />
@@ -66,10 +65,23 @@
             <el-table-column prop="paymentAmount" label="付款金额" width="120" />
             <el-table-column prop="payType" label="支付方式" width="120" />
             <el-table-column prop="payTime" label="付款时间" width="180" />
-            <el-table-column prop="voucher" label="转账凭证" width="120" />
+            <el-table-column prop="voucher" label="转账凭证" width="120" show-overflow-tooltip>
+                <template #default="scope">
+                    <img v-if="scope.row.voucher" :src="scope.row.voucher" style="width: 40px; height: 40px;" />
+                    <span v-else>无转账凭证</span>
+                </template>
+            </el-table-column>
             <el-table-column prop="remark" label="备注" width="150" show-overflow-tooltip />
-            <el-table-column prop="status" label="订单状态" width="120" />
-            <el-table-column prop="operation" label="操作" fixed="right" width="150px">
+            <el-table-column prop="status" label="订单状态" width="120">
+                <template #default="scope">
+                    {{
+                        [10, 20, 30, 40].includes(scope.row.status) ? '审核中' :
+                            [12, 22, 32].includes(scope.row.status) ? '审核驳回' :
+                                scope.row.status === 41 ? '退款完成' : scope.row.status
+                    }}
+                </template>
+            </el-table-column>
+            <el-table-column prop="operation" label="操作" fixed="right" width="100px">
                 <template #default="scope">
                     <div class="operation">
                         <el-button v-if="scope.row.status === 10" type="primary" text
@@ -80,7 +92,8 @@
                             @click="showEditDialog(scope.row)">
                             编辑
                         </el-button>
-                        <el-button v-if="scope.row.status !== 11 && scope.row.status !== 10" type="primary" text @click="">
+                        <el-button v-if="scope.row.status !== 11 && scope.row.status !== 10" type="primary" text
+                            @click="showSteps = true">
                             查看进度
                         </el-button>
                     </div>
@@ -106,7 +119,7 @@
                 </div>
                 <div class="add-item">
                     <el-text style="width:4vw;">所属地区</el-text>
-                    <el-input v-model="editRow.markets" style="width:10vw;" disabled />
+                    <el-input v-model="editRow.marketName" style="width:10vw;" disabled />
                 </div>
                 <div class="add-item">
                     <el-text style="width:4vw;">活动名称</el-text>
@@ -138,19 +151,12 @@
                     <el-date-picker v-model="editRow.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="editRow.voucher" :src="editRow.voucher"
-                                    style="width: 100%; height: 100%; object-fit: cover;">
-                                <el-icon v-else>
-                                    <Plus />
-                                </el-icon>
-                            </template>
-                        </el-upload>
-                    </el-form-item>
+                    <el-text style="width:4vw;">转账凭证</el-text>
+                    <img v-if="editRow.voucher" :src="editRow.voucher"
+                        style="width: 100%; height: 100%; object-fit: cover;">
+                    <div v-else>
+                        无转账凭证
+                    </div>
                 </div>
                 <div class="add-item">
                     <el-text style="width:4vw;">备注</el-text>
@@ -180,7 +186,7 @@
         </div>
     </el-dialog>
 
-    <el-dialog v-model="showSteps" title="唉！！！" overflow draggable width="1206px" :style="{
+    <el-dialog v-model="showSteps" overflow draggable width="1206px" :style="{
         backgroundImage: 'url(/src/assets/images/背景图.png)',
         backgroundSize: 'cover',
         backgroundPosition: 'center'
@@ -217,17 +223,8 @@
                     </el-step>
                 </el-steps>
             </div>
-            <div class="steps-status">
-                <el-steps style="min-width: 50vw" :active="1" finish-status="success" simple>
-                    <el-step title="已通过" />
-                    <el-step title="待审核" />
-                    <el-step title="待审核" />
-                    <el-step title="待审核" />
-                    <el-step title="待审核" />
-                </el-steps>
-            </div>
             <div class="steps-btn">
-                <el-button type="primary">确定</el-button>
+                <el-button type="primary" @click="showSteps = false">确定</el-button>
             </div>
         </div>
     </el-dialog>
@@ -290,33 +287,34 @@ const pagination = ref({
 })
 const tableData = ref([])
 const showEdit = ref(false)
+const currentRow = ref({})// 审核进度行信息
 const showSteps = ref(false)
 const uploadRef = ref(null)
 const showBack = ref(false)
 const showError = ref(false)
 const isKF = adminData.value.adminName.includes('客服')
 const statusList = ref([
-{
-    value: 'waiting',
-    label: '待审核',
-  },
-  {
-    value: 'pending', 
-    label: '审核中'
-  },
-  {
-    value: 'completed',
-    label: '退款完成'
-  }
+    {
+        value: 'waiting',
+        label: '待审核',
+    },
+    {
+        value: 'pending',
+        label: '审核中'
+    },
+    {
+        value: 'completed',
+        label: '退款完成'
+    }
 ])
 // 查全部
 const getRefund = async function () {
     try {
-        if(searchForm.value.statuses === 'completed'){
+        if (searchForm.value.statuses === 'completed') {
             searchForm.value.statuses = [41]
-        } else if(searchForm.value.statuses === 'pending'){
+        } else if (searchForm.value.statuses === 'pending') {
             searchForm.value.statuses = [20, 30, 40]
-        }else if(searchForm.value.statuses === 'waiting'){
+        } else if (searchForm.value.statuses === 'waiting') {
             searchForm.value.statuses = [10]
         }
         const params = {
@@ -402,6 +400,93 @@ const submitEdit = async function () {
         ElMessage.error(error.message || '编辑失败')
     }
 }
+const currencies = ref([
+    {
+        value: '新币',
+        label: '新币'
+    },
+    {
+        value: '港币',
+        label: '港币'
+    },
+    {
+        value: '马币',
+        label: '马币'
+    },
+    {
+        value: '加币',
+        label: '加币'
+    },
+    {
+        value: '泰铢',
+        label: '泰铢'
+    },
+    {
+        value: '越南盾',
+        label: '越南盾'
+    }
+])
+const channelOptions = ref([{
+    value: '银行转账',
+    label: '银行转账'
+},
+{
+    value: '现金',
+    label: '现金'
+},
+{
+    value: '支票',
+    label: '支票'
+},
+{
+    value: '刷卡',
+    label: '刷卡'
+},
+{
+    value: 'Grabpay',
+    label: 'Grabpay'
+},
+{
+    value: 'Nets',
+    label: 'Nets'
+},
+{
+    value: 'PayPal',
+    label: 'PayPal'
+},
+{
+    value: 'Stripe-链接收款',
+    label: 'Stripe-链接收款'
+},
+{
+    value: 'Ipay88-链接收款',
+    label: 'Ipay88-链接收款'
+},
+{
+    value: 'PaymentAsia-链接收款',
+    label: 'PaymentAsia-链接收款'
+},
+{
+    value: 'Stripe-Link平台',
+    label: 'Stripe-Link平台'
+},
+{
+    value: 'PaymentAsia-Link平台',
+    label: 'PaymentAsia-Link平台'
+},
+{
+    value: 'FirstData-Link平台-Link平台',
+    label: 'FirstData-Link平台-Link平台'
+},
+{
+    value: 'IOS-Link平台',
+    label: 'IOS-Link平台'
+},
+{
+    value: 'Ipay88-Link平台',
+    label: 'Ipay88-Link平台'
+}
+])
 const reset = function () {
     searchForm.value = {
         jwcode: ''