From b7426e2384b85e92ec1b59061bdada9b4f5c69ec Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 23 四月 2025 16:12:40 +0800
Subject: [PATCH] feat: 接口
---
src/views/EnterpriseInfo/EnterpriseInfoDetail.vue | 4 ++--
src/views/Reward/RewardGrant.vue | 16 +++++++++++++++-
src/services/api/typings.d.ts | 14 ++++++++++++--
src/components/commonView/types.ts | 6 +++---
src/components/commonView/utils/index.ts | 3 ++-
5 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/src/components/commonView/types.ts b/src/components/commonView/types.ts
index d3c441b..f1415f0 100644
--- a/src/components/commonView/types.ts
+++ b/src/components/commonView/types.ts
@@ -63,9 +63,9 @@
* @deprecated 宸茬粡涓嶇敤浜�
*/
EnterRelateUrl = 50,
- /** C绔釜绋庡畬绋庤鏄� */
+ /** C绔釜绋庡畬绋庤瘉鏄� */
PersonTaxRatePayUrl = 60,
- /** C绔釜绋庡畬绋庤鏄� */
+ /** C绔畬绋庤鏄� */
PersonTaxInstructUrl = 70,
}
@@ -75,7 +75,7 @@
[FourStreamsMaterialFileBusinessTypeEnum.TaxSubFileUrl]: '浼佷笟缂寸◣鏄庣粏姹囨�昏〃(鐩栫珷)',
[FourStreamsMaterialFileBusinessTypeEnum.OperateProfitesUrl]: '浼佷笟钀ユ敹鍒╂鼎琛�',
[FourStreamsMaterialFileBusinessTypeEnum.EnterRelateUrl]: '鍏ラ┗鍏宠仈璇存槑',
- [FourStreamsMaterialFileBusinessTypeEnum.PersonTaxRatePayUrl]: 'C绔釜绋庡畬绋庤鏄�',
+ [FourStreamsMaterialFileBusinessTypeEnum.PersonTaxRatePayUrl]: 'C绔釜绋庡畬绋庤瘉鏄�',
[FourStreamsMaterialFileBusinessTypeEnum.PersonTaxInstructUrl]: 'C绔畬绋庢儏鍐佃鏄�',
};
diff --git a/src/components/commonView/utils/index.ts b/src/components/commonView/utils/index.ts
index badfdc5..8918223 100644
--- a/src/components/commonView/utils/index.ts
+++ b/src/components/commonView/utils/index.ts
@@ -23,11 +23,12 @@
/**鏁板瓧缁忔祹鍥潗鏂� */
static DigitIndustrialParkMaterialFile = [
FourStreamsMaterialFileBusinessTypeEnum.ParkEnterPactUrl,
- FourStreamsMaterialFileBusinessTypeEnum.EnterRelateUrl,
+ // FourStreamsMaterialFileBusinessTypeEnum.EnterRelateUrl,
FourStreamsMaterialFileBusinessTypeEnum.RatePaymentFileUrl,
FourStreamsMaterialFileBusinessTypeEnum.TaxSubFileUrl,
FourStreamsMaterialFileBusinessTypeEnum.OperateProfitesUrl,
FourStreamsMaterialFileBusinessTypeEnum.PersonTaxRatePayUrl,
+ FourStreamsMaterialFileBusinessTypeEnum.PersonTaxInstructUrl,
];
/**璐㈡斂鎷ㄤ粯鍜屽钩鍙板厖鍊煎嚟璇� */
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index aa699ac..1a717fc 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -6744,9 +6744,9 @@
interface GetEnterpriseRechargeDetail {
id?: string;
- /** 鏀舵璐﹀彿 */
+ /** 鍏呭�艰处鍙� */
incomeBankNum?: string;
- /** 鏀舵浼佷笟鍚嶇О */
+ /** 浼佷笟鍚嶇О */
incomeEnterpriseName?: string;
/** 鍑烘璐﹀彿 */
outBankNum?: string;
@@ -7994,6 +7994,10 @@
settleTimeBegin?: string;
/** 鍙戞斁缁撴潫鏃ユ湡 */
settleTimeEnd?: string;
+ /** 鎷ㄤ粯璧峰鏃ユ湡 */
+ financeTimeBegin?: string;
+ /** 鎷ㄤ粯缁撴潫鏃ユ湡 */
+ financeTimeEnd?: string;
/** 鍏ヨ处璧峰鏃ユ湡 */
incomeTimeBegin?: string;
/** 鍏ヨ处缁撴潫鏃ユ湡 */
@@ -8062,6 +8066,7 @@
/** 浼佷笟鍚�/淇＄敤浠ｇ爜 */
searchKeyWord?: string;
transferToStatus?: TransferToStatusEnum;
+ financeToStatus?: FinanceStatusEnum;
}
interface GetParkBountyTradeDetailByIdInput {
@@ -8091,6 +8096,7 @@
tradeTime?: string;
/** 濂栧姳閲戜綑棰� */
remianAmount?: number;
+ financeType?: FinanceTypeEnum;
}
interface GetParkBountyTradeDetailOutputPageOutput {
@@ -14461,12 +14467,14 @@
parkBountyApplyDetailId?: string[];
/** 鍏呭�奸噾棰� */
financeToAmount?: number;
+ parkBountyApplyId?: string;
}
interface ParkBountyApplyBatchTransferInput {
parkBountyApplyDetailId?: string[];
/** 鍏ヨ处閲戦 */
transferToAmount?: number;
+ parkBountyApplyId?: string;
}
interface ParkBountyApplyDetailInfo {
@@ -14538,6 +14546,7 @@
parkBountyApplyDetailId?: string;
/** 璐㈡斂鎷ㄤ粯 */
bountyAmount?: number;
+ parkBountyApplyId?: string;
}
interface ParkBountyApplySettleInput {
@@ -14611,6 +14620,7 @@
parkBountyApplyDetailId?: string;
/** 鍏ヨ处閲戦 */
transferToAmount?: number;
+ parkBountyApplyId?: string;
}
type ParkCustomersCountTypeEnum = 10 | 50 | 100;
diff --git a/src/views/EnterpriseInfo/EnterpriseInfoDetail.vue b/src/views/EnterpriseInfo/EnterpriseInfoDetail.vue
index 67aa55e..09968dc 100644
--- a/src/views/EnterpriseInfo/EnterpriseInfoDetail.vue
+++ b/src/views/EnterpriseInfo/EnterpriseInfoDetail.vue
@@ -8,10 +8,10 @@
<ProTabPane lazy label="浼佷笟鐢虫姤璁板綍" name="enterpriseDeclareRecord">
<EnterpriseDeclareRecordView></EnterpriseDeclareRecordView>
</ProTabPane>
- <ProTabPane lazy label="濂栧姳閲戝彂鏀捐褰�" name="rewardGrantRecord">
+ <ProTabPane lazy label="鍙戞斁璁板綍" name="rewardGrantRecord">
<RewardGrantRecordView></RewardGrantRecordView>
</ProTabPane>
- <ProTabPane lazy label="濂栧姳閲戞秷璐硅褰�" name="rewardConsumeRecord">
+ <ProTabPane lazy label="娑堣垂璁板綍" name="rewardConsumeRecord">
<RewardConsumeRecordView></RewardConsumeRecordView>
</ProTabPane>
</ProTabs>
diff --git a/src/views/Reward/RewardGrant.vue b/src/views/Reward/RewardGrant.vue
index 83dc7d8..a576222 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"
@@ -250,6 +261,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 +277,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