From cb9e56892b40d55298b565c163292ed25e81d0f1 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 20 Jan 2022 19:08:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/bulk-detail/bulk-detail.component.html  | 10 +++-------
 .../vehicle-detail/vehicle-detail.component.html       | 10 +++-------
 2 files changed, 6 insertions(+), 14 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 d39f3319..446da77d 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
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-06 20:20:26
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-19 17:39:14
+ * @LastEditTime : 2022-01-20 19:07:55
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -76,15 +76,11 @@
     <sv label="货物数量">
       {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
     </sv>
-    <sv label="用车需求">
-      {{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCube}}
-    </sv>
+    <sv label="用车需求">{{ i?.carModel }}/{{ i?.carLength }} </sv>
     <sv label="承运司机">
       {{i?.driverName}}/{{i?.driverPhone}}{{i?.carNo}}
     </sv>
-    <sv label="车型车长载重">
-      {{i?.carModel}},{{i?.carLength}},{{i?.carLoad ? i?.carLoad +'吨': ''}}
-    </sv>
+    <sv label="车型车长载重"> {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 </sv>
     <sv label="计划装货时间">
       {{i?.loadPlanTime}}
     </sv>
diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
index ac5997b1..4134075b 100644
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-28 14:42:03
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:19:41
+ * @LastEditTime : 2022-01-20 19:07:33
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -78,15 +78,11 @@
     <sv label="货物数量">
       {{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
     </sv>
-    <sv label="用车需求">
-      {{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCube}}
-    </sv>
+    <sv label="用车需求">{{ i?.carModel }}/{{ i?.carLength }} </sv>
     <sv label="承运司机">
       {{i?.driverName}}/{{i?.driverPhone}}/{{i?.carNo}}
     </sv>
-    <sv label="车型车长载重">
-      {{i?.goodsInfoList?.[0]?.carModel}},{{i?.carLength}}米,{{i?.carLoad ? i?.carLoad +'吨': ''}} 
-    </sv>
+    <sv label="车型车长载重"> {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 </sv>
   </sv-container>
   <div class="mt-md" >
     <h4 class="text-md" >装货卸货信息