From 6250509f6dec599c11b68179cb33513e5d4b8a7d Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 23 十月 2025 13:49:53 +0800
Subject: [PATCH] fix: bug
---
src/services/api/typings.d.ts | 165 +++++++++++++++++++++++++-
src/constants/customerConsume.ts | 60 ++++++++++
src/views/BalanceManage/components/RewardGrantRecordView.vue | 6
src/views/BalanceManage/components/WithdrawalRecordView.vue | 13 +
src/views/BalanceManage/components/PaymentRecordView.vue | 4
src/services/api/ParkBountyApply.ts | 73 +++++++++++
src/views/BalanceManage/components/RechargeRecordView.vue | 21 ++-
7 files changed, 311 insertions(+), 31 deletions(-)
diff --git a/src/constants/customerConsume.ts b/src/constants/customerConsume.ts
index 9fe7902..4c10490 100644
--- a/src/constants/customerConsume.ts
+++ b/src/constants/customerConsume.ts
@@ -18,3 +18,63 @@
[FinanceTypeEnum.Recharge]: '棰勫厖鍊奸噾棰�',
[FinanceTypeEnum.PlatReward]: '骞冲彴濂栧姳',
};
+
+export enum TransferToStatusEnum {
+ /** 寰呭彂鏀�*/
+ WaitingForTransfer = 1,
+ /** 宸插彂鏀�*/
+ HasTransfer = 2,
+}
+
+export const TransferToStatusEnumText = {
+ [TransferToStatusEnum.WaitingForTransfer]: '寰呭彂鏀�',
+ [TransferToStatusEnum.HasTransfer]: '宸插彂鏀�',
+};
+
+export enum FinanceStatusEnum {
+ /** 鎷ㄤ粯寰呯櫥璁�*/
+ WaitForSettle = 1,
+ /** 鎷ㄤ粯宸茬櫥璁�*/
+ HasSettle = 2,
+ /** 宸蹭笂浼犲嚟璇�*/
+ HasBill = 3,
+}
+
+export const FinanceStatusEnumText = {
+ [FinanceStatusEnum.WaitForSettle]: '寰呮嫧浠�',
+ [FinanceStatusEnum.HasSettle]: '宸叉嫧浠�',
+ [FinanceStatusEnum.HasBill]: '宸叉嫧浠�',
+};
+
+export enum EnterpriseRechargeStatusEnum {
+ /** 寰呭鏍�*/
+ WaitCheck = 10,
+ /** 瀹℃牳閫氳繃*/
+ CheckPassed = 20,
+ /** 瀹℃牳鏈�氳繃*/
+ CheckReject = 30,
+}
+
+export const EnterpriseRechargeStatusEnumText = {
+ [EnterpriseRechargeStatusEnum.WaitCheck]: '寰呭鏍�',
+ [EnterpriseRechargeStatusEnum.CheckPassed]: '瀹℃牳閫氳繃',
+ [EnterpriseRechargeStatusEnum.CheckReject]: '瀹℃牳鏈�氳繃',
+};
+
+export const EnterpriseRechargeStatusEnumTextWithdrawal = {
+ [EnterpriseRechargeStatusEnum.WaitCheck]: '寰呭鏍�',
+ [EnterpriseRechargeStatusEnum.CheckPassed]: '宸叉嫧浠�',
+ [EnterpriseRechargeStatusEnum.CheckReject]: '瀹℃牳鏈�氳繃',
+};
+
+export enum EnterprisePrechargeInComeStatusEnum {
+ /** 鏈叆璐�*/
+ NotInCome = 10,
+ /** 宸插叆璐�*/
+ HasInCome = 20,
+}
+
+export const EnterprisePrechargeInComeStatusEnumText = {
+ [EnterprisePrechargeInComeStatusEnum.NotInCome]: '鏈叆璐�',
+ [EnterprisePrechargeInComeStatusEnum.HasInCome]: '宸插叆璐�',
+};
diff --git a/src/services/api/ParkBountyApply.ts b/src/services/api/ParkBountyApply.ts
index 44fb7c0..ae8882e 100644
--- a/src/services/api/ParkBountyApply.ts
+++ b/src/services/api/ParkBountyApply.ts
@@ -4,7 +4,7 @@
/** 濂栧姳閲�-鍑鸿处 POST /api/ParkBountyApply/AuditParkBountyApplyTrade */
export async function auditParkBountyApplyTrade(
- body: API.AuditParkBountyTradeInput,
+ body: API.SyncAuditParkBountyTradeInput,
options?: API.RequestConfig
) {
return request<number>('/api/ParkBountyApply/AuditParkBountyApplyTrade', {
@@ -34,7 +34,7 @@
/** 濂栧姳閲�-鍑鸿处-璐㈠姟瀹℃壒 POST /api/ParkBountyApply/FinanceAuditParkBountyApplyTrade */
export async function financeAuditParkBountyApplyTrade(
- body: API.AuditParkBountyTradeInput,
+ body: API.SyncFinanceAuditParkBountyTradeInput,
options?: API.RequestConfig
) {
return request<number>('/api/ParkBountyApply/FinanceAuditParkBountyApplyTrade', {
@@ -45,6 +45,39 @@
data: body,
...(options || {}),
});
+}
+
+/** 姝ゅ鍚庣娌℃湁鎻愪緵娉ㄩ噴 POST /api/ParkBountyApply/GetEnterpriseDrawWithList */
+export async function getEnterpriseDrawWithList(
+ body: API.GetEnterpriseDrawWithListInput,
+ options?: API.RequestConfig
+) {
+ return request<API.GetEnterpriseDrawWithListOutputPageOutput>(
+ '/api/ParkBountyApply/GetEnterpriseDrawWithList',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 姝ゅ鍚庣娌℃湁鎻愪緵娉ㄩ噴 POST /api/ParkBountyApply/GetEnterprisePrechargeList */
+export async function getEnterprisePrechargeList(body: API.PageInput, options?: API.RequestConfig) {
+ return request<API.GetEnterprisePrechargeListOutputPageOutput>(
+ '/api/ParkBountyApply/GetEnterprisePrechargeList',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
}
/** 杩愯惀绔�-濂栧姳杩涘嚭璐﹁鎯� POST /api/ParkBountyApply/GetParkBountyTradeDetailList */
@@ -83,6 +116,42 @@
);
}
+/** 姝ゅ鍚庣娌℃湁鎻愪緵娉ㄩ噴 POST /api/ParkBountyApply/GetParkCustomerBountyFinanceList */
+export async function getParkCustomerBountyFinanceList(
+ body: API.QueryParkCustomerBountyApplyInput,
+ options?: API.RequestConfig
+) {
+ return request<API.GetParkCustomerBountyFinanceOutputPageOutput>(
+ '/api/ParkBountyApply/GetParkCustomerBountyFinanceList',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 鍥尯瀹㈡埛绠＄悊濂栧姳閲戝彂鏀捐褰� POST /api/ParkBountyApply/GetParkCustomerBountySettleList */
+export async function getParkCustomerBountySettleList(
+ body: API.QueryParkCustomerBountyApplyInput,
+ options?: API.RequestConfig
+) {
+ return request<API.GetParkCustomerBountySettleOutputPageOutput>(
+ '/api/ParkBountyApply/GetParkCustomerBountySettleList',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
/** 杩愯惀绔�斿鍔遍噾-鍑鸿处 POST /api/ParkBountyApply/ParkBountyApplyTrade */
export async function parkBountyApplyTrade(
body: API.CreateParkBountyTradeInput,
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 7769d30..793cec4 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -469,21 +469,13 @@
interface AuditParkBountyTradeBySelfInput {
/** 鍑鸿处璁板綍Id */
id?: string;
+ /** 818鍑鸿处璁板綍Id */
+ parkBountyApplyDetailId?: string;
selfAuditStatus?: EnumParkBountyTradeDetailAuditStatus;
/** 瀹℃牳澶囨敞 */
selfAuditRemark?: string;
/** 瀹℃牳鍑瘉 */
selfAuditFileUrl?: string;
- }
-
- interface AuditParkBountyTradeInput {
- /** 鍑鸿处璁板綍Id */
- id?: string;
- auditStatus?: EnumParkBountyTradeDetailAuditStatus;
- /** 瀹℃牳澶囨敞 */
- auditRemark?: string;
- /** 瀹℃牳鍑瘉 */
- payAuditFileUrl?: string;
}
interface BaseAuthorizeDto {
@@ -531,6 +523,8 @@
interface BatchSyncUserAmountInput {
items?: SyncUserAmountInput[];
}
+
+ type BountyCheckStatusEnum = 10 | 20 | 30 | -10;
interface ChangePasswordInput {
currentPassword?: string;
@@ -745,6 +739,10 @@
downsizingInsuranceList?: string[];
}
+ type EnterprisePrechargeInComeStatusEnum = 10 | 20;
+
+ type EnterpriseRechargeStatusEnum = 10 | 20 | 30;
+
interface EntityExtensionDto {
properties?: Record<string, any>;
configuration?: Record<string, any>;
@@ -852,11 +850,65 @@
url?: string;
}
+ type FinanceStatusEnum = 1 | 2 | 3;
+
type FinanceTypeEnum = 10 | 20;
interface GetEffectingStaffListInput {
claimDateTime?: string;
idNumber?: string;
+ }
+
+ interface GetEnterpriseDrawWithListInput {
+ pageModel?: Pagination;
+ keyWord?: string;
+ beginDateTime?: string;
+ endDateTime?: string;
+ enterpriseId?: string;
+ checkStatus?: EnterpriseRechargeStatusEnum;
+ }
+
+ interface GetEnterpriseDrawWithListOutput {
+ drawWithId?: string;
+ enterpriseId?: string;
+ enterpriseName?: string;
+ societyCreditCode?: string;
+ creationTime?: string;
+ enterpriseType?: string;
+ parkName?: string;
+ parkType?: string;
+ amount?: number;
+ remainAmount?: number;
+ checkStatus?: EnterpriseRechargeStatusEnum;
+ checkTime?: string;
+ checkRemark?: string;
+ checkFileUrl?: string;
+ }
+
+ interface GetEnterpriseDrawWithListOutputPageOutput {
+ pageModel?: Pagination;
+ objectData?: any;
+ data?: GetEnterpriseDrawWithListOutput[];
+ }
+
+ interface GetEnterprisePrechargeListOutput {
+ id?: string;
+ /** 鍏呭�奸噾棰� */
+ prechargeAmount?: number;
+ /** 鍏呭�煎嚟璇� */
+ rechargeVoucherFileUrl?: string;
+ /** 瀹℃牳澶囨敞 */
+ checkRemark?: string;
+ checkStatus?: EnterpriseRechargeStatusEnum;
+ inComeStatus?: EnterprisePrechargeInComeStatusEnum;
+ /** 鎻愪氦鏃ユ湡 */
+ creationTime?: string;
+ }
+
+ interface GetEnterprisePrechargeListOutputPageOutput {
+ pageModel?: Pagination;
+ objectData?: any;
+ data?: GetEnterprisePrechargeListOutput[];
}
interface GetFeatureListResultDto {
@@ -1124,6 +1176,7 @@
/** 绀句細缁熶竴淇＄敤浠ｇ爜 */
societyCreditCode?: string;
id?: string;
+ parkBountyApplyDetailId?: string;
/** 鏈�杩戝嚭璐﹂噾棰� */
tradeAmount?: number;
/** 鍑鸿处鍑瘉 */
@@ -1209,6 +1262,63 @@
pageModel?: Pagination;
objectData?: any;
data?: GetParkBountyTradeOutput[];
+ }
+
+ interface GetParkCustomerBountyFinanceOutput {
+ id?: string;
+ /** 鐢宠鎵规鍙� */
+ batchNo?: string;
+ /** 鐢虫姤鏈堜唤 */
+ applyMonth?: string;
+ /** 鐢虫姤鎬婚 */
+ applySumAmount?: number;
+ /** 璐㈡斂鎷ㄤ粯閲戦 */
+ financeToAmount?: number;
+ /** 璐㈡斂鎷ㄤ粯鍏ヨ处鏃堕棿 */
+ financeToTime?: string;
+ /** 璐㈡斂鎷ㄤ粯鍙戞斁鏃ユ湡 */
+ financeTime?: string;
+ financeToStatus?: FinanceStatusEnum;
+ /** 鎷ㄤ粯鍏ヨ处鍑瘉 */
+ financeToFileUrl?: string;
+ inCheckStatus?: BountyCheckStatusEnum;
+ outCheckStatus?: BountyCheckStatusEnum;
+ }
+
+ interface GetParkCustomerBountyFinanceOutputPageOutput {
+ pageModel?: Pagination;
+ objectData?: any;
+ data?: GetParkCustomerBountyFinanceOutput[];
+ }
+
+ interface GetParkCustomerBountySettleOutput {
+ id?: string;
+ /** 鐢宠鎵规鍙� */
+ batchNo?: string;
+ /** 鐢虫姤鏈堜唤 */
+ applyMonth?: string;
+ /** 鐢虫姤鎬婚 */
+ applySumAmount?: number;
+ /** 骞冲彴鍏呭�煎叆璐︽椂闂� */
+ transferToTime?: string;
+ transferToStatus?: TransferToStatusEnum;
+ /** 骞冲彴鍏呭�奸噾棰� */
+ transferToAmount?: number;
+ /** 骞冲彴鍏呭�煎叆璐﹀嚟璇� */
+ transferToFileUrl?: string;
+ /** 璐㈡斂鎷ㄤ粯閲戦 */
+ financeToAmount?: number;
+ /** 骞冲彴鍏呭�煎彂鏀炬棩鏈� */
+ settleTime?: string;
+ financeToStatus?: FinanceStatusEnum;
+ inCheckStatus?: BountyCheckStatusEnum;
+ outCheckStatus?: BountyCheckStatusEnum;
+ }
+
+ interface GetParkCustomerBountySettleOutputPageOutput {
+ pageModel?: Pagination;
+ objectData?: any;
+ data?: GetParkCustomerBountySettleOutput[];
}
interface GetPermissionListResultDto {
@@ -2493,6 +2603,11 @@
importChannel?: string;
}
+ interface QueryParkCustomerBountyApplyInput {
+ pageModel?: Pagination;
+ id?: string;
+ }
+
interface QueryUserPageInput {
pageModel?: Pagination;
searchKey?: string;
@@ -2647,6 +2762,34 @@
modules: ModuleTypeInfo[];
}
+ interface SyncAuditParkBountyTradeInput {
+ /** 鍑鸿处璁板綍Id */
+ id?: string;
+ auditStatus?: EnumParkBountyTradeDetailAuditStatus;
+ /** 瀹℃牳澶囨敞 */
+ auditRemark?: string;
+ /** 瀹℃牳鍑瘉 */
+ payAuditFileUrl?: string;
+ /** 鍑鸿处鎿嶄綔浜� */
+ auditOperator?: string;
+ /** 鍑鸿处鎿嶄綔浜篒D */
+ auditOperatorId?: string;
+ }
+
+ interface SyncFinanceAuditParkBountyTradeInput {
+ /** 鍑鸿处璁板綍Id */
+ id?: string;
+ auditStatus?: EnumParkBountyTradeDetailAuditStatus;
+ /** 瀹℃牳澶囨敞 */
+ auditRemark?: string;
+ /** 瀹℃牳鍑瘉 */
+ payAuditFileUrl?: string;
+ /** 璐㈠姟瀹℃牳鎿嶄綔浜� */
+ financeAuditOperator?: string;
+ /** 璐㈠姟瀹℃牳鎿嶄綔浜篒d */
+ financeAuditOperatorId?: string;
+ }
+
interface SyncUserAmountInput {
/** 鐢ㄦ埛鍚嶇О */
id?: string;
@@ -2729,6 +2872,8 @@
timeZone?: TimeZone;
}
+ type TransferToStatusEnum = 1 | 2;
+
interface TypeApiDescriptionModel {
baseType?: string;
isEnum?: boolean;
diff --git a/src/views/BalanceManage/components/PaymentRecordView.vue b/src/views/BalanceManage/components/PaymentRecordView.vue
index c047694..9a20b0d 100644
--- a/src/views/BalanceManage/components/PaymentRecordView.vue
+++ b/src/views/BalanceManage/components/PaymentRecordView.vue
@@ -24,7 +24,7 @@
} from '@bole-core/components';
import { OrderInputType } from '@bole-core/core';
import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
-// import { FinanceStatusEnum, FinanceStatusEnumText } from '@/constants';
+import { FinanceStatusEnum, FinanceStatusEnumText } from '@/constants';
import { useUser } from '@/hooks';
import { convertApi2FormUrlBySeparator } from '@/utils';
@@ -104,7 +104,7 @@
orderInput: [{ property: 'financeToTime', order: OrderInputType.Desc }],
},
columnsRenderProps: {
- // financeToStatus: { type: 'enum', valueEnum: FinanceStatusEnumText },
+ financeToStatus: { type: 'enum', valueEnum: FinanceStatusEnumText },
financeToTime: { type: 'date', format: 'YYYY-MM-DD' },
applyMonth: { type: 'date', format: 'YYYY骞碝M鏈�' },
financeToAmount: { type: 'money' },
diff --git a/src/views/BalanceManage/components/RechargeRecordView.vue b/src/views/BalanceManage/components/RechargeRecordView.vue
index d686886..2f560b0 100644
--- a/src/views/BalanceManage/components/RechargeRecordView.vue
+++ b/src/views/BalanceManage/components/RechargeRecordView.vue
@@ -4,14 +4,14 @@
<ProTableV2 v-bind="proTableProps" :columns="column" :operationBtns="operationBtns">
<template #checkStatus="{ data, row }">
<div style="display: flex; justify-content: center; align-items: center">
- <!-- {{ EnterpriseRechargeStatusEnumText[row.checkStatus] }} -->
- <!-- <el-tooltip
+ {{ EnterpriseRechargeStatusEnumText[row.checkStatus] }}
+ <el-tooltip
placement="top"
v-if="row.checkStatus === EnterpriseRechargeStatusEnum.CheckReject && row.checkRemark"
:content="row.checkRemark"
>
<el-icon color="#ff0000"><WarningFilled /></el-icon>
- </el-tooltip> -->
+ </el-tooltip>
</div>
</template>
<template #operationBtn-checkBtn="{ data, row }">
@@ -36,6 +36,12 @@
} from '@bole-core/components';
import { OrderInputType } from '@bole-core/core';
import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
+import {
+ EnterpriseRechargeStatusEnumText,
+ EnterpriseRechargeStatusEnum,
+ EnterprisePrechargeInComeStatusEnum,
+ EnterprisePrechargeInComeStatusEnumText,
+} from '@/constants';
import { useUser } from '@/hooks';
import { convertApi2FormUrlBySeparator } from '@/utils';
@@ -74,20 +80,17 @@
name: '鏌ョ湅鍑瘉',
},
extraProps: {
- // hide: (row) => row.inComeStatus !== EnterprisePrechargeInComeStatusEnum.HasInCome,
+ hide: (row) => row.inComeStatus !== EnterprisePrechargeInComeStatusEnum.HasInCome,
},
},
]);
const route = useRoute();
-const router = useRouter();
-const id = route.params.id as string;
const BaseState = {
loading: true,
};
const state = reactive({ ...BaseState });
-const { userDetail } = useUser();
const {
getDataSource: getList,
@@ -117,8 +120,8 @@
columnsRenderProps: {
creationTime: { type: 'date', format: 'YYYY-MM-DD' },
prechargeAmount: { type: 'money' },
- // checkStatus: { type: 'enum', valueEnum: EnterpriseRechargeStatusEnumText },
- // inComeStatus: { type: 'enum', valueEnum: EnterprisePrechargeInComeStatusEnumText },
+ checkStatus: { type: 'enum', valueEnum: EnterpriseRechargeStatusEnumText },
+ inComeStatus: { type: 'enum', valueEnum: EnterprisePrechargeInComeStatusEnumText },
},
}
);
diff --git a/src/views/BalanceManage/components/RewardGrantRecordView.vue b/src/views/BalanceManage/components/RewardGrantRecordView.vue
index 1c09155..ced3e51 100644
--- a/src/views/BalanceManage/components/RewardGrantRecordView.vue
+++ b/src/views/BalanceManage/components/RewardGrantRecordView.vue
@@ -10,9 +10,9 @@
<script setup lang="ts">
import { AppContainer, useTable, ProTableV2 } from '@bole-core/components';
import { OrderInputType } from '@bole-core/core';
-// import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
+import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
import { useUser } from '@/hooks';
-// import { TransferToStatusEnumText } from '@/constants';
+import { TransferToStatusEnumText } from '@/constants';
defineOptions({
name: 'RewardGrantRecordView',
@@ -83,7 +83,7 @@
orderInput: [{ property: 'settleTime', order: OrderInputType.Desc }],
},
columnsRenderProps: {
- // transferToStatus: { type: 'enum', valueEnum: TransferToStatusEnumText },
+ transferToStatus: { type: 'enum', valueEnum: TransferToStatusEnumText },
transferToTime: { type: 'date', format: 'YYYY-MM-DD' },
applyMonth: { type: 'date', format: 'YYYY骞碝M鏈�' },
transferToAmount: { type: 'money' },
diff --git a/src/views/BalanceManage/components/WithdrawalRecordView.vue b/src/views/BalanceManage/components/WithdrawalRecordView.vue
index 0c86755..269c24e 100644
--- a/src/views/BalanceManage/components/WithdrawalRecordView.vue
+++ b/src/views/BalanceManage/components/WithdrawalRecordView.vue
@@ -4,14 +4,14 @@
<ProTableV2 v-bind="proTableProps" :columns="column" :operationBtns="operationBtns">
<template #checkStatus="{ data, row }">
<div style="display: flex; justify-content: center; align-items: center">
- <!-- {{ EnterpriseRechargeStatusEnumTextWithdrawal[row.checkStatus] }} -->
- <!-- <el-tooltip
+ {{ EnterpriseRechargeStatusEnumTextWithdrawal[row.checkStatus] }}
+ <el-tooltip
placement="top"
v-if="row.checkStatus === EnterpriseRechargeStatusEnum.CheckReject && row.checkRemark"
:content="row.checkRemark"
>
<el-icon color="#ff0000"><WarningFilled /></el-icon>
- </el-tooltip> -->
+ </el-tooltip>
</div>
</template>
<template #operationBtn-checkBtn="{ data, row }">
@@ -37,6 +37,10 @@
import { OrderInputType } from '@bole-core/core';
import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
import { useUser } from '@/hooks';
+import {
+ EnterpriseRechargeStatusEnumTextWithdrawal,
+ EnterpriseRechargeStatusEnum,
+} from '@/constants';
import { convertApi2FormUrlBySeparator } from '@/utils';
defineOptions({
@@ -88,7 +92,6 @@
};
const state = reactive({ ...BaseState });
-const { userDetail } = useUser();
const {
getDataSource: getList,
@@ -120,7 +123,7 @@
checkTime: { type: 'date', format: 'YYYY-MM-DD' },
amount: { type: 'money' },
remainAmount: { type: 'money' },
- // checkStatus: { type: 'enum', valueEnum: EnterpriseRechargeStatusEnumTextWithdrawal },
+ checkStatus: { type: 'enum', valueEnum: EnterpriseRechargeStatusEnumTextWithdrawal },
},
}
);
--
Gitblit v1.9.1