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

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.
 -->
+<page-header-wrapper [title]="'销售渠道管理'"></page-header-wrapper>
+
 <nz-card>
   <!-- 搜索区 -->
   <sf

src/app/routes/usercenter/components/freight/list/list.component.ts

@@ -417,6 +417,7 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
       },
       { title: '申请时间', className: 'text-center', index: 'createTime', width: 180, type: 'date' },
       { title: '审核时间', className: 'text-center', index: 'approvalTime', width: 180, type: 'date' },
+      { title: '迁移认证时间', className: 'text-center', index: 'transferApprovalTime', width: 180, type: 'date' },
       { title: '审核人', className: 'text-center', index: 'approvalUserName', width: 130 },
       {
         title: '保险认证状态',

src/app/routes/vehicle/components/audit/detail/detail.component.ts

@@ -16,11 +16,13 @@ import { VehicleImgViewComponent } from '../../list/img-view/img-view.component'
 import { VehicleComponentsListEditComponent } from '../../list/edit/edit.component';
 import { NzImageService } from 'ng-zorro-antd/image';
 import { fromEvent, Subscription } from 'rxjs';
+import { DateTimePickerUtil } from '@delon/util';
 
 @Component({
   selector: 'app-Vehicle-components-Audit-detail',
   templateUrl: './detail.component.html',
-  styleUrls: ['./detail.component.less']
+  styleUrls: ['./detail.component.less'],
+  providers: [DateTimePickerUtil]
 })
 export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy {
   @ViewChild('st', { static: false }) st!: STComponent;
@@ -52,7 +54,8 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
     private route: ActivatedRoute,
     private nzModalService: NzModalService,
     private modal: ModalHelper,
-    private nzImageService: NzImageService
+    private nzImageService: NzImageService,
+    private dateTimePickerUtil: DateTimePickerUtil
   ) {}
   ngOnDestroy(): void {
     this.subscribeScoll.unsubscribe();
@@ -153,7 +156,8 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
 
     this.detailData.driverLicenseEndTime = EADateUtil.yearToDate(this.detailData?.driverLicenseEndTime);
 
-    this.detailData.driverLicenseGetTime = EADateUtil.yearToDate(this.detailData?.driverLicenseGetTime);
+    this.detailData.driverLicenseGetTime = EADateUtil.yearToDateTime(this.detailData?.driverLicenseGetTime);
+    this.detailData.scrapTime = this.dateTimePickerUtil.format(this.detailData?.scrapTime, 'yyyy-MM-dd HH:mm:ss');
 
     this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime);
 
@@ -243,6 +247,7 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
       useNature: null,
       driverLicenseRegisterTime: null,
       driverLicenseGetTime: null,
+      scrapTime: null,
       driverLicenseEndTime: null,
       roadTransportStartTime: null,
       roadTransportEndTime: null,

src/app/routes/vehicle/components/list/detail/detail.component.ts

@@ -10,11 +10,13 @@ import { apiConf } from '@conf/api.conf';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { EADateUtil } from '@shared';
 import { NzImageService } from 'ng-zorro-antd/image';
+import { DateTimePickerUtil } from '@delon/util';
 
 @Component({
   selector: 'app-supplier-components-list-view',
   templateUrl: './detail.component.html',
-  styleUrls: ['./detail.component.less']
+  styleUrls: ['./detail.component.less'],
+  providers: [DateTimePickerUtil]
 })
 export class VehicleComponentsListDetailComponent implements OnInit {
   i: any;
@@ -46,7 +48,8 @@ export class VehicleComponentsListDetailComponent implements OnInit {
     public service: VehicleService,
     private route: ActivatedRoute,
     private nzModalService: NzModalService,
-    private nzImageService: NzImageService
+    private nzImageService: NzImageService,
+    private dateTimePickerUtil: DateTimePickerUtil
   ) {}
 
   ngOnInit() {
@@ -265,11 +268,11 @@ export class VehicleComponentsListDetailComponent implements OnInit {
 
     this.detailData.driverLicenseGetTime = EADateUtil.yearToDate(this.detailData?.driverLicenseGetTime);
 
+    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);
-    console.log(this.detailData.roadTransportStartTime);
     if (
       this.detailData.roadTransportStartTime > 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,

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 = [];

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);