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:
wangshiming
2022-05-16 17:41:15 +08:00
parent b488fcb236 50b2c60987
commit 250bb0425e
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/routes/vehicle/components/audit/detail/detail.component.ts
View File

@ -166,14 +166,10 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
this.detailData.driverLicenseEndTime = EADateUtil.yearToDate(this.detailData?.driverLicenseEndTime); this.detailData.driverLicenseEndTime = EADateUtil.yearToDate(this.detailData?.driverLicenseEndTime);
this.detailData.driverLicenseGetTime = EADateUtil.yearToDate(this.detailData?.driverLicenseGetTime); this.detailData.driverLicenseGetTime = EADateUtil.yearToDate(this.detailData?.driverLicenseGetTime);
if (this.detailData.scrapTime) {
this.detailData.scrapTime = this.dateTimePickerUtil.format(this.detailData?.scrapTime, 'yyyy-MM-dd HH:mm:ss');
}
this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime); this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime);
this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime); this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime);
console.log(this.detailData.roadTransportStartTime);
if ( if (
this.detailData.roadTransportStartTime > this.detailData.roadTransportEndTime || this.detailData.roadTransportStartTime > this.detailData.roadTransportEndTime ||
this.detailData.driverLicenseRegisterTime > this.detailData.driverLicenseEndTime this.detailData.driverLicenseRegisterTime > this.detailData.driverLicenseEndTime
@ -183,6 +179,9 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
} }
const params = { ...this.detailData }; const params = { ...this.detailData };
if (params.scrapTime && params.scrapTime instanceof Date) {
params.scrapTime = this.dateTimePickerUtil.format(params.scrapTime, 'yyyy-MM-dd HH:mm:ss');
}
if (params.curbWeight) { if (params.curbWeight) {
params.curbWeight = params.curbWeight / 1000; params.curbWeight = params.curbWeight / 1000;
} }

7
src/app/routes/vehicle/components/list/detail/detail.component.ts
View File

@ -276,10 +276,6 @@ export class VehicleComponentsListDetailComponent implements OnInit {
this.detailData.driverLicenseEndTime = EADateUtil.yearToDate(this.detailData?.driverLicenseEndTime); this.detailData.driverLicenseEndTime = EADateUtil.yearToDate(this.detailData?.driverLicenseEndTime);
this.detailData.driverLicenseGetTime = EADateUtil.yearToDate(this.detailData?.driverLicenseGetTime); this.detailData.driverLicenseGetTime = EADateUtil.yearToDate(this.detailData?.driverLicenseGetTime);
if (this.detailData.scrapTime) {
this.detailData.scrapTime = this.dateTimePickerUtil.format(this.detailData?.scrapTime, 'yyyy-MM-dd HH:mm:ss');
}
this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime); this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime);
this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime); this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime);
@ -292,6 +288,9 @@ export class VehicleComponentsListDetailComponent implements OnInit {
} }
const params = { ...this.detailData }; const params = { ...this.detailData };
if (params.scrapTime && params.scrapTime instanceof Date) {
params.scrapTime = this.dateTimePickerUtil.format(params.scrapTime, 'yyyy-MM-dd HH:mm:ss');
}
if (params.curbWeight) { if (params.curbWeight) {
params.curbWeight = params.curbWeight / 1000; params.curbWeight = params.curbWeight / 1000;
} }