From 664ee868edaca327826948fa6ada4a3a76b522b2 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 20 Apr 2022 15:15:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E4=BD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../freight/user/detail/detail.component.html | 20 +++++++++++++++++--
 .../freight/user/detail/detail.component.ts   | 15 ++++++++++----
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/app/routes/usercenter/components/freight/user/detail/detail.component.html b/src/app/routes/usercenter/components/freight/user/detail/detail.component.html
index 42bfb9b9..65315746 100644
--- a/src/app/routes/usercenter/components/freight/user/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/freight/user/detail/detail.component.html
@@ -35,7 +35,7 @@
                   </button>
                   <button *ngIf="!userDetail?.stateLocked" [nzLoading]="service.http.loading" nz-button nzDanger nzGhost
                     (click)="userAction(0)"  acl  [acl-ability]="['USERCENTER-FREIGHT-USER-D-lock']">
-                    冻结33
+                    冻结
                   </button>
                 </div>
               </div>
@@ -80,7 +80,23 @@
         <input nz-input type="text" [minlength]="18"  [maxlength]="18" [(ngModel)]="userIdentityDetail.certificateNumber" [readonly]="!isEditUser"
           [nzBorderless]="!isEditUser" [placeholder]="isEditUser?'':'-'">
       </sv>
-      <sv label="身份证照">
+      <sv label="有效期"  col="1"> 
+        <nz-date-picker [(ngModel)]="userIdentityDetail.validStartTime" [nzDisabled]="!isEditUser" nzPlaceHolder=" "
+          [nzBorderless]="!isEditUser" [nzSuffixIcon]="isEditUser?'calendar':''" style="width: 130px;" 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: 130px;" 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
             *ngTemplateOutlet="uploadTemplate;context:{data:userIdentityDetail,status:isEditUser,key:'certificatePhotoFrontWatermark',key2:'certificatePhotoFront',hover:'certificateBackFront'}">
diff --git a/src/app/routes/usercenter/components/freight/user/detail/detail.component.ts b/src/app/routes/usercenter/components/freight/user/detail/detail.component.ts
index 67e0fe6d..edefc189 100644
--- a/src/app/routes/usercenter/components/freight/user/detail/detail.component.ts
+++ b/src/app/routes/usercenter/components/freight/user/detail/detail.component.ts
@@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router';
 import { apiConf } from '@conf/api.conf';
 import { STColumn, STComponent } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
-import { ModalHelper, _HttpClient } from '@delon/theme';
+import { ModalHelper, _HttpClient, DatePipe } from '@delon/theme';
 import { NzImageService } from 'ng-zorro-antd/image';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalService } from 'ng-zorro-antd/modal';
@@ -13,7 +13,8 @@ import { UsermanageService } from '../../../../services/usercenter.service';
 @Component({
   selector: 'app-supplier-components-list-view',
   templateUrl: './detail.component.html',
-  styleUrls: ['./detail.component.less']
+  styleUrls: ['./detail.component.less'],
+  providers:[DatePipe]
 })
 export class FreightComponentsUserDetailComponent implements OnInit {
   @ViewChild('redectModal', { static: false })
@@ -39,7 +40,8 @@ export class FreightComponentsUserDetailComponent implements OnInit {
     private nzModalService: NzModalService,
     public service: UsermanageService,
     public route: ActivatedRoute,
-    private nzImageService: NzImageService
+    private nzImageService: NzImageService,
+    private datePipe: DatePipe
   ) {}
 
   ngOnInit() {
@@ -154,7 +156,12 @@ export class FreightComponentsUserDetailComponent implements OnInit {
   }
 
   saveUser() {
-    const params = { ...this.userIdentityDetail };
+    const params = {...this.userIdentityDetail};
+    Object.assign(params, {
+      ...this.userIdentityDetail,
+      validStartTime: this.datePipe.transform(this.userIdentityDetail?.validStartTime, 'yyyy-MM-dd'),
+      validEndTime: this.datePipe.transform(this.userIdentityDetail?.validEndTime, 'yyyy-MM-dd'),
+    });
     this.service.request(this.service.$api_update_driver_identity, params).subscribe(res => {
       if (res) {
         this.service.msgSrv.success('修改成功');