优化

src/modules/unified-orders/pages/UnifiedOrdersView.test.ts

@@ -322,6 +322,8 @@ describe('UnifiedOrdersView contract', () => {
     expect(source).toContain('仓库修改外箱（宽）')
     expect(source).toContain('仓库修改外箱（高）')
     expect(source).toContain('saveWarehouseOuterDimensions')
+    expect(source).not.toContain('请至少输入一项需要修改的外箱尺寸')
+    expect(source).toContain(".map((value) => value == null || value === '' ? null : Number(value))")
     expect(source).toContain('相关数值已重新计算')
     expect(source).toContain('runMoreAction($event, row as UnifiedOrderResource)')
     expect(source).toContain(':aria-label="moreUnifiedOrderActionsLabel(row as UnifiedOrderResource)"')
@@ -334,6 +336,11 @@ describe('UnifiedOrdersView contract', () => {
     expect(source).not.toContain("value.replaceAll('_', ' ')")
   })
 
+  it('keeps the customer order package count independent from measured inbound totals', () => {
+    expect(source).toContain("{ source: '客户下单数据', count: customerTotals.count")
+    expect(source).not.toContain("{ source: '客户下单数据', count: summary?.totalPackageCount")
+  })
+
   it('uses the inbound measurement girth formula for cargo dimensions', () => {
     expect(source).toContain('formatNumber(length + 2 * (width + height))')
     expect(source).not.toContain('formatNumber(2 * (width + height))')
@@ -358,14 +365,19 @@ describe('UnifiedOrdersView contract', () => {
     expect(source).toContain("updateMeasurementSectionMode('actual', $event)")
     expect(source).not.toContain("updateMeasurementSectionMode('outer', $event)")
     expect(source.match(/@change="selectAndSaveOuterMeasurementMode\(\$event\)"/g)).toHaveLength(2)
+    expect(source).toContain('@visible-change="handleOuterModeDropdownVisibleChange($event)"')
     expect(source.match(/:disabled="Boolean\(measurementStrategySavingId\) \|\| !can\('platform:firstleg:inbound:measure:edit'\)"/g)).toHaveLength(2)
     expect(source).toContain('const previousMode = measurementSectionModes.outer')
     expect(source).toContain('if (!saved) measurementSectionModes.outer = previousMode')
-    expect(source).toContain('const saved = await updateMeasurementCalculationMode(null, mode)')
+    expect(source).toContain('const selectedSameMode = outerModeAtDropdownOpen.value === measurementSectionModes.outer')
+    expect(source).toContain('await nextTick()')
+    expect(source).toContain('const saved = await updateMeasurementCalculationMode(null, mode, ruleId)')
     expect(source).toContain('calculatedMeasurementRow(row, measurementSectionModes.customer, true)')
     expect(source).toContain('calculatedMeasurementRow(source, measurementSectionModes.outer)')
-    expect(source).toContain('calculatedMeasurementRow(row as unknown as Record<string, unknown>, measurementSectionModes.actual)')
+    expect(source).toContain('calculatedMeasurementRow(row as unknown as Record<string, unknown>, measurementSectionModes.actual, false, false)')
     expect(source).toContain("return Number(hasOuterOverride && override != null && override !== '' ? override : value)")
+    expect(source).toContain("const hasOuterOverride = useWarehouseOuterOverrides && !customerSource")
+    expect(source).not.toContain("!customerSource && mode !== 'ACTUAL'")
     expect(source).toContain('rawDimensions.map((value) => value + rule.edgeAdditionCm * 2)')
     expect(source).toContain('matchedSpecificationCoefficient(chargeRule, calculationSource)')
     expect(source).toContain('listCustomerChargeRules(customerId, tenantId)')
@@ -381,20 +393,38 @@ describe('UnifiedOrdersView contract', () => {
     expect(source).toContain("ElMessage.warning('外箱规数据不完整，请先保存外箱规尺寸和计算规则')")
     expect(source).toContain("weightSource: 'OUTER'")
     expect(source).toContain("volumeSource: 'OUTER'")
+    expect(source).not.toContain('测量审核通过后才能确认并发送费用')
+    expect(source).not.toContain("reviewStatus !== 'APPROVED'")
+    expect(source).toContain('const hasActualMeasurementData = computed(() => (measurementDetail.value?.items?.length ?? 0) > 0)')
+    expect(source).toContain("暂无实际测量数据，不能确认并发送费用")
+    expect(source).toContain(':disabled="confirmFeeSending || measurementLoading || !hasActualMeasurementData || !canSendFeeForCurrentStatus"')
     expect(source).toContain('selectAndSaveOuterMeasurementMode($event)')
-    expect(source).toContain('const saved = await updateMeasurementCalculationMode(null, mode)')
+    expect(source).toContain('const saved = await updateMeasurementCalculationMode(null, mode, ruleId)')
     expect(source).toContain('coefficientMode: targetIds.has(String(item.id)) ? mode')
+    expect(source).toContain('outerLengthCm: item.outerLengthCm')
+    expect(source).toContain('outerWidthCm: item.outerWidthCm')
+    expect(source).toContain('outerHeightCm: item.outerHeightCm')
+    expect(source).toContain("String(item.chargeRuleId) === String(activeRule!.id)")
+    expect(source).toContain('item.calculatedOuterLengthCm, item.calculatedOuterWidthCm, item.calculatedOuterHeightCm')
+    expect(source).toContain('if (dimensions.every((dimension) => dimension == null)) return true')
+    expect(source).toContain('已保存并绑定计算规则，体积已重新计算')
     expect(source).not.toContain('feeConfirmVolume.value = Number(summary.measurement?.actualVolumeCbm)')
     const sendFeeSource = source.slice(source.indexOf('async function executeConfirmAndSendFee()'), source.indexOf('function handleOrderSelectionChange'))
     expect(sendFeeSource).not.toContain('saveInboundMeasurementDraft')
     expect(sendFeeSource).not.toContain('updateMeasurementCalculationMode')
+    expect(source.slice(source.indexOf('async function openFeeConfirmDialog()'), source.indexOf('async function executeConfirmAndSendFee()'))).not.toContain('getLatestInboundFee')
   })
 
   it('restores the saved outer-carton rule and server-calculated dimensions on re-entry', () => {
-    expect(source).toContain("mode is MeasurementCalculationMode => mode === 'ACTUAL' || mode === 'ADD' || mode === 'MULTIPLY'")
-    expect(source).toContain('measurementSectionModes.outer = savedModes.length === 1 ? savedModes[0]!')
+    expect(source).toContain('const savedModes = [...new Set(response.items.map((item) => item.coefficientMode)')
+    expect(source).toContain('measurementSectionModes.outer = savedModes.length === 1')
+    expect(source).toContain('? savedModes[0]!')
+    expect(source).toContain("configuredMode === 'ADD' ? 'ADD' : 'ACTUAL'")
     expect(source).toContain('row.calculatedOuterLengthCm')
     expect(source).toContain('measurementCalculationModeForRow(source) === measurementSectionModes.outer')
+    expect(source).toContain("String(row.calculationRuleVersion || '').startsWith('WAREHOUSE_OUTER_OVERRIDE_')")
+    expect(source).toContain('warehouseOuterOverride')
+    expect(source).toContain('Math.abs(Number(value) - Number(recalculatedDimensions[index])) < 0.001')
     expect(source).toContain('lengthCm: Number(savedDimensions[0])')
   })