Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts

@@ -427,7 +427,7 @@ export class DatatableFundReportingComponent implements OnInit {
   * 异步导出
   */
   export() {
-    this.service.exportStart(this.sf?.value, this.service.$api_export_fund_reporting);
+    this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_fund_reporting);
   }
 
   openWainingModal(content: string, title = '提示') {

src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts

@@ -518,7 +518,7 @@ export class DatatableOrderReportingComponent implements OnInit {
   * 异步导出
   */
   export() {
-    this.service.exportStart(this.sf?.value, this.service.$api_export_reporting_order);
+    this.service.exportStart({...this.sf?.value, pageSize: -1 }, this.service.$api_export_reporting_order);
   }
 
   openWainingModal(content: string, title = '提示') {

src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts

@@ -47,7 +47,7 @@ export class AdvanceCollectionComponent {
   }
 
   exportList() {
-    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
+    this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPlatformAccountBalanceByOperator,);
   }
 
   private initSF(): SFSchema {

src/app/routes/financial-management/components/cost-management/cost-management.component.ts

@@ -90,7 +90,7 @@ export class CostManagementComponent implements OnInit {
   }
 
   exportList() {
-    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
+    this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPlatformAccountBalanceByOperator,);
   }
 
   routeTo(url: string, params?: any, status?: any) {

src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts

@@ -76,7 +76,7 @@ export class DriverAccountDetailComponent implements OnInit {
   stChange(e: STChange): void {}
 
   exportList() {
-    this.service.downloadFile(this.service.$api_get_exportAccountBalanceDriverByOperatorPage, { ...this.sf.value,  pageSize: -1 });
+    this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceDriverByOperatorPage,);
   }
 
   goBack() {

src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts

@@ -83,7 +83,7 @@ export class FreightAccountDetailComponent implements OnInit {
   stChange(e: STChange): void {}
 
   exportList() {
-    this.service.downloadFile(this.service.$api_get_exportAccountBalanceShipperByOperatorPage, { ...this.sf.value, pageSize: -1 });
+    this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceShipperByOperatorPage,);
   }
 
   goBack() {

src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts

@@ -66,7 +66,7 @@ export class PlatformAccountDetailComponent implements OnInit {
   stChange(e: STChange): void {}
 
   exportList() {
-    this.service.downloadFile(this.service.$api_get_exportAccountBalanceByPage, { ...this.sf.value, pageSize: -1 });
+    this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceByPage,);
   }
 
   goBack() {

src/app/routes/financial-management/components/platform-account/platform-account.component.ts

@@ -195,6 +195,6 @@ export class PlatformAccountComponent implements OnInit {
     ];
   }
   exportList() {
-    this.service.downloadFile(this.service.$api_get_exportPlatformAccountBalanceByOperator, { ...this.sf.value, pageSize: -1 });
+    this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPlatformAccountBalanceByOperator,);
   }
 }

src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts

@@ -79,7 +79,7 @@ export class RechargeRecordComponent implements OnInit {
   }
 
   exportList() {
-    this.service.downloadFile(this.service.$api_get_exportPageByOperator, { ...this.sf.value, pageSize: -1 });
+    this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPageByOperator,);
   }
 
   private initSF(): SFSchema {

src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts

@@ -262,6 +262,7 @@ export class TransactionFlowComponent {
     ];
   }
   exportList() {
-    this.service.downloadFile(this.service.$api_get_exportAccountBalanceDetailPage, { ...this.sf.value, pageSize: -1 });
+
+    this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceDetailPage,);
   }
 }

src/app/routes/financial-management/services/freight-account.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 15:57:44
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-08 17:30:12
+ * @LastEditTime : 2022-04-09 15:33:41
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\services\\freight-account.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */

src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts

@@ -285,6 +285,6 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
 
     // 导出
     exprot() {
-      this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportSpotCheckList);
+      this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportSpotCheckList);
     }
 }

src/app/routes/order-management/components/bulk/bulk.component.ts

@@ -851,6 +851,6 @@ export class OrderManagementBulkComponent implements OnInit {
   }
   // 导出
   exprot() {
-    this.service.exportStart(this.reqParams,this.service.$api_get_asyncExportBulkList);
+    this.service.exportStart({ ...this.reqParams, pageSize: -1 },this.service.$api_get_asyncExportBulkList);
   }
 }

src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts

@@ -696,6 +696,6 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
   }
     // 导出
     exprot() {
-      this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportSpotCheckList);
+      this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportSpotCheckList);
     }
 }

src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts

@@ -578,6 +578,6 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
   }
       // 导出
       exprot() {
-        this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportExamineBillList);
+        this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportExamineBillList);
       }
 }

src/app/routes/order-management/components/risk/risk.component.ts

@@ -534,6 +534,6 @@ export class OrderManagementRiskComponent implements OnInit {
   }
     // 导出
     exprot() {
-      this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportRiskBillList);
+      this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportRiskBillList);
     }
 }

src/app/routes/order-management/components/vehicle/vehicle.component.ts

@@ -866,6 +866,6 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
   }
     // 导出
     exprot() {
-      this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportWholeList);
+      this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportWholeList);
     }
 }

src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html

@@ -11,7 +11,7 @@
         <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="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>
+            <button nz-button (click)="exprot()"> 导出</button>
             <button nz-button nzType="link" (click)="expandToggle()">
                 {{ !_$expand ? '展开' : '收起' }}
                 <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts

@@ -184,4 +184,8 @@ export class ETCInvoicedListComponent implements OnInit {
       }
     ];
   }
+     // 导出
+     exprot() {
+      this.service.exportStart({...this.sf?.value, pageSize: -1}, this.service.$api_get_asyncExportEtcApplyRecordList);
+    }
 }

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-08 16:37:58
+ * @LastEditTime : 2022-04-09 15:49:11
  * @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
@@ -134,6 +134,8 @@ export class TicketService extends ShipperBaseService {
   $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode';
   // ETC申请开票导出
   $api_get_asyncExportEtcApplyList = '/api/sdc/invoiceEtcOperate/asyncExportEtcApplyList';
+  // ETC开票记录导出
+  $api_get_asyncExportEtcApplyRecordList = '/api/sdc/invoiceEtcOperate/asyncExportEtcApplyRecordList';
 
   constructor(public injector: Injector) {
     super(injector);