This commit is contained in:
Taric Xin
2022-01-19 16:30:12 +08:00
parent ce64b48674
commit 48ce6a1d10
22 changed files with 623 additions and 144 deletions

View File

@ -1,4 +1,4 @@
<page-header-wrapper [title]="'收票信息'" [logo]="logo">
<page-header-wrapper [title]="'付款单'" [logo]="logo">
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
<i nz-icon nzType="left" nzTheme="outline"></i>
@ -10,13 +10,13 @@
<div nz-row nzGutter="8">
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="150" col="1">
<se label="网络货运人" required>
{{headerInfo?.ltdid}}
{{headerInfo?.ltdName}}
</se>
<se label="收款人" required>
{{headerInfo?.invdate}}
{{headerInfo?.hrToName}}
</se>
<se label="付款账户" required>
{{headerInfo?.invdate}}
{{headerInfo?.ltdAccountId}}
</se>
<se label="应付已核销" required>
{{headerInfo?.invdate}}
@ -24,27 +24,27 @@
</div>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
<se label="要求付款日期" required>
{{headerInfo?.hrtoName}}
{{headerInfo?.payDate}}
</se>
<se label="收款账户" required>
{{headerInfo?.invoiceno}}
{{headerInfo?.hrBankNo}}
</se>
<se label="确认日期" required>
{{headerInfo?.invoiceno}}
{{headerInfo?.payDate2}}
</se>
<se label="付款备注" >
{{headerInfo?.invoiceno}}
<se label="付款备注">
{{headerInfo?.payRemarks}}
</se>
</div>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
<se label="付款方式" required>
{{headerInfo?.invtype}}
{{headerInfo?.payModeLabel}}
</se>
<se label="付款类型" required>
{{headerInfo?.remarks}}
{{headerInfo?.payTypeLabel}}
</se>
<se label="付款金额" required>
{{headerInfo?.remarks}}
{{headerInfo?.payMoney |currency}}
</se>
</div>
</div>

View File

@ -29,11 +29,11 @@ export class PaymentOrderDetailComponent implements OnInit {
ngOnInit(): void {}
loadHeadInfo() {
// this.service.request(this.service.$api_get_input_invoice_header, { id: this.id }).subscribe(res => {
// if (res) {
// this.headerInfo = res;
// }
// });
this.service.request(this.service.$api_get_payment_header, { id: this.id }).subscribe(res => {
if (res) {
this.headerInfo = res;
}
});
}
beforeReq = (requestOptions: STRequestOptions) => {
@ -150,8 +150,22 @@ export class PaymentOrderDetailComponent implements OnInit {
{ title: '订单日期', index: 'billTime', width: 150 },
{ title: '结算客户', index: 'cnoName', width: 90 },
{ title: '费用科目', index: 'feeSubId', width: 100 },
{ title: '收票金额', index: 'paymoney', width: 140 },
{ title: '收票额', index: 'invtax', width: 100 }
{
title: '收票额',
index: 'paymoney',
width: 140,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.paymoney }) }
},
{
title: '收票税额',
index: 'invtax',
width: 140,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invtax }) }
}
];
}
}

View File

@ -225,38 +225,39 @@ export class PaymentOrderComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '', index: 'key', type: 'checkbox' },
{ title: '付款单号', index: 'paycode', type: 'link' },
{ title: '网络货运人', index: 'ltdId' },
{ title: '要求付款日期', index: 'paydate', type: 'date', width: 140 },
{ title: '', index: 'key', type: 'checkbox', fixed: 'left', className: 'text-center' },
{ title: '付款单号', index: 'payCode', type: 'link', width: 180 },
{ title: '网络货运人', index: 'ltdName', width: 160 },
{ title: '要求付款日期', index: 'payDate', type: 'date', className: 'text-center', width: 150 },
{
title: '付款金额',
index: 'paymoney',
index: 'payMoney',
width: 120,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.paymoney }) }
},
{ title: '付款类型', index: 'paytype' },
{ title: '付款方式', index: 'paymode' },
{ title: '结算客户', index: 'call1N2o' },
{ title: '收款人', index: 'hrto' },
{ title: '应付已核销', index: 'callNo' },
{ title: '确认日期', index: 'paydate2', type: 'date' },
{ title: '创建时间', index: 'createTime', type: 'date' },
{ title: '创建人', index: 'createUserId' },
{ title: '付款备注', index: 'payremarks' },
{ title: '付款类型', index: 'payTypeLabel', width: 130 },
{ title: '付款方式', index: 'payModeLabel', width: 130 },
{ title: '结算客户', index: 'shipperId', width: 160 },
{ title: '收款人', index: 'hrToName', width: 150 },
{ title: '应付已核销', index: 'callNo', width: 150 },
{ title: '确认日期', index: 'payDate2', type: 'date', className: 'text-center', width: 150 },
{ title: '创建时间', index: 'createTime', type: 'date', className: 'text-center', width: 150 },
{ title: '创建人', index: 'createUserId', width: 160 },
{ title: '付款备注', index: 'payRemarks', width: 200 },
{
title: '操作',
width: '90px',
className: 'text-center',
fixed: 'right',
width: '110px',
buttons: [
{
text: '浏览',
click: item => this.router.navigate(['/ticket/input-invoice/detail/' + item.id])
click: item => this.router.navigate(['/financial-management/payment-order/detail/' + item.id])
},
{
text: '修改',
click: item => this.router.navigate(['/ticket/input-invoice/edit/1'])
}
]
}