Merge remote-tracking branch 'origin/master'

src/option/business/transport-plan.js

@@ -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 || '';
 };