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

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-03-08 14:45:47 +08:00
parent 83deb7c465
commit 14cba100e4
3 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/app/routes/order-management/components/bulk/bulk.component.ts
View File

@ -442,11 +442,22 @@ export class OrderManagementBulkComponent implements OnInit {
width: '180px',
index: 'unloadingAddressArr'
},
// {
// title: '货物信息',
// className: 'text-left',
// width: '250px',
// render: 'goodsName'
// },
{
title: '货物信息',
index: 'goodsName',
width: '180px',
className: 'text-left',
width: '250px',
render: 'goodsName'
format: (item: any) =>
`${item.goodsName}/
${item.goodsWeight || '0'}吨/
${item.goodsVolume || '0'}方/
${item.goodsNumber || '0'}件`
},
{
title: '运费单价',
@ -460,8 +471,8 @@ export class OrderManagementBulkComponent implements OnInit {
width: '170px',
className: 'text-left',
format: (item: any) =>
`${item.acceptWeight || '--'}吨/
${item.acceptVolume || '--'}方`
`${item.acceptWeight || '0'}吨/
${item.acceptVolume || '0'}方`
},
{
title: '结算数量',
@ -469,8 +480,8 @@ export class OrderManagementBulkComponent implements OnInit {
width: '170px',
className: 'text-left',
format: (item: any) =>
`${item.settlementWeight || '--'}吨/
${item.settlementVolume || '--'}方`
`${item.settlementWeight || '0'}吨/
${item.settlementVolume || '0'}方`
},
{
title: '承运司机',

2
src/app/routes/supply-management/components/vehicle/vehicle.component.ts
View File

@ -606,7 +606,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
{
text: '修改货源',
click: _record => this.amend(_record),
iif: item => item.resourceStatus === '1',
iif: item => item.resourceStatus === '1' ,
acl: { ability: ['SUPPLY-INDEX-vehicleModificationSupply'] }
},
// {

25
src/app/routes/waybill-management/components/bulk/bulk.component.ts
View File

@ -259,11 +259,22 @@ tabs = {
width: '220px',
index: 'dischargePlace'
},
{
// {
// title: '货物信息',
// className: 'text-left',
// width: '250px',
// render: 'goodsInfos'
// },
{
title: '货物信息',
index: 'goodsInfos',
width: '180px',
className: 'text-left',
width: '250px',
render: 'goodsInfos'
format: (item: any) =>
`${item.goodsName}/
${item.goodsWeight || '0'}吨/
${item.goodsVolume || '0'}方/
${item.goodsNumber || '0'}件`
},
{
title: '运费单价',
@ -277,8 +288,8 @@ tabs = {
width: '170px',
className: 'text-left',
format: (item: any) =>
`${item.acceptWeight || '--'}吨/
${item.acceptVolume || '--'}方`
`${item.acceptWeight || '0'}吨/
${item.acceptVolume || '0'}方`
},
{
title: '结算数量',
@ -286,8 +297,8 @@ tabs = {
width: '170px',
className: 'text-left',
format: (item: any) =>
`${item.settlementWeight || '--'}吨/
${item.settlementVolume || '--'}方`
`${item.settlementWeight || '0'}吨/
${item.settlementVolume || '0'}方`
},
{
title: '承运司机',