diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
index 8860232b..6eae375c 100644
--- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
+++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
@@ -30,6 +30,9 @@
{{ headerInfo?.vattax | currency }}
+
+ {{ headerInfo?.remarks }}
+
@@ -50,27 +53,24 @@
{{ headerInfo?.artoacc }}
-
- {{ headerInfo?.remarks }}
+
+ {{headerInfo?.otherremarks || '-'}}
-
-
-
+
-
@@ -103,12 +103,16 @@
-
+
+
+ {{ item.billLType }}: {{ item.vatmoney |currency }}
+
+
-
+
@@ -126,7 +130,7 @@
{{ item.vatunit }}
-
{{ item.vatqty }}
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 b4bedae1..ce250896 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
@@ -40,8 +40,10 @@ export class InvoiceDetailComponent implements OnInit {
id: any = null;
ltdId: any = null;
type: any = 1;
+
+ selectedIndex = 0;
constructor(public service: TicketService, private route: ActivatedRoute) {
- this.isCanEdit = !!route.snapshot.queryParams.type;
+ this.isCanEdit = route.snapshot.queryParams.type === '1';
const expressno = route.snapshot.queryParams.expressno;
this.type = route.snapshot.queryParams.type;
this.id = route.snapshot.params.id;
@@ -226,10 +228,7 @@ export class InvoiceDetailComponent implements OnInit {
{ title: '税率', index: 'vatrate', format: item => `${item.vatrate ? ((item.vatrate as number) * 100).toFixed(2) : 0}%` },
{
title: '申请金额',
- index: 'vatmoney',
- type: 'widget',
- className: 'text-right',
- widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatmoney }) }
+ render: 'vatmoney'
},
{
title: '开票金额',