From d2b42d961c6172cdf8f082b78775ca0170e9e945 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 22 Dec 2021 10:09:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/bulk-detail/bulk-detail.component.html |  2 +-
 .../components/bulk-detail/bulk-detail.component.ts   | 11 ++---------
 .../components/bulk/bulk.component.html               |  6 +++---
 .../components/vehicle/vehicle.component.html         |  2 +-
 .../components/vehicle/vehicle.component.ts           |  1 +
 .../services/order-management.service.ts              |  4 ++--
 6 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
index 2b5273fd..0ea75fc4 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-21 17:13:11
+ * @LastEditTime: 2021-12-22 10:09:11
  * @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
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
index 9c73906e..e1a93ff6 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-22 09:49:57
+ * @LastEditTime: 2021-12-22 10:02:00
  * @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
@@ -49,13 +49,13 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
     private route: ActivatedRoute,
     private msgSrv: NzMessageService,
     private service: OrderManagementService,
-    private modalService: NzModalService
   ) {
 
   }
 
   ngOnInit(): void {
     console.log(this.id)
+    console.log('123')
     this.initData()
   }
 
@@ -68,13 +68,6 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
     })
   }
 
-  hand() {
-    this.modalService.create({
-      nzTitle: '',
-      // nzContent: OrderManagementGaodeMapComponent,
-      nzWidth: 1200
-    });
-  }
 
   goBack() {
     window.history.go(-1);
diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html
index 4c34c13c..c493cfbb 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.html
+++ b/src/app/routes/order-management/components/bulk/bulk.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-21 11:19:15
+ * @LastEditTime: 2021-12-22 10:09:02
  * @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\supply-management\components\vehicle\vehicle.component.html
@@ -61,9 +61,9 @@
     [loading]="service.http.loading"
     >
     <ng-template st-row="billCode" let-item let-index="index">
-      <a [routerLink]="'/waybill-management/vehicle-detail/'+item.id">{{item.wayBillCode}}</a>
+      <a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.wayBillCode}}</a>
       <div>
-        <span>{{item?.billStatusLabel}}</span>
+        <span>{{item?.billStatusLabel}}99999</span>
       </div>
     </ng-template>
     <ng-template st-row="goodsName" let-item let-index="index">
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html
index 050707b9..4cf8147f 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-21 15:08:15
+ * @LastEditTime: 2021-12-22 09:56: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\supply-management\components\vehicle\vehicle.component.html
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
index 25d28c14..88deb548 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -121,6 +121,7 @@ resourceStatus: any;
         billCode: {
           type: 'string',
           title: '订单号'
+          
         },
         resourceCode: {
           type: 'string',
diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts
index 5ea792e6..e35eb4c5 100644
--- a/src/app/routes/order-management/services/order-management.service.ts
+++ b/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-22 09:49:24
+ * @LastEditTime: 2021-12-22 10:09: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\services\order-management.service.ts
@@ -75,7 +75,7 @@ export class OrderManagementService extends BaseService {
   public $api_getFreightChangeBulkDetail = `/api/sdc/billFreightChangeApplication/getFreightChangeBulkDetail`;
   // 变更运费页面-大宗
   public $api_insertFreightChangeBulk = `/api/sdc/billFreightChangeApplication/insertFreightChangeBulk`;
-  // 变更运费页面-大宗
+  // 大宗详情
   public $api_getBulkBillDetail = `/api/sdc/billOperate/getBulkBillDetail`;
 
   constructor(public injector: Injector) {