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 | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/views/FinanceManage/components/DistributionDetailView.vue b/src/views/FinanceManage/components/DistributionDetailView.vue
index be7aa59..4552955 100644
--- a/src/views/FinanceManage/components/DistributionDetailView.vue
+++ b/src/views/FinanceManage/components/DistributionDetailView.vue
@@ -6,6 +6,14 @@
:columns="DistributionDetailColumns"
:showOperationColumn="false"
>
+ <template #settlementStatus="{ row }">
+ {{
+ row.settlementStatus !== EnumTaskSettlementStatus.InProcess &&
+ row.settlementStatus !== EnumTaskSettlementStatus.Wait
+ ? '宸茬‘璁�'
+ : '寰呯‘璁�'
+ }}
+ </template>
</ProTableV2>
</AppContainer>
</LoadingLayout>
@@ -21,7 +29,7 @@
} from '@bole-core/components';
import { DistributionDetailColumns } from '../constants';
import * as userServices from '@/services/api/user';
-import { EnumTaskSettlementStatusText } from '@/constants';
+import { EnumTaskSettlementStatusText, EnumTaskSettlementStatus } from '@/constants';
defineOptions({
name: 'DistributionDetailView',
@@ -58,12 +66,25 @@
},
{
defaultExtraParams: {
- orderInput: [{ property: 'id', order: EnumPagedListOrder.Asc }],
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
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' },
},
}
);
--
Gitblit v1.9.1