From 56eeb2671661ac45fc8d3129951dad96a5bd1f9b Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 19 十月 2025 15:24:16 +0800
Subject: [PATCH] Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-1.2.0.1
---
src/views/FinanceManage/components/DistributionDetailView.vue | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/src/views/FinanceManage/components/DistributionDetailView.vue b/src/views/FinanceManage/components/DistributionDetailView.vue
index 8bd249b..dfce1fa 100644
--- a/src/views/FinanceManage/components/DistributionDetailView.vue
+++ b/src/views/FinanceManage/components/DistributionDetailView.vue
@@ -4,7 +4,7 @@
<ProTableV2
v-bind="proTableProps"
:columns="DistributionDetailColumns"
- :operationBtns="operationBtns"
+ :showOperationColumn="false"
>
</ProTableV2>
</AppContainer>
@@ -20,8 +20,8 @@
defineOperationBtns,
} from '@bole-core/components';
import { DistributionDetailColumns } from '../constants';
-import * as taskServices from '@/services/api/task';
-import { usePersonalUserTransactions } from '../hooks/financeHooks';
+import * as userServices from '@/services/api/user';
+import { EnumTaskSettlementStatusText } from '@/constants';
defineOptions({
name: 'DistributionDetailView',
@@ -35,9 +35,38 @@
const state = reactive({ ...BaseState });
-const { getList, proTableProps } = usePersonalUserTransactions({
- type: EnumUserWalletTransactionType.Withdraw,
-});
+const {
+ getDataSource: getList,
+ proTableProps,
+ paginationState,
+ extraParamState,
+ reset,
+} = useTable(
+ async ({ pageIndex, pageSize }, extraParamState) => {
+ try {
+ let params: API.GetPersonalUserTransactionsQuery = {
+ pageModel: {
+ rows: pageSize,
+ page: pageIndex,
+ orderInput: extraParamState.orderInput,
+ },
+ type: EnumUserWalletTransactionType.Income,
+ };
+ let res = await userServices.getPersonalUserTransactions(params);
+ return res;
+ } catch (error) {}
+ },
+ {
+ defaultExtraParams: {
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
+ },
+ columnsRenderProps: {
+ amount: { type: 'money' },
+ settlementStatus: { type: 'enum', valueEnum: EnumTaskSettlementStatusText },
+ settlementTime: { type: 'date' },
+ },
+ }
+);
onMounted(async () => {
await getList();
--
Gitblit v1.9.1