车辆对接

2022-01-06 16:51:48 +08:00
parent bfcbe348b6
commit d003166b31
12 changed files with 601 additions and 166 deletions
--- a/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html
+++ b/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html
@ -1,65 +1,62 @@
-<button nz-button nzType="primary" style="margin-bottom: 24px" (click)="add()"><i nz-icon nzType="plus"></i>添加司机</button>
+<!--
+ * @Author: your name
+ * @Date: 2021-12-06 15:17:52
+ * @LastEditTime: 2022-01-06 16:42:37
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\choose-famifiar\choose-famifiar.component.html
+-->
+<button nz-button nzType="primary" style="margin-bottom: 24px" (click)="add()"><i nz-icon
+  nzType="plus"></i>添加司机</button>
 <!-- 搜索区 -->
 <div nz-row nzGutter="8">
-  <div nz-col [nzSpan]="12">
-    <div nz-row nzGutter="8">
-      <div nz-col [nzSpan]="18">
-        <sf #sf [ui]="ui" [schema]="schema" [button]="'none'"></sf>
-      </div>
-      <div nz-col [nzSpan]="6">
-        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st.load(1)">查询</button>
-        <button nz-button (click)="resetSF()">重置</button>
-      </div>
+<div nz-col [nzSpan]="12">
+  <div nz-row nzGutter="8">
+    <div nz-col [nzSpan]="18">
+      <sf #sf [ui]="ui" [schema]="schema" [button]="'none'"></sf>
+    </div>
+    <div nz-col [nzSpan]="6">
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st.load(1)">查询</button>
+      <button nz-button (click)="resetSF()">重置</button>
    </div>
  </div>
 </div>
+</div>
 <div nz-row nzGutter="8">
-  <div nz-col [nzSpan]="12">
-    <!-- 数据列表 -->
-    <st
-      #st
-      [bordered]="true"
-      [data]="dataInfo"
-      [columns]="columns"
-      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams, process: reqProcess }"
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-      [loadingDelay]="500"
-      [loading]="service.http.loading"
-      [widthMode]="{ type: 'strict' }"
-      [scroll]="{ x: '600px' }"
-    >
-      <ng-template st-row="name3" let-item let-index="index">
-        <nz-select ngModel="lucy" (ngModelChange)="carChange($event,item)">
-          <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
-          <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
-        </nz-select>
-      </ng-template>
-    </st>
-  </div>
-  <div nz-col [nzSpan]="12">
-    <!-- 选中列表 -->
-    <st
-      #st2
-      [bordered]="true"
-      [data]="st2Data"
-      [columns]="columns2"
-      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams, process: reqProcess }"
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-      [loadingDelay]="500"
-      [loading]="service.http.loading"
-      [widthMode]="{ type: 'strict' }"
-      [scroll]="{ x: '600px' }"
-    >
-      <ng-template st-row="name3" let-item let-index="index">
-        <span>{{ item.name3 }}&nbsp;{{ item.name4 }}</span>&nbsp;
-        <a (click)="setCaptain(item)">设置</a>
-      </ng-template>
-    </st>
-  </div>
+<div nz-col [nzSpan]="12">
+  <!-- 数据列表 -->
+  <st #st [bordered]="true" [data]="service.$api_getList_card" [columns]="columns" size="small"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } , process: reqProcess}"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loadingDelay]="500" [loading]="service.http.loading" [widthMode]="{ type: 'strict' }" [scroll]="{ x: '600px' }"
+    style="margin-top: 22px;">
+    <ng-template st-row="userCarLicenseDesensitizationVOList" let-item let-index="index">
+      <nz-select [(ngModel)]="item.default" (ngModelChange)="carChange($event, item)" style="width: 100%;">
+        <nz-option nzValue="" nzLabel="不限"></nz-option>
+        <nz-option [nzValue]="cart" [nzLabel]="cart.carNo"
+          *ngFor="let cart of item.userCarLicenseDesensitizationVOList">
+        </nz-option>
+      </nz-select>
+    </ng-template>
+  </st>
+</div>
+<div nz-col [nzSpan]="12">
+  <!-- 选中列表 -->
+  <div>已选择{{ st2Data.length }}位司机</div>
+  <st #st2 [bordered]="true" [data]="st2Data" [columns]="columns2" size="small"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loadingDelay]="500" [loading]="service.http.loading" [widthMode]="{ type: 'strict' }" [scroll]="{ x: '600px' }">
+    <ng-template st-row="captain" let-item let-index="index">
+      <span>{{ item.captainName }}&nbsp;{{ item.captainPhone }}</span> &nbsp;
+      <a (click)="setCaptain(item,index)">设置</a>
+    </ng-template>
+  </st>
+</div>
 </div>
 <div *nzModalFooter>
-  <button nz-button nzType="default" (click)="cancel()">取消</button>
-  <button nz-button nzType="primary" (click)="ok()">发布并指派给司机</button>
+<button nz-button nzType="default" (click)="cancel()">取消</button>
+<button nz-button nzType="primary" (click)="ok()">发布并指派给司机</button>
 </div>
--- a/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.ts
+++ b/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.ts
@ -1,13 +1,15 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, Input, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { STChange, STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { ModalHelper } from '@delon/theme';
 import { processSingleSort } from '@shared';
 import { NzDrawerRef, NzDrawerService } from 'ng-zorro-antd/drawer';
-import { NzModalService } from 'ng-zorro-antd/modal';
-import { map } from 'rxjs/operators';
+import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
+import { SupplyManagementAddDriversComponent } from 'src/app/routes/supply-management/components/add-drivers/add-drivers.component';

 import { SupplyManagementService } from '../../services/supply-management.service';
+import { CarAddmodalComponent } from '../addmodal/addmodal.component';
 import { PublishchooseFamifiarAddComponent } from './add/add.component';
 import { PublishchooseFamifiarSetCaptainComponent } from './set-captain/set-captain.component';

@ -18,6 +20,7 @@ import { PublishchooseFamifiarSetCaptainComponent } from './set-captain/set-capt
 export class PublishGoodsChooseFamifiarComponent implements OnInit {
  schema: SFSchema = {};
  columns!: STColumn[];
+  i: any;
  ui!: SFUISchema;
  sfExpand = false;
  @ViewChild('st', { static: false })
@ -30,45 +33,22 @@ export class PublishGoodsChooseFamifiarComponent implements OnInit {
  columns2!: STColumn[];
  st2Data: STData[] = [];

+  @Input()
+  submitUrl = '';
+
+  @Input()
+  submitParams = {};
+
  constructor(
-    private modal: NzModalService,
+    private modal: NzModalRef,
    public router: Router,
    public ar: ActivatedRoute,
    private drawerService: NzDrawerService,
    public service: SupplyManagementService,
-    private modalService: NzModalService
+    private modalService: NzModalService,
+    private modalHelper: ModalHelper
  ) {}

-  dataInfo: STData[] = [
-    {
-      id: '1',
-      name1: '1111',
-      name2: '2222',
-      name3: '3333',
-      name4: '4444',
-      name5: '5555',
-      name6: '6666',
-      name7: '7777',
-      name8: '8888',
-      name9: '9999',
-      name10: '1010',
-      name11: '1012',
-      name12: '1013'
-    },
-    {
-      id: '2',
-      name1: '9999',
-      name2: '8888',
-      name3: '7777',
-      name4: '6666',
-      name5: '5555',
-      name6: '4444',
-      name7: '3333',
-      name8: '2222',
-      name9: '1111'
-    }
-  ];
-
  /**
   * 查询参数
   */
@ -78,10 +58,6 @@ export class PublishGoodsChooseFamifiarComponent implements OnInit {
      isManage: 0
    };
  }
-
-  get selectedRows() {
-    return this.st?.list.filter(item => item.checked) || [];
-  }
  ngOnInit() {
    this.initSF();
    this.initST();
@ -118,21 +94,28 @@ export class PublishGoodsChooseFamifiarComponent implements OnInit {
    this.columns = [
      {
        title: '司机姓名',
-        index: 'name1'
+        index: 'name'
      },
      {
        title: '手机号',
-        index: 'name2'
+        index: 'telephone'
      },
      {
        title: '指定车辆',
-        index: 'name3',
-        render: 'name3',
-        width: '180px'
+        width: 130,
+        render: 'userCarLicenseDesensitizationVOList'
      },
      {
        title: '状态',
-        index: 'name4'
+        className: 'text-center',
+        index: 'certificationStatus',
+        type: 'badge',
+        badge: {
+          '-1': { text: '未提交', color: 'default' },
+          0: { text: '待审核', color: 'processing' },
+          1: { text: '已认证', color: 'success' },
+          2: { text: '未认证', color: 'error' }
+        }
      },
      {
        title: '操作',
@ -140,8 +123,9 @@ export class PublishGoodsChooseFamifiarComponent implements OnInit {
        buttons: [
          {
            text: '选择',
-            iif: item => item.showChoose !== 'false',
-            click: (_record, _modal, _instance) => this.choose(_record)
+            iif: item => item.showChoose != false,
+            click: (_record, _modal, _instance) => this.choose(_record),
+            iifBehavior: 'disabled'
          }
        ]
      }
@ -152,21 +136,22 @@ export class PublishGoodsChooseFamifiarComponent implements OnInit {
    this.columns2 = [
      {
        title: '司机姓名',
-        index: 'name1'
+        index: 'name'
      },
      {
        title: '手机号',
-        index: 'name2'
+        index: 'telephone',
+        width: '120px'
      },
      {
        title: '车队长',
-        index: 'name3',
-        render: 'name3',
-        width: '180px'
+        render: 'captain',
+        width: '200px'
      },
      {
        title: '指定车辆',
-        index: 'name4'
+        index: 'carNo',
+        width: '130px'
      },
      {
        title: '操作',
@ -183,36 +168,42 @@ export class PublishGoodsChooseFamifiarComponent implements OnInit {

  // 选择
  choose(record: STData) {
-    this.st2Data.push({ ...record });
-    this.st2.load();
-    this.st.setRow(record, { showChoose: 'false' });
+    this.st2Data = [...this.st2Data, ...[record]];
+    this.st.setRow(record, { showChoose: false });
  }
  // 移除
-  remove(record: STData, value1: any, value2: any) {
-    this.st.setRow(record, { showChoose: 'true' });
-    let index = (this.st2Data || []).findIndex(obj => obj.id === record.id);
-    this.st2Data.splice(index, 1);
-    this.st2.load();
-
-    const stData = this.st.data;
-    let index2 = (stData as any).findIndex((obj: any) => obj.id === record.id);
-    this.st.setRow(index2, { showChoose: 'true' });
+  remove(record: STData, value1: any, comp: any) {
+    const index = this.st?.list.findIndex((obj: any) => obj.appUserId === record.appUserId);
+    if (index >= 0) {
+      comp!.removeRow(record);
+      this.st2Data = this.st2Data.filter(item => item.appUserId !== record.appUserId);
+      this.st.setRow(index, { showChoose: true });
+    }
  }

  //添加司机
  add() {
-    this.modalService.create({
-      nzTitle: '添加司机',
-      nzContent: PublishchooseFamifiarAddComponent
+    this.modalHelper.create(CarAddmodalComponent, {}, { size: 900, modalOptions: { nzMaskClosable: false } }).subscribe(res => {
+      if (res) this.st.reload();
    });
  }

  //设置车队长
-  setCaptain(record: STData) {
-    this.modalService.create({
-      nzTitle: '设置车队长',
-      nzContent: PublishchooseFamifiarSetCaptainComponent
-    });
+  setCaptain(record: STData, index: any) {
+    this.modalHelper
+      .create(
+        SupplyManagementAddDriversComponent,
+        { dirvierInfo: record },
+        {
+          size: 900,
+          modalOptions: { nzMaskClosable: false, nzTitle: '设置' }
+        }
+      )
+      .subscribe(res => {
+        if (res) {
+          this.st2.setRow(index, { captainName: res.name, captainPhone: res.mobile, captainAppUserId: res.appUserId });
+        }
+      });
  }

  /**
@ -229,16 +220,35 @@ export class PublishGoodsChooseFamifiarComponent implements OnInit {
    this.sf?.setValue('/_expand', this.sfExpand);
  }

-  // 排序
-  reqProcess(requestOptions: STRequestOptions): STRequestOptions {
-    return processSingleSort(requestOptions);
+  // 熟车请求数据处理
+  reqProcess(data: STData[]): STData[] {
+    return data.map((i, index) => {
+      const defaultCart = i.userCarLicenseDesensitizationVOList.find((cart: any) => cart.isDefault);
+      return { ...i, default: defaultCart || '' };
+    });
  }

-  cancel() {}
-
-  ok() {}
-
-  carChange(event: any, item: STData) {
-    this.st.setRow(item, { name3: event });
+  cancel() {
+    this.modal.destroy();
  }
+
+  ok() {
+    if (this.st2._data?.length <= 0) {
+      this.service.msgSrv.warning('请选择熟车');
+      return;
+    }
+    const data = this.st2._data.map(item => ({
+      driverId: item.appUserId,
+      carId: item.default?.carId || null,
+      carCaptainId: item.captainAppUserId
+    }));
+    this.service.request(this.submitUrl, { ...this.submitParams, carDriverIds: data }).subscribe((rs: any) => {
+      if (rs) {
+        this.service.msgSrv.success('指派成功');
+        this.modal.destroy(true);
+      }
+    });
+  }
+
+  carChange(event: any, item: STData) {}
 }