From b48fe7f21b588e9117dddc95bc85ca89a84fd64c Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 13 May 2022 14:14:11 +0800 Subject: [PATCH] edit --- .../basic-table/basic-table.component.ts | 2 -- .../order-reporting.component.html | 2 +- .../order-reporting/order-reporting.component.ts | 16 ++++++++++------ .../services/tax-management.service.ts | 2 ++ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/app/routes/commom/components/basic-table/basic-table.component.ts b/src/app/routes/commom/components/basic-table/basic-table.component.ts index f25482d7..c017940b 100644 --- a/src/app/routes/commom/components/basic-table/basic-table.component.ts +++ b/src/app/routes/commom/components/basic-table/basic-table.component.ts @@ -59,8 +59,6 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy, OnReuseDes } openDrawer() { - console.log(this.sfValue); - if (this.searchDrawerService.drawer?.length > 0) { this.searchDrawerService.create(this.sfValue, this.schema); } else { diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html index c857bbf0..b4ed1992 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html @@ -109,7 +109,7 @@ - + diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index 654eca3b..50121b63 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -290,14 +290,14 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im resetData() { let params: any = {}; if (this.selectedRows.length === 0) { - params ={} - } else{ - params =[] + params = {}; + } else { + params = []; this.selectedRows.forEach(item => { params.push(item.billId); }); } - + this.service.request(this.service.$api_get_renewalOrderById, params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('更新成功'); @@ -436,6 +436,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im const modalRef = this.modal.create({ nzTitle: '本地校验结果', nzWidth: 1200, + nzNoAnimation: true, nzContent: TaxManagementOrderVerifyResultComponent, nzComponentParams: { record: item @@ -467,7 +468,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im * 异步导出 */ export() { - this.service.exportStart({...this.reqParams, pageSize: -1} ,this.service.$api_async_export_order_reporting_list); + this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_async_export_order_reporting_list); } openWainingModal(content: string, title = '提示') { @@ -479,10 +480,13 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im } viewPhoto(images: any[]) { - if (images.length > 0) { const imgs = images.map(item => ({ src: item })); this.imageService.preview(imgs); } } + + exportList() { + this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_getTaxOrderPage_page_export); + } } diff --git a/src/app/routes/tax-management/services/tax-management.service.ts b/src/app/routes/tax-management/services/tax-management.service.ts index ebe510bb..7837d991 100644 --- a/src/app/routes/tax-management/services/tax-management.service.ts +++ b/src/app/routes/tax-management/services/tax-management.service.ts @@ -37,6 +37,8 @@ export class TaxManagementService extends ShipperBaseService { // 订单上报列表 $api_getTaxOrderPage_page = `/api/sdc/taxOrder/getTaxOrderPage`; + // 订单上报列表 + $api_getTaxOrderPage_page_export = `/api/sdc/taxOrder/asyncExport`; // 根据订单Id更新税务订单 $api_get_renewalOrderById = `/api/sdc/taxOrder/renewalOrderById`; // 撤回税务订单