From 2a05d4bb41fb74e802b903e0e13813ecead96d1f Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期五, 25 七月 2025 15:06:06 +0800 Subject: [PATCH] fix: bug --- src/hooks/fourStreams.ts | 52 +++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 41 insertions(+), 11 deletions(-) diff --git a/src/hooks/fourStreams.ts b/src/hooks/fourStreams.ts index b312d80..07feccd 100644 --- a/src/hooks/fourStreams.ts +++ b/src/hooks/fourStreams.ts @@ -8,50 +8,68 @@ } from '@/components/commonView/utils'; import * as parkBountyApplyServices from '@/services/api/ParkBountyApply'; import * as enterpriseApplyFileServices from '@/services/api/EnterpriseApplyFile'; -import { BaseDeclareEnterpriseTableViewColumns, EnterpriseTypeText } from '@/constants'; +import { + BaseDeclareEnterpriseTableViewColumns, + EnterpriseTypeText, + FinanceStatusEnum, + FinanceStatusEnumText, + FinanceStatusEnumTextV2, + FinanceStatusEnumTextV2Query, + SettleStatusEnumTextV2, + TransferToStatusEnum, + TransferToStatusEnumText, +} from '@/constants'; export const rewardGrantRegisterColumns = computed(() => defineColumns([ ...BaseDeclareEnterpriseTableViewColumns, { id: '9', - enCode: 'a', + enCode: 'financeAmount', name: '璐㈡斂鎷ㄤ粯閲戦', + width: 160, }, { id: '10', - enCode: 'a', + enCode: 'financeSumAmount', name: '璐㈡斂鎷ㄤ粯宸茬櫥璁�', + width: 160, }, { id: '11', - enCode: 'a', + enCode: 'financeTime', name: '鏈�杩戠櫥璁版棩鏈�', + width: 160, }, { id: '12', - enCode: 'a', + enCode: 'financeStatus', name: '璐㈡斂鎷ㄤ粯鐧昏鐘舵��', + width: 160, }, { id: '13', - enCode: 'a', + enCode: 'transferAmount', name: '骞冲彴鎷ㄤ粯閲戦', + width: 160, }, { id: '14', - enCode: 'a', + enCode: 'settleSumAmount', name: '骞冲彴鎷ㄤ粯宸茬櫥璁�', + width: 160, }, { id: '15', - enCode: 'a', + enCode: 'settleTime', name: '鏈�杩戠櫥璁版棩鏈�', + width: 160, }, { id: '16', - enCode: 'a', + enCode: 'settleStatus', name: '骞冲彴鎷ㄤ粯鐧昏鐘舵��', + width: 160, }, ]) ); @@ -73,7 +91,7 @@ } = useTable( async ({ pageIndex, pageSize }, extraParamState) => { try { - let params: API.GetParkBountyApplyInfoInput = { + let params: API.GetParkBountyApplyTransferInfoInput = { pageModel: { rows: pageSize, page: pageIndex, @@ -81,8 +99,10 @@ }, searchKeyWord: extraParamState.searchKeyWord, parkBountyApplyId: id.value, + transferToStatus: extraParamState.transferToStatus, + financeStatus: extraParamState.financeStatus, }; - let res = await parkBountyApplyServices.getOutCheckParkBountyApplyDetailList(params); + let res = await parkBountyApplyServices.getParkBountyApplyTransferDetailList(params); return res; } catch (error) {} }, @@ -90,14 +110,24 @@ defaultExtraParams: { orderInput: [{ property: 'parkBountyApplyId', order: OrderInputType.Desc }], searchKeyWord: '', + transferToStatus: '' as any as TransferToStatusEnum, + financeStatus: '' as any as FinanceStatusEnum, }, columnsRenderProps: { authType: { type: 'enum', valueEnum: EnterpriseTypeText }, + financeStatus: { type: 'enum', valueEnum: FinanceStatusEnumTextV2 }, + settleStatus: { type: 'enum', valueEnum: SettleStatusEnumTextV2 }, licenseUrl: { type: 'urlV2', formatter: (row: API.UserCertificationAuditListDto) => setOSSLink(row.licenseUrl), }, + financeTime: { type: 'date', format: 'YYYY-MM-DD' }, + settleTime: { type: 'date', format: 'YYYY-MM-DD' }, applyAmount: { type: 'money' }, + financeAmount: { type: 'money' }, + financeSumAmount: { type: 'money' }, + transferAmount: { type: 'money' }, + settleSumAmount: { type: 'money' }, }, } ); -- Gitblit v1.9.1