车辆对接

src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2022-01-04 15:34:07
+ * @LastEditTime: 2022-01-13 16:43: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\order-management\components\vehicle-detail\vehicle-detail.component.html
@@ -19,8 +19,8 @@
     </div>
     <div nz-row style="display: flex; justify-content: end;">
       <div nz-col nzSpan="10">
-        <button nz-button  >确认发车</button>
-        <button nz-button nzType="primary" nzGhost >确认到车</button>
+        <button nz-button *ngIf="i.wayBillStatus == '2'"  (click)="sureDepart(i)">确认发车</button>
+        <button nz-button nzType="primary" *ngIf="i.wayBillStatus == '3'" (click)="sureArrive(i)" nzGhost >确认到车</button>
       </div>
     </div>
     <nz-divider></nz-divider>

src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts

@@ -13,6 +13,8 @@ import { _HttpClient } from '@delon/theme';
 import { NzCardComponent } from 'ng-zorro-antd/card';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import { VehicleSureArriveComponent } from 'src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component';
+import { VehicleSureDepartComponent } from 'src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component';
 import { WaybillManagementServe } from '../../services/waybill-management.service';
 @Component({
   selector: 'app-supply-management-bulk-detail',
@@ -50,6 +52,7 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
   constructor(
     private route: ActivatedRoute,
     private msgSrv: NzMessageService,
+    private modal: NzModalService, 
     private service: WaybillManagementServe,
     private modalService: NzModalService
   ) {
@@ -111,5 +114,38 @@ goDistance(elf: NzCardComponent) {
   if (elf) {
     elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' });
   }
+}
+ //  *确认发车
+ sureDepart(item: any) {
+  const modalRef = this.modal.create({
+    nzTitle: '确认发车',
+    nzWidth: '50%',
+    nzContent: VehicleSureDepartComponent,
+    nzComponentParams: {
+      i: item,
+     Status: 2
+    },
+    nzFooter: null
+  });
+  modalRef.afterClose.subscribe((result: any) => {
+    this.initData()
+
+});
+}
+// 确认到车
+sureArrive(item: any) {
+  const modalRef = this.modal.create({
+    nzTitle: '确认到车',
+    nzWidth: '50%',
+    nzContent: VehicleSureArriveComponent,
+    nzComponentParams: {
+      i: item,
+     Status: 2
+    },
+    nzFooter: null
+  });
+  modalRef.afterClose.subscribe((result: any) => {
+    this.initData()
+});
 }
 }

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

@@ -58,7 +58,10 @@ tabs = {
   totalQuantity: 0,
   compolatelQuantity: 0
 };
-  constructor(public service: WaybillManagementServe, private modal: NzModalService, public service2: ShipperBaseService) { }
+  constructor(
+    public service: WaybillManagementServe, 
+    private modal: NzModalService, 
+    public service2: ShipperBaseService) { }
 
   /**
  * 查询参数
@@ -358,7 +361,7 @@ tabs = {
       },
       {
         title: '运费明细',
-        width: '150px',
+        width: '220px',
         className: 'text-left',
         render: 'billExpenseDetailVOList'
       },
@@ -388,7 +391,7 @@ tabs = {
       {
         title: '接单数量',
         className: 'text-left',
-        width: '120px',
+        width: '200px',
         index: 'orderReceivingQuantity'
 
       },

src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2022-01-04 15:35:11
+ * @LastEditTime: 2022-01-13 16:55:33
  * @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\components\vehicle-detail\vehicle-detail.component.html
@@ -19,8 +19,8 @@
     </div>
     <div nz-row style="display: flex; justify-content: end;">
       <div nz-col nzSpan="10">
-        <button nz-button  >确认发车</button>
-        <button nz-button nzType="primary" nzGhost >确认到车</button>
+        <button nz-button (click)="sureDepart(i)" *ngIf="i?.wayBillStatus == '2'" >确认发车</button>
+        <button nz-button nzType="primary" (click)="sureArrive(i)" *ngIf="i?.wayBillStatus == '3'" nzGhost >确认到车</button>
       </div>
     </div>
     <nz-divider></nz-divider>

src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-28 17:10:12
+ * @LastEditTime: 2022-01-13 16:52:42
  * @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\components\vehicle-detail\vehicle-detail.component.ts
@@ -13,6 +13,8 @@ import { _HttpClient } from '@delon/theme';
 import { NzCardComponent } from 'ng-zorro-antd/card';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import { VehicleSureArriveComponent } from 'src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component';
+import { VehicleSureDepartComponent } from 'src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component';
 import { WaybillManagementServe } from '../../services/waybill-management.service';
 @Component({
   selector: 'app-supply-management-vehicle-detail',
@@ -51,7 +53,7 @@ export class WaybillManagementVehicleDetailComponent implements OnInit {
     private route: ActivatedRoute,
     private msgSrv: NzMessageService,
     private service: WaybillManagementServe,
-    private modalService: NzModalService
+    private modal: NzModalService,
   ) {
 
   }
@@ -75,15 +77,6 @@ export class WaybillManagementVehicleDetailComponent implements OnInit {
     })
   }
 
-
-  hand() {
-    this.modalService.create({
-      nzTitle: '',
-      // nzContent: OrderManagementGaodeMapComponent,
-      nzWidth: 1200
-    });
-  }
-
   goBack() {
     window.history.go(-1);
   }
@@ -112,4 +105,39 @@ goDistance(elf: NzCardComponent) {
     elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' });
   }
 }
+  //  *确认发车
+
+  sureDepart(item: any) {
+    const modalRef = this.modal.create({
+      nzTitle: '确认发车',
+      nzWidth: '50%',
+      nzContent: VehicleSureDepartComponent,
+      nzComponentParams: {
+        i: item,
+        Status: 1
+      },
+      nzFooter: null
+    });
+    modalRef.afterClose.subscribe((result: any) => {
+      this.initData()
+  
+  });
+  }
+  // 确认到车
+  sureArrive(item: any) {
+    const modalRef = this.modal.create({
+      nzTitle: '确认到车',
+      nzWidth: '50%',
+      nzContent: VehicleSureArriveComponent,
+      nzComponentParams: {
+        i: item,
+        Status: 1
+      },
+      nzFooter: null
+    });
+    modalRef.afterClose.subscribe((result: any) => {
+      this.initData()
+   
+  });
+  }
 }

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

@@ -55,7 +55,10 @@ export class WaybillManagementVehicleComponent implements OnInit {
     totalQuantity: 0,
     compolatelQuantity: 0
   };
-  constructor(public service: WaybillManagementServe, private modal: NzModalService, public service2: ShipperBaseService) {}
+  constructor(
+    public service: WaybillManagementServe,
+     private modal: NzModalService,
+      public service2: ShipperBaseService) {}
 
   /**
    * 查询参数