From 7b5e32b815c6056bfbdafa3c5dd3d6a2cbcd6050 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 28 Apr 2022 14:48:59 +0800
Subject: [PATCH] fix bug

---
 .../bulk-detail/bulk-detail.component.ts      |  2 +-
 .../components/bulk/bulk.component.ts         |  2 +-
 .../vehicle-detail.component.ts               | 15 ++------------
 .../components/vehicle/vehicle.component.ts   |  2 +-
 .../supply-management-routing.module.ts       | 20 ++++++++++++++++---
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts
index b7711049..f8b11cf7 100644
--- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts
+++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts
@@ -125,7 +125,7 @@ export class SupplyManagementBulkDetailComponent implements OnInit {
      */
   placeOrder(record: any) {
     console.log(record)
-    this.router.navigate(['/supply-management/bulk-amend', record.id], {
+    this.router.navigate(['/supply-management/bulk-next', record.id], {
       queryParams: {
         sta: 4
       },
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts
index 5055964a..aa0b4eae 100644
--- a/src/app/routes/supply-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts
@@ -492,7 +492,7 @@ export class SupplyManagementBulkComponent extends BasicTableComponent implement
 
   //  再下一单
   nextOrder(item: any) {
-    this.router.navigate(['/supply-management/bulk-amend', item.id], {
+    this.router.navigate(['/supply-management/bulk-next', item.id], {
       queryParams: {
         sta: 4
       }
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
index c2af6ae7..bf86c271 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
@@ -115,18 +115,7 @@ export class SupplyManagementVehicleDetailComponent implements OnInit {
     })
   }
 
-  /**
-   *再下一单
-   * @param record
-   */
-  placeOrder(record: any) {
-    this.router.navigate(['./pbg/onecar-publish'], {
-      queryParams: {
-        id: record?.id,
-        type: 'add'
-      }
-    })
-  }
+
   /**
   * 编辑外部货源号
   * @param item st当前行对象
@@ -168,7 +157,7 @@ export class SupplyManagementVehicleDetailComponent implements OnInit {
     });
   }
   nextOrder(item: any) {
-    this.router.navigate(['/supply-management/vehicle-amend', item.id], {
+    this.router.navigate(['/supply-management/vehicle-next', item.id], {
       queryParams: {
         sta: 2
       }
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
index 1d0f3c65..817a0c97 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@@ -324,7 +324,7 @@ export class SupplyManagementVehicleComponent extends BasicTableComponent implem
     });
   }
   nextOrder(item: any) {
-    this.router.navigate(['/supply-management/vehicle-amend', item.id], {
+    this.router.navigate(['/supply-management/vehicle-next', item.id], {
       queryParams: {
         sta: 2
       }
diff --git a/src/app/routes/supply-management/supply-management-routing.module.ts b/src/app/routes/supply-management/supply-management-routing.module.ts
index 73eb6dd2..10425568 100644
--- a/src/app/routes/supply-management/supply-management-routing.module.ts
+++ b/src/app/routes/supply-management/supply-management-routing.module.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-03 11:10:14
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-10 14:39:00
+ * @LastEditTime : 2022-04-28 14:45:50
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\supply-management-routing.module.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -58,11 +58,25 @@ const routes: Routes = [
           'SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate',
           'SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder'
         ]
-      }
-    }
+  }
+  }
+  },
+  {
+    path: 'vehicle-next/:id',
+    component: SupplyManagementOnecarPublishComponent,
+    // data: {
+    //   guard: {
+    //     ability: [
+    //       'SUPPLY-VEHICLE-PLACEORDER-QRCode',
+    //       'SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate',
+    //       'SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder'
+    //     ]
+    //   }
+    // }
   },
   { path: 'vehicle-release', component: SupplyManagementReleasePublishComponent },
   { path: 'bulk-release', component: SupplyManagementBulkReleasePublishComponent },
+  { path: 'bulk-next/:id', component: SupplyManagementBulkPublishComponent },
   { path: 'bulk-amend/:id', component: SupplyManagementBulkPublishComponent }
 ];