From 562ce39634ac548a384b94415e8ee17d205ddfc7 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 03 十一月 2025 09:59:35 +0800
Subject: [PATCH] fix: bug
---
src/views/FinanceManage/constants/columns.ts | 12 +++++++++++-
src/services/api/typings.d.ts | 5 +++--
src/views/FinanceManage/components/DistributionDetailView.vue | 3 ++-
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index e5a0a7c..90c7752 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -5846,6 +5846,7 @@
/** 缁撶畻鍗曞悕绉� */
settlementOrderName?: string;
settlementStatus?: EnumTaskSettlementStatus;
+ settlementReceiveStatus?: SettlementReceiveStatus;
/** 缁撶畻鏃堕棿 */
settlementTime?: string;
/** 浠樻浜鸿处鎴� */
@@ -7828,6 +7829,8 @@
}
interface SavePartyAEnterpriseCommand {
+ /** Id */
+ id?: string;
/** 浼佷笟鍚嶇О */
enterpriseName: string;
/** 娉曚汉濮撳悕 */
@@ -7866,8 +7869,6 @@
password?: string;
/** 鎿嶄綔瀵嗙爜锛堥�夊～ 濉簡灏辨敼涓嶅～灏变笉鏀癸級 */
operatorPassword?: string;
- /** Id */
- id?: string;
}
interface SavePersonalUserBankCardCommand {
diff --git a/src/views/FinanceManage/components/DistributionDetailView.vue b/src/views/FinanceManage/components/DistributionDetailView.vue
index 1e7e395..05687b2 100644
--- a/src/views/FinanceManage/components/DistributionDetailView.vue
+++ b/src/views/FinanceManage/components/DistributionDetailView.vue
@@ -21,7 +21,7 @@
} from '@bole-core/components';
import { DistributionDetailColumns } from '../constants';
import * as userServices from '@/services/api/user';
-import { EnumTaskSettlementStatusText } from '@/constants';
+import { EnumTaskSettlementStatusText, SettlementReceiveStatusText } from '@/constants';
defineOptions({
name: 'DistributionDetailView',
@@ -64,6 +64,7 @@
amount: { type: 'money' },
settlementStatus: { type: 'enum', valueEnum: EnumTaskSettlementStatusText },
settlementAccess: { type: 'enum', valueEnum: EnumEnterpriseWalletAccessText },
+ settlementReceiveStatus: { type: 'enum', valueEnum: SettlementReceiveStatusText },
settlementTime: { type: 'date' },
},
}
diff --git a/src/views/FinanceManage/constants/columns.ts b/src/views/FinanceManage/constants/columns.ts
index 728b4e8..274af53 100644
--- a/src/views/FinanceManage/constants/columns.ts
+++ b/src/views/FinanceManage/constants/columns.ts
@@ -46,13 +46,23 @@
enCode: 'amount',
name: '缁撶畻閲戦',
},
+ // {
+ // id: '9',
+ // enCode: 'settlementStatus',
+ // name: '缁撶畻鐘舵��',
+ // },
{
id: '9',
enCode: 'settlementStatus',
- name: '缁撶畻鐘舵��',
+ name: '缁撶畻鍗曠姸鎬�',
},
{
id: '10',
+ enCode: 'settlementReceiveStatus',
+ name: '鍒拌处鐘舵��',
+ },
+ {
+ id: '11',
enCode: 'settlementTime',
name: '缁撶畻鏃ユ湡',
},
--
Gitblit v1.9.1