From 2e5203df4320d35161fb51659b336a93594b90d2 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Sat, 9 Apr 2022 17:11:41 +0800
Subject: [PATCH] fix bug

---
 .../etc-blacklist.component.html              | 75 ++++++++++++-------
 .../etc-blacklist/etc-blacklist.component.ts  | 10 ++-
 .../services/ticket.service.ts                |  6 +-
 3 files changed, 62 insertions(+), 29 deletions(-)

diff --git a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html
index 007c85c4..94d5cf5f 100644
--- a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html
+++ b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html
@@ -1,36 +1,57 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-06 10:57:56
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-09 17:07:02
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\etc-blacklist\\etc-blacklist.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <page-header-wrapper [title]="'ETC白名单'" [content]="content">
-    <ng-template #content>
-        <nz-tabset class="tabs-wrap">
-            <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="changeTab(tab)"> </nz-tab>
-        </nz-tabset>
-    </ng-template>
+  <ng-template #content>
+    <nz-tabset class="tabs-wrap">
+      <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="changeTab(tab)"> </nz-tab>
+    </nz-tabset>
+  </ng-template>
 </page-header-wrapper>
 
 <nz-card class="search-box">
-    <div nz-row nzGutter="8">
-        <div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-            <sf #sf [schema]="searchSchema"
-                [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
-                [button]="'none'"></sf>
-        </div>
-        <div nz-col [nzXl]="6" [nzLg]="24" [nzMd]="24" [nzSm]="24" [nzXs]="24" class="text-right">
-            <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
-            <button nz-button (click)="resetSF()">重置</button>
-            <button nz-button> 导出</button>
-        </div>
+  <div nz-row nzGutter="8">
+    <div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+      <sf
+        #sf
+        [schema]="searchSchema"
+        [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
+        [compact]="true"
+        [button]="'none'"
+      ></sf>
     </div>
+    <div nz-col [nzXl]="6" [nzLg]="24" [nzMd]="24" [nzSm]="24" [nzXs]="24" class="text-right">
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+      <button nz-button (click)="resetSF()">重置</button>
+      <button nz-button (click)="exprot()"> 导出</button>
+    </div>
+  </div>
 </nz-card>
 
 <nz-card>
-    <div class="d-flex align-items-center mb-md">
-        <button nz-button (click)="configAction()">添加</button>
-        <button nz-button (click)="deleteAction()">删除</button>
-        <div class="ml-md">
-            已选择
-            <strong class="text-primary">{{ selectedRows.length }}</strong> 条数据
-            <a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
-        </div>
+  <div class="d-flex align-items-center mb-md">
+    <button nz-button (click)="configAction()">添加</button>
+    <button nz-button (click)="deleteAction()">删除</button>
+    <div class="ml-md">
+      已选择
+      <strong class="text-primary">{{ selectedRows.length }}</strong> 条数据
+      <a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
     </div>
-    <st #st [data]="tabType===1?service.$api_get_etc_shipper_list:service.$api_get_etc_cart_page" [columns]="columns"
-        [page]="{}" [req]="{ process: beforeReq }" [loading]="false" (change)="stChange($event)"></st>
-</nz-card>
\ No newline at end of file
+  </div>
+  <st
+    #st
+    [data]="tabType === 1 ? service.$api_get_etc_shipper_list : service.$api_get_etc_cart_page"
+    [columns]="columns"
+    [page]="{}"
+    [req]="{ process: beforeReq }"
+    [loading]="false"
+    (change)="stChange($event)"
+  ></st>
+</nz-card>
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 413fe016..a899ade5 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
@@ -245,7 +245,7 @@ export class ETCBlacklistComponent implements OnInit {
               tabType: (value: number) => this.tabType === 2
             }
           }
-        },
+        }
         // params6: {
         //   title: '手机号',
         //   type: 'string',
@@ -294,4 +294,12 @@ export class ETCBlacklistComponent implements OnInit {
       }
     ];
   }
+  // 导出
+  exprot() {
+    if (this.tabType == 1) {
+      this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_aficoShipperWhiteList_asyncExport);
+    } else {
+      this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_ficoCarWhiteList_asyncExport);
+    }
+  }
 }
diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts
index 51225f25..77f68a0c 100644
--- a/src/app/routes/ticket-management/services/ticket.service.ts
+++ b/src/app/routes/ticket-management/services/ticket.service.ts
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-29 13:12:35
- * @LastEditTime : 2022-04-09 15:49:11
+ * @LastEditTime : 2022-04-09 17:08:15
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\ticket-management\\services\\ticket.service.ts
@@ -136,6 +136,10 @@ export class TicketService extends ShipperBaseService {
   $api_get_asyncExportEtcApplyList = '/api/sdc/invoiceEtcOperate/asyncExportEtcApplyList';
   // ETC开票记录导出
   $api_get_asyncExportEtcApplyRecordList = '/api/sdc/invoiceEtcOperate/asyncExportEtcApplyRecordList';
+  // ETC白名单（货主）导出接口
+  $api_get_aficoShipperWhiteList_asyncExport = '/api/fcc/ficoShipperWhiteList/asyncExport';
+  // ETC白名单（车辆）导出接口
+  $api_get_ficoCarWhiteList_asyncExport = '/api/fcc/ficoCarWhiteList/asyncExport';
 
   constructor(public injector: Injector) {
     super(injector);