fix bug

src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts

@@ -2,8 +2,9 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { STChange, STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
+import { EAEnvironmentService } from '@shared';
 import { NzMessageService } from 'ng-zorro-antd/message';
-import { NzModalRef } from 'ng-zorro-antd/modal';
+import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
 import { SupplyManagementService } from '../../services/supply-management.service';
 import { SupplyManagementAddDriversComponent } from '../add-drivers/add-drivers.component';
 import { CarAddmodalComponent } from '../addmodal/addmodal.component';
@@ -29,7 +30,6 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit {
   @ViewChild('st') st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   status: string = 'anew';
-  type: any;
   url = ''; // 请求的api地址
   params: any = {}; // 传进来的参数
   cardBADGE: STColumnBadge | any = {
@@ -43,6 +43,8 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit {
     private msgSrv: NzMessageService,
     public service: SupplyManagementService,
     private modalHelper: ModalHelper,
+    private envSrv: EAEnvironmentService,
+    private modalSrv: NzModalService
   ) {
     this.initSF();
     this.initSt();
@@ -54,10 +56,14 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit {
   get reqParams() {
     return {
       ...this.sf?.value,
+      loadingTime: this.params?.loadingTime,
+      unloadingTime: this.params?.unloadingTime
     };
   }
 
 
+
+
   /**
 * 初始化查询表单
 */
@@ -67,14 +73,15 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit {
         _$expand: { type: 'boolean', ui: { hidden: true } },
         nameOrPhone: {
           type: 'string',
-          title: '',
+          title: '承运司机',
           ui: {
             placeholder: '请输入司机姓名/手机号'
           }
         },
         carNo: {
           type: 'string',
-          title: '',
+          title: '车牌号',
+          maxLength: 9,
           ui: {
             placeholder: '请输入车牌号'
           }
@@ -100,13 +107,12 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    console.log(this.type)
   }
 
   dataProcess(data: STData[]): STData[] {
     return data.map((i, index) => {
       i.carId = '';
-      i.disabled = i.carStatus === '1';
+      i.disabled = (i?.certificationStatus === 1 && i.driverStatus === 1);
       const defaultCar = i?.userCarLicenseDesensitizationVOList?.find((item: any) => item.isDefault);
       if (defaultCar) {
         i.carId = defaultCar?.carId;
@@ -116,16 +122,15 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit {
   }
 
   save(): void {
-    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) => {
-        if (res) {
-          this.modal.close(res);
-        }
-      })
+    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) => {
+      if (res) {
+        this.service.msgSrv.success('指派成功！');
+        this.modal.close(res);
+      }
+    })
 
-    }
   }
 
   changeSt(e: STChange): void {
@@ -143,10 +148,28 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit {
     });
   }
 
+  /**
+   * 校验司机是否能设置车队长
+   * @param item 当前对象
+   */
+  verifyCanSetCarCaptain(item: any) {
+    this.service.request(this.service.$api_get_sys_config, [{ itemKey: 'sys.config.shipper.setCarCaptain', businessId: this.envSrv.env.enterpriseId }]).subscribe(res => {
+      if (res && res.length > 0) {
+        const { itemValue } = res[0];
+        if (itemValue !== '1') {
+          this.service.msgSrv.error('不可设置车队长！');
+          return;
+        }
+        this.setCarCaptain(item);
+      }
+    })
+  }
+
   /**
    * 设置车队长
    */
   setCarCaptain(item: any) {
+
     this.modalHelper.create(SupplyManagementAddDriversComponent, { dirvierInfo: item }, {
       size: 900,
       modalOptions: { nzMaskClosable: false, nzTitle: '设置' }
@@ -168,4 +191,57 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit {
     this.sf.reset();
     this.st.load(1);
   }
+
+  /**
+   * 验证车辆的状态
+   */
+  verifyVechicleStatus(params: any) {
+    if (this.selectedRows) {
+      const obj = this.status === 'anew' ? { resourceId: params.id } : { ...params };
+      const { carId, appUserId: driverId, captainAppUserId: carCaptainId } = this.selectedRows;
+      const carInfo: any = { carId, driverId, carCaptainId };
+      this.service.request(this.service.$api_verify_vehicle_status, { ...obj, ...carInfo }).subscribe(res => {
+        if (res) {
+          const { title, alert, subContent, content } = res;
+          switch (alert) {
+            case 'Error':
+              // if (code === '3' || code === '4' || code === '8') {
+              //   this.error(title, subContent, '#CF3834');
+              // } else {
+              this.error(title, content, subContent);
+              break;
+            case 'Warn':
+              this.showConfirm(title, content, subContent);
+              break;
+            case 'Success':
+              this.save();
+              break;
+          }
+        }
+      })
+    }
+
+  }
+
+  error(title: string, content: string, subContent: string): void {
+    this.modalSrv.error({
+      nzTitle: title,
+      nzContent: `<span class="text-error-dark">${content ? content : ''}</span><span class="text-grey-dark">${subContent ? subContent : ''}</span>`,
+      nzOkText: '知道了'
+    });
+  }
+
+  showConfirm(title: string, content: string, subContent: string): void {
+    this.modalSrv.confirm({
+      nzTitle: title,
+      nzContent: `<span class="text-error-dark">${content ? content : ''}</span><span class="text-grey-dark">${subContent ? subContent : ''}</span>`,
+      nzOkText: '继续',
+      nzCancelText: '取消',
+      nzOnOk: () => {
+        this.save();
+      }
+    });
+  }
+
+
 }