From df1bcf46548b6c38ed043b47892222205a869008 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 3 Mar 2022 15:45:44 +0800
Subject: [PATCH] fix bug

---
 .../driver/detail/detail.component.html       | 41 +++++++++----------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.html b/src/app/routes/usercenter/components/driver/detail/detail.component.html
index 07687f6e..53d25019 100644
--- a/src/app/routes/usercenter/components/driver/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html
@@ -95,9 +95,6 @@
           [nzBorderless]="!isEditUser" [placeholder]="isEditUser?'':'-'">
       </sv>
       <sv label="有效期"  col="1">
-          <!-- <nz-date-picker [(ngModel)]="userIdentityDetail.validStartTime" [nzDisabled]="!isEditUser" nzPlaceHolder=" "
-          [nzBorderless]="!isEditUser" [nzSuffixIcon]="userIdentityDetail?'calendar':''" style="width: 110px;" class="calendar">
-        </nz-date-picker> -->
         <nz-date-picker [(ngModel)]="userIdentityDetail.validStartTime" [nzDisabled]="!isEditUser" nzPlaceHolder=" "
         [nzBorderless]="!isEditUser" [nzSuffixIcon]="isEditUser?'calendar':''" style="width: 110px;" class="calendar">
       </nz-date-picker>
@@ -218,25 +215,7 @@
         <input nz-input type="text" [(ngModel)]="licenseDetail.licenseNo" [readonly]="!isEditDriver"
           [nzBorderless]="!isEditDriver" [placeholder]="isEditDriver?'':'-'">
       </sv>
-      <sv label="发证日期">
-        <nz-date-picker [(ngModel)]="licenseDetail.validStartTime" [nzDisabled]="!isEditDriver"
-          [nzPlaceHolder]="isEditDriver?'':'-'" [nzBorderless]="!isEditDriver"
-          [nzSuffixIcon]="isEditDriver?'calendar':''"></nz-date-picker>
-      </sv>
-      <sv label="有效期至">
-        <nz-date-picker [(ngModel)]="licenseDetail.validEndTime" [nzDisabled]="!isEditDriver"
-          [nzPlaceHolder]="isEditDriver?'':'-'" [nzBorderless]="!isEditDriver"
-          [nzSuffixIcon]="isEditDriver?'calendar':''"></nz-date-picker>
-
-          <ng-container *ngIf="!isEditDriver && !licenseDetail?.validEndTime && licenseDetail?.validStartTime">
-            <label style="padding-left: 11px;">长期</label>
-          </ng-container>
-          <ng-container *ngIf="isEditDriver">
-            <label nz-checkbox [ngModel]="!!!licenseDetail.validEndTime"
-              (ngModelChange)="$event?licenseDetail.validEndTime='':''" class="ml-sm">长期</label>
-          </ng-container>
-      </sv>
-      <sv label="公司所在地" col="3">
+      <sv label="公司所在地" >
         <ng-container *ngIf="isEditDriver; else cascaderelseTemplate">
           <nz-select [(ngModel)]="licenseDetail.regionCode">
             <ng-container *ngFor="let item of adressCodeList">
@@ -248,6 +227,24 @@
           {{licenseDetail?.regionCodeName }}
         </ng-template>
       </sv>
+      <sv label="发证日期" col="1">
+        <nz-date-picker [(ngModel)]="licenseDetail.validStartTime" [nzDisabled]="!isEditDriver" nzPlaceHolder=" "
+        [nzBorderless]="!isEditDriver" [nzSuffixIcon]="isEditDriver?'calendar':''" style="width: 110px;" class="calendar">
+      </nz-date-picker>
+        -
+        <ng-container *ngIf="!isEditDriver && !licenseDetail?.validEndTime && licenseDetail?.validStartTime">
+          <label style="padding-left: 11px;">长期</label>
+        </ng-container>
+        <nz-date-picker [(ngModel)]="licenseDetail.validEndTime" [nzDisabled]="!isEditDriver" nzPlaceHolder=" "
+          [nzBorderless]="!isEditDriver" [nzSuffixIcon]="isEditDriver?'calendar':''" style="width: 110px;" class="calendar">
+        </nz-date-picker>
+        <ng-container *ngIf="isEditDriver">
+          <label nz-checkbox [ngModel]="!!!licenseDetail.validEndTime"
+            (ngModelChange)="$event?licenseDetail.validEndTime='':''" class="ml-sm">长期</label>
+        </ng-container>
+
+      </sv>
+  
       <sv label="从业资格证照片" col="1">
         <ng-container
           *ngTemplateOutlet="uploadTemplate;context:{data:licenseDetail,status:isEditDriver,key:'certificatePhotoWatermark',key2:'certificatePhoto',hover:'licenseCertificate'}">