From 53d66e451c276ac1b9abebe06cc0e4b597639c9f Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Fri, 29 Apr 2022 17:47:47 +0800
Subject: [PATCH 1/2] edit

---
 .../components/payable-order/payable-order.component.html       | 2 +-
 .../components/payable-order/payable-order.component.ts         | 1 -
 .../components/receipts-audit/receipts-audit.component.html     | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.html b/src/app/routes/financial-management/components/payable-order/payable-order.component.html
index cbe647cb..be7fcedf 100644
--- a/src/app/routes/financial-management/components/payable-order/payable-order.component.html
+++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.html
@@ -51,6 +51,6 @@
         </div>
     </div>
     <st #st [data]="service.$api_get_fico_ph_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
-        [loading]="false" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
+        [loading]="false" [scroll]="{ x:'1200px',y:scrollY }" (change)="stChange($event)">
     </st>
 </nz-card>
\ No newline at end of file
diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts
index 447dfa8f..bfada0b6 100644
--- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts
+++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts
@@ -23,7 +23,6 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
   info: any = {};
   constructor(
     public service: FreightAccountService,
-    private nzModalService: NzModalService,
     private router: Router,
     public searchDrawerService: SearchDrawerService
   ) {
diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
index d367d660..ef8f05ff 100644
--- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
+++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
@@ -117,7 +117,7 @@
 <ng-template #extraTemplate>
   <div>
     <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
-      [acl-ability]="['ORDER-RECEIPTS-search']">查询</button>
+      [acl-ability]="['ORDER-RECEIPTS-search']">筛选</button>
     <button nz-button nzDanger [disabled]="false" (click)="exprot()">导出</button>
     <button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
       更多<i nz-icon nzType="down" nzTheme="outline"></i></button>

From 0d0f5b35963a17873dbc4d704cf8e168eb58fb69 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Fri, 29 Apr 2022 17:58:56 +0800
Subject: [PATCH 2/2] edit

---
 .../components/etc-blacklist/etc-blacklist.component.ts   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts
index 2a98b86e..28b4dac9 100644
--- a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts
+++ b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts
@@ -288,7 +288,13 @@ export class ETCBlacklistComponent implements OnInit {
         className: 'text-center',
         buttons: [
           {
-            text: '删除',
+            text: '删除', iif: () => this.tabType === 1,
+            acl: { ability: ['TICKET-ETC-BLACK_LIST-deleteFreight'] },
+            click: item => this.deleteAction(item)
+          },
+          {
+            text: '删除', iif: () => this.tabType === 2,
+            acl: { ability: ['TICKET-ETC-BLACK_LIST-deleteCart'] },
             click: item => this.deleteAction(item)
           }
         ]