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 14a3554c..83b8228c 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 @@ -263,6 +263,7 @@ export class InvoiceRequestedComponent { const modal = this.nzModalService.create({ nzTitle: '开票受理', nzContent: RequestedInvoiceModalComponent, + nzNoAnimation: true, nzWidth: 1200, nzComponentParams: { id: item.id diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html index adfc2118..d1f3a8c1 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html @@ -11,26 +11,16 @@ - + {{ item.billHCode }} + \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts index 2a64cece..64d2d120 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts @@ -6,7 +6,7 @@ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\invoice-requested\\requested-invoice-modal\\requested-invoice-modal.component.ts */ -import { Component, ViewChild } from '@angular/core'; +import { ChangeDetectorRef, Component, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STChange, STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; @@ -24,23 +24,38 @@ export class RequestedInvoiceModalComponent { columns: STColumn[] = this.initST(); id: any; selectedRows: any[] = []; - constructor(public service: TicketService, private nzModalService: NzModalService, private modal: NzModalRef, private router: Router) {} + + constructor( + public service: TicketService, + private nzModalService: NzModalService, + private modal: NzModalRef, + private router: Router, + private cdr: ChangeDetectorRef + ) {} beforeReq = (requestOptions: STRequestOptions) => { Object.assign(requestOptions.body, { vatappHId: this.id }); return requestOptions; }; + afterRes = (data: any[], rawData?: any) => { + return data.map(item => ({ ...item, isDelete: data?.length > 1 })); + }; + /** * 移除订单 * * @returns */ removeOrder(item: any[]) { - if (this.st1._data?.length <= 1) { + if (this.st1.total <= 1) { this.service.msgSrv.warning('开票申请记录不能少于一个订单'); return; } + if (item?.length <= 0) { + this.service.msgSrv.warning('请选择要移除订单'); + return; + } this.nzModalService.warning({ nzTitle: '确定从当前批次中移除所选订单?', nzContent: '移除后相关订单可以重新提交开票申请', @@ -111,7 +126,7 @@ export class RequestedInvoiceModalComponent { { text: '移除', click: (item: any) => this.removeOrder([item]), - iif: _ => this.st1._data?.length > 1 + iif: item => item.isDelete } ] }