diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.ts b/src/app/routes/vehicle/components/audit/detail/detail.component.ts index 211feb0f..4ffd1e67 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.ts @@ -166,14 +166,10 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy this.detailData.driverLicenseEndTime = EADateUtil.yearToDate(this.detailData?.driverLicenseEndTime); 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.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime); - console.log(this.detailData.roadTransportStartTime); if ( this.detailData.roadTransportStartTime > this.detailData.roadTransportEndTime || this.detailData.driverLicenseRegisterTime > this.detailData.driverLicenseEndTime @@ -183,6 +179,9 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy } 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) { params.curbWeight = params.curbWeight / 1000; } diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.ts b/src/app/routes/vehicle/components/list/detail/detail.component.ts index 1aa69b19..43a02ef8 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/list/detail/detail.component.ts @@ -276,10 +276,6 @@ export class VehicleComponentsListDetailComponent implements OnInit { this.detailData.driverLicenseEndTime = EADateUtil.yearToDate(this.detailData?.driverLicenseEndTime); 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.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime); @@ -292,6 +288,9 @@ export class VehicleComponentsListDetailComponent implements OnInit { } 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) { params.curbWeight = params.curbWeight / 1000; }