diff --git a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts
index f3dbaca6..d541718c 100644
--- a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts
+++ b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts
@@ -52,7 +52,13 @@ export class CostManagementDetailComponent implements OnInit {
{ title: '结算客户', render: 'cnoName', className: 'text-left', width: 200 },
{ title: '订单费用类型', index: 'billLTypeLabel', className: 'text-left', width: 200 },
{ title: '费用科目', index: 'feeSubName', className: 'text-left', width: 200 },
- { title: '税率', index: 'hrvatrate', className: 'text-right', width: 200 },
+ {
+ title: '税率',
+ index: 'hrvatrate',
+ className: 'text-right',
+ width: 200,
+ format: item => `${item.hrvatrate ? ((item.hrvatrate as number) * 100).toFixed(2) : 0}%`
+ },
{ title: '费用金额', render: 'hrvatmoney', className: 'text-right', width: 200 },
{ title: '收/付款金额', render: 'armoney', className: 'text-right', width: 200 },
{ title: '开/收票金额', render: 'arkpmoney', className: 'text-right', width: 200 }
diff --git a/src/app/routes/financial-management/components/cost-management/expenses-payable/expenses-payable.component.ts b/src/app/routes/financial-management/components/cost-management/expenses-payable/expenses-payable.component.ts
index 7336b09c..7706a93f 100644
--- a/src/app/routes/financial-management/components/cost-management/expenses-payable/expenses-payable.component.ts
+++ b/src/app/routes/financial-management/components/cost-management/expenses-payable/expenses-payable.component.ts
@@ -10,7 +10,6 @@ import { FreightAccountService } from '../../../services/freight-account.service
styleUrls: ['./expenses-payable.component.less']
})
export class ExpensesPayableComponent implements OnInit {
-
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
@@ -125,7 +124,12 @@ export class ExpensesPayableComponent implements OnInit {
return [
{ title: '结算客户', render: 'description1', width: 150 },
{ title: '费用科目', render: 'description2', width: 120 },
- { title: '税率', render: 'description3', width: 120 },
+ {
+ title: '税率',
+ render: 'description3',
+ width: 120,
+ format: item => `${item.description3 ? ((item.description3 as number) * 100).toFixed(2) : 0}%`
+ },
{ title: '应付金额', render: 'num', width: 120 },
{ title: '备注', render: 'description5', width: 150 },
{
diff --git a/src/app/routes/financial-management/components/cost-management/expenses-receivable/expenses-receivable.component.ts b/src/app/routes/financial-management/components/cost-management/expenses-receivable/expenses-receivable.component.ts
index 44634dda..b049fed3 100644
--- a/src/app/routes/financial-management/components/cost-management/expenses-receivable/expenses-receivable.component.ts
+++ b/src/app/routes/financial-management/components/cost-management/expenses-receivable/expenses-receivable.component.ts
@@ -124,7 +124,12 @@ export class ExpensesReceivableComponent implements OnInit {
return [
{ title: '结算客户', render: 'description1', width: 150 },
{ title: '费用科目', render: 'description2', width: 120 },
- { title: '税率', render: 'description3', width: 120 },
+ {
+ title: '税率',
+ render: 'description3',
+ width: 120,
+ format: item => `${item.description3 ? ((item.description3 as number) * 100).toFixed(2) : 0}%`
+ },
{ title: '应收金额', render: 'num', width: 120 },
{ title: '备注', render: 'description5', width: 150 },
{
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 858cf893..d425a8e1 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
@@ -342,7 +342,13 @@ export class CancellationInvoiceComponent implements OnInit {
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) }
},
- { title: '税率', index: 'billvatrate', width: 90, className: 'text-right' },
+ {
+ title: '税率',
+ index: 'billvatrate',
+ width: 90,
+ className: 'text-right',
+ format: item => `${item.billvatrate ? ((item.billvatrate as number) * 100).toFixed(2) : 0}%`
+ },
{
title: '税额',
index: 'vattax',
diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.ts
index f226a86b..6b164d08 100644
--- a/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.ts
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.ts
@@ -46,7 +46,13 @@ export class PushInvoiceComponent implements OnInit {
{ title: '单位', index: 'vatunit', width: 90, className: 'text-center' },
{ title: '数量', index: 'vatqty', width: 90, className: 'text-right' },
{ title: '金额', index: 'vatnotax', width: 90, type: 'currency', format: item => `${this.currencyPipe.transform(item.vatnotax)}` },
- { title: '税率', index: 'vatrate', width: 90, className: 'text-right' },
+ {
+ title: '税率',
+ index: 'vatrate',
+ width: 90,
+ className: 'text-right',
+ format: item => `${item.vatrate ? ((item.vatrate as number) * 100).toFixed(2) : 0}%`
+ },
{ title: '税额', index: 'vattax', width: 90, type: 'currency', format: item => `${this.currencyPipe.transform(item.vattax)}` }
];
}
diff --git a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts
index 37d0090e..c9b230a1 100644
--- a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts
+++ b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts
@@ -173,7 +173,7 @@ export class ETCInvoicedLogsComponent implements OnInit {
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fee }) }
},
- { title: '税率', index: 'taxRate', width: 90 },
+ { title: '税率', index: 'taxRate', width: 90, format: item => `${item.taxRate ? ((item.taxRate as number) * 100).toFixed(2) : 0}%` },
{
title: '金额(元)',
index: 'invoiceAmount',
diff --git a/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts b/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts
index ffd77ed1..13ba19ed 100644
--- a/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts
+++ b/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts
@@ -20,9 +20,9 @@ export class ExpressDetailModalComponent implements OnInit {
sf!: SFComponent;
columns: STColumn[] = [
{ title: '发票号码', index: 'invoiceno', width: 160, className: 'text-left' },
- { title: '发票代码', index: 'invoiceno2', width: 160 , className: 'text-left'},
+ { title: '发票代码', index: 'invoiceno2', width: 160, className: 'text-left' },
{ title: '申请编号', index: 'vatinvcode', width: 160, className: 'text-left' },
- { title: '网络货运人', index: 'ltdName', width: 120 , className: 'text-left'},
+ { title: '网络货运人', index: 'ltdName', width: 120, className: 'text-left' },
{ title: '购买人', index: 'artoname', width: 120, className: 'text-left' },
{
title: '价税合计',
@@ -44,7 +44,8 @@ export class ExpressDetailModalComponent implements OnInit {
title: '税率',
index: 'tax',
width: 90,
- className: 'text-right'
+ className: 'text-right',
+ format: item => `${item.tax ? ((item.tax as number) * 100).toFixed(2) : 0}%`
},
{
title: '税额',
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 d7231f1a..91cc8573 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
@@ -212,7 +212,7 @@ export class InvoiceDetailComponent implements OnInit {
{ title: '订单号', index: 'billHId' },
{ title: '订单日期', index: 'createTime', type: 'date' },
{ title: '计费日期', index: 'feeDate', type: 'date' },
- { title: '税率', index: 'vatrate' },
+ { title: '税率', index: 'vatrate', format: item => `${item.vatrate ? ((item.vatrate as number) * 100).toFixed(2) : 0}%` },
{
title: '申请金额',
index: 'vatmoney',
@@ -244,7 +244,13 @@ export class InvoiceDetailComponent implements OnInit {
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) }
},
- { title: '税率', index: 'vatrate', width: 140, className: 'text-right' },
+ {
+ title: '税率',
+ index: 'vatrate',
+ width: 140,
+ className: 'text-right',
+ format: item => `${item.vatrate ? ((item.vatrate as number) * 100).toFixed(2) : 0}%`
+ },
{
title: '税额',
index: 'vattax',
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
index 794459b6..52a829cf 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
@@ -323,7 +323,12 @@ export class InvoiceRequestedDetailComponent implements OnInit {
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.billkpmoney }) }
},
- { title: '税率', index: 'billvatrate', width: 90 },
+ {
+ title: '税率',
+ index: 'billvatrate',
+ width: 90,
+ format: item => `${item.billvatrate ? ((item.billvatrate as number) * 100).toFixed(2) : 0}%`
+ },
{ title: '发票号码', index: 'vatinvcode', width: 100 },
{ title: '开票日期', index: 'vatinvtime', type: 'date', width: 150 }
];
diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html
index 511be404..9f2b0031 100644
--- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html
+++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html
@@ -47,9 +47,6 @@
{{ item.no }}
预览发票
-
- 0.09
-
{{ item.expresscompany }}
{{ item.expressno }}
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 a844120a..49eb3bb1 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
@@ -210,7 +210,13 @@ export class InvoicedListComponent implements OnInit {
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) }
},
- { title: '税率', render: 'vatrate', className: 'text-right', width: 90 },
+ {
+ title: '税率',
+ index: 'vatrate',
+ className: 'text-right',
+ width: 90,
+ format: item => `${item.vatrate ? ((item.vatrate as number) * 100).toFixed(2) : 0}%`
+ },
{
title: '税额',
index: 'vattax',