diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html index 19420a9d..5670e063 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html @@ -65,6 +65,9 @@ + + + \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts index 7bd939b9..b394a349 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts @@ -29,10 +29,10 @@ export class CancellationInvoiceComponent implements OnInit { selectedRows: any[] = []; totalCallNo = 0; - openInfo: any = { invoicedate: null, invoiceno: null }; - constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) { } + openInfo: any = { invoicedate: null, invoiceno: null, invoiceno2: null }; + constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {} - ngOnInit(): void { } + ngOnInit(): void {} beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { @@ -78,7 +78,7 @@ export class CancellationInvoiceComponent implements OnInit { * @param item */ requestedAction(item: any) { - this.openInfo = { invoicedate: null, invoiceno: null }; + this.openInfo = { invoicedate: null, invoiceno: null, invoiceno2: null }; const modal = this.nzModalService.create({ nzTitle: '发票确认', nzContent: this.requestedModal, @@ -89,7 +89,8 @@ export class CancellationInvoiceComponent implements OnInit { } const params = { invoiceno: this.openInfo.invoiceno, - invoicedate: dateTimePickerUtil.format(this.openInfo.invoicedate) + invoicedate: dateTimePickerUtil.format(this.openInfo.invoicedate), + invoiceno2: this.openInfo.invoiceno2 }; this.service .request(this.service.$api_apply_fico_invoic, { @@ -154,7 +155,7 @@ export class CancellationInvoiceComponent implements OnInit { this.nzModalService.warning({ nzTitle: '确定将所选待确认开票申请撤回?', nzContent: '提交税控后发票信息不可修改,待税控开票完成后返回开票结果', - nzOnOk: () => { } + nzOnOk: () => {} }); } @@ -170,7 +171,7 @@ export class CancellationInvoiceComponent implements OnInit { this.nzModalService.warning({ nzTitle: '确定将所选待确认开票申请撤回?', nzContent: '提交税控后发票信息不可修改,待税控开票完成后返回开票结果', - nzOnOk: () => { } + nzOnOk: () => {} }); } @@ -369,22 +370,22 @@ export class CancellationInvoiceComponent implements OnInit { buttons: [ { type: 'divider' }, { - text: '查看明细', + text: '查看明细
', click: item => this.router.navigate(['ticket/cancellation-invoice/detail/' + item.id], { queryParams: { type: 1, expressno: item.expressno, ltdId: item.shipperId } }) }, { - text: '手工开票', + text: '手工开票
', iif: item => item.sts != '3', click: item => this.requestedAction(item) }, { - text: '推送开票', + text: '推送开票
', iif: item => item.sts === '1', click: item => this.pushInvoiceAction(item) - }, + } // { // text: '作废发票', // iif: item => item.sts === '3', diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts index 0662aa43..ec52f839 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts @@ -137,6 +137,13 @@ export class InvoicedListComponent implements OnInit { autocomplete: 'off' } }, + invoiceno2: { + type: 'string', + title: '发票代码', + ui: { + autocomplete: 'off' + } + }, vatappHCode: { type: 'string', title: '申请编号', @@ -151,7 +158,10 @@ export class InvoicedListComponent implements OnInit { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', placeholder: '请选择', - nzShowTime: true + nzShowTime: true, + visibleIf: { + expand: (value: boolean) => value + } } as SFDateWidgetSchema }, artoname: { @@ -196,6 +206,7 @@ export class InvoicedListComponent implements OnInit { return [ { title: '', index: 'key', type: 'checkbox' }, { title: '发票号码', index: 'invoiceno', width: 150 }, + { title: '发票代码', index: 'invoiceno2', width: 150 }, { title: '申请编号', index: 'vatappHCode',