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-02-28 11:41:04 +08:00
parent d55ff3f838 33b695729a
commit f3062a3cad
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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),

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

@ -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,
) { }
/**
@ -412,6 +413,13 @@ resourceStatus: any;
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),