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:
Taric Xin
2022-04-28 14:40:55 +08:00
parent c5a2453564 d03583c865
commit 023d018c84
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -555,8 +555,8 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements
},{
text: '订单上报推送',
click: _record => this.orderReportPush(_record),
iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5')
// acl: { ability: ['VEHICLE-LIST-view'] },
iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5'),
acl: { ability: ['ORDER-BULK-push'] },
}
]
}

4
src/app/routes/order-management/components/vehicle/vehicle.component.ts
View File

@ -473,8 +473,8 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
{
text: '订单上报推送',
click: _record => this.orderReportPush(_record),
iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5')
// acl: { ability: ['VEHICLE-LIST-view'] },
iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5'),
acl: { ability: ['ORDER-VEHICLE-push'] },
}
]
}