Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-02-24 17:39:37 +08:00
parent 97fde5d6b9 f7efbe28c0
commit 90461ee459
15 changed files with 150 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
View File

@ -161,26 +161,26 @@ export class FreightConfigComponent implements OnInit {
initST(): STColumn[] {
return [
{ title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 250 },
{ title: '网络货运人', className: 'text-center', index: 'netTranName', width: 250 },
{ title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 },
{ title: '网络货运人', className: 'text-center', index: 'netTranName', width: 160 },
{
title: '货源单费率',
className: 'text-right',
index: 'goodsSurchargeRatio',
width: 140,
format: item => `${item.goodsSurchargeRatio}%`
index: 'contractSurchargeRatio',
width: 130,
format: item => `${item.contractSurchargeRatio}%`
},
{
title: '合同单费率',
className: 'text-right',
index: 'contractSurchargeRatio',
width: 140,
format: item => `${item.contractSurchargeRatio}%`
index: 'goodsSurchargeRatio',
width: 130,
format: item => `${item.goodsSurchargeRatio}%`
},
{
title: '合同单业务量（元）',
index: 'contractQuota',
width: 180,
width: 140,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.contractQuota }) }
@ -188,7 +188,7 @@ export class FreightConfigComponent implements OnInit {
{
title: '货源单业务量（元）',
index: 'goodsQuota',
width: 180,
width: 140,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.goodsQuota }) }
@ -201,7 +201,7 @@ export class FreightConfigComponent implements OnInit {
},
{
title: '操作',
width: '110px',
width: '90px',
fixed: 'right',
className: 'text-center',
buttons: [