From d58e204d091034fccff97db8b4248c6cede7fb63 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 11 十一月 2025 15:21:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into dev-1.3.0.2
---
src/views/FinanceManage/components/DistributionDetailView.vue | 63 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/src/views/FinanceManage/components/DistributionDetailView.vue b/src/views/FinanceManage/components/DistributionDetailView.vue
index 86fe668..4552955 100644
--- a/src/views/FinanceManage/components/DistributionDetailView.vue
+++ b/src/views/FinanceManage/components/DistributionDetailView.vue
@@ -4,8 +4,16 @@
<ProTableV2
v-bind="proTableProps"
:columns="DistributionDetailColumns"
- :operationBtns="operationBtns"
+ :showOperationColumn="false"
>
+ <template #settlementStatus="{ row }">
+ {{
+ row.settlementStatus !== EnumTaskSettlementStatus.InProcess &&
+ row.settlementStatus !== EnumTaskSettlementStatus.Wait
+ ? '宸茬‘璁�'
+ : '寰呯‘璁�'
+ }}
+ </template>
</ProTableV2>
</AppContainer>
</LoadingLayout>
@@ -19,10 +27,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, EnumTaskSettlementStatus } from '@/constants';
defineOptions({
name: 'DistributionDetailView',
@@ -36,11 +43,6 @@
const state = reactive({ ...BaseState });
-onMounted(async () => {
- await getList();
- state.loading = false;
-});
-
const {
getDataSource: getList,
proTableProps,
@@ -50,32 +52,45 @@
} = 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 },
+ settlementAccess: { type: 'enum', valueEnum: EnumEnterpriseWalletAccessText },
+ settlementReceiveStatus: { type: 'enum', valueEnum: SettlementReceiveStatusText },
+ settlementAuditStatus: {
+ type: 'text',
+ formatter: (row: API.GetPersonalUserTransactionsQueryResultItem) => {
+ return row.settlementAuditStatus === EnumTaskSettlementAuditStatus.Pass
+ ? '宸叉彁浜�'
+ : '寰呮彁浜�';
+ },
+ },
+ settlementTime: { type: 'date' },
+ transDate: { type: 'date' },
+ createdTime: { type: 'date' },
+ settlementAuditTime: { type: 'date' },
+ },
}
);
+
+onMounted(async () => {
+ await getList();
+ state.loading = false;
+});
</script>
--
Gitblit v1.9.1