From 3845400bfadd3700afbff34a11197cd0c50513ff Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Tue, 1 Mar 2022 15:25:18 +0800
Subject: [PATCH] edit

---
 .../driver-account-detail.component.html              |  6 +++---
 .../payment-record/payment-record.component.ts        |  4 ++--
 .../recharge-record/recharge-record.component.ts      | 11 +++++++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html
index 8c870a65..bb282f97 100644
--- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html
+++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html
@@ -15,17 +15,17 @@
             </nz-statistic>
         </nz-col>
         <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
-            <nz-statistic [nzValue]="(params?.availableBalance || 0)+'元' " [nzTitle]="'账户余额'"
+            <nz-statistic [nzValue]="((params?.availableBalance || 0) | currency)+'元' " [nzTitle]="'账户余额'"
                 [nzValueStyle]="{'font-size':'16px',color:'red'}">
             </nz-statistic>
         </nz-col>
         <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
-            <nz-statistic [nzValue]="(info?.incomeAmount || 0) +'元'" [nzTitle]="'收入金额'"
+            <nz-statistic [nzValue]="((info?.incomeAmount || 0) | currency) +'元'" [nzTitle]="'收入金额'"
                 [nzValueStyle]="{'font-size':'16px',color:'red'}">
             </nz-statistic>
         </nz-col>
         <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
-            <nz-statistic [nzValue]="(info?.payAmount || 0) +'元'" [nzTitle]="'支出金额'"
+            <nz-statistic [nzValue]="((info?.payAmount || 0)| currency) +'元'" [nzTitle]="'支出金额'"
                 [nzValueStyle]="{'font-size':'16px',color:'red'}">
             </nz-statistic>
         </nz-col>
diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts
index 500b02e0..a6383c75 100644
--- a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts
+++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts
@@ -242,7 +242,7 @@ export class PaymentRecordComponent implements OnInit {
       {
         title: '支付金额',
         render: 'payAmount',
-        width: 120,
+        width: 140,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.payAmount }) }
@@ -256,7 +256,7 @@ export class PaymentRecordComponent implements OnInit {
           (item.amountDetails as Array<any>).forEach(detail => {
             surcharge += detail.surcharge || 0;
           });
-          item.surcharge = surcharge;
+          item.surcharge = surcharge.toFixed(2);
           item.price = item.amountDetails?.[0]?.price || 0;
           return '';
         }
diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
index 576b5555..d2bf325d 100644
--- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
+++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
@@ -162,9 +162,16 @@ export class RechargeRecordComponent implements OnInit {
       { title: '网络货运人', index: 'ltdName', width: 160 },
       { title: '银行类型', index: 'bankTypeLabel', width: 100 },
       { title: '账户类型', index: 'accountTypeLabel', width: 100 },
-      { title: '账户名称', index: 'rechargeName', width: 140 },
+      { title: '账户名称', index: 'rechargeName', width: 160 },
       { title: '虚拟账户', index: 'virtualAccount', width: 100 },
-      { title: '充值金额', index: 'rechargeAmount', width: 100 },
+      {
+        title: '充值金额',
+        index: 'rechargeAmount',
+        width: 160,
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.rechargeAmount }) }
+      },
       { title: '充值银行账户', render: 'transferBankAccount', width: 200 },
       { title: '充值方式', index: 'payChannelLabel', width: 100 },
       { title: '充值状态', index: 'rechargeStatusLabel', width: 100 },