Merge branch 'develop' of gitlab.eascs.com:tms-ui/tms-obc-web into develop

src/app/routes/waybill-management/components/bulk/bulk.component.ts

@@ -259,42 +259,28 @@ tabs = {
         width: '220px',
         index: 'dischargePlace'
       },
-    //  {
+     {
-    //     title: '货物信息',
-    //     className: 'text-left',
-    //     width: '250px',
-    //     render: 'goodsInfos'
-    //   },
-      {
         title: '货物信息',
-        index: 'goodsInfos',
-        width: '180px',
         className: 'text-left',
-        format: (item: any) =>
+        width: '250px',
-          `${item.goodsName}/
+        render: 'goodsInfos'
-          ${item.goodsWeight || '0'}吨/
-          ${item.goodsVolume || '0'}方/
-          ${item.goodsNumber || '0'}件`
       },
       {
         title: '运费单价',
         className: 'text-right',
-        width: '120px',
+        width: '150px',
         render: 'freightPrice'
       },
       {
         title: '接单数量',
-        render: 'receveOrderCountInfo',
+        index: 'orderReceivingQuantity',
-        width: '170px',
+        width: '200px',
         className: 'text-left',
-        format: (item: any) =>
-          `${item.acceptWeight || '0'}吨/
-           ${item.acceptVolume || '0'}方`
       },
       {
         title: '结算数量',
         index: '结算数量',
-        width: '170px',
+        width: '200px',
         className: 'text-left',
         format: (item: any) =>
           `${item.settlementWeight || '0'}吨/