修复业务模块bug

2026-08-14 14:46:05 +08:00
parent c6217fcff7
commit 230110c486
4 changed files with 101 additions and 36 deletions
@@ -51,9 +51,9 @@ const formatGoodsQuantity = value => {
 };

 const getSecondCargoTypeName = item =>
-  item?.cargoType ||
  item?.secondCargoTypeName ||
  item?.secondCargoType ||
+  item?.cargoType ||
  item?.goodsType ||
  item?.type ||
  item?.cargoTypeName ||
@@ -97,10 +97,10 @@ const formatGoodsInfo = row => {

  const text = Object.entries(groups)
    .map(([unit, group]) => {
-      const quantity = `${formatGoodsQuantity(group.quantity)}${unit}`;
-      return `${group.typeName}等${group.count}种货物 | ${quantity}`;
+      const quantity = formatGoodsQuantity(group.quantity);
+      return `${group.typeName}等${group.count}种货物 | ${quantity}${unit ? ` ${unit}` : ''}`;
    })
-    .join('; ');
+    .join('； ');

  return text || row.goodsInfo || '';
 };