Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

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

@@ -1,59 +0,0 @@
-<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>
-  </div>
-</div>
-<div nz-row nzGutter="8">
-  <div nz-col [nzSpan]="14">
-    <!-- 数据列表 -->
-    <st #st [bordered]="true" [data]="service.$api_get_practice_car_list" [columns]="columns" size="small"
-      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams,lazyLoad:true }"
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } , process: resProcess}"
-      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-      [loading]="service.http.loading" [widthMode]="{ type: 'strict' }" [scroll]="{ x: '600px' }"
-      style="margin-top: 22px;" (change)="changeSt($event)">
-      <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]="10">
-    <!-- 选中列表 -->
-    <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' }">
-      <ng-template st-row="carNo" let-item let-index="index">
-        <span>{{ item.carNo ? item.carNo:'不限' }}</span>
-      </ng-template>
-      <ng-template st-row="captain" let-item let-index="index">
-        <span>{{ item.captainName }}&nbsp;{{ item.captainPhone }}</span> &nbsp;
-        <a (click)="setCaptain(item)">设置</a>
-      </ng-template>
-    </st>
-  </div>
-</div>
-<div *nzModalFooter>
-  <button nz-button nzType="default" (click)="cancel()">取消</button>
-  <button nz-button nzType="primary" (click)="submit()">发布并指派给司机</button>
-</div>

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

@@ -1,24 +0,0 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SupplyManagementBulkAssignedCarComponent } from './assigned-car-bulk.component';
-
-describe('SupplyManagementBulkAssignedCarComponent', () => {
-  let component: SupplyManagementBulkAssignedCarComponent;
-  let fixture: ComponentFixture<SupplyManagementBulkAssignedCarComponent>;
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [SupplyManagementBulkAssignedCarComponent]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SupplyManagementBulkAssignedCarComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

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

@@ -1,292 +0,0 @@
-import { Component, Input, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { STChange, STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
-import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
-import { ModalHelper } from '@delon/theme';
-import { isTemplateRef } from 'ng-zorro-antd/core/util';
-import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
-import { SupplyManagementService } from '../../services/supply-management.service';
-import { SupplyManagementAddDriversComponent } from '../add-drivers/add-drivers.component';
-import { PublishchooseFamifiarAddComponent } from '../choose-famifiar/add/add.component';
-
-const BADGE: STColumnBadge = {
-  1: { text: '空闲', color: 'success' },
-  2: { text: '未实名', color: 'error' },
-  3: { text: '在途', color: 'warning' },
-};
-
-@Component({
-  selector: 'app-supply-management-assigned-car',
-  templateUrl: './assigned-car-bulk.component.html',
-})
-export class SupplyManagementBulkAssignedCarComponent implements OnInit {
-  schema: SFSchema = {};
-  columns!: STColumn[];
-  i: any;
-  ui!: SFUISchema;
-  sfExpand = false;
-  @ViewChild('st', { static: false })
-  st!: STComponent;
-  @ViewChild('sf', { static: false })
-  sf!: SFComponent;
-
-  @ViewChild('st2', { static: false })
-  st2!: STComponent;
-  columns2!: STColumn[];
-  st2Data: STData[] = [];
-
-  @Input()
-  submitUrl = '';
-
-  @Input()
-  submitParams = {};
-  hasSelectedDrivers = [];
-
-  constructor(
-    private modal: NzModalRef,
-    public router: Router,
-    public ar: ActivatedRoute,
-    public service: SupplyManagementService,
-    private modalService: NzModalService,
-    private modalHelper: ModalHelper,
-  ) { }
-
-  /**
-   * 查询参数
-   */
-  get reqParams() {
-    return {
-      ...this.sf?.value,
-      isManage: 0
-    };
-  }
-
-  ngOnInit() {
-    this.initSF();
-    this.initST();
-    this.initST2();
-    this.getHasAssignedCar(this.i?.id);
-  }
-
-  initSF() {
-    this.schema = {
-      properties: {
-        nameOrPhone: {
-          type: 'string',
-          title: '',
-          ui: {
-            placeholder: '请输入司机姓名/手机号'
-          }
-        },
-        carNo: {
-          type: 'string',
-          title: '',
-          ui: {
-            placeholder: '请输入车牌号'
-          }
-        }
-      }
-    };
-    this.ui = {
-      '*': {
-        spanLabelFixed: 10,
-        grid: { span: 12, gutter: 4, }
-      }
-    };
-  }
-
-  initST() {
-    this.columns = [
-      {
-        title: '司机姓名',
-        index: 'name'
-      },
-      {
-        title: '手机号',
-        index: 'telephone'
-      },
-
-      {
-        title: '指定车辆',
-        width: 130,
-        render: 'userCarLicenseDesensitizationVOList'
-      },
-      {
-        title: '状态',
-        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: '操作',
-        className: 'text-center',
-        buttons: [
-          {
-            text: '选择',
-            iif: item => !item.checked,
-            click: (_record, _modal, _instance) => this.choose(_record),
-            iifBehavior: 'disabled'
-          }
-        ]
-      }
-    ];
-  }
-
-  initST2() {
-    this.columns2 = [
-      {
-        title: '司机姓名',
-        index: 'name',
-        className: 'text-center',
-        width: '20%'
-      },
-      {
-        title: '手机号',
-        index: 'telephone',
-        className: 'text-center',
-        width: '15%'
-      },
-      {
-        title: '车队长',
-        render: 'captain',
-        className: 'text-center',
-        width: '30%'
-      },
-      {
-        title: '指定车辆',
-        render: 'carNo',
-        className: 'text-center',
-        width: '15%'
-      },
-      {
-        title: '操作',
-        className: 'text-center',
-        width: '20%',
-        buttons: [
-          {
-            text: '移除',
-            click: (_record, _modal, _instance) => this.remove(_record, _modal, _instance)
-          }
-        ]
-      }
-    ];
-  }
-
-  // 选择
-  choose(record: STData) {
-    this.st2Data = [...this.st2Data, ...[record]];
-    this.st.setRow(record, { checked: 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, { checked: false });
-    }
-  }
-
-  //添加司机
-  add() {
-    this.modalService.create({
-      nzTitle: '添加司机',
-      nzContent: PublishchooseFamifiarAddComponent
-    });
-  }
-
-  //设置车队长
-  setCaptain(record: STData) {
-
-    this.modalHelper.create(SupplyManagementAddDriversComponent, { dirvierInfo: record }, {
-      size: 900,
-      modalOptions: { nzMaskClosable: false, nzTitle: '设置' }
-    }
-    ).subscribe((res) => {
-      if (res) {
-        this.st2Data = this.st2Data.map(_item => {
-          if (_item?.userId === record?.userId) {
-            _item.captainName = res?.name;
-            _item.captainPhone = res?.mobile;
-            _item.captainAppUserId = res?.appUserId;
-          }
-          return _item;
-        })
-      }
-    });
-  }
-
-  /**
-   * 重置表单
-   */
-  resetSF() {
-    this.sf.reset();
-    this.sfExpand = false;
-    this.st.load(1);
-  }
-
-  expandToggle() {
-    this.sfExpand = !this.sfExpand;
-    this.sf?.setValue('/_expand', this.sfExpand);
-  }
-
-  // 熟车请求数据处理
-  resProcess(data: STData[]): STData[] {
-    return data.map((i, index) => {
-      const defaultCart = i.userCarLicenseDesensitizationVOList.find((cart: any) => cart.isDefault);
-      return { ...i, default: defaultCart || '' };
-    });
-  }
-
-  cancel() {
-    this.modal.close();
-  }
-
-  submit() {
-    if (this.st2Data?.length <= 0) {
-      this.service.msgSrv.warning('请选择熟车');
-      return;
-    }
-    const data = this.st2Data.map(item => ({ driverId: item.appUserId, carId: item.default?.carId || null, carCaptainId: item.captainAppUserId }));
-    this.service.request(this.service.$api_save_assign_bulk, { id: this.i?.id, carDriverIds: data }).subscribe(res => {
-      if (res) {
-        this.service.msgSrv.success('指派成功');
-        this.modal.destroy(true);
-      }
-    });
-  }
-
-  changeSt(e: STChange) {
-    if (e?.type === 'loaded' && this.st2Data.length > 0) {
-      // 页面加载完成时勾选
-      (e?.loaded || []).forEach((r, index) => {
-        this.st2Data.forEach((x) => {
-          if (x.appUserId === r.appUserId) {
-            this.st.setRow(index, { checked: true });
-          }
-        });
-      });
-    }
-  }
-  carChange(event: any, item: STData) {
-    // this.st.setRow(item, { carName: event });
-  }
-
-  getHasAssignedCar(id: any) {
-    this.service.request(this.service.$api_get_has_assigned_car_list, { id }).subscribe(res => {
-      if (res) {
-        this.hasSelectedDrivers = res;
-        this.st2Data = [...res];
-        this.st.reload();
-      }
-    })
-  }
-
-}

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

@@ -57,7 +57,9 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit {
     return {
       ...this.sf?.value,
       loadingTime: this.params?.loadingTime,
-      unloadingTime: this.params?.unloadingTime
+      enterpriseId: this.params?.shipperAppUserId,
+      enterpriseProjectId: this.params?.enterpriseProjectId,
+      unloadingTime: this.params?.unloadingTime,
     };
   }
 
@@ -107,6 +109,7 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit {
   }
 
   ngOnInit(): void {
+    console.log(this.params)
   }
 
   dataProcess(data: STData[]): STData[] {

src/app/routes/supply-management/components/bulk/bulk.component.ts

@@ -2,14 +2,12 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
-import { ModalHelper, _HttpClient } from '@delon/theme';
+import { _HttpClient } from '@delon/theme';
 import { ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { SupplyManagementService } from '../../services/supply-management.service';
-import { SupplyManagementBulkAssignedCarComponent } from '../assigned-car-bulk/assigned-car-bulk.component';
-import { PublishGoodsChooseFamifiarComponent } from '../choose-famifiar/choose-famifiar.component';
 import { SupplyManagementQrcodePageComponent } from '../qrcode-page/qrcode-page.component';
 import { SupplyManagementUpdatePriceComponent } from '../update-price/update-price.component';
 

src/app/routes/supply-management/supply-management.module.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-20 10:13:02
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-01 15:38:17
+ * @LastEditTime : 2022-03-07 15:59:05
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\supply-management.module.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -14,7 +14,6 @@ import { SharedModule } from '@shared';
 import { CarAddDriverComponent } from './components/add-driver/add-driver.component';
 import { SupplyManagementAddDriversComponent } from './components/add-drivers/add-drivers.component';
 import { CarAddmodalComponent } from './components/addmodal/addmodal.component';
-import { SupplyManagementBulkAssignedCarComponent } from './components/assigned-car-bulk/assigned-car-bulk.component';
 import { SupplyManagementVehicleAssignedCarComponent } from './components/assigned-car/assigned-car.component';
 import { SupplyManagementBulkDetailComponent } from './components/bulk-detail/bulk-detail.component';
 import { SupplyManagementBulkPublishComponent } from './components/bulk-publish/bulk-publish.component';
@@ -62,7 +61,6 @@ const COMPONENTS: Type<void>[] = [
   SupplyManagementReleasePublishComponent,
   SupplyManagementBulkReleasePublishComponent,
   TranAgreementComponent,
-  SupplyManagementBulkAssignedCarComponent,
   SupplyManagementImportSupplyComponent
 ];