Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edit

Browse Source
This commit is contained in:
Taric Xin
2022-04-13 10:12:56 +08:00
parent 3cd8a56f49
commit 3d576487d4
8 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/datatable/reporting/components/view-track/view-track.component.ts
View File

@ -50,10 +50,10 @@ export class DatatableReportingvViewTrackComponent implements OnInit {
}); });
}); });
this.mapList = list; this.mapList = list;
this.addressItems = [...res.cityArray]; this.addressItems = [...res.parkArray];
if (this.addressItems && this.addressItems.length > 0) { if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime); item.parkBte = this.getLocalTime(item.parkBte);
}); });
} }
} }
@ -78,7 +78,7 @@ export class DatatableReportingvViewTrackComponent implements OnInit {
this.addressItems = [...res.enclosureDataAppTrack]; this.addressItems = [...res.enclosureDataAppTrack];
if (this.addressItems && this.addressItems.length > 0) { if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.vinOutTime = item.vinOutTime ? this.getLocalTime(item.gtm) : ''; item.parkBte = item.parkBte ? this.getLocalTime(item.parkBte) : '';
item.cityName = item.appAdress; item.cityName = item.appAdress;
}); });
} }

8
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
View File

@ -76,8 +76,8 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
schema: SFSchema = {}; schema: SFSchema = {};
ui: SFUISchema = {}; ui: SFUISchema = {};
logColumns2: STColumn[] = [ logColumns2: STColumn[] = [
{ title: '时间', index: 'vinOutTime' }, { title: '时间', index: 'parkBte' },
{ title: '地点', index: 'cityName' } { title: '地点', index: 'parkAdr' }
]; ];
logColumns: STColumn[] = [ logColumns: STColumn[] = [
{ title: '款项', index: 'expenseCodeLabel' }, { title: '款项', index: 'expenseCodeLabel' },
@ -973,10 +973,10 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
}); });
}); });
this.mapList = list; this.mapList = list;
this.addressItems = res?.cityArray; this.addressItems = res?.parkArray;
if (this.addressItems && this.addressItems.length > 0) { if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime); item.parkBte = this.getLocalTime(item.parkBte);
}); });
} }
} }

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

@ -38,8 +38,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
modalTitle: string = ''; modalTitle: string = '';
isVisible = false; isVisible = false;
logColumns2: STColumn[] = [ logColumns2: STColumn[] = [
{ title: '时间', index: 'vinOutTime' }, { title: '时间', index: 'parkBte' },
{ title: '地点', index: 'cityName' } { title: '地点', index: 'parkAdr' }
]; ];
logColumns: STColumn[] = [ logColumns: STColumn[] = [
{ title: '款项', index: 'expenseCodeLabel' }, { title: '款项', index: 'expenseCodeLabel' },
@ -178,10 +178,10 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
}); });
}); });
this.mapList = list; this.mapList = list;
this.addressItems = res.cityArray; this.addressItems = res.parkArray;
if (this.addressItems && this.addressItems.length > 0) { if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime); item.parkBte = this.getLocalTime(item.parkBte);
}); });
} }
} }

8
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
View File

@ -90,8 +90,8 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
mapList: any[] = []; //地图点位数据组 mapList: any[] = []; //地图点位数据组
addressItems: any[] = []; //打点地址数据组 addressItems: any[] = []; //打点地址数据组
logColumns2: STColumn[] = [ logColumns2: STColumn[] = [
{ title: '时间', index: 'vinOutTime' }, { title: '时间', index: 'parkBte' },
{ title: '地点', index: 'cityName' } { title: '地点', index: 'parkAdr' }
]; ];
constructor( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,
@ -928,10 +928,10 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}); });
}); });
this.mapList = list; this.mapList = list;
this.addressItems = res?.cityArray; this.addressItems = res?.parkArray;
if (this.addressItems && this.addressItems.length > 0) { if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime); item.parkBte = this.getLocalTime(item.parkBte);
}); });
} }
} }

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

@ -43,8 +43,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
approvalLsit: any; approvalLsit: any;
isVisible = false; isVisible = false;
logColumns2: STColumn[] = [ logColumns2: STColumn[] = [
{ title: '时间', index: 'vinOutTime' }, { title: '时间', index: 'parkBte' },
{ title: '地点', index: 'cityName' } { title: '地点', index: 'parkAdr' }
]; ];
logColumns: STColumn[] = [ logColumns: STColumn[] = [
{ title: '款项', index: 'expenseCodeLabel' }, { title: '款项', index: 'expenseCodeLabel' },
@ -171,10 +171,10 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
}); });
}); });
this.mapList = list; this.mapList = list;
this.addressItems = res.cityArray; this.addressItems = res.parkArray;
if (this.addressItems && this.addressItems.length > 0) { if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime); item.parkBte = this.getLocalTime(item.parkBte);
}); });
} }
} }

8
src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts
View File

@ -38,8 +38,8 @@ export class OneCarOrderViewtrackComponent implements OnInit {
mapList:any[] = []; //地图点位数据组 mapList:any[] = []; //地图点位数据组
addressItems: any[] = []; //打点地址数据组 addressItems: any[] = []; //打点地址数据组
logColumns2: STColumn[] = [ logColumns2: STColumn[] = [
{ title: '时间', index: 'vinOutTime' }, { title: '时间', index: 'parkBte' },
{ title: '地点', index: 'cityName' }, { title: '地点', index: 'parkAdr' },
]; ];
constructor( constructor(
private modalRef: NzModalRef, private modalRef: NzModalRef,
@ -70,10 +70,10 @@ export class OneCarOrderViewtrackComponent implements OnInit {
}); });
}); });
this.mapList = list; this.mapList = list;
this.addressItems = res.cityArray; this.addressItems = res.parkAdr;
if(this.addressItems && this.addressItems.length > 0){ if(this.addressItems && this.addressItems.length > 0){
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime); item.parkBte = this.getLocalTime(item.parkBte);
}); });
} }
} }

8
src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts
View File

@ -39,8 +39,8 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
modalTitle:string = ''; modalTitle:string = '';
unLoadingPlaceVOList: any = []; unLoadingPlaceVOList: any = [];
logColumns2: STColumn[] = [ logColumns2: STColumn[] = [
{ title: '时间', index: 'vinOutTime' }, { title: '时间', index: 'parkBte' },
{ title: '地点', index: 'cityName' }, { title: '地点', index: 'parkAdr' },
]; ];
logColumns: STColumn[] = [ logColumns: STColumn[] = [
{ title: '款项', index: 'costCodeLabel' }, { title: '款项', index: 'costCodeLabel' },
@ -172,10 +172,10 @@ sureArrive(item: any) {
}); });
}); });
this.mapList = list; this.mapList = list;
this.addressItems = res.cityArray; this.addressItems = res.parkArray;
if(this.addressItems && this.addressItems.length > 0){ if(this.addressItems && this.addressItems.length > 0){
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime); item.parkBte = this.getLocalTime(item.parkBte);
}); });
} }
} }

4
src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
View File

@ -165,10 +165,10 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro
}); });
}); });
this.mapList = list; this.mapList = list;
this.addressItems = res.cityArray; this.addressItems = res.parkArray;
if (this.addressItems && this.addressItems.length > 0) { if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime); item.parkBte = this.getLocalTime(item.parkBte);
}); });
} }
} }