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

Merge branch 'weiyu' into develop

Browse Source
This commit is contained in:
weiyu
2022-04-24 14:19:58 +08:00
parent 9290f43130 b2d7d8e817
commit 7c60df96ba
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -416,11 +416,13 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
text: '运费变更记录', text: '运费变更记录',
click: _record => this.OpenPrice(_record), click: _record => this.OpenPrice(_record),
iif: item => iif: item =>
item.billType !== '3' && (
item.billStatus == '4' || item.billStatus == '4' ||
item.billStatus == '5' || item.billStatus == '5' ||
item.billStatus == '2' || item.billStatus == '2' ||
item.billStatus == '3' || item.billStatus == '3' ||
item.billStatus == '6', item.billStatus == '6'
),
acl: { ability: ['ORDER-VEHICLE-ChangeApplyList'] } acl: { ability: ['ORDER-VEHICLE-ChangeApplyList'] }
}, },
// { // {