Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop
This commit is contained in:
@ -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' },
|
||||||
@ -71,22 +73,22 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
|
|||||||
{ title: '回复时间', index: 'replyTime', width: '180px', className: 'text-left' }
|
{ title: '回复时间', index: 'replyTime', width: '180px', className: 'text-left' }
|
||||||
];
|
];
|
||||||
resourceStatus: number | undefined;
|
resourceStatus: number | undefined;
|
||||||
|
|
||||||
|
|
||||||
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);
|
||||||
|
|||||||
Reference in New Issue
Block a user