车辆对接

src/app/routes/order-management/components/vehicle/vehicle.component.ts

@@ -647,6 +647,10 @@ resourceStatus: any;
     this.selectedRows.forEach(item => {
       params.push(item.id);
     });
+    let params2: any[] = [];
+    this.selectedRows.forEach(item => {
+      params2.push(item.enterpriseInfoId);
+    });
     if(params.length  === 0) {
       this.service.msgSrv.error('请先选择订单！')
       return
@@ -655,7 +659,7 @@ resourceStatus: any;
           nzTitle: '修改网络货运人',
           nzWidth: 600,
           nzContent: VehicleFreightPeopleComponent,
-          nzComponentParams: { data: { ids: params,  } },
+          nzComponentParams: { data: { ids: params, enterpriseInfoIds: params2, } },
           nzFooter: null,
           // nzOnOk: sin => {
           //   this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {

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

@@ -1,7 +1,8 @@
+import { Params } from '@angular/router';
 /*
  * @Author: your name
  * @Date: 2021-12-14 14:03:07
- * @LastEditTime: 2021-12-29 20:48:59
+ * @LastEditTime: 2022-01-04 09:37:50
  * @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
@@ -61,11 +62,13 @@ export class VehicleFreightPeopleComponent implements OnInit {
   }
 
   save(value: any): void {
- 
+    console.log(this.sf.value)
     const params = {
+      billIds: this.data?.ids,
+      enterpriseInfoId: this.sf.value?.enterpriseInfoName
     };
-
+    console.log(params)
-    this.service.request(this.service.$api_get_insertFreightChangeWhole, params).subscribe((res: any) => {
+    this.service.request(this.service.$api_set_updateEnterpriseInfoBatch, params).subscribe((res: any) => {
       if (res) {
         this.modal.destroy();
         this.service.msgSrv.success('变更运费成功');

src/app/routes/order-management/services/order-management.service.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-31 15:26:07
+ * @LastEditTime: 2022-01-04 09:32:27
  * @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\services\order-management.service.ts
@@ -101,6 +101,8 @@ export class OrderManagementService extends ShipperBaseService {
   $api_set_getWholeOrderDetail = `/api/sdc/billOperate/getWholeOrderDetail`;
      // 修改--大宗订单详情
   $api_set_getBulkOrderDetail = `/api/sdc/billOperate/getBulkOrderDetail`;
+     // 批量修改网络货运人
+  $api_set_updateEnterpriseInfoBatch = `/api/sdc/billOperate/updateEnterpriseInfoBatch`;
 
 
 
@@ -112,7 +114,7 @@ export class OrderManagementService extends ShipperBaseService {
    */
      getNetworkFreightForwarderHistory(params: any) {
        const param = {
-        enterpriseIds: params.ids
+        enterpriseIds: params.enterpriseInfoIds
        }
       return this.request(this.$api_get_getEnterpriseNetTransHis, param).pipe(
         map((res: any) => {

src/app/routes/usercenter/components/driver/detail/detail.component.html

@@ -109,7 +109,7 @@
           </ng-container>
           <ng-template #editDriverButton>
             <button *ngIf="driverDetail?.approvalStatus==10" nz-button nzType="default" nzDanger
-              (click)="approveDriver()">审核通过</button>
+              (click)="approveDriver()">审核通过88</button>
             <button *ngIf="driverDetail?.approvalStatus==10" nz-button nzType="default" nzDanger
               (click)="rejectedDriver()">驳回审核</button>
             <button nz-button nzType="default" nzDanger (click)="ratify(1)">修改</button>
@@ -178,8 +178,7 @@
           </nz-select>
         </ng-container>
         <ng-template #cascaderelseTemplate>
-          {{ detailData?.fullRegionVO?.provinceName }}{{ detailData?.fullRegionVO?.cityName }}{{
+      {{licenseDetail?.regionCodeName }}
-          detailData?.fullRegionVO?.areaName }}
         </ng-template>
       </sv>
       <sv label="从业资格证照片" col="1">

src/app/routes/usercenter/components/driver/detail/detail.component.ts

@@ -274,6 +274,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
     console.log(this.driverDetail)
     const params = {
       userId: this.route.snapshot.params.id,
+      mobile: this.userDetail?.phone,
       appUserId: driverDetail.appUserId || this.route.snapshot.params.id,
       userDriverLicenseDTO: {
         appUserId: driverDetail?.appUserId || this.route.snapshot.params.id,