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-02-25 14:01:14 +08:00
parent 0b2c96e212 ca31caa229
commit 3c44e98401
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html
View File

@ -14,17 +14,17 @@
</nz-statistic> </nz-statistic>
</nz-col> </nz-col>
<nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12"> <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
<nz-statistic [nzValue]="params?.availableBalance+'元' " [nzTitle]="'账户余额'" <nz-statistic [nzValue]="(params?.availableBalance | currency)+'元' " [nzTitle]="'账户余额'"
[nzValueStyle]="{'font-size':'16px',color:'red'}"> [nzValueStyle]="{'font-size':'16px',color:'red'}">
</nz-statistic> </nz-statistic>
</nz-col> </nz-col>
<nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12"> <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
<nz-statistic [nzValue]="(info?.incomeAmount || 0) +'元'" [nzTitle]="'收入金额'" <nz-statistic [nzValue]="((info?.incomeAmount | currency) || 0) +'元'" [nzTitle]="'收入金额'"
[nzValueStyle]="{'font-size':'16px',color:'red'}"> [nzValueStyle]="{'font-size':'16px',color:'red'}">
</nz-statistic> </nz-statistic>
</nz-col> </nz-col>
<nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12"> <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
<nz-statistic [nzValue]="(info?.payAmount || 0) +'元'" [nzTitle]="'支出金额'" <nz-statistic [nzValue]="((info?.payAmount | currency) || 0) +'元'" [nzTitle]="'支出金额'"
[nzValueStyle]="{'font-size':'16px',color:'red'}"> [nzValueStyle]="{'font-size':'16px',color:'red'}">
</nz-statistic> </nz-statistic>
</nz-col> </nz-col>

14
src/app/routes/financial-management/components/payment-record/payment-record.component.ts
View File

@ -250,7 +250,7 @@ export class PaymentRecordComponent implements OnInit {
{ {
title: '运费明细', title: '运费明细',
render: 'amountDetails', render: 'amountDetails',
width: 150, width: 160,
format: item => { format: item => {
let surcharge = 0; let surcharge = 0;
(item.amountDetails as Array<any>).forEach(detail => { (item.amountDetails as Array<any>).forEach(detail => {
@ -264,19 +264,19 @@ export class PaymentRecordComponent implements OnInit {
{ {
title: '支付类型', title: '支付类型',
index: 'payTypeLabel', index: 'payTypeLabel',
width: 130 width: 140
}, },
{ title: '货主', index: 'enterpriseInfoName', width: 160 }, { title: '货主', index: 'enterpriseInfoName', width: 180 },
{ title: '订单号', render: 'billCode', width: 160 }, { title: '订单号', render: 'billCode', width: 170 },
{ title: '运单号', render: 'wayBillCode', width: 160 }, { title: '运单号', render: 'wayBillCode', width: 170 },
{ title: '货源编号', index: 'resourceCode', width: 160 }, { title: '货源编号', index: 'resourceCode', width: 160 },
{ {
title: '服务类型', title: '服务类型',
index: 'serviceTypeLabel', index: 'serviceTypeLabel',
width: 150 width: 150
}, },
{ title: '承运司机', render: 'driverId', width: 120 }, { title: '承运司机', render: 'driverId', width: 140 },
{ title: '收款人', render: 'captainName', width: 120 }, { title: '收款人', render: 'captainName', width: 140 },
{ title: '银行类型', index: 'bankType', width: 150, type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } }, { title: '银行类型', index: 'bankType', width: 150, type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
{ title: '网络货运人', index: 'ltdName', width: 160 }, { title: '网络货运人', index: 'ltdName', width: 160 },
{ title: '申请时间', index: 'applyTime', width: 160 }, { title: '申请时间', index: 'applyTime', width: 160 },