html/admin-web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
liuyihe
2026-09-04 14:48:47 +08:00
parent 2fc84d249c
commit 3e59898b09
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/unified-orders/pages/UnifiedOrdersView.test.ts
+3 -2
View File
@@ -418,8 +418,9 @@ describe('UnifiedOrdersView contract', () => {
expect(source).toContain('const measuredGrossWeight = Number(measurementDetail.value?.actualGrossWeightKg)') expect(source).toContain('const measuredGrossWeight = Number(measurementDetail.value?.actualGrossWeightKg)')
expect(source).toContain('const measuredNetWeight = Number(measurementDetail.value?.actualNetWeightKg)') expect(source).toContain('const measuredNetWeight = Number(measurementDetail.value?.actualNetWeightKg)')
expect(source).toContain('const actualVolume = Number(measurementDetail.value?.actualVolumeCbm)') expect(source).toContain('const actualVolume = Number(measurementDetail.value?.actualVolumeCbm)')
expect(source).toContain('feeConfirmWeight.value = measuredGrossWeight > 0') expect(source).toContain('feeConfirmWeight.value = Number(actualTotals.gross) > 0')
expect(source).toContain('feeConfirmVolume.value = actualVolume > 0') expect(source).toContain('feeConfirmVolume.value = Number(actualTotals.volume) > 0')
expect(source).toContain("{ source: '实际测量数据', count: actualTotals.count, weight: actualWeight, volume: actualVolume }")
const sendFeeSource = source.slice(source.indexOf('async function executeConfirmAndSendFee()'), source.indexOf('function handleOrderSelectionChange')) const sendFeeSource = source.slice(source.indexOf('async function executeConfirmAndSendFee()'), source.indexOf('function handleOrderSelectionChange'))
expect(sendFeeSource).not.toContain('saveInboundMeasurementDraft') expect(sendFeeSource).not.toContain('saveInboundMeasurementDraft')
expect(sendFeeSource).not.toContain('updateMeasurementCalculationMode') expect(sendFeeSource).not.toContain('updateMeasurementCalculationMode')
src/modules/unified-orders/pages/UnifiedOrdersView.vue
+10 -15
View File
@@ -199,16 +199,16 @@ const feeConfirmRows = computed(() => {
const summary = detail.value?.summary const summary = detail.value?.summary
const measuredGrossWeight = Number(measurementDetail.value?.actualGrossWeightKg) const measuredGrossWeight = Number(measurementDetail.value?.actualGrossWeightKg)
const measuredNetWeight = Number(measurementDetail.value?.actualNetWeightKg) const measuredNetWeight = Number(measurementDetail.value?.actualNetWeightKg)
const measuredVolume = Number(measurementDetail.value?.actualVolumeCbm) const actualTotals = measurementTotals(actualMeasurementRows.value)
const actualWeight = measuredGrossWeight > 0 const actualWeight = Number(actualTotals.gross) > 0
? measuredGrossWeight ? actualTotals.gross
: measuredNetWeight > 0 ? measuredNetWeight : null : measuredGrossWeight > 0 ? measuredGrossWeight : measuredNetWeight > 0 ? measuredNetWeight : null
const actualVolume = measuredVolume > 0 ? measuredVolume : null const actualVolume = Number(actualTotals.volume) > 0 ? actualTotals.volume : null
const customerTotals = measurementTotals(customerMeasurementRows.value) const customerTotals = measurementTotals(customerMeasurementRows.value)
return [ return [
{ source: '客户下单数据', count: customerTotals.count, weight: customerTotals.gross, volume: customerTotals.volume ?? summary?.expectedVolumeCbm }, { source: '客户下单数据', count: customerTotals.count, weight: customerTotals.gross, volume: customerTotals.volume ?? summary?.expectedVolumeCbm },
{ source: '外箱规数据', count: measurementTotals(outerMeasurementRows.value).count, weight: measurementTotals(outerMeasurementRows.value).gross, volume: measurementTotals(outerMeasurementRows.value).volume }, { source: '外箱规数据', count: measurementTotals(outerMeasurementRows.value).count, weight: measurementTotals(outerMeasurementRows.value).gross, volume: measurementTotals(outerMeasurementRows.value).volume },
{ source: '实际测量数据', count: measurementDetail.value?.actualPackageCount, weight: actualWeight, volume: actualVolume }, { source: '实际测量数据', count: actualTotals.count, weight: actualWeight, volume: actualVolume },
] ]
}) })
const smartLoadingOpen = ref(false) const smartLoadingOpen = ref(false)
@@ -1431,15 +1431,10 @@ async function openFeeConfirmDialog() {
const actualTotals = measurementTotals(actualMeasurementRows.value) const actualTotals = measurementTotals(actualMeasurementRows.value)
const measuredGrossWeight = Number(measurementDetail.value?.actualGrossWeightKg) const measuredGrossWeight = Number(measurementDetail.value?.actualGrossWeightKg)
const measuredNetWeight = Number(measurementDetail.value?.actualNetWeightKg) const measuredNetWeight = Number(measurementDetail.value?.actualNetWeightKg)
const actualVolume = Number(measurementDetail.value?.actualVolumeCbm) feeConfirmWeight.value = Number(actualTotals.gross) > 0
feeConfirmWeight.value = measuredGrossWeight > 0 ? Number(actualTotals.gross)
? measuredGrossWeight : measuredGrossWeight > 0 ? measuredGrossWeight : measuredNetWeight > 0 ? measuredNetWeight : null
: measuredNetWeight > 0 feeConfirmVolume.value = Number(actualTotals.volume) > 0 ? Number(actualTotals.volume) : null
? measuredNetWeight
: Number(actualTotals.gross) > 0 ? Number(actualTotals.gross) : null
feeConfirmVolume.value = actualVolume > 0
? actualVolume
: Number(actualTotals.volume) > 0 ? Number(actualTotals.volume) : null
feeConfirmOpen.value = true feeConfirmOpen.value = true
} }