From 9b77359fab3d0824b29ca1a71f7b316ccde805e1 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 17 九月 2025 17:39:37 +0800
Subject: [PATCH] Merge branch 'dev-v1.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-v1.1
---
src/views/ServiceChargeManage/constants/columns.ts | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/src/views/ServiceChargeManage/constants/columns.ts b/src/views/ServiceChargeManage/constants/columns.ts
index aecda4a..0c3f24a 100644
--- a/src/views/ServiceChargeManage/constants/columns.ts
+++ b/src/views/ServiceChargeManage/constants/columns.ts
@@ -13,41 +13,51 @@
},
{
id: '3',
+ enCode: 'checkReceiveStatus',
+ name: '楠屾敹鐘舵��',
+ },
+ {
+ id: '4',
enCode: 'settlementOrderStatus',
name: '缁撶畻鍗曠姸鎬�',
},
{
- id: '4',
+ id: '5',
enCode: 'settlementOrderName',
name: '缁撶畻鍗曞悕绉�',
},
{
- id: '5',
+ id: '6',
enCode: 'settlementOrderTime',
name: '涓婁紶鏃堕棿',
},
{
- id: '6',
+ id: '7',
enCode: 'actualSettlementAmount',
name: '瀹炲彂閲戦',
},
{
- id: '7',
+ id: '8',
enCode: 'settlementAmount',
name: '缁撶畻閲戦',
},
{
- id: '8',
+ id: '9',
enCode: 'settlementStatus',
name: '缁撶畻鐘舵��',
},
{
- id: '9',
+ id: '10',
+ enCode: 'createdTime',
+ name: '鍒涘缓鏃堕棿',
+ },
+ {
+ id: '11',
enCode: 'settlementTime',
name: '缁撶畻鏃堕棿',
},
{
- id: '10',
+ id: '12',
enCode: 'settlementRemark',
name: '澶囨敞',
},
@@ -96,6 +106,11 @@
},
{
id: '9',
+ enCode: 'settlementReceiveStatus',
+ name: '鍒拌处鐘舵��',
+ },
+ {
+ id: '10',
enCode: 'settlementTime',
name: '缁撶畻鏃堕棿',
},
@@ -109,17 +124,17 @@
},
{
id: '2',
- enCode: 'name',
+ enCode: 'contactPhoneNumber',
name: '鎵嬫満鍙�',
},
{
id: '3',
- enCode: 'name',
+ enCode: 'identity',
name: '韬唤璇佸彿',
},
{
id: '4',
- enCode: 'name',
+ enCode: 'balance',
name: '璐︽埛浣欓',
},
]);
--
Gitblit v1.9.1