From e9dda9e6c52cb737267185f5118ded73c0053115 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 06 五月 2025 17:13:41 +0800
Subject: [PATCH] feat: 接口

---
 src/views/Reward/RewardGrant.vue |   36 +++++++++++++++++++++++++++++-------
 1 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/views/Reward/RewardGrant.vue b/src/views/Reward/RewardGrant.vue
index 83dc7d8..8716cc1 100644
--- a/src/views/Reward/RewardGrant.vue
+++ b/src/views/Reward/RewardGrant.vue
@@ -14,7 +14,18 @@
               @change="getList()"
             ></FieldDatePicker>
           </QueryFilterItem>
-          <QueryFilterItem tip-content="鍙戞斁鏃ユ湡">
+          <QueryFilterItem tip-content="鎷ㄤ粯鏃ユ湡">
+            <FieldDatePicker
+              v-model="extraParamState.financeTime"
+              type="daterange"
+              range-separator="~"
+              start-placeholder="寮�濮嬫棩鏈�"
+              end-placeholder="缁撴潫鏃ユ湡"
+              clearable
+              @change="getList()"
+            ></FieldDatePicker>
+          </QueryFilterItem>
+          <QueryFilterItem tip-content="鍏呭�兼棩鏈�">
             <FieldDatePicker
               v-model="extraParamState.settleTime"
               type="daterange"
@@ -57,7 +68,7 @@
 
       <ProTableV2 v-bind="proTableProps" :columns="column" :operationBtns="operationBtns">
       </ProTableV2>
-      <FourStreamsMaterialFileDialog
+      <FourStreamsMaterialFileDialogV2
         v-bind="dialogMaterialFileProps"
         :show-upload-btn="false"
         :show-delete-btn="false"
@@ -94,6 +105,7 @@
   SettleStatusEnumText,
   FinanceStatusEnum,
   FinanceStatusEnumText,
+  TransferFileEnumInRewardGrandText,
 } from '@/constants';
 import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
 import FinancialDialog from './components/FinancialDialog.vue';
@@ -101,11 +113,8 @@
 import _ from 'lodash';
 import { ModelValueType } from 'element-plus';
 import { useQueryClient } from '@tanstack/vue-query';
+import { TransferFileEnumInRewardGrandTableItem } from '@/components/commonView/types';
 import { FourStreamsMaterialUtils } from '@/components/commonView/utils';
-import {
-  TransferFileEnumInRewardGrandText,
-  TransferFileEnumInRewardGrandTableItem,
-} from '@/components/commonView/types';
 
 defineOptions({
   name: 'RewardGrant',
@@ -116,51 +125,61 @@
     id: '1',
     enCode: 'batchNo',
     name: '鐢宠鎵规鍙�',
+    width: 160,
   },
   {
     id: '2',
     enCode: 'parkName',
     name: '鐢宠鍥尯',
+    width: 250,
   },
   {
     id: '3',
     enCode: 'parkTypeName',
     name: '鍥尯绫诲瀷',
+    width: 160,
   },
   {
     id: '4',
     enCode: 'applyMonth',
     name: '鐢宠骞冲彴濂栧姳鏈堜唤',
+    width: 160,
   },
   {
     id: '5',
     enCode: 'applySumAmount',
     name: '骞冲彴濂栧姳姹囨�婚噾棰濓紙鍏冿級',
+    width: 180,
   },
   {
     id: '6',
     enCode: 'creationTime',
     name: '鐢虫姤鏃ユ湡',
+    width: 180,
   },
   {
     id: '7',
     enCode: 'financeStatus',
     name: '璐㈡斂鎷ㄤ粯鐘舵��',
+    width: 160,
   },
   {
     id: '8',
     enCode: 'financeTime',
     name: '鎷ㄤ粯鏃ユ湡',
+    width: 180,
   },
   {
     id: '9',
     enCode: 'settleStatus',
     name: '骞冲彴鍏呭�肩姸鎬�',
+    width: 160,
   },
   {
     id: '10',
     enCode: 'settleTime',
     name: '鍏呭�兼棩鏈�',
+    width: 180,
   },
 ];
 
@@ -197,7 +216,7 @@
     },
     extraProps: {
       hide: (row: API.GetParkBountyApplyListOutput) =>
-        row.settleStatus === SettleStatusEnum.HasSettle,
+        row.settleStatus !== SettleStatusEnum.WaitForSettle,
     },
   },
   {
@@ -250,6 +269,8 @@
         creationTimeEnd: format(extraParamState.creationTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
         settleTimeBegin: format(extraParamState.settleTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
         settleTimeEnd: format(extraParamState.settleTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
+        financeTimeBegin: format(extraParamState.financeTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
+        financeTimeEnd: format(extraParamState.financeTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
       };
       let res = await parkBountyApplyServices.getParkBountyApplyList(params, {
         showLoading: !state.loading,
@@ -264,6 +285,7 @@
       financeStatus: '' as any as FinanceStatusEnum,
       creationTime: [] as unknown as ModelValueType,
       settleTime: [] as unknown as ModelValueType,
+      financeTime: [] as unknown as ModelValueType,
       orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }],
     },
     columnsRenderProps: {

--
Gitblit v1.9.1