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:
Taric Xin
2022-04-13 20:37:27 +08:00
parent 23fc6a465d 875a2414d2
commit 89262801a8
2 changed files with 6 additions and 6 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.html
View File

@ -113,7 +113,7 @@
<nz-tab nzTitle="发票明细"> <nz-tab nzTitle="发票明细">
<st #invoiceST [data]="service.$api_get_invoice_details" [columns]="invoiceColumns" size="small" bordered="true" <st #invoiceST [data]="service.$api_get_invoice_details" [columns]="invoiceColumns" size="small" bordered="true"
[page]="{}" [req]="{ process: beforeReq }" [loading]="false" [scroll]="{ x: '1200px', y: '250px' }"> [page]="{}" [req]="{ process: beforeReq }" [loading]="false" [scroll]="{ x: '1200px', y: '250px' }">
<ng-template st-row="vatname" let-item let-index="index"> <ng-template st-row="vatnameLabel" let-item let-index="index">
<nz-select *ngIf="isEdit" [ngModel]="item.vatname" <nz-select *ngIf="isEdit" [ngModel]="item.vatname"
(ngModelChange)="invoiceST.setRow(index, { vatname: $event })" style="width: 100%"> (ngModelChange)="invoiceST.setRow(index, { vatname: $event })" style="width: 100%">
<nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of services"></nz-option> <nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of services"></nz-option>

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

@ -278,17 +278,17 @@ export class InvoiceDetailComponent implements OnInit {
private initInvoiceST(): STColumn[] { private initInvoiceST(): STColumn[] {
return [ return [
{ title: '服务名称', render: 'vatname', width: 350 }, { title: '服务名称', render: 'vatnameLabel', width: 350 },
{ title: '规格型号', render: 'vatmodel' }, { title: '规格型号', render: 'vatmodel' },
{ title: '单位', render: 'vatunit', width: 100 }, { title: '单位', render: 'vatunit', width: 100 },
{ title: '数量', render: 'vatqty', width: 140, className: 'text-right' }, { title: '数量', render: 'vatqty', width: 140, className: 'text-right' },
{ {
title: '金额', title: '金额',
index: 'vatnotax', index: 'vattax',
width: 140, width: 140,
type: 'widget', type: 'widget',
className: 'text-right', className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) } widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) }
}, },
{ {
title: '税率', title: '税率',
@ -299,11 +299,11 @@ export class InvoiceDetailComponent implements OnInit {
}, },
{ {
title: '税额', title: '税额',
index: 'vattax', index: 'vatnotax',
width: 140, width: 140,
type: 'widget', type: 'widget',
className: 'text-right', className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) } widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) }
} }
]; ];
} }