diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue index bf279bb..bc9fe4e 100644 --- a/src/views/settlement/components/formal-settlement-editor.vue +++ b/src/views/settlement/components/formal-settlement-editor.vue @@ -306,7 +306,7 @@ {{ formatMoney(row[item.column.prop]) }} - {{ formatDetailTransportQuantity(row[item.column.prop]) }} + {{ formatDetailTransportQuantity(row) }} {{ formatDetailMileage(row[item.column.prop]) }} @@ -3172,13 +3172,13 @@ export default { formatMoney(value) { return `${Number(value || 0).toFixed(2)} RMB`; }, - formatQuantity(value) { - if (value === undefined || value === null || value === '') return '-'; + formatDetailTransportQuantity(row) { + const value = row.transportQuantity; + if (this.readonly && Number(value) === -1) return '-'; const quantity = Number(value); - return Number.isFinite(quantity) ? quantity.toFixed(2) : '-'; - }, - formatDetailTransportQuantity(value) { - return this.readonly && Number(value) === -1 ? '-' : this.formatQuantity(value); + if (!Number.isFinite(quantity)) return '-'; + // 与预结算编辑器 formatQuantity 保持一致,拼接计量单位 + return `${quantity.toFixed(2)}${row.quantityUnit ? ` ${row.quantityUnit}` : ''}`; }, formatDetailMileage(value) { return this.readonly && Number(value) === -1 ? '-' : this.displayValue(value);