From 32baf50a5a66a9a9530c0ffe0856f3105e14bce2 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 21 Feb 2022 19:39:21 +0800
Subject: [PATCH] fix bug

---
 .../waybill-management/components/bulk/bulk.component.html  | 6 +++---
 .../waybill-management/components/bulk/bulk.component.ts    | 3 +--
 .../components/vehicle/vehicle.component.html               | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.html b/src/app/routes/waybill-management/components/bulk/bulk.component.html
index 1f418391..681e56da 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.html
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime : 2022-02-21 19:29:16
+ * @LastEditTime : 2022-02-21 19:37:30
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk\\bulk.component.html
@@ -79,7 +79,7 @@
         </div>
       </ng-template>
       <ng-template st-row="freightPrice" let-item let-index="index">
-        {{ item?.freightPrice | currency }}
+        {{ item?.freight | currency }}
       </ng-template>
       <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
         <div *ngIf="item?.billExpenseDetailVOList.length > 0">
@@ -94,7 +94,7 @@
       </ng-template>
       <ng-template st-row="goodsInfos" let-item let-index="index">
         <div>{{ item?.goodsInfos?.goodsName }}</div>
-        <div>{{ item?.goodsInfos?.goodsResource }}</div>
+        <div>{{ item?.goodsInfos?.weight }}{{ item?.goodsInfos?.volume?  '/' +item?.goodsInfos?.volume : '' }}{{ item?.goodsInfos?.number ? '/' + item?.goodsInfos?.number : '' }}</div>
       </ng-template>
       <ng-template st-row="loadingTime" let-item let-index="index">
         <div *ngIf="item?.loadingTime">装 | {{ item?.loadingTime }}</div>
diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
index a41c2ac5..ce1517b9 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
@@ -260,14 +260,13 @@ tabs = {
      {
         title: '货物信息',
         className: 'text-left',
-        width: '180px',
+        width: '250px',
         render: 'goodsInfos'
       },
       {
         title: '运费单价',
         className: 'text-right',
         width: '120px',
-        index: 'freightPrice',
         render: 'freightPrice'
       },
       {
diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html
index 88502af2..140fa7bb 100644
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime : 2022-02-21 19:29:39
+ * @LastEditTime : 2022-02-21 19:34:48
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle\\vehicle.component.html
@@ -97,7 +97,7 @@
       </ng-template>
       <ng-template st-row="goodsInfos" let-item let-index="index">
         <div>{{ item?.goodsInfos?.goodsName }}</div>
-        <div>{{ item?.goodsInfos?.goodsResource }}</div>
+        <div>{{ item?.goodsInfos?.weight }}{{ item?.goodsInfos?.volume?  '/' +item?.goodsInfos?.volume : '' }}{{ item?.goodsInfos?.number ? '/' + item?.goodsInfos?.number : '' }}</div>
       </ng-template>
       <ng-template st-row="loadingTime" let-item let-index="index">
         <div *ngIf="item?.loadingTime">装 | {{ item?.loadingTime }}</div>