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 d541718c..bc735195 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
@@ -54,10 +54,10 @@ export class CostManagementDetailComponent implements OnInit {
{ title: '费用科目', index: 'feeSubName', className: 'text-left', width: 200 },
{
title: '税率',
- index: 'hrvatrate',
+ index: 'arvatrate',
className: 'text-right',
width: 200,
- format: item => `${item.hrvatrate ? ((item.hrvatrate as number) * 100).toFixed(2) : 0}%`
+ format: item => `${item.arvatrate ? ((item.arvatrate as number) * 100).toFixed(2) : 0}%`
},
{ title: '费用金额', render: 'hrvatmoney', className: 'text-right', width: 200 },
{ title: '收/付款金额', render: 'armoney', className: 'text-right', width: 200 },
diff --git a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html
index deda8303..fb9486d2 100644
--- a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html
+++ b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html
@@ -29,7 +29,7 @@
{{headerInfo?.ltdAccountId}}
- {{headerInfo?.payMoney}}
+ {{headerInfo?.payMoney | currency}}
@@ -37,7 +37,7 @@
{{headerInfo?.payDate}}
- {{headerInfo?.ltdaccountId}}
+ {{headerInfo?.hrBankName}} - {{headerInfo?.hrBankCode}}
{{headerInfo?.payDate}}
@@ -51,7 +51,7 @@
{{headerInfo?.payModeLabel}}
- {{headerInfo?.payType}}
+ {{headerInfo?.payTypeLabel}}
{{headerInfo?.payMoney |currency}}
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 d425a8e1..b2c8021c 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
@@ -204,7 +204,7 @@ export class CancellationInvoiceComponent implements OnInit {
const modal = this.nzModalService.create({
nzTitle: '推送开票',
nzContent: PushInvoiceComponent,
- nzComponentParams: { id: item.id },
+ nzComponentParams: { id: item.vatappHId },
nzWidth: 1200,
nzOnOk: () => {
this.service.request(this.service.$api_push_invoic, { id: item.id }).subscribe(res => {
@@ -314,22 +314,22 @@ export class CancellationInvoiceComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '', index: 'key', type: 'checkbox', fixed: 'left', width: 50, className: 'text-center' },
- { title: '分票编号', render: 'vatinvcode', width: 160 },
+ { title: '分票编号', render: 'vatinvcode', width: 200 },
{
title: '申请编号',
index: 'vatappHCode',
- width: 120,
+ width: 150,
type: 'link',
click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item?.vatappHId])
},
{ title: '申请时间', index: 'createTime', type: 'date', width: 150 },
- { title: '网络货运人', index: 'ltdName', width: 120 },
- { title: '购买人', index: 'artoname', width: 90 },
+ { title: '网络货运人', index: 'ltdName', width: 160 },
+ { title: '购买人', index: 'artoname', width: 160 },
{ title: '订单数', index: 'ordlines', width: 90, className: 'text-right' },
{
title: '价税合计',
index: 'vatmoney',
- width: 120,
+ width: 140,
type: 'widget',
className: 'text-right font-weight-bold',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatmoney }) }
@@ -337,7 +337,7 @@ export class CancellationInvoiceComponent implements OnInit {
{
title: '金额',
index: 'vatnotax',
- width: 100,
+ width: 140,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) }
@@ -345,27 +345,28 @@ export class CancellationInvoiceComponent implements OnInit {
{
title: '税率',
index: 'billvatrate',
- width: 90,
+ width: 120,
className: 'text-right',
format: item => `${item.billvatrate ? ((item.billvatrate as number) * 100).toFixed(2) : 0}%`
},
{
title: '税额',
index: 'vattax',
- width: 90,
+ width: 140,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) }
},
- { title: '服务名称', index: 'vatname', width: 100 },
- { title: '销货清单', index: 'isdetail', width: 90, type: 'enum', enum: { 1: '是', 0: '否' }, className: 'text-center' },
+ { title: '服务名称', index: 'vatname', width: 120 },
+ { title: '销货清单', index: 'isdetail', width: 120, type: 'enum', enum: { 1: '是', 0: '否' }, className: 'text-center' },
{ title: '票面备注', index: 'remarks', width: 250 },
{ title: '其他要求', index: 'otherremarks', width: 100 },
{
title: '操作',
- width: '100px',
+ width: '120px',
fixed: 'right',
buttons: [
+ { type: 'divider' },
{
text: '查看明细',
click: item =>
diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.html
index 86dbbfdd..f4ace5d8 100644
--- a/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.html
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.html
@@ -4,42 +4,42 @@
{{info?.artoName}}
- {{info?.artotaxno}}
+ {{info?.taxNumber}}
- {{info?.artoadd}}
+ {{info?.registerAddr}}
- {{info?.artotel}}
+ {{info?.registerPhone}}
- {{info?.artobank}}
+ {{info?.bankName}}
- {{info?.artoacc}}
+ {{info?.bankAccount}}
- {{info?.remarks}}
+ {{info?.vatremarks}}
- {{info?.shipperId}}
+ {{info?.ltdidName}}
- {{info?.vatinvcode}}
+ {{info?.vatappcode}}
- {{info?.ordlines}}笔
+ {{info?.vatinvBillNum}}笔
- {{info?.vatmoney}}元
+ {{info?.vatinvHNumAmount | currency}}元
- {{info?.vatname}}
+ {{info?.vatnameLabel}}
- {{info?.isdetail}}
+ {{info?.isdetail?'是':'否'}}
{{info?.otherremarks}}
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 6b164d08..dec8b28f 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
@@ -13,7 +13,7 @@ import { TicketService } from '../../../services/ticket.service';
export class PushInvoiceComponent implements OnInit {
@ViewChild('st', { static: false })
st!: STComponent;
- columns: STColumn[] = this.initST();
+ columns!: STColumn[];
info: any = {};
id!: number;
@@ -22,6 +22,9 @@ export class PushInvoiceComponent implements OnInit {
ngOnInit(): void {
this.loadHeader(this.id);
+ setTimeout(() => {
+ this.columns = this.initST();
+ }, 100);
}
beforeReq = (requestOptions: STRequestOptions) => {
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 9f2b0031..a0b80dae 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
@@ -41,7 +41,7 @@
-->
-
{{ item.no }}