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

src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-15 13:17:42
- * @LastEditTime: 2021-12-29 15:12:09
+ * @LastEditTime: 2021-12-29 20:23:18
  * @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\order-management\modal\vehicle\update-freight\update-freight.component.html
@@ -10,5 +10,5 @@
 <sf style="margin-top: 15px;" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
 <div class="modal-footer">
   <button nz-button type="button" (click)="close()">关闭</button>
-  <button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [disabled]="sf.valid">确定</button>
+  <button nz-button type="submit" nzType="primary" (click)="save(sf?.value)" [disabled]="sf?.valid">确定</button>
 </div>

src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts

@@ -1,15 +1,13 @@
 /*
  * @Author: your name
  * @Date: 2021-12-14 14:03:07
- * @LastEditTime: 2021-12-29 17:02:54
+ * @LastEditTime: 2021-12-29 20:23:48
  * @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\order-management\modal\bulk\update-freight\update-freight.component.ts
  */
 import { Component, Input, OnInit, ViewChild } from '@angular/core';
-import {
+import {SFComponent, SFSchema, SFUISchema} from '@delon/form';
-  SFComponent, SFSchema, SFUISchema
-} from '@delon/form';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalRef } from 'ng-zorro-antd/modal';
 import { OrderManagementService } from '../../../services/order-management.service';
@@ -27,7 +25,6 @@ export class VehicleFreightPeopleComponent implements OnInit {
 
   aggreechecked = false;
 
-  @Input()
   data: any;
 
   constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService, private service2: ShipperBaseService) {}
@@ -44,9 +41,6 @@ export class VehicleFreightPeopleComponent implements OnInit {
         ui: {
           widget: 'select',
           placeholder: '请选择',
-          visibleIf: {
-            _$expand: (value: boolean) => value,
-          },
           allowClear: true,
           asyncData: () => this.service2.getNetworkFreightForwarder(),
         },

src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-14 14:03:07
- * @LastEditTime: 2021-12-29 17:02:54
+ * @LastEditTime: 2021-12-29 20:07:40
  * @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\order-management\modal\bulk\update-freight\update-freight.component.ts
@@ -13,14 +13,14 @@ import {
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalRef } from 'ng-zorro-antd/modal';
 import { OrderManagementService } from '../../../services/order-management.service';
-import { ShipperBaseService } from './../../../../../shared/services/business/shipper-base.service';
+import { ShipperBaseService } from '../../../../../shared/services/business/shipper-base.service';
 
 @Component({
-  selector: 'app-order-management-vehicle-freight-people',
+  selector: 'app-order-management-vehicle-modify-captain',
-  templateUrl: './freight-people.component.html',
+  templateUrl: './modify-captain.component.html',
-  styleUrls: ['./freight-people.component.less']
+  styleUrls: ['./modify-captain.component.less']
 })
-export class VehicleFreightPeopleComponent implements OnInit {
+export class VehicleModifyCaptainComponent implements OnInit {
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   schema: SFSchema = {};
   ui: SFUISchema = {};

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

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-29 16:49:32
+ * @LastEditTime: 2021-12-29 20:07:54
  * @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\order-management\order-management.module.ts
@@ -28,6 +28,7 @@ import { UpdateFreightComponent } from './modal/bulk/update-freight/update-freig
 import { OneCarOrderCancelComponent } from './modal/vehicle/cancel/cancel.component';
 import { VehicleConfirReceiptComponent } from './modal/vehicle/confir-receipt/confir-receipt.component';
 import { VehicleFreightPeopleComponent } from './modal/vehicle/freight-people/freight-people.component';
+import { VehicleModifyCaptainComponent } from './modal/vehicle/modify-captain/modify-captain.component';
 import { VehicleModifyRateComponent } from './modal/vehicle/modify-rate/modify-rate.component';
 import { VehicleSureArriveComponent } from './modal/vehicle/sure-arrive/sure-arrive.component';
 import { VehicleSureDepartComponent } from './modal/vehicle/sure-depart/sure-depart.component';
@@ -57,7 +58,8 @@ const COMPONENTS: Type<void>[] = [
   OrderManagementVehicleDetailChangeComponent,
   OrderManagementBulkDetailChangeComponent,
   VehicleModifyRateComponent,
-  VehicleFreightPeopleComponent
+  VehicleFreightPeopleComponent,
+  VehicleModifyCaptainComponent
 ];
 
 @NgModule({