From 1e7171cb23177f9074633ed6cb16d09ecb1a5591 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 7 Mar 2022 17:49:58 +0800
Subject: [PATCH] fix bug

---
 .../bulk-detail-change.component.ts           |  2 +-
 .../components/bulk/bulk.component.ts         | 20 ++++++++++++-------
 .../components/bulk/bulk.component.ts         | 17 ++++++++++------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
index c7b2455f..63f7e514 100644
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-24 16:58:02
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-07 17:32:05
+ * @LastEditTime : 2022-03-07 17:41:48
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts
index 5e54ff7d..723aa1a6 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -456,15 +456,21 @@ export class OrderManagementBulkComponent implements OnInit {
       },
       {
         title: '接单数量',
-        className: 'text-right',
-        index: 'goodsNumber',
-        width: '180px'
+        render: 'receveOrderCountInfo',
+        width: '170px',
+        className: 'text-left',
+        format: (item: any) =>
+          `${item.acceptWeight || '--'}吨/
+           ${item.acceptVolume || '--'}方`
       },
       {
-        title: '结算重量',
-        className: 'text-right',
-        index: 'settlementWeight',
-        width: '150px'
+        title: '结算数量',
+        index: '结算数量',
+        width: '170px',
+        className: 'text-left',
+        format: (item: any) =>
+          `${item.settlementWeight || '--'}吨/
+           ${item.settlementVolume || '--'}方`
       },
       {
         title: '承运司机',
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 feacd841..1b3ce216 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
@@ -273,16 +273,21 @@ tabs = {
       },
       {
         title: '接单数量',
+        render: 'receveOrderCountInfo',
+        width: '170px',
         className: 'text-left',
-        width: '200px',
-        index: 'orderReceivingQuantity'
-
+        format: (item: any) =>
+          `${item.acceptWeight || '--'}吨/
+           ${item.acceptVolume || '--'}方`
       },
       {
-        title: '结算重量',
+        title: '结算数量',
+        index: '结算数量',
+        width: '170px',
         className: 'text-left',
-        width: '200px',
-        index: 'settlementWeight'
+        format: (item: any) =>
+          `${item.settlementWeight || '--'}吨/
+           ${item.settlementVolume || '--'}方`
       },
       {
         title: '承运司机',