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-18 10:53:17 +08:00
parent df934dbddd ce002d94df
commit 99a83acacb
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
View File

@ -45,6 +45,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
columns: STColumn[] = [ columns: STColumn[] = [
{ title: '异常编号', index: 'exceptionCode', width: '180px', className: 'text-left' }, { title: '异常编号', index: 'exceptionCode', width: '180px', className: 'text-left' },
{ title: '异常类型', index: 'exceptionTypeLabel', width: '180px', className: 'text-left' },
{ title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left' }, { title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' }, { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '250px', className: 'text-left' }, { title: '货主', index: 'shipperAppUserName', width: '250px', className: 'text-left' },
@ -57,6 +58,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
]; ];
columns2: STColumn[] = [ columns2: STColumn[] = [
{ title: '异常编号', index: 'exceptionCode', width: '180px', className: 'text-left' }, { title: '异常编号', index: 'exceptionCode', width: '180px', className: 'text-left' },
{ title: '异常类型', index: 'exceptionTypeLabel', width: '180px', className: 'text-left' },
{ title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left' }, { title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' }, { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-left' }, { title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-left' },
@ -76,17 +78,17 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
get reqParams() { get reqParams() {
return { return {
...this.sf?.value, ...this.sf?.value,
replyStatus: this.resourceStatus || 0 replyStatus: this.resourceStatus || 0
}; };
} }
get reqParams2() { get reqParams2() {
return { return {
...this.sf?.value, ...this.sf?.value,
replyStatus:this.resourceStatus || 1 replyStatus: this.resourceStatus || 1
}; };
} }
constructor(public service: WaybillManagementServe, private nzModalService: NzModalService, public shipperSrv: ShipperBaseService) {} constructor(public service: WaybillManagementServe, private nzModalService: NzModalService, public shipperSrv: ShipperBaseService) { }
ngOnInit(): void { ngOnInit(): void {
this.initSF(); this.initSF();
@ -217,7 +219,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
} }
selectChange(e: number) { selectChange(e: number) {
console.log(e); console.log(e);
this.resourceStatus = e ; this.resourceStatus = e;
setTimeout(() => { setTimeout(() => {
this?.st?.load(1); this?.st?.load(1);
this?.st2?.load(1); this?.st2?.load(1);