From 6e923a6a46e0c8ab08ef698a14e0b81548220b50 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Fri, 1 Apr 2022 16:09:06 +0800
Subject: [PATCH] edit

---
 .../driver-account-detail.component.ts        | 24 ++++++++++---------
 .../freight-account-detail.component.ts       |  2 +-
 .../platform-account-detail.component.ts      |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts
index 679bd575..7b27f0bc 100644
--- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts
+++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts
@@ -35,7 +35,8 @@ export class DriverAccountDetailComponent implements OnInit {
       ltdId: this.params.ltdId,
       projectId: this.params.projectId,
       enterpriseId: this.params.enterpriseId,
-      roleId: this.params.roleId
+      roleId: this.params.roleId,
+      bankType: this.params.bankType,
     });
     if (this.sf) {
       Object.assign(requestOptions.body, {
@@ -59,6 +60,7 @@ export class DriverAccountDetailComponent implements OnInit {
         roleId: this.params.roleId,
         pageIndex: this.st.pi,
         pageSize: this.st.ps,
+        bankType: this.params.bankType,
         createTime: {
           start: this.sf?.value?.createTime?.[0] || '',
           end: this.sf?.value?.createTime?.[1] || ''
@@ -162,13 +164,13 @@ export class DriverAccountDetailComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
-      { title: '交易时间', index: 'createTime', type: 'date' },
-      { title: '流水号', index: 'channelPaySn' },
-      { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center' },
-      { title: '交易单号', index: 'businessNumber' },
-      { title: '订单号', index: 'orderSn' },
-      { title: '运单号', index: 'transportSn' },
-      { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center' },
+      { title: '交易时间', index: 'createTime', type: 'date', width: 150 },
+      { title: '流水号', index: 'channelPaySn', width: 170 },
+      { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center', width: 150 },
+      { title: '交易单号', index: 'businessNumber' , width: 190},
+      { title: '订单号', index: 'orderSn' , width: 190},
+      { title: '运单号', index: 'transportSn', width: 190 },
+      { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center', width: 150 },
       {
         title: '交易金额',
         index: 'amount',
@@ -185,9 +187,9 @@ export class DriverAccountDetailComponent implements OnInit {
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) }
       },
-      { title: '付款方', index: 'payName'},
-      { title: '收款方', index: 'payeeName' },
-      { title: '备注', index: 'tradeContent' },
+      { title: '付款方', index: 'payName', width: 150},
+      { title: '收款方', index: 'incomeName', width: 150 },
+      { title: '备注', index: 'tradeContent' , width: 150},
     ];
   }
 }
diff --git a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
index 499dee65..410c7fac 100644
--- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
+++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
@@ -221,7 +221,7 @@ export class FreightAccountDetailComponent implements OnInit {
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) }
       },
       { title: '付款方', index: 'payName' , width: 170},
-      { title: '收款方', index: 'payeeName', width: 170 },
+      { title: '收款方', index: 'incomeName', width: 170 },
       { title: '备注', index: 'tradeContent', width: 170 }
     ];
   }
diff --git a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
index 8c4575d4..ed00c9f4 100644
--- a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
+++ b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
@@ -221,7 +221,7 @@ export class PlatformAccountDetailComponent implements OnInit {
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) }
       },
       { title: '付款方', index: 'payName', className: 'text-center', width: 150 },
-      { title: '收款方', index: 'payeeName', className: 'text-center', width: 150 },
+      { title: '收款方', index: 'incomeName', className: 'text-center', width: 150 },
       { title: '备注', index: 'tradeContent', className: 'text-center', width: 150 }
     ];
   }