From 64f178c81cf9b657cc2d550f48e189e1d33657ca Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 25 Mar 2022 18:06:02 +0800
Subject: [PATCH] fix bug

---
 .../components/vehicle/vehicle.component.ts   |  2 +-
 .../driver/detail/detail.component.ts         | 24 ++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
index 92a29c7c..22bdb5c3 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -450,7 +450,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
           {
             text: '取消订单',
             click: _record => this.cancellation(_record),
-            iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus !== '2',
+            iif: item => item.billStatus !== '6' && item.overallPaymentStatus !== '2',
             acl: { ability: ['ORDER-VEHICLE-cancelAnOrder'] }
           },
           {
diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.ts b/src/app/routes/usercenter/components/driver/detail/detail.component.ts
index 98c51cc2..6dcce146 100644
--- a/src/app/routes/usercenter/components/driver/detail/detail.component.ts
+++ b/src/app/routes/usercenter/components/driver/detail/detail.component.ts
@@ -8,8 +8,10 @@ import { ModalHelper, _HttpClient } from '@delon/theme';
 import { NzImageService } from 'ng-zorro-antd/image';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import { Subject } from 'rxjs';
 import { ImageViewComponent } from 'src/app/shared/components/imagelist';
 import { UsermanageService } from '../../../services/usercenter.service';
+import { debounceTime } from 'rxjs/operators';
 
 @Component({
   selector: 'app-usercenter-components-driver-detail',
@@ -21,6 +23,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
   detailData: any;
   userDetail: any;
   contencarModel: any;
+  changeSub = new Subject<string>();
   facetext: any;
   faceStatus: any = 0;
   userIdentityDetail: any = {};
@@ -73,6 +76,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
   ngOnInit() {
     this.initData();
     this.initDetailByCode();
+    this.changeEndKmAction()
   }
   initData() {
     // 获取司机头部信息
@@ -209,17 +213,21 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
       nzTitle: '审核通过',
       nzContent: `<p>驾驶证号：${this.driverDetail?.licenseNo}</p><p>从业资格证号：${this.licenseDetail?.licenseNo}</p><p>是否确认通过审核`,
       nzOnOk: () => {
-        this.adjuctDriverLicense(
-          {
-            approvalStatus: 20,
-            appUserId: this.userDetail?.appUserId
-          },
-          '审核成功'
-        );
+        this.changeEndKmAction()
       }
     });
   }
-
+  changeEndKmAction() {
+    this.changeSub.pipe(debounceTime(500)).subscribe((res: string) => {
+      this.adjuctDriverLicense(
+        {
+          approvalStatus: 20,
+          appUserId: this.userDetail?.appUserId
+        },
+        '审核成功'
+      );
+    })
+  }
   /** 驳回驾驶员信息 */
   rejectedDriver() {
     this.approvalOpinion = '';