This commit is contained in:
2026-08-28 02:10:54 +08:00
parent 3482d03905
commit 17bbde81b2
5 changed files with 140 additions and 44 deletions
@@ -505,12 +505,13 @@
<el-table-column prop="cargoType" label="货物类型" min-width="130" align="center" />
<el-table-column label="运输总量" min-width="150" align="center">
<template #default="{ row }">
<span v-if="adjustDialog.readonly">{{ formatQuantity(row) }}</span>
<el-input-number
v-else
v-model="row.transportQuantity"
:min="0"
:precision="6"
:precision="2"
:controls="false"
:disabled="adjustDialog.readonly"
/>
</template>
</el-table-column>
@@ -570,7 +571,6 @@
<template #default="{ row }">
<el-input-number
v-model="row.settlementAmountTax"
:min="0"
:precision="2"
:controls="false"
:disabled="adjustDialog.readonly"
@@ -1111,11 +1111,6 @@ export default {
},
recalculateSummaryRow(row) {
row.settlementAmount = Number(row.originalAmount || 0) + Number(row.adjustAmount || 0);
if (row.settlementAmount < 0) {
row.adjustAmount = -Number(row.originalAmount || 0);
row.settlementAmount = 0;
this.$message.warning('结算金额不能小于0');
}
},
buildSummaryFeesFromDetails() {
const summaryMap = new Map();
@@ -1176,7 +1171,9 @@ export default {
0
);
const residualAmount = Number((totalAmount - knownAmount).toFixed(2));
if (residualAmount > 0) appendSummary('其他费用', residualAmount, row.feeType);
if (Math.abs(residualAmount) >= 0.005) {
appendSummary('其他费用', residualAmount, row.feeType);
}
});
const manualFees = this.summaryFees.filter(row => row.manualFlag === 1);
@@ -1479,8 +1476,11 @@ export default {
return `${amount.toFixed(2)} ${currency || 'RMB'}`;
},
formatQuantity(row) {
if (row.transportQuantity === undefined || row.transportQuantity === null) return '-';
return `${row.transportQuantity}${row.quantityUnit ? ` ${row.quantityUnit}` : ''}`;
const value = row.transportQuantity;
if (value === undefined || value === null || value === '') return '-';
const quantity = Number(value);
if (!Number.isFinite(quantity)) return '-';
return `${quantity.toFixed(2)}${row.quantityUnit ? ` ${row.quantityUnit}` : ''}`;
},
displayValue(value) {
return value === undefined || value === null || value === '' ? '-' : value;