From f3d746181155c223bccdafcbbc45041e944e5eaa Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 21 十月 2025 20:20:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into dev-1.2.0.2
---
src/views/FinanceManage/FinanceManageList.vue | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/views/FinanceManage/FinanceManageList.vue b/src/views/FinanceManage/FinanceManageList.vue
index 183bcca..8163c16 100644
--- a/src/views/FinanceManage/FinanceManageList.vue
+++ b/src/views/FinanceManage/FinanceManageList.vue
@@ -19,7 +19,7 @@
} from '@bole-core/components';
import { useAccess } from '@/hooks';
import { ModelValueType } from 'element-plus';
-import * as enterpriseServices from '@/services/api/enterprise';
+import * as userServices from '@/services/api/user';
import FinanceDetailDialog from './components/FinanceDetailDialog.vue';
defineOptions({
@@ -55,15 +55,15 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetEnterprisesQuery = {
+ let params: API.GetPersonalUserTransactionsQuery = {
pageModel: {
rows: pageSize,
page: pageIndex,
orderInput: extraParamState.orderInput,
},
- // searchKeys: extraParamState.keyword,
+ type: EnumUserWalletTransactionType.Income,
};
- let res = await enterpriseServices.getEnterprises(params, {
+ let res = await userServices.getPersonalUserTransactions(params, {
showLoading: !state.loading,
});
return res;
@@ -71,14 +71,11 @@
},
{
defaultExtraParams: {
- keyword: '',
- pageType: '' as any as number,
- status: '' as any as boolean,
- beginDate: [] as unknown as ModelValueType,
- endDate: [] as unknown as ModelValueType,
- orderInput: [{ property: 'id', order: EnumPagedListOrder.Asc }],
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
- columnsRenderProps: {},
+ columnsRenderProps: {
+ transDate: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ },
}
);
--
Gitblit v1.9.1