From 1ced203cb981764be5c1a844058fc881f1f02738 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 6 Jan 2022 13:32:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assigned-car/assigned-car.component.html       | 14 ++++++--------
 .../assigned-car/assigned-car.component.ts         |  8 ++++++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html
index e2e9599e..ec9bc1ca 100644
--- a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html
+++ b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html
@@ -23,9 +23,9 @@
             *ngFor="let car of item.userCarLicenseDesensitizationVOList" [nzCustomContent]="true">
             <span>{{car.carNo}} -</span>
             <span>{{car.carLength}}米,{{car.carLoad}}顿 -</span>
-            <span *ngIf="car?.approvalStatus === '20' && car.carStatus === '0'" class="text-success-dark">空闲</span>
-            <span *ngIf="car?.approvalStatus === '20' && car.carStatus === '1'" class="text-warning-dark">已被指派</span>
-            <span *ngIf="car?.approvalStatus !== '20'" class="text-red-dark">未认证</span>
+            <span *ngIf="car?.approvalStatus === 20 && !car.carStatus " class="text-success-dark">空闲</span>
+            <span *ngIf="car?.approvalStatus === 20 && car.carStatus " class="text-warning-dark">已被指派</span>
+            <span *ngIf="car?.approvalStatus !== 20" class="text-red-dark">未认证</span>
             <!-- <span [ngClass]="cardBADGE[car.carStatus]?.color">{{cardBADGE[car.carStatus]?.text}}</span> -->
           </nz-option>
         </nz-select>
@@ -35,11 +35,9 @@
         <a (click)="setCarCaptain(item)">设置</a>
       </ng-template>
       <ng-template st-row="driverStatus" let-item let-index>
-        <span *ngIf="item?.certificationStatus === '20' && item.driverStatus === '0'"
-          class="text-success-dark">空闲</span>
-        <span *ngIf="item?.certificationStatus === '20' && item.driverStatus === '1'"
-          class="text-warning-dark">已被指派</span>
-        <span *ngIf="item?.certificationStatus !== '20'" class="text-red-dark">未认证</span>
+        <span *ngIf="item?.certificationStatus === 1 && item.driverStatus === 0" class="text-success-dark">空闲</span>
+        <span *ngIf="item?.certificationStatus === 1 && item.driverStatus === 1" class="text-warning-dark">已被指派</span>
+        <span *ngIf="item?.certificationStatus !== 1" class="text-red-dark">未认证</span>
       </ng-template>
     </st>
   </div>
diff --git a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts
index 6c73d077..adde5b77 100644
--- a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts
+++ b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts
@@ -117,7 +117,7 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit {
     if (this.selectedRows) {
       const { carId, appUserId: driverId, captainAppUserId: carCaptainId } = this.selectedRows;
       const params: any = { carId, driverId, carCaptainId };
-      this.service.request(this.url, { ...params, ...this.params }).subscribe((res: any) => {
+      this.service.request(this.service.$api_save_assign_bulk, { ...params, ...this.params }).subscribe((res: any) => {
         if (res) {
           this.modal.close(res);
         }
@@ -150,7 +150,11 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit {
       modalOptions: { nzMaskClosable: false, nzTitle: '设置' }
     }
     ).subscribe((res) => {
-      if (res) this.st.reload();
+      if (res) {
+        item.captainName = res?.name;
+        item.captainPhone = res?.mobile;
+        item.captainAppUserId = res?.appUserId;
+      }
     });
   }