This commit is contained in:
Taric Xin
2022-03-10 19:06:05 +08:00
parent 0d49a8e9d0
commit 36f07fc430
3 changed files with 17 additions and 3 deletions

View File

@ -372,7 +372,7 @@ export class CancellationInvoiceComponent implements OnInit {
text: '查看明细', text: '查看明细',
click: item => click: item =>
this.router.navigate(['ticket/cancellation-invoice/detail/' + item.id], { this.router.navigate(['ticket/cancellation-invoice/detail/' + item.id], {
queryParams: { type: 1, expressno: item.expressno } queryParams: { type: 1, expressno: item.expressno, ltdId: item.ltdId }
}) })
}, },
{ {

View File

@ -38,12 +38,14 @@ export class InvoiceDetailComponent implements OnInit {
routes: [] routes: []
}; };
id: any = null; id: any = null;
ltdId: any = null;
type: any = 1; type: any = 1;
constructor(public service: TicketService, private route: ActivatedRoute) { constructor(public service: TicketService, private route: ActivatedRoute) {
this.isCanEdit = !!route.snapshot.queryParams.type; this.isCanEdit = !!route.snapshot.queryParams.type;
const expressno = route.snapshot.queryParams.expressno; const expressno = route.snapshot.queryParams.expressno;
this.type = route.snapshot.queryParams.type; this.type = route.snapshot.queryParams.type;
this.id = route.snapshot.params.id; this.id = route.snapshot.params.id;
this.ltdId = route.snapshot.queryParams.ltdId;
this.loadInvoiceHeader(this.id); this.loadInvoiceHeader(this.id);
if (expressno) { if (expressno) {
this.loadRoutes(expressno); this.loadRoutes(expressno);
@ -130,7 +132,12 @@ export class InvoiceDetailComponent implements OnInit {
projectId: { projectId: {
type: 'string', type: 'string',
title: '所属项目', 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: '' default: ''
} }
} }
@ -147,6 +154,13 @@ export class InvoiceDetailComponent implements OnInit {
{ title: '卸货地', index: 'loadingto', width: 220 }, { title: '卸货地', index: 'loadingto', width: 220 },
{ title: '货物信息', index: 'goodsinfo', width: 140 }, { title: '货物信息', index: 'goodsinfo', width: 140 },
{ title: '承运司机', index: 'driverinfo', width: 280 }, { 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: '申请金额', title: '申请金额',
index: 'billkpnotax', index: 'billkpnotax',

View File

@ -240,7 +240,7 @@ export class InvoicedListComponent implements OnInit {
text: '查看明细', text: '查看明细',
click: item => click: item =>
this.router.navigate(['/ticket/invoice-list/detail/' + item.id], { this.router.navigate(['/ticket/invoice-list/detail/' + item.id], {
queryParams: { expressno: item.expressno, type: 2 } queryParams: { expressno: item.expressno, type: 2, ltdId: item.ltdId }
}) })
}, },
{ {