From 0cce1559f3ef178aff9402942216bfa689e8b046 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 23 Mar 2022 10:30:58 +0800 Subject: [PATCH 1/3] edit --- .../invoice-requested.component.ts | 30 ++++++++++++++----- .../services/ticket.service.ts | 3 ++ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index 12465791..4cf2df39 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -33,7 +33,12 @@ export class InvoiceRequestedComponent { totalCallNo = 0; selectedRows: any[] = []; - constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router,public shipperservice: ShipperBaseService,) {} + constructor( + public service: TicketService, + private nzModalService: NzModalService, + private router: Router, + public shipperservice: ShipperBaseService + ) {} beforeReq = (requestOptions: STRequestOptions) => { if (this.resourceStatus) { @@ -226,6 +231,16 @@ export class InvoiceRequestedComponent { }); } + downloadPdf(item: any) { + this.service.request(this.service.$api_downloadPdf, { vatappHId: item.id }).subscribe(res => { + if (res?.reconciliationUrl) { + this.service.reviewPDF(res.reconciliationUrl); + } else { + this.service.msgSrv.warning('获取对账单失败'); + } + }); + } + /** * 重置表单 */ @@ -305,7 +320,7 @@ export class InvoiceRequestedComponent { visibleIf: { expand: (value: boolean) => value } - }, + } }, createTime: { title: '申请时间', @@ -349,7 +364,7 @@ export class InvoiceRequestedComponent { }, asyncData: () => this.shipperservice.getCRM() } - }, + } } }; } @@ -441,11 +456,12 @@ export class InvoiceRequestedComponent { text: '查看原因
', click: item => this.showReason(item), iif: item => item.sts === '4' + }, + { + text: '下载对账单', + iif: item => item.sts === '3', + click: item => this.downloadPdf(item) } - // { - // text: '下载对账单' - // // click: item => this.rejectAction(item) - // } ] } ]; diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index 71facc39..759dd0aa 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -108,6 +108,9 @@ export class TicketService extends ShipperBaseService { // 查询快递轨迹 $api_get_express_routes = '/api/fcc/ficoExpressH/searchRoutes'; + // 下载对账单文件 + $api_downloadPdf = '/api/fcc/ficoVatappBill/downloadPdf'; + constructor(public injector: Injector, public eaCacheSrv: EACacheService) { super(injector, eaCacheSrv); } From 8d31f21547f53daa583b01e311838e2be66a0215 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 23 Mar 2022 11:06:24 +0800 Subject: [PATCH 2/3] edit --- .../basic-table/basic-table.component.ts | 40 +++++++++++++++++++ .../components/vehicle/vehicle.component.ts | 34 +++------------- src/app/routes/routes.module.ts | 3 +- 3 files changed, 47 insertions(+), 30 deletions(-) create mode 100644 src/app/routes/commom/components/basic-table/basic-table.component.ts 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 new file mode 100644 index 00000000..99def7f4 --- /dev/null +++ b/src/app/routes/commom/components/basic-table/basic-table.component.ts @@ -0,0 +1,40 @@ +import { AfterViewInit, Component, OnInit } from '@angular/core'; +import { fromEvent } from 'rxjs'; +import { debounceTime } from 'rxjs/operators'; + +@Component({ + template: '' +}) +export class BasicTableComponent implements AfterViewInit { + scrollY = '400px'; + + constructor() {} + + ngAfterViewInit(): void { + setTimeout(() => { + this.getScrollY(); + }, 100); + fromEvent(window, 'resize') + .pipe(debounceTime(100)) + .subscribe(event => { + this.getScrollY(); + }); + } + + getScrollY() { + const windowHeight = window.innerHeight || Math.max(document.documentElement.clientHeight, document.body.clientHeight); + const header = document.getElementsByTagName('layout-pro-header')?.[0]; + if (windowHeight && header) { + let scrollY = windowHeight - header.clientHeight - 35 - 49; + const headerWrapper = document.getElementsByTagName('page-header-wrapper')?.[0]; + if (headerWrapper) { + scrollY -= headerWrapper.clientHeight; + } + const tabset = document.getElementsByTagName('nz-tabset')?.[0]; + if (tabset) { + scrollY -= tabset.clientHeight; + } + this.scrollY = scrollY + 'px'; + } + } +} 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 75d29b9a..c8efe1a0 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -6,6 +6,7 @@ import { ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { fromEvent, of } from 'rxjs'; import { debounceTime, map } from 'rxjs/operators'; +import { BasicTableComponent } from 'src/app/routes/commom/components/basic-table/basic-table.component'; import { OneCarOrderCancelConfirmComponent } from '../../modal/vehicle/cancel-confirm/cancel-confirm.component'; import { VehicleConfirReceiptComponent } from '../../modal/vehicle/confir-receipt/confir-receipt.component'; import { VehicleFreightPeopleComponent } from '../../modal/vehicle/freight-people/freight-people.component'; @@ -20,7 +21,7 @@ import { OrderManagementService } from '../../services/order-management.service' templateUrl: './vehicle.component.html', styleUrls: ['../../../commom/less/commom-table.less'] }) -export class OrderManagementVehicleComponent implements OnInit { +export class OrderManagementVehicleComponent extends BasicTableComponent implements OnInit { ui: SFUISchema = {}; schema: SFSchema = {}; auditMany = false; @@ -67,7 +68,6 @@ export class OrderManagementVehicleComponent implements OnInit { }; resourceStatus: any; - scrollY = '400px'; visible = false; constructor( public service: OrderManagementService, @@ -75,7 +75,9 @@ export class OrderManagementVehicleComponent implements OnInit { public shipperservice: ShipperBaseService, public router: Router, public ar: ActivatedRoute - ) {} + ) { + super(); + } /** * 查询参数 @@ -145,32 +147,6 @@ export class OrderManagementVehicleComponent implements OnInit { this.initST(); this.initSTFloat(); this.initSTFloatView(); - - setTimeout(() => { - this.getScrollY(); - }, 100); - fromEvent(window, 'resize') - .pipe(debounceTime(100)) - .subscribe(event => { - this.getScrollY(); - }); - } - - getScrollY() { - const windowHeight = window.innerHeight || Math.max(document.documentElement.clientHeight, document.body.clientHeight); - const header = document.getElementsByTagName('layout-pro-header')?.[0]; - if (windowHeight && header) { - let scrollY = windowHeight - header.clientHeight - 35 - 49; - const headerWrapper = document.getElementsByTagName('page-header-wrapper')?.[0]; - if (headerWrapper) { - scrollY -= headerWrapper.clientHeight; - } - const tabset = document.getElementsByTagName('nz-tabset')?.[0]; - if (tabset) { - scrollY -= tabset.clientHeight; - } - this.scrollY = scrollY + 'px'; - } } search() { diff --git a/src/app/routes/routes.module.ts b/src/app/routes/routes.module.ts index 1651bc70..5f911e3a 100644 --- a/src/app/routes/routes.module.ts +++ b/src/app/routes/routes.module.ts @@ -4,13 +4,14 @@ import { SharedModule } from '@shared'; // dashboard pages import { DashboardComponent } from './dashboard/dashboard.component'; import { RouteRoutingModule } from './routes-routing.module'; +import { BasicTableComponent } from './commom/components/basic-table/basic-table.component'; const COMPONENTS = [DashboardComponent]; const COMPONENTS_NOROUNT: Array> = []; @NgModule({ imports: [SharedModule, RouteRoutingModule], - declarations: [...COMPONENTS, ...COMPONENTS_NOROUNT], + declarations: [...COMPONENTS, ...COMPONENTS_NOROUNT, BasicTableComponent], entryComponents: COMPONENTS_NOROUNT }) export class RoutesModule {} From 2a065d7c6d2e3d2e506e4864b5796d55a4272fed Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 23 Mar 2022 11:22:38 +0800 Subject: [PATCH 3/3] edit --- src/app/routes/routes.module.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/routes.module.ts b/src/app/routes/routes.module.ts index 5f911e3a..a185d251 100644 --- a/src/app/routes/routes.module.ts +++ b/src/app/routes/routes.module.ts @@ -6,12 +6,12 @@ import { DashboardComponent } from './dashboard/dashboard.component'; import { RouteRoutingModule } from './routes-routing.module'; import { BasicTableComponent } from './commom/components/basic-table/basic-table.component'; -const COMPONENTS = [DashboardComponent]; +const COMPONENTS = [DashboardComponent, BasicTableComponent]; const COMPONENTS_NOROUNT: Array> = []; @NgModule({ imports: [SharedModule, RouteRoutingModule], - declarations: [...COMPONENTS, ...COMPONENTS_NOROUNT, BasicTableComponent], + declarations: [...COMPONENTS, ...COMPONENTS_NOROUNT], entryComponents: COMPONENTS_NOROUNT }) export class RoutesModule {}