From 14cba100e40f83f80bc56659d2d6dbafab7d0bc0 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 8 Mar 2022 14:45:47 +0800
Subject: [PATCH] fix bug

---
 .../components/bulk/bulk.component.ts         | 23 ++++++++++++-----
 .../components/vehicle/vehicle.component.ts   |  2 +-
 .../components/bulk/bulk.component.ts         | 25 +++++++++++++------
 3 files changed, 36 insertions(+), 14 deletions(-)

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 f9493bb9..2f56ef24 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -442,11 +442,22 @@ export class OrderManagementBulkComponent implements OnInit {
         width: '180px',
         index: 'unloadingAddressArr'
       },
+      // {
+      //   title: '货物信息',
+      //   className: 'text-left',
+      //   width: '250px',
+      //   render: 'goodsName'
+      // },
       {
         title: '货物信息',
+        index: 'goodsName',
+        width: '180px',
         className: 'text-left',
-        width: '250px',
-        render: 'goodsName'
+        format: (item: any) =>
+          `${item.goodsName}/
+          ${item.goodsWeight || '0'}吨/
+          ${item.goodsVolume || '0'}方/
+          ${item.goodsNumber || '0'}件`
       },
       {
         title: '运费单价',
@@ -460,8 +471,8 @@ export class OrderManagementBulkComponent implements OnInit {
         width: '170px',
         className: 'text-left',
         format: (item: any) =>
-          `${item.acceptWeight || '--'}吨/
-           ${item.acceptVolume || '--'}方`
+          `${item.acceptWeight || '0'}吨/
+           ${item.acceptVolume || '0'}方`
       },
       {
         title: '结算数量',
@@ -469,8 +480,8 @@ export class OrderManagementBulkComponent implements OnInit {
         width: '170px',
         className: 'text-left',
         format: (item: any) =>
-          `${item.settlementWeight || '--'}吨/
-           ${item.settlementVolume || '--'}方`
+          `${item.settlementWeight || '0'}吨/
+           ${item.settlementVolume || '0'}方`
       },
       {
         title: '承运司机',
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 4021e4de..4fdcc546 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@@ -606,7 +606,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
           {
             text: '修改货源',
             click: _record => this.amend(_record),
-            iif: item => item.resourceStatus === '1',
+            iif: item => item.resourceStatus === '1' ,
             acl: { ability: ['SUPPLY-INDEX-vehicleModificationSupply'] }
           },
           // {
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 858b314b..87256622 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
@@ -259,11 +259,22 @@ tabs = {
         width: '220px',
         index: 'dischargePlace'
       },
-     {
+    //  {
+    //     title: '货物信息',
+    //     className: 'text-left',
+    //     width: '250px',
+    //     render: 'goodsInfos'
+    //   },
+      {
         title: '货物信息',
+        index: 'goodsInfos',
+        width: '180px',
         className: 'text-left',
-        width: '250px',
-        render: 'goodsInfos'
+        format: (item: any) =>
+          `${item.goodsName}/
+          ${item.goodsWeight || '0'}吨/
+          ${item.goodsVolume || '0'}方/
+          ${item.goodsNumber || '0'}件`
       },
       {
         title: '运费单价',
@@ -277,8 +288,8 @@ tabs = {
         width: '170px',
         className: 'text-left',
         format: (item: any) =>
-          `${item.acceptWeight || '--'}吨/
-           ${item.acceptVolume || '--'}方`
+          `${item.acceptWeight || '0'}吨/
+           ${item.acceptVolume || '0'}方`
       },
       {
         title: '结算数量',
@@ -286,8 +297,8 @@ tabs = {
         width: '170px',
         className: 'text-left',
         format: (item: any) =>
-          `${item.settlementWeight || '--'}吨/
-           ${item.settlementVolume || '--'}方`
+          `${item.settlementWeight || '0'}吨/
+           ${item.settlementVolume || '0'}方`
       },
       {
         title: '承运司机',