Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2021-12-30 15:53:05 +08:00
parent 12653a2961 6d173e8aa5
commit b2794c80f0
11 changed files with 841 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts
View File

@ -184,7 +184,7 @@ export class InvoiceDetailComponent implements OnInit {
{ title: '单位', render: 'vatunit' },
{ title: '数量', render: 'vatqty' },
{ title: '金额', index: 'vatnotax' },
{ title: '税率', index: 'callNo' },
{ title: '税率', index: 'vatrate' },
{ title: '税额', index: 'vattax' }
];
}

8
src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts
View File

@ -47,7 +47,7 @@ export class InvoicedListComponent implements OnInit {
switch (e.type) {
case 'checkbox':
this.selectedRows = e.checkbox!;
this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.callNo, 0);
this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.vatnotax, 0);
break;
}
}
@ -178,9 +178,9 @@ export class InvoicedListComponent implements OnInit {
{ title: '网络货运人', index: 'ltdId', width: 120 },
{ title: '购买人', index: 'artoname', width: 90 },
{ title: '订单数', index: 'ordlines', width: 90 },
{ title: '价税合计', index: 'callNo', width: 100 },
{ title: '金额', index: 'disvatnotax', width: 90 },
{ title: '税率', index: 'callNo', width: 90 },
{ title: '价税合计', index: 'vatmoney', width: 100 },
{ title: '金额', index: 'vatnotax', width: 90 },
{ title: '税率', index: 'vatrate', width: 90 },
{ title: '税额', index: 'disvattax', width: 90 },
{ title: '开票日期', index: 'invoicedate', type: 'date', width: 150 },
{