From 1d922e2cd32532fc149fac86cd63e318431d22a4 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期五, 05 九月 2025 14:39:33 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient --- src/views/ServiceChargeManage/constants/columns.ts | 111 ++++++++++++++++++++++++++----------------------------- 1 files changed, 52 insertions(+), 59 deletions(-) diff --git a/src/views/ServiceChargeManage/constants/columns.ts b/src/views/ServiceChargeManage/constants/columns.ts index e4f1720..aecda4a 100644 --- a/src/views/ServiceChargeManage/constants/columns.ts +++ b/src/views/ServiceChargeManage/constants/columns.ts @@ -8,67 +8,47 @@ }, { id: '2', - enCode: 'name', - name: '鍙戞斁鏂瑰紡', + enCode: 'code', + name: '浠诲姟鍗曞彿', }, { id: '3', - enCode: 'name', - name: '鏀舵浜�', - }, - { - id: '4', - enCode: 'name', - name: '鏀舵璐﹀彿', - }, - { - id: '5', - enCode: 'name', + enCode: 'settlementOrderStatus', name: '缁撶畻鍗曠姸鎬�', }, { - id: '6', - enCode: 'name', + id: '4', + enCode: 'settlementOrderName', name: '缁撶畻鍗曞悕绉�', }, { - id: '7', - enCode: 'signNum', + id: '5', + enCode: 'settlementOrderTime', name: '涓婁紶鏃堕棿', }, { + id: '6', + enCode: 'actualSettlementAmount', + name: '瀹炲彂閲戦', + }, + { + id: '7', + enCode: 'settlementAmount', + name: '缁撶畻閲戦', + }, + { id: '8', - enCode: 'name', + enCode: 'settlementStatus', name: '缁撶畻鐘舵��', }, { id: '9', - enCode: 'name', - name: '瀹炲彂閲戦', - }, - { - id: '10', - enCode: 'name', - name: '缁撶畻閲戦', - }, - { - id: '11', - enCode: 'name', - name: '澶辫触閲戦', - }, - { - id: '12', - enCode: 'name', - name: '閫�娆鹃噾棰�', - }, - { - id: '13', - enCode: 'name', + enCode: 'settlementTime', name: '缁撶畻鏃堕棿', }, { - id: '14', - enCode: 'name', + id: '10', + enCode: 'settlementRemark', name: '澶囨敞', }, ]); @@ -81,52 +61,65 @@ }, { id: '2', - enCode: 'name', + enCode: 'identity', name: '韬唤璇佸彿', }, { id: '3', - enCode: 'name', + enCode: 'contactPhoneNumber', name: '鎵嬫満鍙�', }, { id: '4', - enCode: 'name', + enCode: 'bank', name: '鎵�灞為摱琛�', }, { id: '5', - enCode: 'name', + enCode: 'bankBranch', name: '鎵�灞炴敮琛�', }, { id: '6', - enCode: 'name', + enCode: 'receiveAccount', name: '鏀舵甯愭埛', }, { id: '7', - enCode: 'signNum', + enCode: 'settlementAmount', name: '缁撶畻閲戦', }, { id: '8', - enCode: 'name', + enCode: 'actualSettlementAmount', name: '瀹炲彂閲戦', }, { id: '9', - enCode: 'name', - name: '鐘舵��', - }, - { - id: '10', - enCode: 'name', - name: '缁撶畻娴佹按鍙�', - }, - { - id: '11', - enCode: 'name', + enCode: 'settlementTime', name: '缁撶畻鏃堕棿', }, ]); + +export const BalanceManageColumns = defineColumns([ + { + id: '1', + enCode: 'name', + name: '濮撳悕', + }, + { + id: '2', + enCode: 'name', + name: '鎵嬫満鍙�', + }, + { + id: '3', + enCode: 'name', + name: '韬唤璇佸彿', + }, + { + id: '4', + enCode: 'name', + name: '璐︽埛浣欓', + }, +]); -- Gitblit v1.9.1