From b69aaa38d56d337370bee711edcd2c83ddfca1e6 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Tue, 10 May 2022 09:51:46 +0800
Subject: [PATCH 1/2] edit

---
 .../components/refund-record/refund-record.component.html | 7 ++++---
 .../components/refund-record/refund-record.component.ts   | 8 ++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/app/routes/financial-management/components/refund-record/refund-record.component.html b/src/app/routes/financial-management/components/refund-record/refund-record.component.html
index 463ab740..91bdd967 100644
--- a/src/app/routes/financial-management/components/refund-record/refund-record.component.html
+++ b/src/app/routes/financial-management/components/refund-record/refund-record.component.html
@@ -41,9 +41,10 @@
             {{ item.orderRefundCode }} <br> {{ item.refundStatusLabel }}
         </ng-template>
         <ng-template st-row="refundAmount" let-item let-index="index" let-column="column">
-            <ng-container *ngFor="let cost of item.billRefundDetailVOS">
-                {{cost.costName}}：{{ cost.refundAmount |currency }}<br>
-            </ng-container>
+            <p *ngFor="let cost of item.billRefundDetailVOS"
+                style="display: flex;align-items: center;justify-content: space-between;margin: 0;">
+                <label> {{cost.costName}}：</label><label>{{ cost.refundAmount |currency }}</label>
+            </p>
         </ng-template>
         <ng-template st-row="billRefundPaymentVOS" let-item let-index="index" let-column="column">
             <ng-container *ngFor="let bill of item.billRefundPaymentVOS">
diff --git a/src/app/routes/financial-management/components/refund-record/refund-record.component.ts b/src/app/routes/financial-management/components/refund-record/refund-record.component.ts
index 6a190102..61845c4c 100644
--- a/src/app/routes/financial-management/components/refund-record/refund-record.component.ts
+++ b/src/app/routes/financial-management/components/refund-record/refund-record.component.ts
@@ -233,6 +233,14 @@ export class RefundRecordComponent extends BasicTableComponent implements OnInit
       { title: '退款单号', render: 'orderRefundCode', width: 190 },
       { title: '退款类型', index: 'refundTypeLabel', width: 140 },
       { title: '退款金额', render: 'refundAmount', className: 'text-right', width: 180 },
+      {
+        title: '合计金额',
+        index: 'refundAmount',
+        width: 150,
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.refundAmount }) }
+      },
       { title: '退款时间', index: 'refundExecuteTime', width: 170 },
       { title: '货主', index: 'enterpriseInfoName', width: 150 },
       { title: '所属项目', index: 'enterpriseProjectName', width: 140 },

From bdca87d0eca5912751cc0e245f5819ed89abfadc Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Tue, 10 May 2022 10:16:23 +0800
Subject: [PATCH 2/2] edit

---
 .../voucher-management/voucher-management.component.ts          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
index 8d03e555..fb1ac5d8 100644
--- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
+++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
@@ -63,7 +63,7 @@ export class VoucherManagementComponent extends BasicTableComponent {
 
   // 导出
   exprot() {
-    this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_asyncExportBillPaymentApplicationList);
+    this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_fico_vch_export);
   }
 
   private initSF(): SFSchema {