Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

This commit is contained in:
Taric Xin
2022-04-18 10:53:17 +08:00

View File

@ -45,6 +45,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
columns: STColumn[] = [
{ 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: 'enterpriseInfoName', width: '250px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '250px', className: 'text-left' },
@ -57,6 +58,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
];
columns2: STColumn[] = [
{ 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: 'enterpriseInfoName', width: '180px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-left' },
@ -82,11 +84,11 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
get reqParams2() {
return {
...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 {
this.initSF();
@ -217,7 +219,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
}
selectChange(e: number) {
console.log(e);
this.resourceStatus = e ;
this.resourceStatus = e;
setTimeout(() => {
this?.st?.load(1);
this?.st2?.load(1);