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

---
 .../driver/detail/detail.component.html       | 57 ++++++++++++++-----
 1 file changed, 44 insertions(+), 13 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 b70f5df7..f4e3885c 100644
--- a/src/app/routes/usercenter/components/driver/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html
@@ -94,16 +94,23 @@
         <input nz-input type="text" [(ngModel)]="userIdentityDetail.certificateNumber" [readonly]="!isEditUser"
           [nzBorderless]="!isEditUser" [placeholder]="isEditUser?'':'-'">
       </sv>
-      <sv label="有效期起">
-        <nz-date-picker [(ngModel)]="userIdentityDetail.validStartTime" [nzDisabled]="!isEditUser"
-          [nzPlaceHolder]="isEditUser?'':'-'" [nzBorderless]="!isEditUser"
-          [nzSuffixIcon]="isEditUser?'calendar':''"></nz-date-picker>
-      </sv>
-      <sv label="有效期至">
-        <nz-date-picker [(ngModel)]="userIdentityDetail.validEndTime" [nzDisabled]="!isEditUser" dateFormat="yyyy-MM-dd"
-          [nzPlaceHolder]="isEditUser?'':'-'" [nzBorderless]="!isEditUser"
-          [nzSuffixIcon]="isEditUser?'calendar':''"></nz-date-picker>
+      <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>
+        -
+        <ng-container *ngIf="!isEditUser && !userIdentityDetail?.validEndTime && userIdentityDetail?.validStartTime">
+          <label style="padding-left: 11px;">长期</label>
+        </ng-container>
+        <nz-date-picker [(ngModel)]="userIdentityDetail.validEndTime" [nzDisabled]="!isEditUser" nzPlaceHolder=" "
+          [nzBorderless]="!isEditUser" [nzSuffixIcon]="isEditUser?'calendar':''" style="width: 110px;" class="calendar">
+        </nz-date-picker>
+        <ng-container *ngIf="isEditUser">
+          <label nz-checkbox [ngModel]="!!!userIdentityDetail.validEndTime"
+            (ngModelChange)="$event?userIdentityDetail.validEndTime='':''" class="ml-sm">长期</label>
+        </ng-container>
       </sv>
+  
       <sv label="身份证照" col="1">
         <div class="d-flex">
           <ng-container
@@ -157,7 +164,23 @@
           <nz-option *ngFor="let i of contencarModel" [nzLabel]="i.label" [nzValue]="i.label"></nz-option>
         </nz-select>
       </sv>
-      <sv label="有效期起">
+      <sv label="有效期" col="1">
+        <nz-date-picker [(ngModel)]="driverDetail.validStartTime" [nzDisabled]="!isEditDriver" nzPlaceHolder=" "
+        [nzBorderless]="!isEditDriver" [nzSuffixIcon]="isEditDriver?'calendar':''" style="width: 110px;" class="calendar">
+      </nz-date-picker>
+      -
+      <ng-container *ngIf="!isEditDriver && !driverDetail?.validEndTime && driverDetail?.validStartTime">
+        <label style="padding-left: 11px;">长期</label>
+      </ng-container>
+      <nz-date-picker [(ngModel)]="driverDetail.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]="!!!driverDetail.validEndTime"
+          (ngModelChange)="$event?driverDetail.validEndTime='':''" class="ml-sm">长期</label>
+      </ng-container>
+      </sv>
+      <!-- <sv label="有效期起">
         <nz-date-picker [(ngModel)]="driverDetail.validStartTime" [nzDisabled]="!isEditDriver"
           [nzPlaceHolder]="isEditDriver?'':'-'" [nzBorderless]="!isEditDriver"
           [nzSuffixIcon]="isEditDriver?'calendar':''"></nz-date-picker>
@@ -166,7 +189,7 @@
         <nz-date-picker [(ngModel)]="driverDetail.validEndTime" [nzDisabled]="!isEditDriver" dateFormat="yyyy-MM-dd"
           [nzPlaceHolder]="isEditDriver?'':'-'" [nzBorderless]="!isEditDriver"
           [nzSuffixIcon]="isEditDriver?'calendar':''"></nz-date-picker>
-      </sv>
+      </sv> -->
       <sv label="驾驶证签发机关" col="2">
         <input nz-input type="text" [(ngModel)]="driverDetail.signingOrganization" [readonly]="!isEditDriver"
           [nzBorderless]="!isEditDriver" [placeholder]="isEditDriver?'':'-'">
@@ -201,6 +224,14 @@
         <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">
         <ng-container *ngIf="isEditDriver; else cascaderelseTemplate">
@@ -262,10 +293,10 @@
   <sv-container col="3" class="mt-md">
     <sv-title>银行结算信息</sv-title>
     <sv label="开户银行">
-      {{ detailData?.name }}
+      {{ userIdentityDetail?.name }}
     </sv>
     <sv label="银行卡号">
-      {{ detailData?.certificateNumber }}
+      {{ userIdentityDetail?.certificateNumber }}
     </sv>
   </sv-container>