From f393d0372b5ef06099a3591a4c77e61b48935a3b Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 19 九月 2025 15:57:18 +0800
Subject: [PATCH] Merge branch 'dev-v1.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-v1.1
---
src/views/FinanceManage/components/DistributionDetailView.vue | 42 ++++++++++++++++++------------------------
1 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/src/views/FinanceManage/components/DistributionDetailView.vue b/src/views/FinanceManage/components/DistributionDetailView.vue
index 10d3f52..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>
@@ -19,10 +19,9 @@
useTable,
defineOperationBtns,
} from '@bole-core/components';
-// import * as flexEnterpriseServices from '@/services/api/FlexEnterprise';
import { DistributionDetailColumns } from '../constants';
-import { FlexEnterpriseSettingStatus } from '@/constants';
-import { OrderInputType } from '@bole-core/core';
+import * as userServices from '@/services/api/user';
+import { EnumTaskSettlementStatusText } from '@/constants';
defineOptions({
name: 'DistributionDetailView',
@@ -36,11 +35,6 @@
const state = reactive({ ...BaseState });
-onMounted(async () => {
- await getList();
- state.loading = false;
-});
-
const {
getDataSource: getList,
proTableProps,
@@ -50,32 +44,32 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetFlexEnterpriseInput = {
+ let params: API.GetPersonalUserTransactionsQuery = {
pageModel: {
rows: pageSize,
page: pageIndex,
orderInput: extraParamState.orderInput,
},
- flexEnterpriseSettingStatus: extraParamState.flexEnterpriseSettingStatus,
- searchWord: extraParamState.searchWord,
+ type: EnumUserWalletTransactionType.Income,
};
-
- let res = await flexEnterpriseServices.getFlexEnterpriseList(params, {
- showLoading: !state.loading,
- });
+ let res = await userServices.getPersonalUserTransactions(params);
return res;
- } catch (error) {
- console.log('error: ', error);
- }
+ } catch (error) {}
},
{
defaultExtraParams: {
- searchWord: '',
- orderInput: [{ property: 'id', order: OrderInputType.Desc }],
- flexEnterpriseSettingStatus: '' as any as FlexEnterpriseSettingStatus,
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
- queryKey: ['flexEnterpriseServices/getFlexEnterpriseList'],
- columnsRenderProps: {},
+ columnsRenderProps: {
+ amount: { type: 'money' },
+ settlementStatus: { type: 'enum', valueEnum: EnumTaskSettlementStatusText },
+ settlementTime: { type: 'date' },
+ },
}
);
+
+onMounted(async () => {
+ await getList();
+ state.loading = false;
+});
</script>
--
Gitblit v1.9.1