更新计费预览与测量精度并精简作业界面
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
import { flushPromises, shallowMount } from '@vue/test-utils'
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { ApiResponseError } from '@/shared/api/http'
|
||||
import { getLoadingAssociationSummary, getOverseasInboundCodeRelationship } from '@/shared/api/inboundCodeRelations'
|
||||
import { downloadPlatformProductImage, getPlatformUnifiedOrder, listPlatformUnifiedOrders } from '@/modules/unified-orders/api/unifiedOrders'
|
||||
import { calculateInboundFee, confirmInboundFee, downloadPlatformInboundHoldEvidence, getLatestInboundFee, getPlatformInboundHold, holdPlatformInbound, releasePlatformInbound, sendInboundFee, uploadPlatformInboundHoldEvidence } from '@/modules/inbounds'
|
||||
import { adjustPublishedInboundFee, calculateInboundFee, confirmInboundFee, downloadPlatformInboundHoldEvidence, getInboundMeasurement, getLatestInboundFee, getPlatformInboundHold, holdPlatformInbound, previewInboundFee, releasePlatformInbound, sendInboundFee, updateMeasurementOuterDimensions, uploadPlatformInboundHoldEvidence, type InboundFeePreview } from '@/modules/inbounds'
|
||||
import UnifiedOrdersView from './UnifiedOrdersView.vue'
|
||||
|
||||
const { routeQuery, routerPush } = vi.hoisted(() => ({ routeQuery: { tenantId: '6001', from: '' }, routerPush: vi.fn() }))
|
||||
@@ -18,7 +18,9 @@ vi.mock('@/modules/iam', async importOriginal => ({
|
||||
vi.mock('@/modules/warehouses', () => ({ listAllPlatformWarehouses: vi.fn().mockResolvedValue([]) }))
|
||||
vi.mock('@/modules/inbounds', () => ({
|
||||
downloadWeightImage: vi.fn(), getInboundMeasurement: vi.fn(),
|
||||
calculateInboundFee: vi.fn(), confirmInboundFee: vi.fn(), sendInboundFee: vi.fn(), getLatestInboundFee: vi.fn(),
|
||||
updateMeasurementOuterDimensions: vi.fn(),
|
||||
adjustPublishedInboundFee: vi.fn(),
|
||||
calculateInboundFee: vi.fn(), confirmInboundFee: vi.fn(), sendInboundFee: vi.fn(), getLatestInboundFee: vi.fn(), previewInboundFee: vi.fn(),
|
||||
createFeeActionIdempotencyKey: vi.fn((action: string) => `fee-${action}`),
|
||||
createFeeAdjustmentIdempotencyKey: vi.fn(() => 'fee-adjust'),
|
||||
downloadPlatformInboundHoldEvidence: vi.fn(), getPlatformInboundHold: vi.fn(), holdPlatformInbound: vi.fn(), releasePlatformInbound: vi.fn(), uploadPlatformInboundHoldEvidence: vi.fn(),
|
||||
@@ -61,6 +63,7 @@ function mountDetail() {
|
||||
directives: { loading: () => undefined },
|
||||
stubs: {
|
||||
AdminPage: { template: '<main><slot /></main>' },
|
||||
AppDialog: { props: ['modelValue'], template: '<section v-if="modelValue"><slot /></section>' },
|
||||
DetailPageLayout: { template: '<section><slot /></section>' },
|
||||
OrderFulfillmentTreePanel: { template: '<div data-testid="fulfillment-tree" />' },
|
||||
LoadErrorState: { props: ['title', 'message'], template: '<div>{{ title }} {{ message }}<slot name="details" /></div>' },
|
||||
@@ -77,9 +80,44 @@ function mountDetail() {
|
||||
})
|
||||
}
|
||||
|
||||
function feePreview(overrides: Partial<InboundFeePreview> = {}): InboundFeePreview {
|
||||
return { actualWeightKg: 570.5, actualVolumeCbm: 3.894, chargeableQuantity: 650.298, chargeUnit: 'KG',
|
||||
conversionFactor: 167, roundingScale: 6, roundingMode: 'HALF_UP', unitPrice: 13.6,
|
||||
additionalAmount: 0, totalAmount: 8844.05, currency: 'CNY', priceMatched: true, ...overrides }
|
||||
}
|
||||
|
||||
function savedOuterMeasurement() {
|
||||
return { actualPackageCount: 22, actualGrossWeightKg: 570.5, actualVolumeCbm: 3.6894,
|
||||
items: [{ id: '9001', itemNo: 'B1', packageCount: 22, lengthCm: 62, widthCm: 52, heightCm: 52,
|
||||
outerLengthCm: 63, outerWidthCm: 53, outerHeightCm: 53,
|
||||
calculatedOuterLengthCm: 63, calculatedOuterWidthCm: 53, calculatedOuterHeightCm: 53,
|
||||
unitVolumeCbm: 0.177, totalVolumeCbm: 3.894, volumeWeightKg: 650.298,
|
||||
coefficientMode: 'ACTUAL', calculationRuleVersion: 'WAREHOUSE_OUTER_OVERRIDE_V1' }] }
|
||||
}
|
||||
|
||||
type FeeConfirmVm = {
|
||||
measurementDetail: Record<string, unknown>
|
||||
measurementDimensionConfig: Record<string, unknown>
|
||||
measurementSectionModes: { outer: string; actual: string }
|
||||
feeConfirmVolume: number
|
||||
feeConfirmWeight: number
|
||||
feeConfirmUnitPrice: number | null
|
||||
feeConfirmPriceReason: string
|
||||
feeConfirmPriceChanged: boolean
|
||||
feeConfirmReference: InboundFeePreview | null
|
||||
feeConfirmReferenceLoading: boolean
|
||||
feeConfirmEstimatedTotal: number | null
|
||||
feeConfirmRows: { source: string; volume: number }[]
|
||||
openFeeConfirmDialog(): Promise<void>
|
||||
refreshFeeConfirmPreview(initializePrice?: boolean): Promise<void>
|
||||
executeConfirmAndSendFee(): Promise<void>
|
||||
}
|
||||
|
||||
describe('UnifiedOrdersView downstream fulfillment detail', () => {
|
||||
afterEach(() => vi.useRealTimers())
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
vi.mocked(previewInboundFee).mockReset().mockResolvedValue(feePreview())
|
||||
routeQuery.from = ''
|
||||
canPermission.mockImplementation(() => true)
|
||||
vi.mocked(getPlatformUnifiedOrder).mockResolvedValue(detail as never)
|
||||
@@ -122,7 +160,7 @@ describe('UnifiedOrdersView downstream fulfillment detail', () => {
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('keeps unchanged actual and outer volumes on the same server snapshot with three decimal places', async () => {
|
||||
it('shows actual and outer unit volumes and totals consistently with four decimal places', async () => {
|
||||
const wrapper = mountDetail()
|
||||
await flushPromises()
|
||||
const vm = wrapper.vm as unknown as {
|
||||
@@ -138,8 +176,9 @@ describe('UnifiedOrdersView downstream fulfillment detail', () => {
|
||||
{ lengthCm: 60, widthCm: 50, heightCm: 50, packageCount: 10, unitVolumeCbm: 0.15, totalVolumeCbm: 1.5 },
|
||||
{ lengthCm: 61, widthCm: 51, heightCm: 51, packageCount: 9, unitVolumeCbm: 0.159, totalVolumeCbm: 1.431 },
|
||||
{ lengthCm: 50, widthCm: 40, heightCm: 40, packageCount: 1, unitVolumeCbm: 0.08, totalVolumeCbm: 0.08 },
|
||||
{ lengthCm: 62, widthCm: 52, heightCm: 52, packageCount: 22, unitVolumeCbm: 0.1677, totalVolumeCbm: 3.6894 },
|
||||
].map((row, index) => ({
|
||||
...row, itemNo: index + 1, coefficientMode: 'ACTUAL',
|
||||
...row, itemNo: index + 1, coefficientMode: 'ACTUAL', calculationRuleVersion: 'ACTUAL_DIMENSION_V1',
|
||||
calculatedOuterLengthCm: row.lengthCm, calculatedOuterWidthCm: row.widthCm, calculatedOuterHeightCm: row.heightCm,
|
||||
}))
|
||||
vm.measurementDetail = { items }
|
||||
@@ -148,13 +187,13 @@ describe('UnifiedOrdersView downstream fulfillment detail', () => {
|
||||
await flushPromises()
|
||||
|
||||
for (const rows of [vm.outerMeasurementRows, vm.actualMeasurementRows]) {
|
||||
expect(rows.map(row => vm.measurementValue(row, 'totalVolumeCbm'))).toEqual(['1.500', '1.431', '0.080'])
|
||||
expect(rows.map(row => vm.measurementValue(row, 'unitVolumeCbm'))).toEqual(['0.150', '0.159', '0.080'])
|
||||
expect(vm.formatMeasurementVolume(vm.measurementTotals(rows).volume)).toBe('3.011')
|
||||
expect(vm.formatMeasurementVolume(vm.measurementTotals(rows).weightVolume)).toBe('3.011')
|
||||
expect(rows.map(row => vm.measurementValue(row, 'totalVolumeCbm'))).toEqual(['1.5000', '1.4310', '0.0800', '3.6894'])
|
||||
expect(rows.map(row => vm.measurementValue(row, 'unitVolumeCbm'))).toEqual(['0.1500', '0.1590', '0.0800', '0.1677'])
|
||||
expect(vm.formatMeasurementVolume(vm.measurementTotals(rows).volume)).toBe('6.7004')
|
||||
expect(vm.formatMeasurementVolume(vm.measurementTotals(rows).weightVolume)).toBe('6.7004')
|
||||
}
|
||||
expect(vm.formatMeasurementVolume(3)).toBe('3.000')
|
||||
expect(vm.formatMeasurementVolume(0)).toBe('0.000')
|
||||
expect(vm.formatMeasurementVolume(3)).toBe('3.0000')
|
||||
expect(vm.formatMeasurementVolume(0)).toBe('0.0000')
|
||||
expect(vm.formatMeasurementVolume(null)).toBe('—')
|
||||
|
||||
// 仓库修正的外箱仍与实测尺寸分开，不能把外箱计费快照当成原始实测体积。
|
||||
@@ -162,46 +201,26 @@ describe('UnifiedOrdersView downstream fulfillment detail', () => {
|
||||
calculatedOuterLengthCm: 62, unitVolumeCbm: 0.1613, totalVolumeCbm: 1.4517,
|
||||
calculationRuleVersion: 'WAREHOUSE_OUTER_OVERRIDE_V1' }] }
|
||||
await flushPromises()
|
||||
expect(vm.measurementValue(vm.outerMeasurementRows[0]!, 'totalVolumeCbm')).toBe('1.452')
|
||||
expect(vm.measurementValue(vm.actualMeasurementRows[0]!, 'totalVolumeCbm')).toBe('1.428')
|
||||
expect(vm.measurementValue(vm.outerMeasurementRows[0]!, 'totalVolumeCbm')).toBe('1.4517')
|
||||
expect(vm.measurementValue(vm.actualMeasurementRows[0]!, 'totalVolumeCbm')).toBe('1.4283')
|
||||
|
||||
vm.measurementDetail = { items: [{ ...items[1], coefficientMode: 'ADD', calculatedOuterLengthCm: 62,
|
||||
calculatedOuterWidthCm: 52, calculatedOuterHeightCm: 52, unitVolumeCbm: 0.168, totalVolumeCbm: 1.512 }] }
|
||||
await flushPromises()
|
||||
expect(vm.measurementValue(vm.actualMeasurementRows[0]!, 'totalVolumeCbm')).toBe('1.428')
|
||||
expect(vm.measurementValue(vm.actualMeasurementRows[0]!, 'totalVolumeCbm')).toBe('1.4283')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it.each([
|
||||
{ confirmedVolume: 3.894, hasReference: true },
|
||||
{ confirmedVolume: 4.25, hasReference: true },
|
||||
{ confirmedVolume: 4.25, hasReference: false },
|
||||
])('defaults billing to the saved outer volume and sends $confirmedVolume (reference: $hasReference)', async ({ confirmedVolume, hasReference }) => {
|
||||
it.each([3.894, 4.25])('defaults billing to the saved outer volume and sends the confirmed value %s', async (confirmedVolume) => {
|
||||
const fee = { unitPrice: 13.6, chargeableQuantity: 650.298, chargeUnit: 'KG', roundingScale: 4, rateCode: 'RATE', feeStatus: 'CALCULATED' }
|
||||
vi.mocked(getLatestInboundFee).mockResolvedValue(fee as never)
|
||||
if (!hasReference) vi.mocked(getLatestInboundFee).mockRejectedValueOnce(new ApiResponseError('暂无费用快照', 'A0404', 200))
|
||||
vi.mocked(calculateInboundFee).mockResolvedValue(fee as never)
|
||||
vi.mocked(confirmInboundFee).mockResolvedValue({ ...fee, feeStatus: 'CONFIRMED' } as never)
|
||||
vi.mocked(sendInboundFee).mockResolvedValue({ ...fee, feeStatus: 'SENT' } as never)
|
||||
const wrapper = mountDetail()
|
||||
await flushPromises()
|
||||
const vm = wrapper.vm as unknown as {
|
||||
measurementDetail: Record<string, unknown>
|
||||
measurementSectionModes: { outer: string; actual: string }
|
||||
feeConfirmVolume: number
|
||||
feeConfirmWeight: number
|
||||
feeConfirmRows: { source: string; volume: number }[]
|
||||
openFeeConfirmDialog(): Promise<void>
|
||||
executeConfirmAndSendFee(): Promise<void>
|
||||
}
|
||||
vm.measurementDetail = {
|
||||
actualPackageCount: 22, actualGrossWeightKg: 570.5, actualVolumeCbm: 3.6894,
|
||||
items: [{ id: '9001', itemNo: 'B1', packageCount: 22, lengthCm: 62, widthCm: 52, heightCm: 52,
|
||||
outerLengthCm: 63, outerWidthCm: 53, outerHeightCm: 53,
|
||||
calculatedOuterLengthCm: 63, calculatedOuterWidthCm: 53, calculatedOuterHeightCm: 53,
|
||||
unitVolumeCbm: 0.177, totalVolumeCbm: 3.894, volumeWeightKg: 650.298,
|
||||
coefficientMode: 'ACTUAL', calculationRuleVersion: 'WAREHOUSE_OUTER_OVERRIDE_V1' }],
|
||||
}
|
||||
const vm = wrapper.vm as unknown as FeeConfirmVm
|
||||
vm.measurementDetail = savedOuterMeasurement()
|
||||
vm.measurementSectionModes.outer = 'ACTUAL'
|
||||
vm.measurementSectionModes.actual = 'ACTUAL'
|
||||
await vm.openFeeConfirmDialog()
|
||||
@@ -210,10 +229,13 @@ describe('UnifiedOrdersView downstream fulfillment detail', () => {
|
||||
expect(vm.feeConfirmRows.find(row => row.source === '外箱规数据')?.volume).toBeCloseTo(3.894)
|
||||
expect(vm.feeConfirmVolume).toBeCloseTo(3.894)
|
||||
expect(vm.feeConfirmWeight).toBeCloseTo(570.5)
|
||||
if (!hasReference) expect(calculateInboundFee).toHaveBeenCalledWith('6001', '7001', {
|
||||
selectedWeightKg: 570.5, selectedVolumeCbm: 3.894, weightSource: 'ACTUAL', volumeSource: 'OUTER',
|
||||
}, 'fee-calculate')
|
||||
expect(previewInboundFee).toHaveBeenCalledWith('6001', '7001', {
|
||||
selectedWeightKg: 570.5, selectedVolumeCbm: 3.894, selectedUnitPrice: null, weightSource: 'ACTUAL', volumeSource: 'OUTER',
|
||||
})
|
||||
expect(calculateInboundFee).not.toHaveBeenCalled()
|
||||
expect(getLatestInboundFee).not.toHaveBeenCalled()
|
||||
vm.feeConfirmVolume = confirmedVolume
|
||||
await vm.refreshFeeConfirmPreview()
|
||||
await vm.executeConfirmAndSendFee()
|
||||
|
||||
expect(calculateInboundFee).toHaveBeenCalledWith('6001', '7001', {
|
||||
@@ -224,6 +246,245 @@ describe('UnifiedOrdersView downstream fulfillment detail', () => {
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('refreshes the amount from current outer values instead of an older fee snapshot', async () => {
|
||||
vi.mocked(getLatestInboundFee).mockResolvedValue({ unitPrice: 13.6, chargeableQuantity: 616.1298, totalAmount: 8379.37 } as never)
|
||||
const wrapper = mountDetail()
|
||||
await flushPromises()
|
||||
const vm = wrapper.vm as unknown as FeeConfirmVm
|
||||
vm.measurementDetail = savedOuterMeasurement()
|
||||
await vm.openFeeConfirmDialog()
|
||||
|
||||
expect(vm.feeConfirmVolume).toBe(3.894)
|
||||
expect(vm.feeConfirmReference?.chargeableQuantity).toBe(650.298)
|
||||
expect(vm.feeConfirmEstimatedTotal).toBe(8844.05)
|
||||
expect(getLatestInboundFee).not.toHaveBeenCalled()
|
||||
expect(calculateInboundFee).not.toHaveBeenCalled()
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('keeps saved outer totals when customer rules change without resaving the measurement', async () => {
|
||||
const wrapper = mountDetail()
|
||||
await flushPromises()
|
||||
const vm = wrapper.vm as unknown as FeeConfirmVm
|
||||
vm.measurementDetail = {
|
||||
actualPackageCount: 10, actualGrossWeightKg: 100, actualVolumeCbm: 0.81,
|
||||
items: [{ id: '9001', itemNo: 'B1', packageCount: 10, lengthCm: 50, widthCm: 40, heightCm: 30,
|
||||
outerLengthCm: null, outerWidthCm: null, outerHeightCm: null,
|
||||
calculatedOuterLengthCm: 54, calculatedOuterWidthCm: 44, calculatedOuterHeightCm: 34,
|
||||
unitVolumeCbm: 0.081, totalVolumeCbm: 0.81, volumeWeightKg: 135.27,
|
||||
coefficientMode: 'ADD', calculationRuleVersion: 'CUSTOMER_DIMENSION_LARGE_V1' }],
|
||||
}
|
||||
vm.measurementDimensionConfig = { defaultCalculationMode: 'ADD', rules: [
|
||||
[30, 20, 20], [40, 30, 30], [50, 40, 40], [60, 50, 50],
|
||||
].map(([innerLengthCm, innerWidthCm, innerHeightCm]) => ({ innerLengthCm, innerWidthCm, innerHeightCm, edgeAdditionCm: 3 })) }
|
||||
vm.measurementSectionModes.outer = 'ADD'
|
||||
await vm.openFeeConfirmDialog()
|
||||
|
||||
expect(vm.feeConfirmVolume).toBeCloseTo(0.81)
|
||||
expect(previewInboundFee).toHaveBeenCalledWith('6001', '7001', {
|
||||
selectedWeightKg: 100, selectedVolumeCbm: 0.81, selectedUnitPrice: null, weightSource: 'ACTUAL', volumeSource: 'OUTER',
|
||||
})
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('keeps the price-table reference visible when manual pricing refreshes the amount and requires a reason before sending', async () => {
|
||||
vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
|
||||
const wrapper = mountDetail()
|
||||
await flushPromises()
|
||||
const vm = wrapper.vm as unknown as FeeConfirmVm
|
||||
vm.measurementDetail = savedOuterMeasurement()
|
||||
await vm.openFeeConfirmDialog()
|
||||
await flushPromises()
|
||||
const referencePriceText = () => wrapper.findAll('tr')
|
||||
.find(row => row.find('th').text() === '价格表参考单价')!.get('td').text()
|
||||
expect(referencePriceText()).toBe('13.6 CNY / KG')
|
||||
|
||||
vi.mocked(previewInboundFee).mockResolvedValueOnce(feePreview({ totalAmount: 9104.17 }))
|
||||
vm.feeConfirmUnitPrice = 14
|
||||
await flushPromises()
|
||||
expect(referencePriceText()).toBe('13.6 CNY / KG')
|
||||
expect(vm.feeConfirmEstimatedTotal).toBeNull()
|
||||
expect(vm.feeConfirmPriceChanged).toBe(true)
|
||||
await vi.advanceTimersByTimeAsync(250)
|
||||
expect(referencePriceText()).toBe('13.6 CNY / KG')
|
||||
expect(vm.feeConfirmUnitPrice).toBe(14)
|
||||
expect(vm.feeConfirmEstimatedTotal).toBe(9104.17)
|
||||
expect(previewInboundFee).toHaveBeenLastCalledWith('6001', '7001', {
|
||||
selectedWeightKg: 570.5, selectedVolumeCbm: 3.894, selectedUnitPrice: 14, weightSource: 'ACTUAL', volumeSource: 'OUTER',
|
||||
})
|
||||
|
||||
await vm.executeConfirmAndSendFee()
|
||||
expect(calculateInboundFee).not.toHaveBeenCalled()
|
||||
const fee = { unitPrice: 13.6, chargeableQuantity: 650.298, additionalAmount: 0,
|
||||
rateCode: 'RATE', feeVersion: 2, feeStatus: 'CALCULATED' }
|
||||
vi.mocked(calculateInboundFee).mockResolvedValue(fee as never)
|
||||
vi.mocked(adjustPublishedInboundFee).mockResolvedValue({ ...fee, unitPrice: 14, feeVersion: 3 } as never)
|
||||
vi.mocked(confirmInboundFee).mockResolvedValue({ ...fee, unitPrice: 14, feeStatus: 'CONFIRMED' } as never)
|
||||
vi.mocked(sendInboundFee).mockResolvedValue({ ...fee, unitPrice: 14, feeStatus: 'SENT' } as never)
|
||||
vm.feeConfirmPriceReason = '客户协商调价'
|
||||
await vm.executeConfirmAndSendFee()
|
||||
expect(adjustPublishedInboundFee).toHaveBeenCalledWith('6001', '7001', {
|
||||
expectedFeeVersion: 2, chargeableQuantity: 650.298, unitPrice: 14, additionalAmount: 0,
|
||||
reason: '客户协商调价', toleranceConfirmed: true,
|
||||
}, 'fee-adjust')
|
||||
expect(sendInboundFee).toHaveBeenCalledWith('6001', '7001', 'fee-send')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('stops requiring an adjustment reason immediately when the manual price is restored to the price-table reference', async () => {
|
||||
vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
|
||||
const wrapper = mountDetail()
|
||||
await flushPromises()
|
||||
const vm = wrapper.vm as unknown as FeeConfirmVm
|
||||
vm.measurementDetail = savedOuterMeasurement()
|
||||
await vm.openFeeConfirmDialog()
|
||||
vm.feeConfirmUnitPrice = 14
|
||||
await vi.advanceTimersByTimeAsync(250)
|
||||
expect(vm.feeConfirmPriceChanged).toBe(true)
|
||||
vm.feeConfirmUnitPrice = 13.6
|
||||
expect(vm.feeConfirmPriceChanged).toBe(false)
|
||||
await vi.advanceTimersByTimeAsync(250)
|
||||
expect(vm.feeConfirmPriceChanged).toBe(false)
|
||||
expect(vm.feeConfirmEstimatedTotal).toBe(8844.05)
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('ignores stale preview responses and retains the manually entered unit price', async () => {
|
||||
vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
|
||||
const wrapper = mountDetail()
|
||||
await flushPromises()
|
||||
const vm = wrapper.vm as unknown as FeeConfirmVm
|
||||
vm.measurementDetail = savedOuterMeasurement()
|
||||
await vm.openFeeConfirmDialog()
|
||||
vm.feeConfirmUnitPrice = 16
|
||||
let resolveOld!: (value: InboundFeePreview) => void
|
||||
vi.mocked(previewInboundFee).mockImplementationOnce(() => new Promise(resolve => { resolveOld = resolve }))
|
||||
vm.feeConfirmVolume = 4
|
||||
expect(vm.feeConfirmEstimatedTotal).toBeNull()
|
||||
await vi.advanceTimersByTimeAsync(250)
|
||||
vi.mocked(previewInboundFee).mockResolvedValueOnce(feePreview({ actualVolumeCbm: 4.25, chargeableQuantity: 709.75, totalAmount: 11356 }))
|
||||
vm.feeConfirmVolume = 4.25
|
||||
await vi.advanceTimersByTimeAsync(250)
|
||||
expect(vm.feeConfirmReference?.actualVolumeCbm).toBe(4.25)
|
||||
expect(vm.feeConfirmUnitPrice).toBe(16)
|
||||
expect(vm.feeConfirmEstimatedTotal).toBe(11356)
|
||||
expect(previewInboundFee).toHaveBeenLastCalledWith('6001', '7001', {
|
||||
selectedWeightKg: 570.5, selectedVolumeCbm: 4.25, selectedUnitPrice: 16, weightSource: 'ACTUAL', volumeSource: 'OUTER',
|
||||
})
|
||||
resolveOld(feePreview({ actualVolumeCbm: 4, chargeableQuantity: 668, totalAmount: 9084.8 }))
|
||||
await flushPromises()
|
||||
expect(vm.feeConfirmReference?.actualVolumeCbm).toBe(4.25)
|
||||
expect(vm.feeConfirmEstimatedTotal).toBe(11356)
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('closes billing preview and ignores its result after switching orders', async () => {
|
||||
const wrapper = mountDetail()
|
||||
await flushPromises()
|
||||
const vm = wrapper.vm as unknown as FeeConfirmVm & { detail: Record<string, unknown>; feeConfirmOpen: boolean }
|
||||
vm.measurementDetail = savedOuterMeasurement()
|
||||
let resolvePreview!: (value: InboundFeePreview) => void
|
||||
vi.mocked(previewInboundFee).mockImplementationOnce(() => new Promise(resolve => { resolvePreview = resolve }))
|
||||
const pending = vm.openFeeConfirmDialog()
|
||||
vm.detail = { ...detail, summary: { ...detail.summary, inboundId: '7002' } }
|
||||
expect(vm.feeConfirmOpen).toBe(false)
|
||||
resolvePreview(feePreview())
|
||||
await pending
|
||||
expect(vm.feeConfirmReference).toBeNull()
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('does not send when current fee preview fails', async () => {
|
||||
vi.mocked(previewInboundFee).mockRejectedValueOnce(new ApiResponseError('预览服务暂不可用', 'A0500', 200))
|
||||
const wrapper = mountDetail()
|
||||
await flushPromises()
|
||||
const vm = wrapper.vm as unknown as FeeConfirmVm
|
||||
vm.measurementDetail = savedOuterMeasurement()
|
||||
await vm.openFeeConfirmDialog()
|
||||
vm.feeConfirmUnitPrice = 13.6
|
||||
await vm.executeConfirmAndSendFee()
|
||||
|
||||
expect(vm.feeConfirmReference).toBeNull()
|
||||
expect(vm.feeConfirmEstimatedTotal).toBeNull()
|
||||
expect(calculateInboundFee).not.toHaveBeenCalled()
|
||||
expect(sendInboundFee).not.toHaveBeenCalled()
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('previews manual pricing with server quantity when no price is matched', async () => {
|
||||
vi.mocked(previewInboundFee).mockResolvedValueOnce(feePreview({ priceMatched: false, unitPrice: null, totalAmount: null }))
|
||||
const wrapper = mountDetail()
|
||||
await flushPromises()
|
||||
const vm = wrapper.vm as unknown as FeeConfirmVm
|
||||
vm.measurementDetail = savedOuterMeasurement()
|
||||
await vm.openFeeConfirmDialog()
|
||||
expect(vm.feeConfirmEstimatedTotal).toBeNull()
|
||||
vi.mocked(previewInboundFee).mockResolvedValueOnce(feePreview({ priceMatched: false, unitPrice: null, totalAmount: 6502.98 }))
|
||||
vm.feeConfirmUnitPrice = 10
|
||||
await vm.refreshFeeConfirmPreview()
|
||||
expect(vm.feeConfirmEstimatedTotal).toBe(6502.98)
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('uses server money rounding after a manual unit price change', async () => {
|
||||
const wrapper = mountDetail()
|
||||
await flushPromises()
|
||||
const vm = wrapper.vm as unknown as FeeConfirmVm
|
||||
vm.measurementDetail = savedOuterMeasurement()
|
||||
await vm.openFeeConfirmDialog()
|
||||
vi.mocked(previewInboundFee).mockResolvedValueOnce(feePreview({ chargeableQuantity: 1, unitPrice: 2, totalAmount: 1.01 }))
|
||||
vm.feeConfirmUnitPrice = 1.005
|
||||
expect(vm.feeConfirmEstimatedTotal).toBeNull()
|
||||
await vm.refreshFeeConfirmPreview()
|
||||
expect(vm.feeConfirmUnitPrice).toBe(1.005)
|
||||
expect(vm.feeConfirmEstimatedTotal).toBe(1.01)
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('rejects a partially missing outer snapshot instead of billing the remaining rows', async () => {
|
||||
const wrapper = mountDetail()
|
||||
await flushPromises()
|
||||
const vm = wrapper.vm as unknown as FeeConfirmVm
|
||||
const saved = savedOuterMeasurement()
|
||||
vm.measurementDetail = { ...saved, items: [saved.items[0], { ...saved.items[0], id: '9002', calculatedOuterLengthCm: null }] }
|
||||
await vm.openFeeConfirmDialog()
|
||||
expect(previewInboundFee).not.toHaveBeenCalled()
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('saves cleared warehouse dimensions as null and keeps them blank after server readback', async () => {
|
||||
const wrapper = mountDetail()
|
||||
await flushPromises()
|
||||
const vm = wrapper.vm as unknown as FeeConfirmVm & {
|
||||
actualMeasurementRows: Record<string, unknown>[]
|
||||
outerMeasurementRows: Record<string, unknown>[]
|
||||
saveWarehouseOuterDimensions(row: Record<string, unknown>): Promise<void>
|
||||
}
|
||||
const previous = { ...savedOuterMeasurement(), measurementId: '8001', version: 3, customerFeeConfirmed: false }
|
||||
vm.measurementDetail = previous
|
||||
const cleared = { ...previous, version: 4, items: previous.items.map(row => ({ ...row,
|
||||
outerLengthCm: null, outerWidthCm: null, outerHeightCm: null,
|
||||
calculatedOuterLengthCm: 62, calculatedOuterWidthCm: 52, calculatedOuterHeightCm: 52,
|
||||
unitVolumeCbm: 0.1677, totalVolumeCbm: 3.6894, volumeWeightKg: 616.13,
|
||||
calculationRuleVersion: 'ACTUAL_DIMENSION_V1',
|
||||
})) }
|
||||
vi.mocked(updateMeasurementOuterDimensions).mockResolvedValue({ measurementId: '8001', version: 4, status: 'SUBMITTED', itemId: '9001' })
|
||||
vi.mocked(getInboundMeasurement).mockResolvedValue(cleared as never)
|
||||
const row = vm.actualMeasurementRows[0]!
|
||||
row.outerLengthCm = null
|
||||
row.outerWidthCm = undefined
|
||||
row.outerHeightCm = ''
|
||||
|
||||
await vm.saveWarehouseOuterDimensions(row)
|
||||
|
||||
expect(updateMeasurementOuterDimensions).toHaveBeenCalledWith('6001', '7001', '9001', {
|
||||
measurementId: '8001', version: 3, outerLengthCm: null, outerWidthCm: null, outerHeightCm: null,
|
||||
})
|
||||
expect(vm.actualMeasurementRows[0]).toMatchObject({ outerLengthCm: null, outerWidthCm: null, outerHeightCm: null })
|
||||
expect(vm.outerMeasurementRows[0]).toMatchObject({ lengthCm: 62, widthCm: 52, heightCm: 52, totalVolumeCbm: 3.6894 })
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('downloads one preview for cargo rows sharing the same product image', async () => {
|
||||
vi.mocked(getPlatformUnifiedOrder).mockResolvedValue({
|
||||
...detail,
|
||||
|
||||
@@ -29,12 +29,13 @@ describe('UnifiedOrdersView contract', () => {
|
||||
it('loads the reference unit price and lets the backend enforce the combined final lock', () => {
|
||||
const openDialogSource = source.slice(source.indexOf('async function openFeeConfirmDialog()'), source.indexOf('async function executeConfirmAndSendFee()'))
|
||||
const sendFeeSource = source.slice(source.indexOf('async function executeConfirmAndSendFee()'), source.indexOf('function handleOrderSelectionChange'))
|
||||
expect(openDialogSource).toContain('getLatestInboundFee')
|
||||
expect(openDialogSource).toContain('previewInboundFee')
|
||||
expect(openDialogSource).not.toContain('calculateInboundFee(')
|
||||
expect(sendFeeSource).not.toContain('getLatestInboundFee')
|
||||
expect(sendFeeSource).toContain('adjustPublishedInboundFee')
|
||||
expect(source).toContain('价格表参考单价')
|
||||
expect(source).toContain('本次对客单价')
|
||||
expect(openDialogSource).toContain("feeConfirmPriceMissing.value = true")
|
||||
expect(openDialogSource).toContain('feeConfirmPriceMissing.value = !snapshot.priceMatched')
|
||||
expect(sendFeeSource).toContain('createManualInboundQuote')
|
||||
expect(source).toContain("feeConfirmPriceMissing ? '未命中'")
|
||||
expect(source).toContain("feeConfirmPriceMissing ? '人工定价原因'")
|
||||
@@ -486,7 +487,8 @@ describe('UnifiedOrdersView contract', () => {
|
||||
expect(source).not.toContain('handleOuterModeDropdownVisibleChange')
|
||||
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).not.toContain('calculatedMeasurementRow(source, measurementSectionModes.outer)')
|
||||
expect(source).toContain('items.every(hasSavedOuterMeasurement)')
|
||||
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")
|
||||
@@ -535,7 +537,7 @@ describe('UnifiedOrdersView contract', () => {
|
||||
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()'))).toContain('getLatestInboundFee')
|
||||
expect(source.slice(source.indexOf('async function openFeeConfirmDialog()'), source.indexOf('async function executeConfirmAndSendFee()'))).toContain('previewInboundFee')
|
||||
})
|
||||
|
||||
it('clears an invalidated measurement loading state before refreshing order details', () => {
|
||||
@@ -549,11 +551,10 @@ describe('UnifiedOrdersView contract', () => {
|
||||
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])')
|
||||
expect(source).toContain('const saved = hasSavedOuterMeasurement(row)')
|
||||
expect(source).toContain('lengthCm: saved ? row.calculatedOuterLengthCm : null')
|
||||
expect(source).toContain('totalVolumeCbm: saved ? row.totalVolumeCbm : null')
|
||||
expect(source).not.toContain('warehouseOuterOverride')
|
||||
})
|
||||
|
||||
it('binds dimension and weight evidence to their formal server records without mixing galleries', () => {
|
||||
|
||||
@@ -76,7 +76,7 @@ import {
|
||||
confirmInboundFee,
|
||||
createFeeAdjustmentIdempotencyKey,
|
||||
createFeeActionIdempotencyKey,
|
||||
getLatestInboundFee,
|
||||
previewInboundFee,
|
||||
getInboundMeasurement,
|
||||
getPlatformInboundHold,
|
||||
downloadInboundCartonLabelsBatch,
|
||||
@@ -93,6 +93,7 @@ import {
|
||||
DropshipPalletPrintPanel,
|
||||
sendInboundFee,
|
||||
type InboundFeeSnapshot,
|
||||
type InboundFeePreview,
|
||||
type InboundMeasurementDetail,
|
||||
type InboundHoldDetail,
|
||||
} from '@/modules/inbounds'
|
||||
@@ -270,10 +271,16 @@ const feeConfirmOpen = ref(false)
|
||||
const feeConfirmWeight = ref<number | null>(null)
|
||||
const feeConfirmVolume = ref<number | null>(null)
|
||||
const feeConfirmReferenceLoading = ref(false)
|
||||
const feeConfirmReference = ref<InboundFeeSnapshot | null>(null)
|
||||
const feeConfirmReference = ref<InboundFeePreview | null>(null)
|
||||
const feeConfirmPriceReference = ref<Pick<InboundFeePreview, 'unitPrice' | 'currency' | 'chargeUnit'> | null>(null)
|
||||
const feeConfirmPriceMissing = ref(false)
|
||||
const feeConfirmUnitPrice = ref<number | null>(null)
|
||||
const feeConfirmPriceReason = ref('')
|
||||
let feeConfirmPreviewSerial = 0
|
||||
let feeConfirmPreviewTimer: ReturnType<typeof setTimeout> | null = null
|
||||
const feeConfirmPreviewKey = ref('')
|
||||
let feeConfirmSettingInitialPrice = false
|
||||
const feeConfirmSelectionKey = computed(() => JSON.stringify([feeConfirmWeight.value, feeConfirmVolume.value, feeConfirmUnitPrice.value]))
|
||||
type FeeConfirmAttempt = {
|
||||
fingerprint: string
|
||||
calculateKey: string
|
||||
@@ -285,19 +292,20 @@ type FeeConfirmAttempt = {
|
||||
let feeConfirmAttempt: FeeConfirmAttempt | null = null
|
||||
const feeConfirmPriceChanged = computed(() => {
|
||||
if (feeConfirmPriceMissing.value) return true
|
||||
const reference = Number(feeConfirmReference.value?.unitPrice)
|
||||
const reference = feeConfirmPriceReference.value?.unitPrice
|
||||
const current = Number(feeConfirmUnitPrice.value)
|
||||
return reference >= 0 && current >= 0 && Math.abs(reference - current) > 0.000001
|
||||
return reference != null && reference >= 0 && current >= 0 && Math.abs(reference - current) > 0.000001
|
||||
})
|
||||
const feeConfirmPriceUnit = computed(() => {
|
||||
const snapshot = feeConfirmReference.value
|
||||
const snapshot = feeConfirmPriceReference.value
|
||||
return snapshot ? `${snapshot.currency} / ${snapshot.chargeUnit}` : 'CNY / 计费单位'
|
||||
})
|
||||
const feeConfirmEstimatedTotal = computed(() => {
|
||||
const snapshot = feeConfirmReference.value
|
||||
const unitPrice = Number(feeConfirmUnitPrice.value)
|
||||
if (!snapshot || !(unitPrice >= 0)) return null
|
||||
return Number(snapshot.chargeableQuantity || 0) * unitPrice + Number(snapshot.additionalAmount || 0)
|
||||
if (!snapshot || feeConfirmReferenceLoading.value || feeConfirmPreviewKey.value !== feeConfirmSelectionKey.value
|
||||
|| feeConfirmUnitPrice.value == null || !(unitPrice > 0)) return null
|
||||
return snapshot.totalAmount
|
||||
})
|
||||
const feeConfirmRows = computed(() => {
|
||||
const summary = detail.value?.summary
|
||||
@@ -537,34 +545,37 @@ function calculatedMeasurementRow(
|
||||
const customerMeasurementRows = computed(() => (detail.value?.order.cargoes || []).map((row) => (
|
||||
calculatedMeasurementRow(row, measurementSectionModes.customer, true)
|
||||
)))
|
||||
const outerMeasurementRows = computed(() => (measurementDetail.value?.items || []).map((row) => {
|
||||
function hasSavedOuterMeasurement(row: InboundMeasurementDetail['items'][number]) {
|
||||
return [row.calculatedOuterLengthCm, row.calculatedOuterWidthCm, row.calculatedOuterHeightCm,
|
||||
row.unitVolumeCbm, row.totalVolumeCbm].every(value => value != null && Number.isFinite(Number(value)) && Number(value) > 0)
|
||||
&& Boolean(row.calculationRuleVersion)
|
||||
}
|
||||
|
||||
const outerMeasurementRows = computed(() => (measurementDetail.value?.items || []).map((row): Record<string, unknown> => {
|
||||
const source = row as unknown as Record<string, unknown>
|
||||
const recalculated = calculatedMeasurementRow(source, measurementSectionModes.outer)
|
||||
const savedDimensions = [row.calculatedOuterLengthCm, row.calculatedOuterWidthCm, row.calculatedOuterHeightCm]
|
||||
const recalculatedDimensions = [recalculated.lengthCm, recalculated.widthCm, recalculated.heightCm]
|
||||
const warehouseOuterOverride = String(row.calculationRuleVersion || '').startsWith('WAREHOUSE_OUTER_OVERRIDE_')
|
||||
if (savedDimensions.every((value) => Number.isFinite(Number(value)) && Number(value) > 0)
|
||||
&& (warehouseOuterOverride
|
||||
|| savedDimensions.every((value, index) => Math.abs(Number(value) - Number(recalculatedDimensions[index])) < 0.001))
|
||||
&& measurementCalculationModeForRow(source) === measurementSectionModes.outer) {
|
||||
const packageCount = Number(row.packageCount)
|
||||
const unitWeightKg = Number(row.unitWeightKg) > 0
|
||||
? Number(row.unitWeightKg)
|
||||
: Number.isFinite(Number(measurementDetail.value?.actualGrossWeightKg))
|
||||
&& Number(measurementDetail.value?.actualPackageCount) > 0
|
||||
? Number(measurementDetail.value?.actualGrossWeightKg) / Number(measurementDetail.value?.actualPackageCount)
|
||||
: null
|
||||
return {
|
||||
...source,
|
||||
lengthCm: Number(savedDimensions[0]),
|
||||
widthCm: Number(savedDimensions[1]),
|
||||
heightCm: Number(savedDimensions[2]),
|
||||
unitWeightKg,
|
||||
totalWeightKg: unitWeightKg != null && Number.isFinite(packageCount) ? unitWeightKg * packageCount : null,
|
||||
}
|
||||
const saved = hasSavedOuterMeasurement(row)
|
||||
const packageCount = Number(row.packageCount)
|
||||
const unitWeightKg = Number(row.unitWeightKg) > 0
|
||||
? Number(row.unitWeightKg)
|
||||
: Number.isFinite(Number(measurementDetail.value?.actualGrossWeightKg))
|
||||
&& Number(measurementDetail.value?.actualPackageCount) > 0
|
||||
? Number(measurementDetail.value?.actualGrossWeightKg) / Number(measurementDetail.value?.actualPackageCount)
|
||||
: null
|
||||
// 外箱规和对客计费只认已保存快照，当前客户配置的变化不得在前端重写历史测量。
|
||||
return {
|
||||
...source,
|
||||
lengthCm: saved ? row.calculatedOuterLengthCm : null,
|
||||
widthCm: saved ? row.calculatedOuterWidthCm : null,
|
||||
heightCm: saved ? row.calculatedOuterHeightCm : null,
|
||||
unitVolumeCbm: saved ? row.unitVolumeCbm : null,
|
||||
totalVolumeCbm: saved ? row.totalVolumeCbm : null,
|
||||
volumeWeightKg: saved ? row.volumeWeightKg : null,
|
||||
unitWeightKg,
|
||||
totalWeightKg: unitWeightKg != null && Number.isFinite(packageCount) ? unitWeightKg * packageCount : null,
|
||||
}
|
||||
return recalculated
|
||||
}))
|
||||
const hasSavedOuterMeasurementData = computed(() => hasActualMeasurementData.value
|
||||
&& measurementDetail.value!.items.every(hasSavedOuterMeasurement))
|
||||
const actualMeasurementRows = computed(() => (measurementDetail.value?.items || []).map((row) => (
|
||||
calculatedMeasurementRow(row as unknown as Record<string, unknown>, measurementSectionModes.actual, false, false)
|
||||
)))
|
||||
@@ -878,7 +889,7 @@ function formatNumber(value: number | null | undefined, digits = 2) {
|
||||
|
||||
function formatMeasurementVolume(value: number | null | undefined) {
|
||||
return value == null || !Number.isFinite(value) ? '—'
|
||||
: value.toLocaleString('zh-CN', { minimumFractionDigits: 3, maximumFractionDigits: 3 })
|
||||
: value.toLocaleString('zh-CN', { minimumFractionDigits: 4, maximumFractionDigits: 4 })
|
||||
}
|
||||
|
||||
function partyValue(parties: Array<Record<string, unknown>>, type: 'SENDER' | 'RECEIVER', key: string) {
|
||||
@@ -1163,9 +1174,10 @@ async function saveWarehouseOuterDimensions(row: Record<string, unknown>) {
|
||||
outerLengthCm: dimensions[0],
|
||||
outerWidthCm: dimensions[1],
|
||||
outerHeightCm: dimensions[2],
|
||||
calculatedOuterLengthCm: dimensions[0],
|
||||
calculatedOuterWidthCm: dimensions[1],
|
||||
calculatedOuterHeightCm: dimensions[2],
|
||||
// 保存完成后等待服务端返回完整计算快照，不用修正输入值伪装计算结果。
|
||||
calculatedOuterLengthCm: null,
|
||||
calculatedOuterWidthCm: null,
|
||||
calculatedOuterHeightCm: null,
|
||||
} : item),
|
||||
}
|
||||
const refreshed = await waitForSavedMeasurementVersion(
|
||||
@@ -1737,12 +1749,12 @@ async function openFeeConfirmDialog() {
|
||||
if (confirmFeeSending.value) {
|
||||
return
|
||||
}
|
||||
if (measurementStrategySavingId.value) {
|
||||
if (measurementStrategySavingId.value || measurementOuterSavingId.value) {
|
||||
ElMessage.warning('外箱规计算规则正在保存，请稍后再发送费用')
|
||||
return
|
||||
}
|
||||
const outerTotals = measurementTotals(outerMeasurementRows.value)
|
||||
if (!outerMeasurementRows.value.length || !(Number(outerTotals.volume) > 0)) {
|
||||
if (!hasSavedOuterMeasurementData.value || !(Number(outerTotals.volume) > 0)) {
|
||||
ElMessage.warning('外箱规数据不完整，请先保存外箱规尺寸和计算规则')
|
||||
return
|
||||
}
|
||||
@@ -1754,44 +1766,79 @@ async function openFeeConfirmDialog() {
|
||||
: measuredGrossWeight > 0 ? measuredGrossWeight : measuredNetWeight > 0 ? measuredNetWeight : null
|
||||
feeConfirmVolume.value = Number(outerTotals.volume)
|
||||
feeConfirmReference.value = null
|
||||
feeConfirmPriceReference.value = null
|
||||
feeConfirmPriceMissing.value = false
|
||||
feeConfirmUnitPrice.value = null
|
||||
feeConfirmPriceReason.value = ''
|
||||
feeConfirmAttempt = null
|
||||
feeConfirmOpen.value = true
|
||||
await refreshFeeConfirmPreview(true)
|
||||
}
|
||||
|
||||
function cancelFeeConfirmPreview() {
|
||||
feeConfirmPreviewSerial += 1
|
||||
if (feeConfirmPreviewTimer) clearTimeout(feeConfirmPreviewTimer)
|
||||
feeConfirmPreviewTimer = null
|
||||
feeConfirmReferenceLoading.value = false
|
||||
feeConfirmPreviewKey.value = ''
|
||||
}
|
||||
|
||||
async function refreshFeeConfirmPreview(initializePrice = false) {
|
||||
cancelFeeConfirmPreview()
|
||||
const summary = detail.value?.summary
|
||||
const selectedWeightKg = Number(feeConfirmWeight.value)
|
||||
const selectedVolumeCbm = Number(feeConfirmVolume.value)
|
||||
const selectedUnitPrice = feeConfirmUnitPrice.value
|
||||
if (!feeConfirmOpen.value || !summary?.inboundId || !(selectedWeightKg > 0) || !(selectedVolumeCbm > 0)
|
||||
|| (selectedUnitPrice != null && !(selectedUnitPrice > 0))) {
|
||||
feeConfirmReference.value = null
|
||||
return
|
||||
}
|
||||
const serial = feeConfirmPreviewSerial
|
||||
feeConfirmReferenceLoading.value = true
|
||||
try {
|
||||
const tenantId = String(summary.tenantId)
|
||||
const inboundId = String(summary.inboundId)
|
||||
let snapshot: InboundFeeSnapshot
|
||||
try {
|
||||
snapshot = await getLatestInboundFee(tenantId, inboundId)
|
||||
} catch (error) {
|
||||
const details = getApiErrorDetails(error, '价格表参考单价加载失败')
|
||||
if (details.code !== 'A0404') throw error
|
||||
snapshot = await calculateInboundFee(tenantId, inboundId, {
|
||||
selectedWeightKg: Number(feeConfirmWeight.value),
|
||||
selectedVolumeCbm: Number(feeConfirmVolume.value),
|
||||
weightSource: 'ACTUAL',
|
||||
volumeSource: 'OUTER',
|
||||
}, createFeeActionIdempotencyKey('calculate'))
|
||||
}
|
||||
const snapshot = await previewInboundFee(String(summary.tenantId), String(summary.inboundId), {
|
||||
selectedWeightKg, selectedVolumeCbm, selectedUnitPrice, weightSource: 'ACTUAL', volumeSource: 'OUTER',
|
||||
})
|
||||
if (serial !== feeConfirmPreviewSerial || !feeConfirmOpen.value) return
|
||||
feeConfirmReference.value = snapshot
|
||||
feeConfirmUnitPrice.value = Number(snapshot.unitPrice)
|
||||
} catch (error) {
|
||||
const details = getApiErrorDetails(error, '价格表参考单价加载失败')
|
||||
if (details.code === 'A0404') {
|
||||
feeConfirmPriceMissing.value = true
|
||||
ElMessage.warning('当前FBA价格未命中，请填写本次对客单价和人工定价原因')
|
||||
} else {
|
||||
ElMessage.error(details.message)
|
||||
feeConfirmOpen.value = false
|
||||
// unitPrice 是价格表匹配价；人工单价只参与服务端金额预览，不覆盖该只读参考。
|
||||
feeConfirmPriceReference.value = { unitPrice: snapshot.unitPrice, currency: snapshot.currency, chargeUnit: snapshot.chargeUnit }
|
||||
feeConfirmPriceMissing.value = !snapshot.priceMatched
|
||||
if (initializePrice) {
|
||||
feeConfirmSettingInitialPrice = true
|
||||
feeConfirmUnitPrice.value = snapshot.unitPrice
|
||||
feeConfirmSettingInitialPrice = false
|
||||
}
|
||||
feeConfirmPreviewKey.value = feeConfirmSelectionKey.value
|
||||
if (initializePrice && !snapshot.priceMatched) ElMessage.warning('当前FBA价格未命中，请填写本次对客单价和人工定价原因')
|
||||
} catch (error) {
|
||||
if (serial !== feeConfirmPreviewSerial || !feeConfirmOpen.value) return
|
||||
feeConfirmReference.value = null
|
||||
ElMessage.error(getApiErrorDetails(error, '计费预览加载失败，请稍后重试').message)
|
||||
} finally {
|
||||
feeConfirmReferenceLoading.value = false
|
||||
if (serial === feeConfirmPreviewSerial) feeConfirmReferenceLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
watch([feeConfirmWeight, feeConfirmVolume, feeConfirmUnitPrice], () => {
|
||||
if (!feeConfirmOpen.value || confirmFeeSending.value || feeConfirmSettingInitialPrice) return
|
||||
cancelFeeConfirmPreview()
|
||||
feeConfirmReference.value = null
|
||||
if (!(Number(feeConfirmWeight.value) > 0) || !(Number(feeConfirmVolume.value) > 0)
|
||||
|| (feeConfirmUnitPrice.value != null && !(feeConfirmUnitPrice.value > 0))) return
|
||||
feeConfirmReferenceLoading.value = true
|
||||
feeConfirmPreviewTimer = setTimeout(() => { void refreshFeeConfirmPreview() }, 250)
|
||||
}, { flush: 'sync' })
|
||||
|
||||
watch(feeConfirmOpen, open => {
|
||||
if (!open) cancelFeeConfirmPreview()
|
||||
}, { flush: 'sync' })
|
||||
|
||||
watch(() => `${detail.value?.summary.tenantId}:${detail.value?.summary.inboundId}`, () => {
|
||||
feeConfirmOpen.value = false
|
||||
}, { flush: 'sync' })
|
||||
|
||||
function currentFeeConfirmAttempt(
|
||||
selectedWeightKg: number,
|
||||
selectedVolumeCbm: number,
|
||||
@@ -1831,6 +1878,11 @@ async function executeConfirmAndSendFee() {
|
||||
ElMessage.warning('对客单价必须大于 0')
|
||||
return
|
||||
}
|
||||
if (feeConfirmReferenceLoading.value || !feeConfirmReference.value
|
||||
|| feeConfirmPreviewKey.value !== feeConfirmSelectionKey.value) {
|
||||
ElMessage.warning('请等待当前计费重量和体积的预览更新后再发送')
|
||||
return
|
||||
}
|
||||
if (feeConfirmPriceChanged.value && feeConfirmPriceReason.value.trim().length < 2) {
|
||||
ElMessage.warning('人工修改参考单价后，请填写至少 2 个字符的调整原因')
|
||||
return
|
||||
@@ -2402,6 +2454,7 @@ onMounted(() => {
|
||||
if (!isDetailRoute.value) void loadOrders()
|
||||
})
|
||||
onBeforeUnmount(() => {
|
||||
cancelFeeConfirmPreview()
|
||||
ordersRequestSerial += 1
|
||||
statusCountsRequestSerial += 1
|
||||
detailAssociationRequestSerial += 1
|
||||
@@ -2418,7 +2471,7 @@ function orderDialogTitle(action: string, inboundCode?: string | null) {
|
||||
<template>
|
||||
<AdminPage class="admin-workbench admin-density">
|
||||
<section class="business-page unified-orders-page admin-density">
|
||||
<AppDialog class="admin-density-dialog admin-workbench is-dialog" v-model="feeConfirmOpen" :title="orderDialogTitle('编辑计费数据', detail?.summary.inboundCode)" confirm-text="确认并发送" :confirm-loading="confirmFeeSending || feeConfirmReferenceLoading" width="min(920px, 94vw)" fullscreenable :teleported="false" @confirm="executeConfirmAndSendFee">
|
||||
<AppDialog class="admin-density-dialog admin-workbench is-dialog" v-model="feeConfirmOpen" :title="orderDialogTitle('编辑计费数据', detail?.summary.inboundCode)" confirm-text="确认并发送" :confirm-loading="confirmFeeSending" :confirm-disabled="feeConfirmReferenceLoading || !feeConfirmReference" width="min(920px, 94vw)" fullscreenable :teleported="false" @confirm="executeConfirmAndSendFee">
|
||||
<el-alert class="fee-confirm-price-alert" title="价格表单价仅作为参考；本次对客单价可人工修改，客户将一次确认计费量、单价和费用合计。" type="info" :closable="false" show-icon />
|
||||
<section class="density-dialog-section" data-tone="work">
|
||||
<h3 class="density-dialog-section__title">本次计费数据 <small>毛重、体积和对客单价可修改</small></h3>
|
||||
@@ -2431,15 +2484,15 @@ function orderDialogTitle(action: string, inboundCode?: string | null) {
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row"><label for="fee-confirm-weight">计费毛重</label></th>
|
||||
<td><div class="density-table-editor density-table-editor--outlined"><el-input-number id="fee-confirm-weight" v-model="feeConfirmWeight" :min="0" :precision="3" :controls="false" placeholder="请输入计费毛重" /><span>kg</span></div></td>
|
||||
<td><div class="density-table-editor density-table-editor--outlined"><el-input-number id="fee-confirm-weight" v-model="feeConfirmWeight" :min="0" :precision="3" :controls="false" :disabled="confirmFeeSending" placeholder="请输入计费毛重" /><span>kg</span></div></td>
|
||||
<th scope="row"><label for="fee-confirm-volume">计费体积</label></th>
|
||||
<td><div class="density-table-editor density-table-editor--outlined"><el-input-number id="fee-confirm-volume" v-model="feeConfirmVolume" :min="0" :precision="6" :controls="false" placeholder="请输入计费体积" /><span>m³</span></div></td>
|
||||
<td><div class="density-table-editor density-table-editor--outlined"><el-input-number id="fee-confirm-volume" v-model="feeConfirmVolume" :min="0" :precision="6" :controls="false" :disabled="confirmFeeSending" placeholder="请输入计费体积" /><span>m³</span></div></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">价格表参考单价</th>
|
||||
<td>{{ feeConfirmPriceMissing ? '未命中' : feeConfirmReference?.unitPrice == null ? '正在读取参考单价' : `${formatNumber(Number(feeConfirmReference.unitPrice), 4)} ${feeConfirmPriceUnit}` }}</td>
|
||||
<td>{{ feeConfirmPriceMissing ? '未命中' : feeConfirmPriceReference?.unitPrice == null ? '正在读取参考单价' : `${formatNumber(feeConfirmPriceReference.unitPrice, 4)} ${feeConfirmPriceUnit}` }}</td>
|
||||
<th scope="row"><label for="fee-confirm-unit-price">本次对客单价</label></th>
|
||||
<td><div class="density-table-editor density-table-editor--outlined"><el-input-number id="fee-confirm-unit-price" v-model="feeConfirmUnitPrice" :min="0" :precision="4" :controls="false" :disabled="feeConfirmReferenceLoading" placeholder="请输入对客单价" /><span>{{ feeConfirmPriceUnit }}</span></div></td>
|
||||
<td><div class="density-table-editor density-table-editor--outlined"><el-input-number id="fee-confirm-unit-price" v-model="feeConfirmUnitPrice" :min="0" :precision="4" :controls="false" :disabled="feeConfirmReferenceLoading || confirmFeeSending" placeholder="请输入对客单价" /><span>{{ feeConfirmPriceUnit }}</span></div></td>
|
||||
</tr>
|
||||
<tr v-if="feeConfirmReference">
|
||||
<th scope="row">参考计费量</th><td>{{ formatNumber(Number(feeConfirmReference.chargeableQuantity), feeConfirmReference.roundingScale) }} {{ feeConfirmReference.chargeUnit }}</td>
|
||||
|
||||
Reference in New Issue
Block a user