Merge branch 'lihuilin/feature-20250923114949-现金' into milestone-20250913-现金管理

src/views/moneyManage/executor/executor.vue

@@ -301,6 +301,7 @@ const getRefund = async function () {
         })
 
         tableData.value = result.data.list || []
+        pagination.value.total = result.data.total || 0
     } catch (error) {
         ElMessage.error(error.message || '查询失败')
     }

src/views/moneyManage/refundDetail/refundFinance.vue

@@ -507,6 +507,8 @@ const handleReject = async function () {
             ElMessage.success('审核驳回')
             showAudit.value = false
             getRefund()
+            addForm.value.remark = ''
+            showReject.value = false
         }
     } catch (error) {
         ElMessage.error(error.message || '审核失败')

src/views/moneyManage/refundDetail/refundService.vue

@@ -59,7 +59,7 @@
             <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="130" show-overflow-tooltip />
             <el-table-column prop="goodNum" label="产品数量" width="120" />
@@ -247,8 +247,12 @@ const showError = ref(false)
 const isKF = adminData.value.adminName.includes('客服')
 const statusList = ref([
     {
-        value: 'waiting',
-        label: '待审核',
+        value:'submitted',
+        label:'已提交',
+    },
+    {
+        value: 'back',
+        label: '已撤回',
     },
     {
         value: 'pending',
@@ -256,7 +260,11 @@ const statusList = ref([
     },
     {
         value: 'completed',
-        label: '退款完成'
+        label: '已退款'
+    },
+    {
+        value:'rejected',
+        label:'已驳回'
     }
 ])
 // 查全部
@@ -266,12 +274,16 @@ const getRefund = async function () {
         return
     }
     try {
-        if (searchForm.value.statuses === 'completed') {
-            searchForm.value.statuses = [41]
-        } else if (searchForm.value.statuses === 'pending') {
-            searchForm.value.statuses = [20, 30, 40]
-        } else if (searchForm.value.statuses === 'waiting') {
+        if (searchForm.value.statuses === 'submitted') {
             searchForm.value.statuses = [10]
+        } else if (searchForm.value.statuses === 'back') {
+            searchForm.value.statuses = [11]
+        } else if (searchForm.value.statuses === 'pending') {
+            searchForm.value.statuses = [20,30,40]
+        } else if(searchForm.value.statuses === 'completed') {
+            searchForm.value.statuses = [41]
+        } else if(searchForm.value.statuses === 'rejected') {
+            searchForm.value.statuses = [12,22,32]
         }
         const params = {
             pageNum: pagination.value.pageNum,
@@ -279,7 +291,7 @@ const getRefund = async function () {
             cashRecordDone: {
                 jwcode: searchForm.value.jwcode,//精网号
                 name: searchForm.value.name,//姓名
-                markets: searchForm.value.market,//地区
+                market: searchForm.value.market,//地区
                 goodsNames: searchForm.value.goodsName,//商品名
                 statuses: searchForm.value.statuses,//10：地区财务待审核；12：地区财务驳回；
                 // 20：地区负责人待审核；22：地区负责人驳回；