diff --git a/src/app/routes/partner/channel-sales/components/list/list.component.html b/src/app/routes/partner/channel-sales/components/list/list.component.html
index 1183199e..35ebff8a 100644
--- a/src/app/routes/partner/channel-sales/components/list/list.component.html
+++ b/src/app/routes/partner/channel-sales/components/list/list.component.html
@@ -4,10 +4,12 @@
* @Author : Shiming
* @Date : 2022-04-21 13:49:22
* @LastEditors : Shiming
- * @LastEditTime : 2022-04-26 09:47:43
+ * @LastEditTime : 2022-05-16 13:30:12
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\channel-sales\\components\\list\\list.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
+
+
this.detailData.roadTransportEndTime ||
this.detailData.driverLicenseRegisterTime > this.detailData.driverLicenseEndTime
@@ -305,6 +308,7 @@ export class VehicleComponentsListDetailComponent implements OnInit {
useNature: null,
driverLicenseRegisterTime: null,
driverLicenseGetTime: null,
+ scrapTime: null,
driverLicenseEndTime: null,
roadTransportStartTime: null,
roadTransportEndTime: null,
diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts
index 25e64bbb..73112c6a 100644
--- a/src/app/shared/services/business/shipper-base.service.ts
+++ b/src/app/shared/services/business/shipper-base.service.ts
@@ -162,8 +162,8 @@ export class ShipperBaseService extends BaseService {
}
const list = res.map((item: any) => {
return {
- label: item.partnerType == 1 ? item.enterpriseName : item.contactName + '/' + item.contactMobile ,
- value: item.id
+ label: item?.partnerType == 1 ? item?.enterpriseName : item?.contactName + '/' + item?.contactMobile ,
+ value: item?.id
};
});
const obj = [];
diff --git a/src/app/shared/utils/date.util.ts b/src/app/shared/utils/date.util.ts
index f5a7ab35..b6b42c19 100644
--- a/src/app/shared/utils/date.util.ts
+++ b/src/app/shared/utils/date.util.ts
@@ -67,8 +67,6 @@ export class EADateUtil {
* @returns YYYY-MM-DD 00:00:00
*/
static yearToDateTime(start: Date): number {
- console.log('222')
- console.log(start)
let Dates : any='';
if(typeof(start) !== 'string') {
var c = new Date(start);