diff --git a/src/option/business/transport-plan.js b/src/option/business/transport-plan.js index f395e93..b7d1200 100644 --- a/src/option/business/transport-plan.js +++ b/src/option/business/transport-plan.js @@ -124,7 +124,8 @@ const formatGoodsInfo = row => { const text = Object.entries(groups) .map(([unit, group]) => { const quantity = formatGoodsQuantity(group.quantity); - return `${group.typeName}等${group.count}种货物 | ${quantity}${unit ? ` ${unit}` : ''}`; + const typeName = group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName; + return `${typeName} | ${quantity}${unit ? ` ${unit}` : ''}`; }) .join('; '); diff --git a/src/views/business/components/transport-plan-page.vue b/src/views/business/components/transport-plan-page.vue index c3643eb..374c9e4 100644 --- a/src/views/business/components/transport-plan-page.vue +++ b/src/views/business/components/transport-plan-page.vue @@ -3949,9 +3949,9 @@ export default { return Object.values(groups) .map(group => { const quantity = this.formatDispatchQuantity(group.quantity); - return `${group.typeName}等${group.count}种货物 | ${quantity}${ - group.unit ? ` ${group.unit}` : '' - }`; + const typeName = + group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName; + return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`; }) .join('; '); }, @@ -7549,12 +7549,13 @@ export default { }, {}); const cargoInfo = Object.values(groups) - .map( - group => - `${group.cargoType}等${group.count}种货物 | ${this.formatDispatchQuantity( - group.quantity - )}${group.unit ? ` ${group.unit}` : ''}` - ) + .map(group => { + const typeName = + group.count > 1 ? `${group.cargoType}等${group.count}种货物` : group.cargoType; + return `${typeName} | ${this.formatDispatchQuantity(group.quantity)}${ + group.unit ? ` ${group.unit}` : '' + }`; + }) .join('; '); return cargoInfo || plan.goodsInfo || ''; }, diff --git a/src/views/business/loading-manage.vue b/src/views/business/loading-manage.vue index 5be2599..8a90ed4 100644 --- a/src/views/business/loading-manage.vue +++ b/src/views/business/loading-manage.vue @@ -2524,9 +2524,9 @@ export default { Object.values(groups) .map(group => { const quantity = this.formatGoodsQuantity(group.quantity); - return `${group.typeName}等${group.count}种货物 | ${quantity}${ - group.unit ? ` ${group.unit}` : '' - }`; + const typeName = + group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName; + return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`; }) .join('; ') || '-' );