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:
wangshiming
2022-04-11 16:43:26 +08:00
parent 472849e532 09e55b2d1c
commit 933b7b8e50
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.html
View File

@ -20,7 +20,7 @@
<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="结算客户">
{{headerInfo?.cnoName}}

14
src/app/routes/financial-management/components/payable-order/payable-order.component.ts
View File

@ -227,30 +227,30 @@ export class PayableOrderComponent implements OnInit {
return [
{ title: '', index: 'key', type: 'checkbox' },
{ title: '核销单号', index: 'phxcode', type: 'link', width: 140 },
{ title: '网络货运人', index: 'ltdName', width: 160 },
{ title: '网络货运人', index: 'ltdName', width: 220 },
{ title: '核销日期', index: 'phxdate', type: 'date', width: 160 },
{ title: '付款账户', index: 'shipperaccount', width: 170 },
{ title: '收款账户', index: 'ltdaccountId', width: 170 },
{ title: '收款账户', index: 'ltdaccountId', width: 190 },
{
title: '核销金额',
index: 'phxmoney',
width: 120,
width: 140,
className: 'text-right',
format: item => `${this.currencyPipe.transform(item.phxmoney || 0)}`
},
{
title: '应付金额',
index: 'prmoney',
width: 120,
width: 140,
className: 'text-right',
format: item => `${this.currencyPipe.transform(item.prmoney || 0)}`
},
{ title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 },
{ title: '付款类型', index: 'brmtype', type: 'enum', enum: { '1': '费用款项' }, width: 120 },
{ title: '收款人', index: 'driver2IdName', width: 120 },
{ title: '结算客户', index: 'cno', width: 120 },
{ title: '银行水单', index: 'bankreceipt', width: 120 },
{ title: '创建时间', index: 'createTime', width: 160 },
{ title: '结算客户', index: 'cnoName', width: 180 },
{ title: '银行水单', index: 'bankreceipt', width: 190 },
{ title: '创建时间', index: 'createTime', width: 180 },
// { title: '创建人', index: 'createUserIdLabel', width: 120 },
{ title: '核销状态', index: 'sts', type: 'enum', enum: { 0: '待核销', 1: '已核销' }, width: 120 },
{ title: '核销备注', index: 'remarks', width: 120 },