From faf399ca4460588a702fc1f1893fb41f1448f7b6 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Thu, 14 Apr 2022 14:10:28 +0800
Subject: [PATCH] edit

---
 .../transaction-flow/transaction-flow.component.ts | 14 ++++++++++++--
 .../services/freight-account.service.ts            |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts
index 7f26b5ca..0e7987e9 100644
--- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts
+++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts
@@ -91,6 +91,16 @@ export class TransactionFlowComponent {
             placeholder: '请输入'
           }
         },
+        orderSn: {
+          type: 'string',
+          title: '订单号',
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
         tradeType: {
           type: 'string',
           title: '交易类型',
@@ -216,6 +226,7 @@ export class TransactionFlowComponent {
       { title: '流水号', index: 'transactionNumber', width: 180 },
       { title: '交易类型', index: 'tradeTypeLabel', width: 120 },
       { title: '关联单号', index: 'businessNumber', width: 150 },
+      { title: '订单号', index: 'orderSn', width: 150 },
       { title: '账户类型', index: 'accountTypeLabel', width: 130 },
       { title: '账户名称', index: 'roleName', width: 180 },
       { title: '所属项目', index: 'projectName', width: 140 },
@@ -262,7 +273,6 @@ export class TransactionFlowComponent {
     ];
   }
   exportList() {
-
-    this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceDetailPage,);
+    this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceDetailPage);
   }
 }
diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts
index 9056f8d9..c550bfde 100644
--- a/src/app/routes/financial-management/services/freight-account.service.ts
+++ b/src/app/routes/financial-management/services/freight-account.service.ts
@@ -173,7 +173,7 @@ export class FreightAccountService extends ShipperBaseService {
     const { bankType, snglFlgCd } = params;
     if (url) {
       if (params?.bankType === '1') {
-        window.open(params?.receiptUrl);
+        window.open(url);
       } else if (params?.bankType === '2') {
         window.open(url);
         // this.exportFile({ bankType, receiptUrl: url, bankSerialNumber: snglFlgCd }, this.$api_download_receipt_apply_byte);