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 94130c83..3f55b97b 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 @@ -372,7 +372,7 @@ export class CancellationInvoiceComponent implements OnInit { text: '查看明细', click: item => this.router.navigate(['ticket/cancellation-invoice/detail/' + item.id], { - queryParams: { type: 1, expressno: item.expressno } + queryParams: { type: 1, expressno: item.expressno, ltdId: item.ltdId } }) }, { 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 86afcd02..1ae799ba 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 @@ -38,12 +38,14 @@ export class InvoiceDetailComponent implements OnInit { routes: [] }; id: any = null; + ltdId: any = null; type: any = 1; constructor(public service: TicketService, private route: ActivatedRoute) { this.isCanEdit = !!route.snapshot.queryParams.type; const expressno = route.snapshot.queryParams.expressno; this.type = route.snapshot.queryParams.type; this.id = route.snapshot.params.id; + this.ltdId = route.snapshot.queryParams.ltdId; this.loadInvoiceHeader(this.id); if (expressno) { this.loadRoutes(expressno); @@ -130,7 +132,12 @@ export class InvoiceDetailComponent implements OnInit { projectId: { type: 'string', title: '所属项目', - ui: { widget: 'select', placeholder: '请选择', allowClear: true, asyncData: () => this.service.getEnterpriseProject() }, + ui: { + widget: 'select', + placeholder: '请选择', + allowClear: true, + asyncData: () => this.service.getEnterpriseProject({ id: this.ltdId }) + }, default: '' } } @@ -147,6 +154,13 @@ export class InvoiceDetailComponent implements OnInit { { title: '卸货地', index: 'loadingto', width: 220 }, { title: '货物信息', index: 'goodsinfo', width: 140 }, { title: '承运司机', index: 'driverinfo', width: 280 }, + { + title: '税额', + index: 'billvatrate', + width: 120, + className: 'text-right', + format: item => `${item.billvatrate ? ((item.billvatrate as number) * 100).toFixed(2) : 0}%` + }, { title: '申请金额', index: 'billkpnotax', 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 34c6d849..1678a9ad 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 @@ -240,7 +240,7 @@ export class InvoicedListComponent implements OnInit { text: '查看明细', click: item => this.router.navigate(['/ticket/invoice-list/detail/' + item.id], { - queryParams: { expressno: item.expressno, type: 2 } + queryParams: { expressno: item.expressno, type: 2, ltdId: item.ltdId } }) }, {