From be1053eb70246ed1d3c59d230d9ed399c1bf4052 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 28 Feb 2022 11:39:42 +0800 Subject: [PATCH] fix bug --- .../components/bulk/bulk.component.ts | 12 ++++++++++-- .../components/vehicle/vehicle.component.ts | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index f7781bd7..6da706ea 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -9,7 +9,7 @@ import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-f import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component'; import { of } from 'rxjs'; import { ShipperBaseService } from '@shared'; -import { Router } from '@angular/router'; +import { Router, ActivatedRoute } from '@angular/router'; import { OneCarOrderCancelConfirmComponent } from '../../modal/vehicle/cancel-confirm/cancel-confirm.component'; @Component({ @@ -71,7 +71,8 @@ export class OrderManagementBulkComponent implements OnInit { public service: OrderManagementService, private modal: NzModalService, public shipperservice: ShipperBaseService, - private router: Router + private router: Router, + private ar: ActivatedRoute, ) {} /** @@ -493,6 +494,13 @@ export class OrderManagementBulkComponent implements OnInit { iif: item => item.billStatus == '5', acl: { ability: ['ORDER-BULK-evaluation'] }, }, + { + text: '查看详情 ', + click: (item: any) => { + this.router.navigate(['./bulk-detail', item.id], { relativeTo: this.ar }); + }, + acl: { ability: ['USERCENTER-FREIGHT-USER-view'] }, + }, { text: '变更运费 ', click: _record => this.updateFreight(_record), diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 46109751..dca02003 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { Router } from '@angular/router'; +import { Router, ActivatedRoute } from '@angular/router'; import { STColumn, STComponent } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; import { ShipperBaseService } from '@shared'; @@ -70,6 +70,7 @@ resourceStatus: any; private modal: NzModalService, public shipperservice: ShipperBaseService, public router: Router, + public ar: ActivatedRoute, ) { } /** @@ -405,13 +406,20 @@ resourceStatus: any; width: '130px', className: 'text-left', buttons: [ - + { text: '运费变更记录', click: (_record) => this.OpenPrice(_record), iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6', acl: { ability: ['ORDER-VEHICLE-ChangeApplyList'] }, }, + { + text: '查看详情 ', + click: (item: any) => { + this.router.navigate(['./vehicle-detail', item.id], { relativeTo: this.ar }); + }, + acl: { ability: ['USERCENTER-FREIGHT-USER-view'] }, + }, { text: '查看评价 ', click: (_record) => this.viewEvaluate(_record),