From b568ac9dd2f4483fea23d918edf301269c397118 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 8 Apr 2022 16:08:34 +0800 Subject: [PATCH] edit --- .../driver-account/driver-account.component.ts | 2 +- .../freight-account/freight-account.component.ts | 2 +- .../abnormal-warning/abnormal-warning.component.ts | 2 +- .../order-management/components/bulk/bulk.component.ts | 2 +- .../compliance-audit/compliance-audit.component.ts | 2 +- .../receipts-audit/receipts-audit.component.ts | 2 +- .../order-management/components/risk/risk.component.ts | 2 +- .../components/vehicle/vehicle.component.ts | 2 +- .../components/bulk/bulk.component.ts | 2 +- .../components/vehicle/vehicle.component.ts | 2 +- .../invoice-detail/invoice-detail.component.html | 2 +- .../invoice-detail/invoice-detail.component.ts | 10 ++++++++++ .../ticket-management/services/ticket.service.ts | 2 ++ .../components/bulk/bulk.component.ts | 2 +- .../components/vehicle/vehicle.component.ts | 2 +- 15 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts index 9d0545cc..09830820 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts @@ -74,7 +74,7 @@ export class DriverAccountComponent implements OnInit { } exportList() { - this.service.asyncExport({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_driver_account_page); + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_driver_account_page); } private initSF(): SFSchema { diff --git a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts index 610f1efe..4fecfd91 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts @@ -80,7 +80,7 @@ export class FreightAccountComponent implements OnInit { } exportList() { - this.service.asyncExport({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_shipper); + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_shipper); } private initSF(): SFSchema { diff --git a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts index 68867622..a1a5dbf9 100644 --- a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts +++ b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts @@ -283,6 +283,6 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { // 导出 exprot() { - this.service.asyncExport(this.reqParams, this.service.$api_get_asyncExportSpotCheckList); + this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportSpotCheckList); } } diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 00a306fb..8aed0d9b 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -851,6 +851,6 @@ export class OrderManagementBulkComponent implements OnInit { } // 导出 exprot() { - this.service.asyncExport(this.reqParams,this.service.$api_get_asyncExportBulkList); + this.service.exportStart(this.reqParams,this.service.$api_get_asyncExportBulkList); } } diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index 5ae60cc3..386efae2 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts @@ -696,6 +696,6 @@ export class OrderManagementComplianceAuditComponent implements OnInit { } // 导出 exprot() { - this.service.asyncExport(this.reqParams, this.service.$api_get_asyncExportSpotCheckList); + this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportSpotCheckList); } } diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts index a8b7fe1f..738f45fc 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts @@ -578,6 +578,6 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { } // 导出 exprot() { - this.service.asyncExport(this.reqParams, this.service.$api_get_asyncExportExamineBillList); + this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportExamineBillList); } } diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts index 14e690d7..c0591e1d 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -534,6 +534,6 @@ export class OrderManagementRiskComponent implements OnInit { } // 导出 exprot() { - this.service.asyncExport(this.reqParams, this.service.$api_get_asyncExportRiskBillList); + this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportRiskBillList); } } diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 58b2f93d..33976857 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -866,6 +866,6 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme } // 导出 exprot() { - this.service.asyncExport(this.reqParams, this.service.$api_get_asyncExportWholeList); + this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportWholeList); } } diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts index 14fddd9a..9e90a8f6 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -568,6 +568,6 @@ export class SupplyManagementBulkComponent implements OnInit { userAction() {} // 导出 exportFire() { - this.service.asyncExport(this.reqParams, this.service.$api_asyncExportBulkList); + this.service.exportStart(this.reqParams, this.service.$api_asyncExportBulkList); } } diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index c469dc82..e24a5a29 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -685,6 +685,6 @@ export class SupplyManagementVehicleComponent implements OnInit { } // 导出 exportFire() { - this.service.asyncExport(this.reqParams, this.service.$api_asyncExportWholeList); + this.service.exportStart(this.reqParams, this.service.$api_asyncExportWholeList); } } diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html index 88dd0af1..32ca65f4 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html @@ -81,7 +81,7 @@
- +
diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts index ce250896..116357d8 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts @@ -107,6 +107,16 @@ export class InvoiceDetailComponent implements OnInit { } } + exportList() { + const params = { listSource: 1, pageSize: -1, vatinvHId: this.id }; + if (this.orderSf) { + Object.assign(params, { + ...this.orderSf.value + }); + } + this.service.exportStart(params, this.service.$api_export_invoice_order_detail); + } + private initOrderSF(): SFSchema { return { properties: { diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index 23e50119..33bea9ba 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -73,6 +73,8 @@ export class TicketService extends ShipperBaseService { $api_get_invoice_header_detail = '/api/fcc/ficoVatinvH/get'; // 获取分票发票抬头开票申请订单明细 $api_get_invoice_order_detail = '/api/fcc/ficoVatappBill/getDetailByVatinvHId'; + // 货主/运营端获取开票申请订单明细导出 + $api_export_invoice_order_detail = '/api/fcc/ficoVatappBill/reportDetailByVatapp'; // 获取分票发票抬头开票申请费用明细 $api_get_invoice_cost_detail = '/api/fcc/ficoVatappFee/getDetailByVatinvHId'; // 获取分票发票明细 diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts index cb6a8a74..e3b993be 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts @@ -480,6 +480,6 @@ export class WaybillManagementBulkComponent implements OnInit { } // 导出 exprot() { - this.service.asyncExport(this.reqParams,this.service.$api_asyncExportBulkList) + this.service.exportStart(this.reqParams,this.service.$api_asyncExportBulkList) } } diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts index 189a802a..eb87999f 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts @@ -489,6 +489,6 @@ export class WaybillManagementVehicleComponent implements OnInit { } // 导出 exprot() { - this.service.asyncExport(this.reqParams, this.service.$api_asyncExportWholeList); + this.service.exportStart(this.reqParams, this.service.$api_asyncExportWholeList); } }