From aea28d0ad246cc8d6ce0744b8f101dd7c8fd474f Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 14 五月 2025 14:29:15 +0800
Subject: [PATCH] feat: 接口
---
src/views/Reward/RewardGrant.vue | 19 ++++++++++++++-----
src/constants/reward.ts | 20 ++++++++++++++++++++
2 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/constants/reward.ts b/src/constants/reward.ts
index 85294f9..8304a23 100644
--- a/src/constants/reward.ts
+++ b/src/constants/reward.ts
@@ -46,6 +46,10 @@
*/
HasSettle = 2,
/**
+ * 宸蹭笂浼犲嚟璇�
+ */
+ HasBill = 3,
+ /**
* 鏃犻渶鍏呭��
*/
NoNeed = -1,
@@ -56,9 +60,15 @@
[SettleStatusEnum.HasSettle]: '宸插厖鍊�',
[SettleStatusEnum.NoNeed]: '鏃犻渶鍏呭��',
};
+export const SettleStatusEnumTextV2Query = {
+ [SettleStatusEnum.WaitForSettle]: '寰呯櫥璁�',
+ [SettleStatusEnum.HasSettle]: '宸茬櫥璁�',
+};
+
export const SettleStatusEnumTextV2 = {
[SettleStatusEnum.WaitForSettle]: '寰呯櫥璁�',
[SettleStatusEnum.HasSettle]: '宸茬櫥璁�',
+ [SettleStatusEnum.HasBill]: '宸茬櫥璁�',
[SettleStatusEnum.NoNeed]: '鏃犻渶鐧昏',
};
@@ -71,6 +81,10 @@
* 宸叉嫧浠�
*/
HasIncome = 2,
+ /**
+ * 宸蹭笂浼犲嚟璇�
+ */
+ HasBill = 3,
}
export const FinanceStatusEnumText = {
@@ -81,6 +95,12 @@
export const FinanceStatusEnumTextV2 = {
[FinanceStatusEnum.WaitForIncome]: '寰呯櫥璁�',
[FinanceStatusEnum.HasIncome]: '宸茬櫥璁�',
+ [FinanceStatusEnum.HasBill]: '宸茬櫥璁�',
+};
+
+export const FinanceStatusEnumTextV2Query = {
+ [FinanceStatusEnum.WaitForIncome]: '寰呯櫥璁�',
+ [FinanceStatusEnum.HasIncome]: '宸茬櫥璁�',
};
export enum IncomeStatusEnum {
diff --git a/src/views/Reward/RewardGrant.vue b/src/views/Reward/RewardGrant.vue
index ab8d42f..563ce13 100644
--- a/src/views/Reward/RewardGrant.vue
+++ b/src/views/Reward/RewardGrant.vue
@@ -39,7 +39,7 @@
<QueryFilterItem tip-content="璐㈡斂鎷ㄤ粯鐘舵��">
<FieldRadio
v-model="extraParamState.financeStatus"
- :value-enum="FinanceStatusEnumTextV2"
+ :value-enum="FinanceStatusEnumTextV2Query"
buttonStyle
showAllBtn
@change="getList()"
@@ -48,7 +48,7 @@
<QueryFilterItem tip-content="骞冲彴鍏呭�肩姸鎬�">
<FieldRadio
v-model="extraParamState.settleStatus"
- :value-enum="SettleStatusEnumTextV2"
+ :value-enum="SettleStatusEnumTextV2Query"
buttonStyle
showAllBtn
@change="getList()"
@@ -107,7 +107,9 @@
FinanceStatusEnum,
TransferFileEnumInRewardGrandText,
FinanceStatusEnumTextV2,
+ FinanceStatusEnumTextV2Query,
SettleStatusEnumTextV2,
+ SettleStatusEnumTextV2Query,
IncomeTypeEnum,
BillStatusEnum,
} from '@/constants';
@@ -266,7 +268,11 @@
onClick: (row) => openMaterialFileDialog(row),
},
extraProps: {
- hide: (row: API.GetParkBountyApplyListOutput) => row.billStatus !== BillStatusEnum.HasUpload,
+ hide: (row: API.GetParkBountyApplyListOutput) =>
+ !(
+ row.settleStatus === SettleStatusEnum.HasBill ||
+ row.financeStatus === FinanceStatusEnum.HasBill
+ ),
},
},
]);
@@ -422,15 +428,18 @@
}
async function handleRegister() {
try {
- let params: API.ParkBountyApplyFinanceFileInput = {
+ let params = {
parkBountyApplyId: editRegisterForm.parkBountyApplyId,
- financeSumAmount: editRegisterForm.financeSumAmount,
};
let res;
if (editRegisterForm.incomeType === IncomeTypeEnum.Fiscal) {
+ (params as API.ParkBountyApplyFinanceFileInput).financeSumAmount =
+ editRegisterForm.financeSumAmount;
res = await parkBountyApplyServices.parkBountyApplyFinanceBillAmount(params);
}
if (editRegisterForm.incomeType === IncomeTypeEnum.Platform) {
+ (params as API.ParkBountyApplySettleInput).settleSumAmount =
+ editRegisterForm.financeSumAmount;
res = await parkBountyApplyServices.parkBountyApplySettleAmount(params);
}
if (res) {
--
Gitblit v1.9.1