')
- expect(source).toContain('.row-actions { display: flex; align-items: center; gap: 8px; white-space: nowrap; }')
+ expect(source).toContain('.row-actions { display: inline-flex; min-width: max-content; align-items: center; flex-wrap: nowrap; gap: 8px; white-space: nowrap; }')
+ expect(source).toContain('.row-actions :deep(.el-button) { flex: 0 0 auto; }')
expect(source).toContain('.row-actions :deep(.el-button + .el-button) { margin-left: 0; }')
})
diff --git a/src/modules/overseas-warehouse/pages/InboundOrdersView.vue b/src/modules/overseas-warehouse/pages/InboundOrdersView.vue
index bbd752fb..08b100d6 100644
--- a/src/modules/overseas-warehouse/pages/InboundOrdersView.vue
+++ b/src/modules/overseas-warehouse/pages/InboundOrdersView.vue
@@ -64,7 +64,7 @@ function selectableRow(source: object) {
}
const columns: DataTableColumn[] = [
- { key: 'actions', label: '操作', width: 260, fixed: 'left', slotName: 'actions' },
+ { key: 'actions', label: '操作', width: 300, fixed: 'left', slotName: 'actions' },
{ key: 'selection', type: 'selection', width: 48, fixed: 'left', selectable: selectableRow },
{ key: 'orderNo', prop: 'orderNo', label: '入库单号', minWidth: 170 },
{ key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 140 },
@@ -213,7 +213,8 @@ onMounted(() => { void load() })
.appointment-summary { margin-bottom: 16px; padding: 10px 12px; border: 1px solid #cdddfd; border-radius: 6px; background: #f5f9ff; color: #52627a; font-size: 13px; }
.appointment-form { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0 18px; }
.appointment-form :deep(.el-date-editor), .appointment-form :deep(.el-select) { width: 100%; }
-.row-actions { display: flex; align-items: center; gap: 8px; white-space: nowrap; }
+.row-actions { display: inline-flex; min-width: max-content; align-items: center; flex-wrap: nowrap; gap: 8px; white-space: nowrap; }
+.row-actions :deep(.el-button) { flex: 0 0 auto; }
.row-actions :deep(.el-button + .el-button) { margin-left: 0; }
@media (max-width: 720px) { .appointment-form { grid-template-columns: 1fr; } }
From 7ba81007a81b1eaa05a83daa24e49e7b92b6e672 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Tue, 8 Sep 2026 17:24:49 +0800
Subject: [PATCH 25/31] feat: support dropship pallet loading
---
.../api/platformContainerLoading.test.ts | 13 ++++-
.../api/platformContainerLoading.ts | 13 ++++-
.../pages/GlobalSmartLoadingView.test.ts | 9 ++-
.../pages/GlobalSmartLoadingView.vue | 39 +++++++++----
.../pages/SmartLoadingWorkbenchView.test.ts | 33 +++++++++--
.../pages/SmartLoadingWorkbenchView.vue | 35 ++++++++----
.../smartLoadingItems.test.ts | 13 ++++-
.../container-loading/smartLoadingItems.ts | 6 +-
.../smartLoadingPlanGroups.test.ts | 2 +-
src/modules/container-loading/types.ts | 8 +++
.../InboundWorkflowWorkspace.test.ts | 3 +-
.../components/InboundWorkflowWorkspace.vue | 9 ++-
.../inbounds/core/InboundHistoryPanel.test.ts | 21 +++++++
.../inbounds/core/InboundHistoryPanel.vue | 57 ++++++++++++++++++-
src/modules/inbounds/core/api.test.ts | 16 +++++-
src/modules/inbounds/core/api.ts | 38 +++++++++++--
src/modules/inbounds/core/types.ts | 21 ++++++-
.../inbounds/pages/InboundOrdersView.test.ts | 2 +-
.../api/platformLoadingLists.test.ts | 4 +-
.../loading-lists/api/platformLoadingLists.ts | 7 +++
.../components/LoadingListDetailDrawer.vue | 3 +
21 files changed, 300 insertions(+), 52 deletions(-)
create mode 100644 src/modules/inbounds/core/InboundHistoryPanel.test.ts
diff --git a/src/modules/container-loading/api/platformContainerLoading.test.ts b/src/modules/container-loading/api/platformContainerLoading.test.ts
index 4c0fea2e..25a6d45d 100644
--- a/src/modules/container-loading/api/platformContainerLoading.test.ts
+++ b/src/modules/container-loading/api/platformContainerLoading.test.ts
@@ -3,7 +3,7 @@ import { readFileSync } from 'node:fs'
import { resolve } from 'node:path'
import { http } from '@/shared/api/http'
import {
- adjustSmartLoadingItem, assignPendingReviewSmartLoadingOrder, assignSmartLoadingGroup, assignSmartLoadingItem, getContainer,
+ adjustSmartLoadingItem, assignPendingReviewSmartLoadingOrder, assignSmartLoadingGroup, assignSmartLoadingItem, assignSmartLoadingPallet, getContainer,
listContainers, listSmartLoadingCandidates, listSmartLoadingWorkbenchContainers, removeAllUnpickedSmartLoadingItems, removeSmartLoadingGroup, removeSmartLoadingItem,
getContainerClearance, downloadContainerClearance, uploadContainerClearance, completeContainerClearance,
getContainerOverview, markContainerException, cancelContainerException, uploadContainerDocument, downloadContainerDocument, downloadContainerPdaPhoto,
@@ -91,6 +91,17 @@ describe('platform container loading API', () => {
expect(vi.mocked(http.delete).mock.calls[0]?.[1]).toMatchObject({ data: { expectedPlanVersion: 9, expectedItemVersion: 10, operationId: expect.stringContaining('remove-') } })
})
+ it('assigns a sealed pallet through the whole-pallet command', async () => {
+ vi.mocked(http.post).mockResolvedValue({ code: '200', data: plan })
+
+ await assignSmartLoadingPallet('10', { palletId: '9007199254740998', expectedVersion: 5 })
+
+ expect(http.post).toHaveBeenCalledWith(
+ '/platform/v1/first-leg/smart-loading/plans/10/pallet-assignments',
+ { palletId: '9007199254740998', expectedVersion: 5, operationId: expect.stringContaining('assign-pallet-') },
+ )
+ })
+
it('uses the dedicated provisional assignment command for a pending-review order', async () => {
vi.mocked(http.post).mockResolvedValue({ code: '200', data: plan })
diff --git a/src/modules/container-loading/api/platformContainerLoading.ts b/src/modules/container-loading/api/platformContainerLoading.ts
index a9454c01..249e211a 100644
--- a/src/modules/container-loading/api/platformContainerLoading.ts
+++ b/src/modules/container-loading/api/platformContainerLoading.ts
@@ -101,6 +101,8 @@ function item(raw: SmartLoadingItem): SmartLoadingItem {
id: id(raw.id), loadingPlanId: id(raw.loadingPlanId), accountId: id(raw.accountId),
inboundId: id(raw.inboundId), inboundDetailId: id(raw.inboundDetailId), orderId: id(raw.orderId),
destinationWarehouseId: optionalId(raw.destinationWarehouseId), version: numberValue(raw.version),
+ palletId: optionalId(raw.palletId), palletNo: raw.palletNo || null,
+ unitType: raw.unitType, indivisible: Boolean(raw.indivisible),
packageCount: numberValue(raw.packageCount),
pickedPackageCount: numberValue(raw.pickedPackageCount),
minPackageCount: numberValue(raw.minPackageCount, 1),
@@ -267,7 +269,8 @@ export async function listSmartLoadingCandidates(query: SmartLoadingCandidateQue
return {
...raw, accountId, customerId: accountId, inboundId: optionalId(raw.inboundId),
orderId: id(raw.orderId), warehouseId: id(raw.warehouseId), destinationWarehouseId: optionalId(raw.destinationWarehouseId),
- coLoadGroupId: optionalId(raw.coLoadGroupId),
+ coLoadGroupId: optionalId(raw.coLoadGroupId), palletId: optionalId(raw.palletId), palletNo: raw.palletNo || null,
+ unitType: raw.unitType, indivisible: Boolean(raw.indivisible),
memberCount: raw.memberCount == null ? null : numberValue(raw.memberCount),
groupTotalBoxes: raw.groupTotalBoxes == null ? null : numberValue(raw.groupTotalBoxes),
locked: raw.locked == null ? null : Boolean(raw.locked),
@@ -317,6 +320,14 @@ export async function assignSmartLoadingItem(planId: string, payload: { inboundI
return plan(unwrapApiResponse(response))
}
+export async function assignSmartLoadingPallet(planId: string, payload: { palletId: string; expectedVersion: number }) {
+ const response = await http.post
, ApiEnvelope>(
+ `${smartLoadingPath}/plans/${encodeURIComponent(planId)}/pallet-assignments`,
+ { ...payload, operationId: operationId('assign-pallet') },
+ )
+ return plan(unwrapApiResponse(response))
+}
+
export async function assignPendingReviewSmartLoadingOrder(planId: string, payload: { customerId: string; orderId: string; inboundCode: string; packageCount: number; expectedVersion: number }) {
const response = await http.post, ApiEnvelope>(
`${smartLoadingPath}/plans/${encodeURIComponent(planId)}/pending-review-assignments`,
diff --git a/src/modules/container-loading/pages/GlobalSmartLoadingView.test.ts b/src/modules/container-loading/pages/GlobalSmartLoadingView.test.ts
index 0dec60bd..0cc2bdd9 100644
--- a/src/modules/container-loading/pages/GlobalSmartLoadingView.test.ts
+++ b/src/modules/container-loading/pages/GlobalSmartLoadingView.test.ts
@@ -13,6 +13,7 @@ import {
assignPendingReviewSmartLoadingOrder,
assignSmartLoadingGroup,
assignSmartLoadingItem,
+ assignSmartLoadingPallet,
getSmartLoadingPlanByBooking,
listContainers,
listSmartLoadingCandidates,
@@ -43,6 +44,7 @@ vi.mock('../api/platformContainerLoading', () => ({
listSmartLoadingWorkbenchContainers: vi.fn(),
createSmartLoadingPlan: vi.fn(),
assignSmartLoadingItem: vi.fn(),
+ assignSmartLoadingPallet: vi.fn(),
assignPendingReviewSmartLoadingOrder: vi.fn(),
assignSmartLoadingGroup: vi.fn(),
recommendSmartLoading: vi.fn(),
@@ -74,7 +76,7 @@ const plan = {
canAssign: true, canEdit: true, blockedReason: null, finalCompletionStatus: 'NOT_STARTED' as const,
pdaTaskId: null, pdaTaskStatus: null, pdaTaskVersion: null,
coLoadGroups: [],
- items: [{ id: '101', loadingPlanId: '99', accountId: '1', inboundId: '2', inboundDetailId: '3', orderId: '4', orderNo: 'ORD-1', inboundCode: 'IN-1', customerName: '示例企业', destinationWarehouseId: '9', destinationWarehouseCode: 'LAX9', destinationWarehouseName: 'LAX9', skuCode: 'SKU-1', productNameZh: '服装', packageCount: 6, productQuantity: 6, grossWeightKg: 60, volumeCbm: 1.2, loadSequence: 1, version: 1, pickedPackageCount: 0, minPackageCount: 1, canAdjust: true, canRemove: true }],
+ items: [{ id: '101', loadingPlanId: '99', accountId: '1', inboundId: '2', inboundDetailId: '3', orderId: '4', orderNo: 'ORD-1', inboundCode: 'IN-1', customerName: '示例企业', destinationWarehouseId: '9', destinationWarehouseCode: 'LAX9', destinationWarehouseName: 'LAX9', skuCode: 'SKU-1', productNameZh: '服装', unitType: 'PACKAGE' as const, palletId: null, palletNo: null, indivisible: false, packageCount: 6, productQuantity: 6, grossWeightKg: 60, volumeCbm: 1.2, loadSequence: 1, version: 1, pickedPackageCount: 0, minPackageCount: 1, canAdjust: true, canRemove: true }],
}
const candidate = {
accountId: '1', inboundId: '5', orderId: '7', orderNo: 'ORD-2', inboundCode: 'IN-2',
@@ -89,7 +91,7 @@ function candidatePage(records: unknown[], page = 1, size = 20, total = records.
return {
records: records.map((record) => {
const candidate = record as { accountId?: string; customerId?: string; groupMembers?: unknown[] }
- return { customerId: candidate.customerId || candidate.accountId || '', groupMembers: [], ...candidate }
+ return { customerId: candidate.customerId || candidate.accountId || '', groupMembers: [], unitType: 'PACKAGE', palletId: null, palletNo: null, indivisible: false, ...candidate }
}),
page, size, total, pages: total ? Math.ceil(total / size) : 0,
} as Awaited>
@@ -116,7 +118,8 @@ describe('GlobalSmartLoadingView', () => {
it('uses one-line shared text clamps for co-load and assigned-count summaries', () => {
const source = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/GlobalSmartLoadingView.vue'), 'utf8')
expect(source).toContain('')
- expect(source).toContain('')
+ expect(source).toContain('')
+ expect(source).toContain("row.unitType === 'SEALED_PALLET'")
expect(source).toContain('.candidate-group { display: grid; width: 100%; min-width: 0;')
expect(source).toContain('.candidate-group :deep(.line-clamp-text) { width: 100%; }')
expect(source).not.toContain(' {
const editable = computed(() => plan.value?.canEdit === true)
const assignable = computed(() => plan.value?.canAssign === true)
const assignedInboundIds = computed(() => new Set((plan.value?.items || []).map((item) => item.inboundId)))
+const assignedPalletIds = computed(() => new Set((plan.value?.items || []).map((item) => item.palletId).filter(Boolean)))
type SmartLoadingCandidateRow = SmartLoadingCandidate & { memberInboundIds: string[]; memberInboundCodes: string[]; memberOrderSummaries: string[]; memberOrderCount: number; inboundFragmentCount: number; totalGrossWeightKg: number | null; totalVolumeCbm: number | null }
function memberOrderSummaries(members: T[]) {
const orders = new Map()
@@ -114,6 +116,7 @@ function groupMemberLabel(group: SmartLoadingPlanCoLoadGroup) {
: `${group.memberOrderCount} 票 · ${group.inboundFragmentCount} 个入仓片段`
}
function candidateTotalGrossWeight(candidate: SmartLoadingCandidate) {
+ if (candidate.unitType === 'SEALED_PALLET') return candidate.unitGrossWeightKg
return candidate.unitGrossWeightKg == null ? null : Number(candidate.unitGrossWeightKg) * Number(candidate.availablePackageCount || 0)
}
function candidateTotalVolume(candidate: SmartLoadingCandidate) {
@@ -221,20 +224,23 @@ function preferredContainerId() {
const candidateColumns: DataTableColumn[] = [
{ key: 'actions', label: '操作', width: 90, fixed: 'left', slotName: 'actions' },
{ key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 140, fixed: 'left', showOverflowTooltip: true },
+ { key: 'palletNo', prop: 'palletNo', label: '托盘号', minWidth: 145, showOverflowTooltip: true },
+ { key: 'unitType', label: '分配单位', width: 105, slotName: 'unitType' },
{ key: 'coLoadGroup', label: '同柜', minWidth: 80, slotName: 'coLoadGroup' },
{ key: 'customerName', prop: 'customerName', label: '客户', minWidth: 70, slotName: 'customerName' },
{ key: 'orderStatusSnapshot', prop: 'orderStatusSnapshot', label: '订单状态', width: 100, slotName: 'orderStatusSnapshot' },
- { key: 'availablePackageCount', prop: 'availablePackageCount', label: '可用箱数', width: 80 },
+ { key: 'availablePackageCount', prop: 'availablePackageCount', label: '箱数', width: 80 },
// { key: 'cartonIdentityStatus', label: '箱号归属', width: 105, slotName: 'cartonIdentityStatus' },
- { key: 'unitGrossWeightKg', label: '单箱毛重', width: 80, slotName: 'unitGrossWeight' },
+ { key: 'unitGrossWeightKg', label: '单位毛重', width: 90, slotName: 'unitGrossWeight' },
{ key: 'totalGrossWeightKg', label: '重量', width: 90, slotName: 'candidateTotalWeight' },
- { key: 'averageUnitVolumeCbm', label: '单箱体积', width: 80, slotName: 'averageUnitVolume' },
+ { key: 'averageUnitVolumeCbm', label: '单位体积', width: 90, slotName: 'averageUnitVolume' },
{ key: 'totalVolumeCbm', label: '体积', width: 90, slotName: 'candidateTotalVolume' },
{ key: 'estimatedVolumeCbm', label: '预估体积', width: 100, slotName: 'estimatedVolume' },
]
const itemColumns: DataTableColumn[] = [
{ key: 'actions', label: '操作', width: 90, fixed: 'left', slotName: 'actions' },
{ key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 140, fixed: 'left', showOverflowTooltip: true },
+ { key: 'palletNo', prop: 'palletNo', label: '托盘号', minWidth: 145, showOverflowTooltip: true },
{ key: 'coLoadGroup', label: '同柜', minWidth: 80, slotName: 'coLoadGroup' },
{ key: 'customerName', prop: 'customerName', label: '客户', minWidth: 70, slotName: 'customerName' },
{ key: 'packageCount', label: '分配箱数', width: 140, slotName: 'packageCount' },
@@ -490,7 +496,8 @@ function openAssign(source: object) {
assignOpen.value = true
}
async function assign() {
- if (!plan.value || !selectedCandidate.value || assignForm.packageCount < 1) return
+ if (!plan.value || !selectedCandidate.value) return
+ if (selectedCandidate.value.unitType !== 'SEALED_PALLET' && assignForm.packageCount < 1) return
if (selectedCandidate.value.coLoadGroupId && (selectedCandidate.value.blockReason || selectedCandidate.value.locked)) return
if (!selectedCandidate.value.coLoadGroupId && assignForm.packageCount > selectedCandidate.value.availablePackageCount) {
ElMessage.warning(`本次最多可分配 ${selectedCandidate.value.availablePackageCount} 箱`)
@@ -498,7 +505,9 @@ async function assign() {
}
await mutate(async () => {
const selected = selectedCandidate.value!
- acceptPlan(selected.orderStatusSnapshot === 'PENDING_REVIEW'
+ acceptPlan(selected.unitType === 'SEALED_PALLET' && selected.palletId
+ ? await assignSmartLoadingPallet(plan.value!.id, { palletId: selected.palletId, expectedVersion: plan.value!.version })
+ : selected.orderStatusSnapshot === 'PENDING_REVIEW'
? await assignPendingReviewSmartLoadingOrder(plan.value!.id, {
customerId: selected.accountId,
orderId: selected.orderId,
@@ -519,6 +528,10 @@ async function assign() {
}, '分配明细失败', { preserveAssign: true })
}
function candidateBlocked(candidate: SmartLoadingCandidateRow) {
+ if (candidate.unitType === 'SEALED_PALLET') {
+ return Boolean(candidate.blockReason) || candidate.locked === true || !candidate.palletId
+ || !candidate.indivisible || assignedPalletIds.value.has(candidate.palletId)
+ }
if (candidate.orderStatusSnapshot === 'PENDING_REVIEW') {
return Boolean(candidate.blockReason) || candidate.locked === true
|| !candidate.accountId || !candidate.inboundCode || candidate.availablePackageCount < 1
@@ -547,6 +560,7 @@ async function recommend() {
}
async function adjust(source: object) {
const item = itemRow(source)
+ if (item.unitType === 'SEALED_PALLET') return
if (!plan.value || mutating.value) return
const count = Number(quantityDrafts[item.id])
if (count === item.packageCount) return
@@ -712,10 +726,10 @@ onMounted(() => { void load(); void loadCustomers() })
plain
:disabled="mutating || candidateBlocked(row as SmartLoadingCandidateRow)"
@click="openAssign(row)"
- >{{ row.coLoadGroupId ? '整组分配' : '加入' }}
+ >{{ row.unitType === 'SEALED_PALLET' ? '整托分配' : row.coLoadGroupId ? '整组分配' : '加入' }}
-
+
{{ candidateStatusLabel(row.orderStatusSnapshot) }}
{{ formatMeasurement(row.unitGrossWeightKg, 'kg', 1) }}
{{ formatMeasurement(row.totalGrossWeightKg, 'kg', 1) }}
@@ -789,8 +803,9 @@ onMounted(() => { void load(); void loadCustomers() })
删除
-
- 使用：{{ row.packageCount }} 未用：{{ row.remainingPackageCount }}
+ 使用：{{ row.packageCount }} 未用：{{ row.remainingPackageCount }}
{{ selectedCandidate.groupNo || selectedCandidate.customerName || '客户待补充' }}
目标柜次：{{ displayCabinetNo(selectedContainer) }} · 集装箱号：{{ displayActualContainerNo(selectedContainer) }}
@@ -810,6 +825,10 @@ onMounted(() => { void load(); void loadCustomers() })
{{ summary }}
+
+ 托盘号 {{ selectedCandidate.palletNo || '—' }} · 入仓码 {{ selectedCandidate.inboundCode || '—' }} · {{ selectedCandidate.availablePackageCount }} 箱
+
+
入仓码 {{ selectedCandidate.inboundCode || '—' }} · 可用 {{ selectedCandidate.availablePackageCount }} 箱 · 平均单箱毛重 {{ formatMeasurement(selectedCandidate.unitGrossWeightKg, 'kg', 1) }} · 平均单箱体积 {{ formatMeasurement(selectedCandidate.averageUnitVolumeCbm, 'm³') }}
本次只记录该入仓码的计划装柜箱数，具体箱号归属为未核验。
diff --git a/src/modules/container-loading/pages/SmartLoadingWorkbenchView.test.ts b/src/modules/container-loading/pages/SmartLoadingWorkbenchView.test.ts
index d2da4b54..321abead 100644
--- a/src/modules/container-loading/pages/SmartLoadingWorkbenchView.test.ts
+++ b/src/modules/container-loading/pages/SmartLoadingWorkbenchView.test.ts
@@ -7,11 +7,11 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
import { readFileSync } from 'node:fs'
import { resolve } from 'node:path'
import SmartLoadingWorkbenchView from './SmartLoadingWorkbenchView.vue'
-import { assignSmartLoadingGroup, assignSmartLoadingItem, getContainer, getSmartLoadingPlanByBooking, listSmartLoadingCandidates, recommendSmartLoading, removeSmartLoadingGroup } from '../api/platformContainerLoading'
+import { assignSmartLoadingGroup, assignSmartLoadingItem, assignSmartLoadingPallet, getContainer, getSmartLoadingPlanByBooking, listSmartLoadingCandidates, recommendSmartLoading, removeSmartLoadingGroup } from '../api/platformContainerLoading'
vi.mock('../api/platformContainerLoading', () => ({
getContainer: vi.fn(), getSmartLoadingPlanByBooking: vi.fn(), listSmartLoadingCandidates: vi.fn(),
- createSmartLoadingPlan: vi.fn(), assignSmartLoadingItem: vi.fn(), assignSmartLoadingGroup: vi.fn(), recommendSmartLoading: vi.fn(),
+ createSmartLoadingPlan: vi.fn(), assignSmartLoadingItem: vi.fn(), assignSmartLoadingPallet: vi.fn(), assignSmartLoadingGroup: vi.fn(), recommendSmartLoading: vi.fn(),
adjustSmartLoadingItem: vi.fn(), removeSmartLoadingItem: vi.fn(), removeSmartLoadingGroup: vi.fn(), pushSmartLoadingPreload: vi.fn(),
}))
vi.mock('../smartLoadingPlanGroups', () => ({ loadSmartLoadingPlanCoLoadGroups: vi.fn().mockResolvedValue(new Map()) }))
@@ -36,7 +36,7 @@ function candidatePage(records: unknown[]) {
return {
records: records.map((record) => {
const candidate = record as { accountId?: string; customerId?: string; groupMembers?: unknown[] }
- return { customerId: candidate.customerId || candidate.accountId || '', groupMembers: [], ...candidate }
+ return { customerId: candidate.customerId || candidate.accountId || '', groupMembers: [], unitType: 'PACKAGE', palletId: null, palletNo: null, indivisible: false, ...candidate }
}),
page: 1, size: 200, total: records.length, pages: records.length ? 1 : 0,
} as Awaited>
@@ -46,7 +46,8 @@ describe('SmartLoadingWorkbenchView', () => {
it('uses one-line shared text clamps for co-load and assigned-count summaries', () => {
const source = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue'), 'utf8')
expect(source).toContain('')
- expect(source).toContain('')
+ expect(source).toContain('')
+ expect(source).toContain("row.unitType === 'SEALED_PALLET'")
expect(source).toContain('.candidate-group { display: grid; width: 100%; min-width: 0;')
expect(source).toContain('.candidate-group :deep(.line-clamp-text) { width: 100%;')
expect(source).toContain(' {
wrapper.unmount()
})
+ it('assigns a sealed pallet atomically without a package-count input', async () => {
+ vi.mocked(listSmartLoadingCandidates).mockResolvedValue(candidatePage([{
+ ...candidate, unitType: 'SEALED_PALLET', palletId: '9007199254740998', palletNo: 'DP-260908-0001',
+ indivisible: true, availablePackageCount: 12,
+ }]))
+ vi.mocked(assignSmartLoadingPallet).mockResolvedValue(planResponse)
+ const router = createRouter({ history: createMemoryHistory(), routes: [{ path: '/container-loading/:containerId/smart-loading', component: SmartLoadingWorkbenchView }] })
+ await router.push(`/container-loading/${container.id}/smart-loading`); await router.isReady()
+ const wrapper = mount(SmartLoadingWorkbenchView, { attachTo: document.body, global: { plugins: [ElementPlus, router] } })
+ await flushPromises()
+
+ expect(wrapper.text()).toContain('DP-260908-0001')
+ await wrapper.find('.el-table__body-wrapper button').trigger('click')
+ await flushPromises()
+ expect(document.body.textContent).toContain('不可拆分单元整托加入')
+ expect(document.body.textContent).not.toContain('本次计划装柜箱数')
+ ;([...document.body.querySelectorAll('button')].find((button) => button.textContent?.trim() === '确认整托分配') as HTMLButtonElement).click()
+ await flushPromises()
+
+ expect(assignSmartLoadingPallet).toHaveBeenCalledWith(planResponse.id, { palletId: '9007199254740998', expectedVersion: planResponse.version })
+ expect(assignSmartLoadingItem).not.toHaveBeenCalled()
+ wrapper.unmount()
+ })
+
})
diff --git a/src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue b/src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue
index aaa7385b..354c43fe 100644
--- a/src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue
+++ b/src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue
@@ -12,7 +12,7 @@ import LoadErrorState from '@/shared/components/LoadErrorState.vue'
import LineClampText from '@/shared/components/LineClampText.vue'
import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
import {
- adjustSmartLoadingItem, assignSmartLoadingGroup, assignSmartLoadingItem, getContainer,
+ adjustSmartLoadingItem, assignSmartLoadingGroup, assignSmartLoadingItem, assignSmartLoadingPallet, getContainer,
getSmartLoadingPlanByBooking, listSmartLoadingCandidates,
recommendSmartLoading, removeSmartLoadingGroup, removeSmartLoadingItem,
} from '../api/platformContainerLoading'
@@ -46,6 +46,7 @@ const canViewLoadingList = computed(() => access.can('platform:firstleg:loading-
const editable = computed(() => plan.value?.canEdit === true)
const assignable = computed(() => plan.value?.canAssign === true)
const assignedInboundIds = computed(() => new Set((plan.value?.items || []).map((item) => item.inboundId)))
+const assignedPalletIds = computed(() => new Set((plan.value?.items || []).map((item) => item.palletId).filter(Boolean)))
type SmartLoadingCandidateRow = SmartLoadingCandidate & { memberInboundIds: string[]; memberInboundCodes: string[]; memberOrderSummaries: string[]; memberOrderCount: number; inboundFragmentCount: number }
function memberOrderSummaries(members: T[]) {
const orders = new Map()
@@ -130,6 +131,7 @@ const itemColumns: DataTableColumn[] = [
{ key: 'actions', label: '操作', width: 90, fixed: 'left', slotName: 'actions' },
{ key: 'sequence', prop: 'loadSequence', label: '顺序', width: 75 },
{ key: 'order', label: '入仓码', minWidth: 190, slotName: 'order' },
+ { key: 'palletNo', prop: 'palletNo', label: '托盘号', minWidth: 150, showOverflowTooltip: true },
{ key: 'coLoadGroup', label: '同柜不可拆', minWidth: 210, slotName: 'coLoadGroup' },
{ key: 'customerName', prop: 'customerName', label: '客户', minWidth: 150, slotName: 'customerName' },
{ key: 'goods', label: '货物', minWidth: 190, slotName: 'goods' },
@@ -140,13 +142,15 @@ const itemColumns: DataTableColumn[] = [
const candidateColumns: DataTableColumn[] = [
{ key: 'actions', label: '操作', width: 110, fixed: 'left', slotName: 'actions' },
{ key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 190, fixed: 'left', showOverflowTooltip: true },
+ { key: 'palletNo', prop: 'palletNo', label: '托盘号', minWidth: 150, showOverflowTooltip: true },
+ { key: 'unitType', label: '分配单位', width: 110, slotName: 'unitType' },
{ key: 'coLoadGroup', label: '同柜不可拆', minWidth: 210, slotName: 'coLoadGroup' },
{ key: 'customerName', prop: 'customerName', label: '客户', minWidth: 150, slotName: 'customerName' },
{ key: 'goodsSummary', prop: 'goodsSummary', label: '货物摘要', minWidth: 180, slotName: 'goodsSummary' },
- { key: 'availablePackageCount', prop: 'availablePackageCount', label: '可用箱数', width: 110 },
+ { key: 'availablePackageCount', prop: 'availablePackageCount', label: '箱数', width: 90 },
{ key: 'cartonIdentityStatus', label: '箱号归属', width: 110, slotName: 'cartonIdentityStatus' },
- { key: 'averageUnitVolumeCbm', label: '平均单箱体积', width: 145, slotName: 'averageUnitVolume' },
- { key: 'unitGrossWeightKg', label: '平均单箱毛重', width: 140, slotName: 'unitGrossWeight' },
+ { key: 'averageUnitVolumeCbm', label: '单位体积', width: 120, slotName: 'averageUnitVolume' },
+ { key: 'unitGrossWeightKg', label: '单位毛重', width: 120, slotName: 'unitGrossWeight' },
]
function formatNumber(value: number, digits = 3) { return Number.isFinite(value) ? value.toLocaleString('zh-CN', { maximumFractionDigits: digits }) : '0' }
@@ -231,12 +235,15 @@ async function assign() {
const currentPlan = plan.value
const selected = selectedCandidate.value
const inboundId = selected?.inboundId
- if (!currentPlan || !selected || !inboundId || assignForm.packageCount < 1) return
+ if (!currentPlan || !selected || !inboundId) return
+ if (selected.unitType !== 'SEALED_PALLET' && assignForm.packageCount < 1) return
if (selected.coLoadGroupId && (selected.blockReason || selected.locked)) return
mutating.value = true
mutationError.value = null
try {
- const next = selected.coLoadGroupId
+ const next = selected.unitType === 'SEALED_PALLET' && selected.palletId
+ ? await assignSmartLoadingPallet(currentPlan.id, { palletId: selected.palletId, expectedVersion: currentPlan.version })
+ : selected.coLoadGroupId
? await assignSmartLoadingGroup(currentPlan.id, inboundId, currentPlan.version)
: await assignSmartLoadingItem(currentPlan.id, { inboundId, packageCount: assignForm.packageCount, expectedVersion: currentPlan.version })
await acceptPlanWithGroups(next)
@@ -246,6 +253,10 @@ async function assign() {
finally { mutating.value = false }
}
function candidateBlocked(candidate: SmartLoadingCandidateRow) {
+ if (candidate.unitType === 'SEALED_PALLET') {
+ return Boolean(candidate.blockReason) || candidate.locked === true || !candidate.palletId
+ || !candidate.indivisible || assignedPalletIds.value.has(candidate.palletId)
+ }
return Boolean(candidate.blockReason) || candidate.locked === true
|| !candidate.inboundId
|| candidate.memberInboundIds.some((inboundId) => assignedInboundIds.value.has(inboundId))
@@ -272,6 +283,7 @@ async function recommend() {
}
async function adjust(source: object) {
const item = itemRow(source)
+ if (item.unitType === 'SEALED_PALLET') return
if (!plan.value || mutating.value) return
const count = Number(quantityDrafts[item.id])
if (count === item.packageCount) return
@@ -372,24 +384,25 @@ onMounted(load)
删除
{{ row.inboundCode || '—' }}
-
+
- 使用：{{ row.packageCount }} 未用：{{ row.remainingPackageCount }}使用：{{ row.packageCount }} 未用：{{ row.remainingPackageCount }}候选货物
系统基于装柜仓库、物流渠道、可用箱数及 150% 容量上限校验。
+
+ {{ row.unitType === 'SEALED_PALLET' ? '封托托盘' : '箱件' }}
{{ formatNumber(Number(row.averageUnitVolumeCbm || 0)) }} m³{{ formatNumber(Number(row.unitGrossWeightKg || 0),1) }} kg
未核验
- {{ selectedCandidate.groupNo || selectedCandidate.inboundCode || '入仓码暂缺' }}
组内 {{ selectedCandidate.memberOrderCount }} 票、{{ selectedCandidate.inboundFragmentCount }} 个入仓片段，共 {{ selectedCandidate.groupTotalBoxes }} 箱
{{ summary }}
{{ selectedCandidate.goodsSummary || '货物摘要暂缺' }} · 可用 {{ selectedCandidate.availablePackageCount }} 箱
只记录数量，具体上柜箱号未核验。{{ selectedCandidate.palletNo || selectedCandidate.groupNo || selectedCandidate.inboundCode || '入仓码暂缺' }}
组内 {{ selectedCandidate.memberOrderCount }} 票、{{ selectedCandidate.inboundFragmentCount }} 个入仓片段，共 {{ selectedCandidate.groupTotalBoxes }} 箱
{{ summary }}
托盘号 {{ selectedCandidate.palletNo || '—' }} · 入仓码 {{ selectedCandidate.inboundCode || '—' }} · {{ selectedCandidate.availablePackageCount }} 箱
{{ selectedCandidate.goodsSummary || '货物摘要暂缺' }} · 可用 {{ selectedCandidate.availablePackageCount }} 箱
只记录数量，具体上柜箱号未核验。
- 一件代发绑定托盘
{{ dropshipPallets.length }} 个托盘
- {{ value(pallet.palletNo) }} · {{ pallet.cartonCount }} 箱 打印托盘唛{{ item.inboundCode }} · SKU {{ item.skuCode }} · {{ item.cartonCount }} 箱
暂无一件代发托盘绑定
+ 一件代发清点与组托结果
{{ dropshipPallets.length }} 个托盘
+
+
+
+
+
+ - 箱数
- {{ pallet.cartonCount }}
+ - SKU 数
- {{ pallet.skuCount }}
+ - 毛重
- {{ number(pallet.weightKg) }} kg
+ - 体积
- {{ number(pallet.volumeCbm) }} m³
+ - 差异箱数
- {{ pallet.discrepancyCartons }}
+ - 封托时间
- {{ date(pallet.sealedAt) }}
+
+
+
+
+ {{ value(item.inboundCode) }}
+ {{ value(item.skuCode) }}{{ value(item.cargoName) }}
+ {{ item.skuQuantity }}
+ {{ item.cartonCount }}
+ {{ item.cartonMarks.length ? item.cartonMarks.join('、') : '—' }}
+
+
+
暂无一件代发清点与组托结果
托盘与库位
{{ palletLocations.length }} 条分配
@@ -93,6 +124,25 @@ async function printPallet(pallet: InboundDropshipPallet) {
.allocation-location { overflow-wrap: anywhere; color: var(--cc-primary); text-align: right; }
.simple-list > div { padding: 10px 12px; border-bottom: 1px solid #edf0f4; font-size: 12px; }
.simple-list strong, .simple-list span { overflow-wrap: anywhere; }
+.dropship-pallet-list { display: grid; gap: 12px; }
+.dropship-pallet-card { min-width: 0; overflow: hidden; border: 1px solid var(--cc-border); border-radius: 6px; background: #fff; }
+.dropship-pallet-card > header { display: flex; min-height: 42px; align-items: center; justify-content: space-between; gap: 12px; padding: 8px 12px; border-bottom: 1px solid #edf0f4; background: #f8fafc; }
+.dropship-pallet-card > header > div { display: flex; min-width: 0; align-items: center; gap: 8px; }
+.dropship-pallet-card > header strong { overflow-wrap: anywhere; color: #172033; font-size: 13px; }
+.dropship-pallet-summary { display: grid; grid-template-columns: repeat(6, minmax(0, 1fr)); margin: 0; border-bottom: 1px solid #edf0f4; }
+.dropship-pallet-summary > div { min-width: 0; padding: 8px 12px; border-right: 1px solid #edf0f4; }
+.dropship-pallet-summary > div:last-child { border-right: 0; }
+.dropship-pallet-summary dt { color: var(--cc-muted); font-size: 11px; }
+.dropship-pallet-summary dd { margin: 3px 0 0; overflow-wrap: anywhere; color: var(--cc-text); font-size: 12px; font-weight: 650; }
+.dropship-item-table { min-width: 680px; }
+.dropship-pallet-card { overflow-x: auto; }
+.dropship-item-row { display: grid; grid-template-columns: minmax(140px, 1fr) minmax(180px, 1.2fr) 100px 70px minmax(220px, 1.5fr); min-width: 800px; border-bottom: 1px solid #edf0f4; }
+.dropship-item-row:last-child { border-bottom: 0; }
+.dropship-item-row > span { min-width: 0; padding: 8px 12px; overflow-wrap: anywhere; color: var(--cc-text); font-size: 12px; }
+.dropship-item-row > span + span { border-left: 1px solid #edf0f4; }
+.dropship-item-row small { display: block; margin-top: 3px; color: var(--cc-muted); font-size: 11px; }
+.dropship-item-row--header { background: #f8fafc; }
+.dropship-item-row--header > span { color: var(--cc-muted); font-size: 11px; font-weight: 650; }
.muted-empty { margin: 0; padding: 18px 12px; border: 1px dashed var(--cc-border); border-radius: 6px; background: #f8fafc; color: var(--cc-muted); font-size: 12px; text-align: center; }
.timeline { display: grid; gap: 0; margin: 0; padding: 0; list-style: none; }
.timeline li { display: grid; grid-template-columns: 16px 1fr; gap: 10px; min-width: 0; padding-bottom: 16px; }
@@ -101,5 +151,6 @@ async function printPallet(pallet: InboundDropshipPallet) {
.timeline strong, .timeline span, .timeline small { display: block; overflow-wrap: anywhere; }
.timeline span, .timeline small { margin-top: 3px; color: var(--cc-muted); font-size: 12px; line-height: 1.5; }
.remark-section p { margin: 0; padding: 12px; border-radius: 6px; background: #f8fafc; color: var(--cc-text); font-size: 13px; line-height: 1.6; white-space: pre-wrap; }
+@media (max-width: 720px) { .dropship-pallet-summary { grid-template-columns: 1fr; } .dropship-pallet-summary > div { border-right: 0; border-bottom: 1px solid #edf0f4; } .dropship-pallet-summary > div:last-child { border-bottom: 0; } }
@media (max-width: 480px) { .allocation-row { grid-template-columns: 1fr auto; } .allocation-location { grid-column: 1 / -1; text-align: left; } }
diff --git a/src/modules/inbounds/core/api.test.ts b/src/modules/inbounds/core/api.test.ts
index 79746e4d..345aadc1 100644
--- a/src/modules/inbounds/core/api.test.ts
+++ b/src/modules/inbounds/core/api.test.ts
@@ -1,6 +1,6 @@
import { beforeEach, describe, expect, it, vi } from 'vitest'
import { http } from '@/shared/api/http'
-import { downloadInboundCartonLabels, downloadPlatformInboundHoldEvidence, getPlatformInbound, getPlatformInboundHold, holdPlatformInbound, listPlatformInbounds, releasePlatformInbound, uploadPlatformInboundHoldEvidence } from './api'
+import { downloadInboundCartonLabels, downloadPlatformInboundHoldEvidence, getPlatformInbound, getPlatformInboundHold, holdPlatformInbound, listPlatformInboundDropshipPallets, listPlatformInbounds, releasePlatformInbound, uploadPlatformInboundHoldEvidence } from './api'
vi.mock('@/shared/api/http', () => ({
ApiResponseError: class ApiResponseError extends Error {
@@ -73,6 +73,20 @@ describe('platform inbound query API', () => {
expect(http.get).toHaveBeenCalledWith('/platform/inbounds/19001', { params: { tenantId: '10001' } })
})
+ it('loads and normalizes the inbound-scoped dropship pallet result', async () => {
+ vi.mocked(http.get).mockResolvedValue({ code: '200', data: [{
+ palletId: 9007199254740993n, palletNo: 'PLT-001', status: 'SEALED', cartonCount: '2', skuCount: '1', version: '3',
+ weightKg: '20.5', volumeCbm: '0.88', discrepancyCartons: '1', sealedAt: '2026-09-08T10:00:00',
+ items: [{ inboundId: 19001, inboundCode: 'RK001', inboundDetailId: 9007199254740994n, skuCode: 'SKU001', cargoName: '服装', cartonCount: '2', skuQuantity: '19', cartonMarks: ['BOX-001', 'BOX-002'] }],
+ }] })
+
+ await expect(listPlatformInboundDropshipPallets('10001', '19001')).resolves.toMatchObject([{
+ palletId: '9007199254740993', weightKg: 20.5, volumeCbm: 0.88, discrepancyCartons: 1,
+ items: [{ inboundId: '19001', inboundDetailId: '9007199254740994', cartonCount: 2, skuQuantity: 19, cartonMarks: ['BOX-001', 'BOX-002'] }],
+ }])
+ expect(http.get).toHaveBeenCalledWith('/platform/v1/first-leg/pda-dropship/inbound-orders/19001/pallets', { params: { accountId: '10001' } })
+ })
+
it('passes the implemented order, process, measurement and fee review filters without renaming them', async () => {
vi.mocked(http.get).mockResolvedValue({
code: '200', message: 'success', data: { records: [], page: 1, size: 20, total: 0, pages: 0 },
diff --git a/src/modules/inbounds/core/api.ts b/src/modules/inbounds/core/api.ts
index 5709bcf8..7000ae88 100644
--- a/src/modules/inbounds/core/api.ts
+++ b/src/modules/inbounds/core/api.ts
@@ -11,6 +11,7 @@ import type {
InboundPageResult,
InboundPalletLocation,
InboundStatusHistory,
+ InboundDropshipPallet,
} from './types'
const basePath = '/platform/inbounds'
@@ -102,11 +103,7 @@ function normalizeDetail(raw: InboundOrderDetail): InboundOrderDetail {
return {
...raw,
summary: normalizeInboundSummary(raw.summary),
- dropshipPallets: (raw.dropshipPallets || []).map((pallet) => ({
- ...pallet,
- palletId: id(pallet.palletId) || '',
- items: (pallet.items || []).map((item) => ({ ...item, inboundId: id(item.inboundId) || '', inboundDetailId: id(item.inboundDetailId) || '' })),
- })),
+ dropshipPallets: [],
palletLocations: (raw.palletLocations || []).map(normalizePallet),
files: (raw.files || []).map(normalizeFile),
internalNotes: (raw.internalNotes || []).map(normalizeNote),
@@ -114,6 +111,29 @@ function normalizeDetail(raw: InboundOrderDetail): InboundOrderDetail {
}
}
+function normalizeDropshipPallet(raw: InboundDropshipPallet): InboundDropshipPallet {
+ return {
+ ...raw,
+ palletId: id(raw.palletId) || '',
+ palletNo: raw.palletNo || null,
+ cartonCount: integerValue(raw.cartonCount) || 0,
+ skuCount: integerValue(raw.skuCount) || 0,
+ version: integerValue(raw.version) || 0,
+ weightKg: numberValue(raw.weightKg),
+ volumeCbm: numberValue(raw.volumeCbm),
+ discrepancyCartons: integerValue(raw.discrepancyCartons) || 0,
+ sealedAt: raw.sealedAt || null,
+ items: (raw.items || []).map((item) => ({
+ ...item,
+ inboundId: id(item.inboundId) || '',
+ inboundDetailId: id(item.inboundDetailId) || '',
+ cartonCount: integerValue(item.cartonCount) || 0,
+ skuQuantity: integerValue(item.skuQuantity) || 0,
+ cartonMarks: item.cartonMarks || [],
+ })),
+ }
+}
+
function normalizeHoldDetail(raw: InboundHoldDetail): InboundHoldDetail {
return {
...raw,
@@ -161,6 +181,14 @@ export async function getPlatformInbound(tenantId: string, inboundId: string) {
return normalizeDetail(unwrapApiResponse(response))
}
+export async function listPlatformInboundDropshipPallets(accountId: string, inboundId: string) {
+ const response = await http.get, ApiEnvelope>(
+ `/platform/v1/first-leg/pda-dropship/inbound-orders/${encodeURIComponent(inboundId)}/pallets`,
+ { params: { accountId } },
+ )
+ return (unwrapApiResponse(response) || []).map(normalizeDropshipPallet)
+}
+
export async function getPlatformInboundHold(tenantId: string, inboundId: string) {
const response = await http.get, ApiEnvelope>(
`${basePath}/${encodeURIComponent(inboundId)}/hold`,
diff --git a/src/modules/inbounds/core/types.ts b/src/modules/inbounds/core/types.ts
index b9fb3fe1..c7196f4a 100644
--- a/src/modules/inbounds/core/types.ts
+++ b/src/modules/inbounds/core/types.ts
@@ -36,6 +36,7 @@ export interface InboundOrderSummary {
deliveryWarehouseId: string | null
deliveryWarehouseName: string | null
businessType: string | null
+ fulfillmentType: 'STANDARD' | 'ONE_CLICK_DROPSHIP' | string | null
channelCode: string | null
channelName: string | null
taxMode: string | null
@@ -161,12 +162,26 @@ export interface InboundHoldEvidenceUpload {
export interface InboundDropshipPallet {
palletId: string
palletNo: string | null
- palletStatus: string
+ status: 'OPEN' | 'SEALED'
cartonCount: number
skuCount: number
version: number
- items: Array<{ inboundId: string; inboundCode: string; inboundDetailId: string; skuCode: string; cargoName: string | null; cartonCount: number; cartonMarks: string[] }>
- completedAt: string | null
+ weightKg: number | null
+ volumeCbm: number | null
+ discrepancyCartons: number
+ sealedAt: string | null
+ items: InboundDropshipSkuItem[]
+}
+
+export interface InboundDropshipSkuItem {
+ inboundId: string
+ inboundCode: string
+ inboundDetailId: string
+ skuCode: string
+ cargoName: string | null
+ cartonCount: number
+ skuQuantity: number
+ cartonMarks: string[]
}
export interface InboundPageResult {
diff --git a/src/modules/inbounds/pages/InboundOrdersView.test.ts b/src/modules/inbounds/pages/InboundOrdersView.test.ts
index 61151bd9..e194c4ea 100644
--- a/src/modules/inbounds/pages/InboundOrdersView.test.ts
+++ b/src/modules/inbounds/pages/InboundOrdersView.test.ts
@@ -43,7 +43,7 @@ const summary: InboundOrderSummary = {
orderStatusSnapshot: 'APPROVED', measureReviewStatus: 'PENDING', feeStatus: 'UNPRICED', feeReviewStatus: null,
notificationStatus: null, version: 1, expectedArrivalAt: '2026-08-04T10:00:00', customerId: '10001', customerName: '示例客户',
companyId: '10001', companyName: '示例企业', warehouseId: '20001', warehouseName: '义乌收货仓', deliveryWarehouseId: null,
- deliveryWarehouseName: null, businessType: 'FBA', channelCode: 'SEA', channelName: '海运', taxMode: 'DDP', containerMode: null,
+ deliveryWarehouseName: null, businessType: 'FBA', fulfillmentType: 'STANDARD', channelCode: 'SEA', channelName: '海运', taxMode: 'DDP', containerMode: null,
customsInspection: false, destinationType: 'FBA', destinationWarehouseId: '30001', destinationCode: 'ONT8', destinationName: 'ONT8',
holdFlag: false, currentHoldReason: null, totalPackageCount: 6, actualGrossWeightKg: 120, actualNetWeightKg: 110,
actualVolumeCbm: 1.2, volumeWeightKg: 200, chargeableWeightKg: 200, chargeableVolumeCbm: null, palletCount: 1, locationCodes: 'A-01',
diff --git a/src/modules/loading-lists/api/platformLoadingLists.test.ts b/src/modules/loading-lists/api/platformLoadingLists.test.ts
index 1f46db2f..8e73e56f 100644
--- a/src/modules/loading-lists/api/platformLoadingLists.test.ts
+++ b/src/modules/loading-lists/api/platformLoadingLists.test.ts
@@ -49,7 +49,7 @@ const detail = {
items: [{
itemId: 11, itemVersion: 4, accountId: 12, orderId: 15, orderNo: 'ORD-001', inboundId: 13, inboundDetailId: 14, containerNo: 'MSCU1234567', productQuantity: 20,
customerName: '测试客户', inboundCode: 'RK001', skuCode: 'SKU001', destinationWarehouse: 'ONT8', chineseName: '产品', englishName: null,
- goodsImageUrl: null, packageCount: 2, palletCount: 1, grossWeightKg: 10, netWeightKg: 9, volumeCbm: 1,
+ goodsImageUrl: null, unitType: 'SEALED_PALLET', palletId: 9007199254740993n, palletNo: 'PLT-001', indivisible: true, packageCount: 2, palletCount: 1, grossWeightKg: 10, netWeightKg: 9, volumeCbm: 1,
dimensionalWeightKg: 2, unitsPerPackage: 10, fbaTrackingNo: null, shipmentNo: null, shippingMark: null,
internalRemark: null, customerRemark: null, warehouseRemark: null, loadSequence: 1, frozenAt: null,
}],
@@ -75,7 +75,7 @@ describe('platform loading lists API', () => {
vi.spyOn(http, 'get').mockResolvedValue({ code: '200', message: 'ok', data: detail })
const result = await getPreloadPlan('100', '300')
- expect(result.items[0]).toMatchObject({ itemId: '11', itemVersion: 4, accountId: '12', orderId: '15', orderNo: 'ORD-001', inboundId: '13', inboundDetailId: '14', containerNo: 'MSCU1234567', productQuantity: '20' })
+ expect(result.items[0]).toMatchObject({ itemId: '11', itemVersion: 4, accountId: '12', orderId: '15', orderNo: 'ORD-001', inboundId: '13', inboundDetailId: '14', unitType: 'SEALED_PALLET', palletId: '9007199254740993', palletNo: 'PLT-001', indivisible: true, containerNo: 'MSCU1234567', productQuantity: '20' })
expect(result.summary.containerBookingId).toBe('1900000000000000004')
expect(result.histories[0]).toMatchObject({ historyId: '21', itemId: '11', operationId: 'transport-21', operatorId: '22' })
})
diff --git a/src/modules/loading-lists/api/platformLoadingLists.ts b/src/modules/loading-lists/api/platformLoadingLists.ts
index 8fbc13c8..0fe802b7 100644
--- a/src/modules/loading-lists/api/platformLoadingLists.ts
+++ b/src/modules/loading-lists/api/platformLoadingLists.ts
@@ -91,6 +91,10 @@ export interface LoadingItem {
chineseName: string | null
englishName: string | null
goodsImageUrl: string | null
+ unitType: 'PACKAGE' | 'SEALED_PALLET'
+ palletId: string | null
+ palletNo: string | null
+ indivisible: boolean
packageCount: number
palletCount: number
grossWeightKg: number
@@ -240,6 +244,9 @@ function normalizeItem(raw: LoadingItem): LoadingItem {
orderId: requiredId(raw.orderId),
inboundId: requiredId(raw.inboundId),
inboundDetailId: requiredId(raw.inboundDetailId),
+ palletId: optionalId(raw.palletId),
+ palletNo: raw.palletNo || null,
+ indivisible: Boolean(raw.indivisible),
productQuantity: String(raw.productQuantity ?? '0'),
}
}
diff --git a/src/modules/loading-lists/components/LoadingListDetailDrawer.vue b/src/modules/loading-lists/components/LoadingListDetailDrawer.vue
index cb2ff581..67f83571 100644
--- a/src/modules/loading-lists/components/LoadingListDetailDrawer.vue
+++ b/src/modules/loading-lists/components/LoadingListDetailDrawer.vue
@@ -28,6 +28,8 @@ const actionColumn: DataTableColumn = { key: 'actions', label: '操作', fixed:
const baseItemColumns: DataTableColumn[] = [
{ key: 'sequence', prop: 'loadSequence', label: '装柜顺序', width: 92 },
{ key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 170, className: 'identifier-column', showOverflowTooltip: true },
+ { key: 'palletNo', prop: 'palletNo', label: '托盘号', minWidth: 155, className: 'identifier-column', showOverflowTooltip: true },
+ { key: 'unitType', label: '装柜单位', width: 110, slotName: 'unitType' },
{ key: 'orderNo', prop: 'orderNo', label: '订单号', minWidth: 170, className: 'identifier-column', showOverflowTooltip: true },
{ key: 'containerNo', prop: 'containerNo', label: '集装箱号', minWidth: 165, className: 'identifier-column', showOverflowTooltip: true, formatter: (row: LoadingItem) => row.containerNo || '待补录' },
{ key: 'skuCode', prop: 'skuCode', label: 'SKU', minWidth: 150, className: 'identifier-column', showOverflowTooltip: true },
@@ -212,6 +214,7 @@ function formatNumber(value?: number | null, digits = 3) {
编辑备注
+ {{ row.unitType === 'SEALED_PALLET' ? '封托托盘' : '箱件' }}整托不可拆
{{ formatNumber(row.grossWeightKg) }}
{{ formatNumber(row.netWeightKg) }}
{{ formatNumber(row.volumeCbm) }}
From dd9b8f7a6381168942f13f8b63cd3787863a6814 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Tue, 8 Sep 2026 17:38:09 +0800
Subject: [PATCH 26/31] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E5=A4=B4?=
=?UTF-8?q?=E7=A8=8B=E5=AE=A1=E6=A0=B8=E4=B8=8E=E8=AE=A1=E8=B4=B9=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../inbounds/fee/InboundFeePanel.test.ts | 27 +++++-
src/modules/inbounds/fee/InboundFeePanel.vue | 47 ++++++++--
src/modules/inbounds/fee/api.test.ts | 4 +-
src/modules/inbounds/fee/types.ts | 6 ++
.../InboundMeasurementPanel.test.ts | 5 ++
.../measurement/InboundMeasurementPanel.vue | 15 ++++
src/modules/inbounds/measurement/types.ts | 3 +
.../api/platformLoadingLists.test.ts | 4 +-
.../loading-lists/api/platformLoadingLists.ts | 2 +
.../components/LoadingListDetailDrawer.vue | 2 +
.../components/LoadingListsView.test.ts | 1 +
.../unified-orders/api/unifiedOrders.test.ts | 33 ++++++-
.../unified-orders/api/unifiedOrders.ts | 53 ++++++++++-
.../components/InboundFeeDetailManager.vue | 12 ++-
.../pages/UnifiedOrdersView.test.ts | 3 +
.../pages/UnifiedOrdersView.vue | 87 ++++++++++++++++---
16 files changed, 273 insertions(+), 31 deletions(-)
diff --git a/src/modules/inbounds/fee/InboundFeePanel.test.ts b/src/modules/inbounds/fee/InboundFeePanel.test.ts
index b72aa05a..4a0096b0 100644
--- a/src/modules/inbounds/fee/InboundFeePanel.test.ts
+++ b/src/modules/inbounds/fee/InboundFeePanel.test.ts
@@ -35,9 +35,11 @@ const snapshot: InboundFeeSnapshot = {
carrierRateId: '202', rateCode: 'RATE-LAX', carrierRateVersion: 5,
customerId: '303', customerName: '测试客户', originWarehouseId: '404', originWarehouseName: '义乌仓',
businessType: 'FBA_SEA', channelCode: 'SEA-TAX', carrierId: '505', carrierName: '测试船司',
- destinationCode: 'LAX9', taxMode: 'TAX_INCLUDED', chargeMode: 'KG',
+ destinationCode: 'LAX9', taxMode: 'TAX_REFUND', pricingTaxMode: 'TAX_INCLUDED', chargeMode: 'KG',
conversionFactor: 167, roundingScale: 2, roundingMode: 'HALF_UP',
- actualWeightKg: 100, actualVolumeCbm: 0.8, convertedQuantity: 133.6, chargeableQuantity: 133.6,
+ actualWeightKg: 100, actualVolumeCbm: 0.8, convertedQuantity: 133.6,
+ baselineChargeableQuantity: 133.6, lowerChargeableQuantity: 120.24, upperChargeableQuantity: 146.96,
+ tolerancePercent: 10, chargeableQuantity: 133.6,
chargeUnit: 'KG', unitPrice: 8.5, subtotalAmount: 1135.6, additionalAmount: 100,
totalAmount: 1235.6, currency: 'CNY',
rateEffectiveFrom: '2026-08-01T00:00:00', rateEffectiveTo: null,
@@ -88,6 +90,8 @@ describe('InboundFeePanel', () => {
await flushPromises()
expect(getLatestInboundFee).toHaveBeenCalledWith('10001', '88')
+ expect(document.body.textContent).toContain('订单报关：退税报关')
+ expect(document.body.textContent).toContain('报价税制：包税')
expect(document.body.textContent).not.toContain('租户')
expect(document.body.textContent).toContain('头程自动费用 · CNY')
expect(document.body.textContent).toContain('¥1,235.60')
@@ -237,6 +241,18 @@ describe('InboundFeePanel', () => {
expect(wrapper.find('[data-testid="adjust-fee-button"]').exists()).toBe(true)
})
+ it('allows a published fee adjustment until the customer confirms it', async () => {
+ const wrapper = mountPanel()
+ await flushPromises()
+ expect(wrapper.get('[data-testid="adjust-fee-button"]').text()).toContain('调整已发布费用')
+
+ document.body.innerHTML = ''
+ vi.mocked(getLatestInboundFee).mockResolvedValue({ ...snapshot, customerConfirmationStatus: 'CONFIRMED' })
+ const confirmed = mountPanel()
+ await flushPromises()
+ expect(confirmed.find('[data-testid="adjust-fee-button"]').exists()).toBe(false)
+ })
+
it('confirms and then sends a calculated fee through the implemented backend transitions', async () => {
vi.mocked(getLatestInboundFee).mockResolvedValue({ ...snapshot, feeStatus: 'CALCULATED', confirmedAt: null, sentAt: null })
vi.spyOn(ElMessageBox, 'confirm').mockResolvedValue(undefined as never)
@@ -294,7 +310,7 @@ describe('InboundFeePanel', () => {
expect(adjustPublishedInboundFee).toHaveBeenCalledWith(
'10001',
'88',
- { expectedFeeVersion: 2, chargeableQuantity: 140, unitPrice: 8.2, additionalAmount: 80, reason: '补充已确认的附加费用' },
+ { expectedFeeVersion: 2, chargeableQuantity: 140, unitPrice: 8.2, additionalAmount: 80, reason: '补充已确认的附加费用', toleranceConfirmed: true },
expect.stringMatching(/^fee-adjust-/),
)
expect(wrapper.emitted('changed')?.[0]?.[0]).toMatchObject({ feeVersion: 3 })
@@ -307,6 +323,11 @@ describe('InboundFeePanel', () => {
expect(source).toContain('grid-template-columns: repeat(3, minmax(0, 1fr))')
expect(source).toContain('class="adjustment-unit"')
expect(source).toContain('white-space: nowrap')
+ expect(source).toContain('snapshot.value?.lowerChargeableQuantity')
+ expect(source).toContain('snapshot.value?.upperChargeableQuantity')
+ expect(source).toContain('toleranceConfirmed: true')
+ expect(source).toContain("'再次确认计费量调整'")
+ expect(source).toContain('nextQuantity < adjustmentMinimum.value || nextQuantity > adjustmentMaximum.value')
})
it('refreshes the latest snapshot after a conflict while retaining the dialog', async () => {
diff --git a/src/modules/inbounds/fee/InboundFeePanel.vue b/src/modules/inbounds/fee/InboundFeePanel.vue
index b51a25ce..28f91214 100644
--- a/src/modules/inbounds/fee/InboundFeePanel.vue
+++ b/src/modules/inbounds/fee/InboundFeePanel.vue
@@ -86,11 +86,17 @@ const normalizedInboundId = computed(() => {
return identifier && identifier !== 'null' && identifier !== 'undefined' ? identifier : ''
})
const adjustmentEligible = computed(() => (
- snapshot.value?.feeStatus === 'CALCULATED'
+ ['CALCULATED', 'CONFIRMED', 'SENT'].includes(snapshot.value?.feeStatus || '')
&& snapshot.value?.nextProcessStatus === 'WAIT_SPLIT'
+ && snapshot.value?.customerConfirmationStatus !== 'CONFIRMED'
))
const chargeModeLabel = computed(() => snapshot.value?.chargeMode === 'KG' ? '按重量计费' : '按体积计费')
const chargeUnitLabel = computed(() => snapshot.value?.chargeUnit === 'KG' ? 'KG' : 'CBM')
+const convertedQuantityLabel = computed(() => snapshot.value?.chargeMode === 'KG' ? '体积重量' : '重量折算体积')
+const adjustmentBaseline = computed(() => Number(snapshot.value?.baselineChargeableQuantity || 0))
+const adjustmentMinimum = computed(() => Number(snapshot.value?.lowerChargeableQuantity || 0))
+const adjustmentMaximum = computed(() => Number(snapshot.value?.upperChargeableQuantity || 0))
+const adjustmentQuantityChanged = computed(() => Math.abs(Number(adjustmentForm.chargeableQuantity) - adjustmentBaseline.value) > 1e-8)
const statusInfo = computed(() => feeStatusInfo(snapshot.value?.feeStatus))
const sourceOptions = computed(() => {
const value = measurement.value
@@ -145,6 +151,12 @@ function taxModeLabel(value: string) {
return firstLegTaxModeLabel(value)
}
+function pricingTaxModeLabel(value: string | null | undefined) {
+ if (value === 'TAX_INCLUDED') return '包税'
+ if (value === 'TAX_EXCLUDED') return '不包税'
+ return '—'
+}
+
function roundingModeLabel(value: string) {
const labels: Record = {
UP: '远离零方向', DOWN: '向零方向', CEILING: '向上', FLOOR: '向下',
@@ -275,6 +287,7 @@ function adjustmentPayload(): AdjustPublishedInboundFeeRequest {
unitPrice: Number(adjustmentForm.unitPrice),
additionalAmount: Number(adjustmentForm.additionalAmount),
reason: adjustmentForm.reason.trim(),
+ toleranceConfirmed: true,
}
}
@@ -291,6 +304,22 @@ async function submitAdjustment() {
if (!snapshot.value) return
const valid = await adjustFormRef.value?.validate().catch(() => false)
if (!valid) return
+ const nextQuantity = Number(adjustmentForm.chargeableQuantity)
+ if (nextQuantity < adjustmentMinimum.value || nextQuantity > adjustmentMaximum.value) {
+ ElMessage.warning(`调整后计费量须在基准值的 ±10% 范围内（${formatNumber(adjustmentMinimum.value, 4)}–${formatNumber(adjustmentMaximum.value, 4)} ${chargeUnitLabel.value}）`)
+ return
+ }
+ if (adjustmentQuantityChanged.value) {
+ try {
+ await ElMessageBox.confirm(
+ `计费量将由 ${formatNumber(adjustmentBaseline.value, 4)} 调整为 ${formatNumber(nextQuantity, 4)} ${chargeUnitLabel.value}，并生成新费用版本。是否继续？`,
+ '再次确认计费量调整',
+ { type: 'warning', confirmButtonText: '确认调整', cancelButtonText: '返回检查' },
+ )
+ } catch {
+ return
+ }
+ }
const payload = adjustmentPayload()
adjustmentError.value = null
conflictRefreshed.value = false
@@ -364,7 +393,7 @@ defineExpose({ reload: loadFee })
data-testid="adjust-fee-button"
type="primary"
@click="openAdjustment"
- >调整初算费用
+ >{{ snapshot?.feeStatus === 'CALCULATED' ? '调整初算费用' : '调整已发布费用' }}
计费依据
实际重量与体积重量取大后计费，金额以服务端快照为准。
-
{{ taxModeLabel(snapshot.taxMode) }}
+
+ 订单报关：{{ taxModeLabel(snapshot.taxMode) }}
+ 报价税制：{{ pricingTaxModeLabel(snapshot.pricingTaxMode) }}
+
实际重量{{ formatNumber(snapshot.actualWeightKg, 3) }} KG
实际体积{{ formatNumber(snapshot.actualVolumeCbm, 4) }} CBM
-
体积重量{{ formatNumber(snapshot.convertedQuantity, snapshot.roundingScale) }} {{ chargeUnitLabel }}系数 {{ formatNumber(snapshot.conversionFactor, 4) }}
+
{{ convertedQuantityLabel }}{{ formatNumber(snapshot.convertedQuantity, snapshot.roundingScale) }} {{ chargeUnitLabel }}系数 {{ formatNumber(snapshot.conversionFactor, 4) }}
取大后的计费量{{ formatNumber(snapshot.chargeableQuantity, snapshot.roundingScale) }} {{ chargeUnitLabel }}
@@ -517,6 +549,10 @@ defineExpose({ reload: loadFee })
@confirm="submitAdjustment"
>
+
+ 计费量允许在系统原始基准值 ±{{ formatNumber(snapshot?.tolerancePercent, 2) }}% 内调整
+ 系统基准 {{ formatNumber(adjustmentBaseline, 4) }} {{ chargeUnitLabel }}，服务端允许范围 {{ formatNumber(adjustmentMinimum, 4) }}–{{ formatNumber(adjustmentMaximum, 4) }} {{ chargeUnitLabel }}（包含边界）；超出范围将无法提交。
+
费用已被其他操作员更新，系统已刷新最新快照
当前输入仍保留，请先核对最新版本后再提交。
@@ -524,7 +560,7 @@ defineExpose({ reload: loadFee })
-
+
{{ chargeUnitLabel }}
@@ -571,6 +607,7 @@ defineExpose({ reload: loadFee })
.version-status { display: flex; flex-wrap: wrap; align-items: center; gap: 8px; }
.calculation-section, .fee-timeline { padding: 10px 0; border-bottom: 1px solid var(--cc-border); }
.section-title { display: flex; align-items: flex-start; justify-content: space-between; gap: 16px; }
+.calculation-tags { display: flex; flex-wrap: wrap; justify-content: flex-end; gap: 6px; }
.section-title h4 { font-size: 14px; }
.calculation-flow { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); margin-top: 7px; border-top: 1px solid var(--cc-border); border-bottom: 1px solid var(--cc-border); }
.calculation-flow > div { display: flex; min-width: 0; min-height: 46px; flex-direction: row; align-items: center; justify-content: space-between; gap: 8px; padding: 6px 10px; border-right: 1px solid var(--cc-border); }
diff --git a/src/modules/inbounds/fee/api.test.ts b/src/modules/inbounds/fee/api.test.ts
index 8c485311..95f7aab9 100644
--- a/src/modules/inbounds/fee/api.test.ts
+++ b/src/modules/inbounds/fee/api.test.ts
@@ -42,7 +42,7 @@ describe('inbound fee API', () => {
it('adjusts a published snapshot with the required idempotency key', async () => {
vi.mocked(http.put).mockResolvedValue({ code: '200', message: 'success', data: { ...snapshot, feeVersion: 3 } })
- const payload = { expectedFeeVersion: 2, chargeableQuantity: 140, unitPrice: 8.2, additionalAmount: 80, reason: '补充已确认的附加费' }
+ const payload = { expectedFeeVersion: 2, chargeableQuantity: 140, unitPrice: 8.2, additionalAmount: 80, reason: '补充已确认的附加费', toleranceConfirmed: true as const }
await expect(adjustPublishedInboundFee('10001', '88', payload, 'fee-adjust-1'))
.resolves.toMatchObject({ feeVersion: 3 })
@@ -78,7 +78,7 @@ describe('inbound fee API', () => {
const error = await adjustPublishedInboundFee(
'10001',
'88',
- { expectedFeeVersion: 2, chargeableQuantity: 140, unitPrice: 8.2, additionalAmount: 80, reason: '价格修正' },
+ { expectedFeeVersion: 2, chargeableQuantity: 140, unitPrice: 8.2, additionalAmount: 80, reason: '价格修正', toleranceConfirmed: true },
'fee-adjust-2',
).catch((reason: unknown) => reason)
diff --git a/src/modules/inbounds/fee/types.ts b/src/modules/inbounds/fee/types.ts
index 305d247a..1e3b814b 100644
--- a/src/modules/inbounds/fee/types.ts
+++ b/src/modules/inbounds/fee/types.ts
@@ -26,6 +26,7 @@ export interface InboundFeeSnapshot {
carrierName: string
destinationCode: string
taxMode: string
+ pricingTaxMode: string | null
chargeMode: InboundChargeMode
conversionFactor: number
roundingScale: number
@@ -33,6 +34,10 @@ export interface InboundFeeSnapshot {
actualWeightKg: number
actualVolumeCbm: number
convertedQuantity: number
+ baselineChargeableQuantity: number
+ lowerChargeableQuantity: number
+ upperChargeableQuantity: number
+ tolerancePercent: number
chargeableQuantity: number
chargeUnit: string
unitPrice: number | null
@@ -58,4 +63,5 @@ export interface AdjustPublishedInboundFeeRequest {
unitPrice: number
additionalAmount: number
reason: string
+ toleranceConfirmed: true
}
diff --git a/src/modules/inbounds/measurement/InboundMeasurementPanel.test.ts b/src/modules/inbounds/measurement/InboundMeasurementPanel.test.ts
index 7907255c..fced8f6c 100644
--- a/src/modules/inbounds/measurement/InboundMeasurementPanel.test.ts
+++ b/src/modules/inbounds/measurement/InboundMeasurementPanel.test.ts
@@ -89,6 +89,9 @@ function measurement(overrides: Partial = {}): Inbound
items: [{
id: '9101',
inboundDetailId: '8101',
+ inboundCode: 'RK202608040001',
+ fbaShipmentNo: 'FBA18ABC1234',
+ scannedShipmentId: 'FBA18SCAN5678',
boxCode: 'RK202608040001#10-1',
itemNo: '001',
boxSpecification: '50×40×30cm',
@@ -168,6 +171,8 @@ describe('InboundMeasurementPanel', () => {
expect(getInboundMeasurement).toHaveBeenCalledWith('10001', '7001')
expect(wrapper.text()).toContain('RK202608040001')
+ expect(wrapper.find('.measurement-table').text()).toContain('FBA18ABC1234')
+ expect(wrapper.find('.measurement-table').text()).toContain('FBA18SCAN5678')
expect(wrapper.find('.measurement-table').text()).toContain('0.6')
expect(wrapper.find('.measurement-table').text()).not.toContain('周长')
await wrapper.find('.el-table__expand-icon').trigger('click')
diff --git a/src/modules/inbounds/measurement/InboundMeasurementPanel.vue b/src/modules/inbounds/measurement/InboundMeasurementPanel.vue
index f423f66a..3ebab966 100644
--- a/src/modules/inbounds/measurement/InboundMeasurementPanel.vue
+++ b/src/modules/inbounds/measurement/InboundMeasurementPanel.vue
@@ -32,6 +32,9 @@ const emit = defineEmits<{
type EditableMeasurementItem = Omit & {
itemId: string
clientKey: string
+ inboundCode: string
+ fbaShipmentNo: string | null
+ scannedShipmentId: string | null
serverValues: Pick
chargeRuleId: string | null
coefficientMode: 'ACTUAL' | 'ADD' | 'MULTIPLY'
@@ -266,6 +269,9 @@ function editableItem(item: InboundMeasurementItem): EditableMeasurementItem {
itemId: String(item.id),
inboundDetailId: String(item.inboundDetailId || item.id),
clientKey: nextItemKey(),
+ inboundCode: item.inboundCode || '—',
+ fbaShipmentNo: item.fbaShipmentNo || null,
+ scannedShipmentId: item.scannedShipmentId || null,
boxCode: item.boxCode,
itemNo: item.itemNo,
boxSpecification: item.boxSpecification,
@@ -701,6 +707,15 @@ defineExpose({ saveDraft, submitForReview, updateActualWeights, mayMaintain, may
+
+ {{ row.inboundCode || '—' }}
+
+
+ {{ row.fbaShipmentNo || '—' }}
+
+
+ {{ row.scannedShipmentId || '—' }}
+
{{ row.boxCode || '—' }}
diff --git a/src/modules/inbounds/measurement/types.ts b/src/modules/inbounds/measurement/types.ts
index 52fce114..0f784174 100644
--- a/src/modules/inbounds/measurement/types.ts
+++ b/src/modules/inbounds/measurement/types.ts
@@ -13,7 +13,10 @@ export type InboundMeasurementProcessStatus =
export interface InboundMeasurementItem {
id: MeasurementIdentifier
+ inboundCode?: string | null
inboundDetailId?: MeasurementIdentifier | null
+ fbaShipmentNo?: string | null
+ scannedShipmentId?: string | null
boxCode: string | null
itemNo: string
boxSpecification: string
diff --git a/src/modules/loading-lists/api/platformLoadingLists.test.ts b/src/modules/loading-lists/api/platformLoadingLists.test.ts
index 1f46db2f..77046e85 100644
--- a/src/modules/loading-lists/api/platformLoadingLists.test.ts
+++ b/src/modules/loading-lists/api/platformLoadingLists.test.ts
@@ -48,7 +48,7 @@ const detail = {
summary: preloadSummary,
items: [{
itemId: 11, itemVersion: 4, accountId: 12, orderId: 15, orderNo: 'ORD-001', inboundId: 13, inboundDetailId: 14, containerNo: 'MSCU1234567', productQuantity: 20,
- customerName: '测试客户', inboundCode: 'RK001', skuCode: 'SKU001', destinationWarehouse: 'ONT8', chineseName: '产品', englishName: null,
+ customerName: '测试客户', customsTaxMode: 'TAX_REFUND', taxRefundFlag: true, inboundCode: 'RK001', skuCode: 'SKU001', destinationWarehouse: 'ONT8', chineseName: '产品', englishName: null,
goodsImageUrl: null, packageCount: 2, palletCount: 1, grossWeightKg: 10, netWeightKg: 9, volumeCbm: 1,
dimensionalWeightKg: 2, unitsPerPackage: 10, fbaTrackingNo: null, shipmentNo: null, shippingMark: null,
internalRemark: null, customerRemark: null, warehouseRemark: null, loadSequence: 1, frozenAt: null,
@@ -75,7 +75,7 @@ describe('platform loading lists API', () => {
vi.spyOn(http, 'get').mockResolvedValue({ code: '200', message: 'ok', data: detail })
const result = await getPreloadPlan('100', '300')
- expect(result.items[0]).toMatchObject({ itemId: '11', itemVersion: 4, accountId: '12', orderId: '15', orderNo: 'ORD-001', inboundId: '13', inboundDetailId: '14', containerNo: 'MSCU1234567', productQuantity: '20' })
+ expect(result.items[0]).toMatchObject({ itemId: '11', itemVersion: 4, accountId: '12', orderId: '15', orderNo: 'ORD-001', inboundId: '13', inboundDetailId: '14', containerNo: 'MSCU1234567', productQuantity: '20', customsTaxMode: 'TAX_REFUND', taxRefundFlag: true })
expect(result.summary.containerBookingId).toBe('1900000000000000004')
expect(result.histories[0]).toMatchObject({ historyId: '21', itemId: '11', operationId: 'transport-21', operatorId: '22' })
})
diff --git a/src/modules/loading-lists/api/platformLoadingLists.ts b/src/modules/loading-lists/api/platformLoadingLists.ts
index 8fbc13c8..32ff36cd 100644
--- a/src/modules/loading-lists/api/platformLoadingLists.ts
+++ b/src/modules/loading-lists/api/platformLoadingLists.ts
@@ -80,6 +80,8 @@ export interface LoadingItem {
itemVersion: number
accountId: string
customerName: string | null
+ customsTaxMode: 'TAX_REFUND' | 'BUY_DECLARATION' | null
+ taxRefundFlag: boolean | null
orderId: string
orderNo: string
inboundId: string
diff --git a/src/modules/loading-lists/components/LoadingListDetailDrawer.vue b/src/modules/loading-lists/components/LoadingListDetailDrawer.vue
index cb2ff581..c13f8f92 100644
--- a/src/modules/loading-lists/components/LoadingListDetailDrawer.vue
+++ b/src/modules/loading-lists/components/LoadingListDetailDrawer.vue
@@ -33,6 +33,7 @@ const baseItemColumns: DataTableColumn[] = [
{ key: 'skuCode', prop: 'skuCode', label: 'SKU', minWidth: 150, className: 'identifier-column', showOverflowTooltip: true },
{ key: 'destinationWarehouse', prop: 'destinationWarehouse', label: '目的仓', minWidth: 150, className: 'identifier-column', showOverflowTooltip: true },
{ key: 'customerName', prop: 'customerName', label: '客户', minWidth: 150 },
+ { key: 'taxRefundFlag', label: '是否退税', width: 96, align: 'center', slotName: 'taxRefundFlag' },
{ key: 'chineseName', prop: 'chineseName', label: '中文品名', minWidth: 160 },
{ key: 'englishName', prop: 'englishName', label: '英文品名', minWidth: 170 },
{ key: 'netWeightKg', label: '净重(kg)', width: 110, align: 'right', slotName: 'netWeight' },
@@ -214,6 +215,7 @@ function formatNumber(value?: number | null, digits = 3) {
{{ formatNumber(row.grossWeightKg) }}
{{ formatNumber(row.netWeightKg) }}
+ {{ row.taxRefundFlag === true ? '是' : row.taxRefundFlag === false ? '否' : '—' }}
{{ formatNumber(row.volumeCbm) }}
{{ formatNumber(row.dimensionalWeightKg) }}
diff --git a/src/modules/loading-lists/components/LoadingListsView.test.ts b/src/modules/loading-lists/components/LoadingListsView.test.ts
index a2d5c685..3842e1be 100644
--- a/src/modules/loading-lists/components/LoadingListsView.test.ts
+++ b/src/modules/loading-lists/components/LoadingListsView.test.ts
@@ -152,6 +152,7 @@ describe('LoadingListsView', () => {
expect(detailSource.indexOf("key: 'orderNo'")).toBeLessThan(detailSource.indexOf("key: 'containerNo'"))
expect(detailSource.indexOf("key: 'containerNo'")).toBeLessThan(detailSource.indexOf("key: 'skuCode'"))
const fields = [
+ 'taxRefundFlag',
'chineseName',
'englishName',
'netWeightKg',
diff --git a/src/modules/unified-orders/api/unifiedOrders.test.ts b/src/modules/unified-orders/api/unifiedOrders.test.ts
index d5446fff..8370b63a 100644
--- a/src/modules/unified-orders/api/unifiedOrders.test.ts
+++ b/src/modules/unified-orders/api/unifiedOrders.test.ts
@@ -3,6 +3,7 @@ import { http } from '@/shared/api/http'
import {
approvePlatformUnifiedOrder,
batchApprovePlatformUnifiedOrders,
+ getPlatformUnifiedOrderBatchApprovalPreview,
addPlatformUnifiedOrderNote,
getPlatformUnifiedOrder,
downloadPlatformProductImage,
@@ -134,11 +135,39 @@ describe('unified orders API contract', () => {
} })
await expect(batchApprovePlatformUnifiedOrders('2089176869176389634', [
- '2089223263733518337', '2089223263733518338',
+ { orderId: '2089223263733518337', orderVersion: 3 },
+ { orderId: '2089223263733518338', orderVersion: 8 },
])).resolves.toMatchObject({ successCount: 1, failureCount: 1 })
expect(http.post).toHaveBeenCalledWith(
'/platform/v1/orders/first-leg/batch-approve',
- { orderIds: ['2089223263733518337', '2089223263733518338'] },
+ { items: [
+ { orderId: '2089223263733518337', orderVersion: 3 },
+ { orderId: '2089223263733518338', orderVersion: 8 },
+ ] },
+ { params: { tenantId: '2089176869176389634' } },
+ )
+ })
+
+ it('loads one batch-review preview with Chinese goods and normalizes long IDs', async () => {
+ vi.mocked(http.post).mockResolvedValue({ data: {
+ total: 1,
+ approvableCount: 1,
+ items: [{
+ orderId: '2089223263733518337', orderVersion: '3', inboundCode: 'NYEXX2609080001',
+ customerId: '2089176869176389634', customerName: '测试客户', chineseGoodsNames: [' 蓝牙音箱 ', ''],
+ channelCode: 'NY_EXX', channelName: '纽约海运', destinationWarehouseCode: 'ONT8',
+ destinationWarehouseName: 'ONT8 亚马逊仓', canApprove: true, blockReason: null,
+ }],
+ } })
+ const items = [{ orderId: '2089223263733518337', orderVersion: 3 }]
+
+ await expect(getPlatformUnifiedOrderBatchApprovalPreview('2089176869176389634', items)).resolves.toMatchObject({
+ total: 1, approvableCount: 1,
+ items: [{ orderId: '2089223263733518337', orderVersion: 3, chineseGoodsNames: ['蓝牙音箱'] }],
+ })
+ expect(http.post).toHaveBeenCalledWith(
+ '/platform/v1/orders/first-leg/batch-review-preview',
+ { items },
{ params: { tenantId: '2089176869176389634' } },
)
})
diff --git a/src/modules/unified-orders/api/unifiedOrders.ts b/src/modules/unified-orders/api/unifiedOrders.ts
index 61fde28d..b5bc70d3 100644
--- a/src/modules/unified-orders/api/unifiedOrders.ts
+++ b/src/modules/unified-orders/api/unifiedOrders.ts
@@ -540,10 +540,59 @@ export interface UnifiedOrderBatchApprovalResult {
failedOrders: Array<{ orderId: number | string; code: string; message: string }>
}
-export function batchApprovePlatformUnifiedOrders(tenantId: string, orderIds: string[]) {
+export interface UnifiedOrderBatchReviewItem {
+ orderId: string
+ orderVersion: number
+}
+
+export interface UnifiedOrderBatchApprovalPreviewItem extends UnifiedOrderBatchReviewItem {
+ inboundCode: string | null
+ customerId: string | null
+ customerName: string | null
+ chineseGoodsNames: string[]
+ channelCode: string | null
+ channelName: string | null
+ destinationWarehouseCode: string | null
+ destinationWarehouseName: string | null
+ canApprove: boolean
+ blockReason: string | null
+}
+
+export interface UnifiedOrderBatchApprovalPreview {
+ total: number
+ approvableCount: number
+ items: UnifiedOrderBatchApprovalPreviewItem[]
+}
+
+function normalizeBatchApprovalPreview(result: UnifiedOrderBatchApprovalPreview): UnifiedOrderBatchApprovalPreview {
+ return {
+ ...result,
+ total: integer(result.total, 0),
+ approvableCount: integer(result.approvableCount, 0),
+ items: (result.items || []).map((item) => ({
+ ...item,
+ orderId: String(item.orderId),
+ orderVersion: integer(item.orderVersion, 0),
+ customerId: id(item.customerId),
+ chineseGoodsNames: (item.chineseGoodsNames || []).map((name) => name.trim()).filter(Boolean),
+ canApprove: Boolean(item.canApprove),
+ })),
+ }
+}
+
+export async function getPlatformUnifiedOrderBatchApprovalPreview(tenantId: string, items: UnifiedOrderBatchReviewItem[]) {
+ const response = await http.post, ApiEnvelope>(
+ '/platform/v1/orders/first-leg/batch-review-preview',
+ { items },
+ { params: { tenantId } },
+ )
+ return normalizeBatchApprovalPreview(unwrapApiResponse(response))
+}
+
+export function batchApprovePlatformUnifiedOrders(tenantId: string, items: UnifiedOrderBatchReviewItem[]) {
return http.post, ApiEnvelope>(
'/platform/v1/orders/first-leg/batch-approve',
- { orderIds },
+ { items },
{ params: { tenantId } },
).then(unwrapApiResponse)
}
diff --git a/src/modules/unified-orders/components/InboundFeeDetailManager.vue b/src/modules/unified-orders/components/InboundFeeDetailManager.vue
index f0b7c07e..89fe5547 100644
--- a/src/modules/unified-orders/components/InboundFeeDetailManager.vue
+++ b/src/modules/unified-orders/components/InboundFeeDetailManager.vue
@@ -18,7 +18,7 @@ import type {
InboundFeeSupplierOption, SaveInboundFeeDetailRequest,
} from '@/modules/unified-orders/api/inboundFeeDetails'
-const props = defineProps<{ accountId: string; inboundId: string }>()
+const props = defineProps<{ accountId: string; inboundId: string; destinationType?: string | null }>()
interface OtherFeeSummary { currency: string; approvedReceivable: number; approvedPayable: number }
const emit = defineEmits<{ changed: []; summary: [value: OtherFeeSummary] }>()
const access = useAccessPreviewStore()
@@ -74,7 +74,11 @@ const directionOptions = computed(() => [
{ label: '应收', value: 'RECEIVABLE' },
{ label: '应付', value: 'PAYABLE', disabled: !canViewSuppliers.value },
])
-const applicableItems = computed(() => feeItems.value.filter((item) => form.direction === 'RECEIVABLE' ? item.warehouseReceivable : item.warehousePayable))
+const privateDeliveryFeeCode = 'PRIVATE_LAST_MILE_DELIVERY'
+const applicableItems = computed(() => feeItems.value.filter((item) => {
+ if (item.feeCode === privateDeliveryFeeCode && props.destinationType !== 'PRIVATE') return false
+ return form.direction === 'RECEIVABLE' ? item.warehouseReceivable : item.warehousePayable
+}))
const selectedFeeItem = computed(() => feeItems.value.find((item) => String(item.id) === String(form.feeItemId)))
function isManual(row: InboundFeeDetail) { return row.sourceType === 'MANUAL' }
@@ -298,7 +302,7 @@ onMounted(() => void load())
{{ directionLabel(row.direction) }}
{{ settlementLabel(row as InboundFeeDetail) }}
{{ paidSummary(row as InboundFeeDetail) }}
-
+ {{ row.feeTypeNameSnapshot }}仅私人仓
{{ row.direction === 'PAYABLE' ? row.supplierName : row.customerName || '—' }}
@@ -314,6 +318,7 @@ onMounted(() => void load())
+
{{ feeItemsError.message }}
@@ -360,6 +365,7 @@ onMounted(() => void load())
.voucher-field { grid-column: 1 / -1; }.voucher-control { display: flex; align-items: center; flex-wrap: wrap; gap: 10px; width: 100%; }.voucher-picker { display: inline-flex; align-items: center; gap: 6px; padding: 7px 12px; border: 1px solid var(--cc-border); border-radius: 6px; color: var(--el-color-primary); cursor: pointer; }.voucher-picker.is-disabled { cursor: not-allowed; opacity: .6; }.voucher-picker input { position: absolute; width: 1px; height: 1px; opacity: 0; }.voucher-hint { color: var(--cc-muted); font-size: 12px; }.voucher-list { display: grid; width: 100%; gap: 6px; margin-top: 8px; }.voucher-list > span { display: flex; align-items: center; justify-content: space-between; gap: 8px; padding: 6px 9px; border-radius: 5px; background: var(--el-fill-color-light); }.voucher-list > span > span { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }.voucher-list button { display: inline-flex; padding: 2px; border: 0; background: transparent; color: var(--el-color-danger); cursor: pointer; }
.fee-table-shell { min-width: 0; max-width: 100%; overflow: hidden; }
.fee-table-shell :deep(.el-table) { width: 100%; max-width: 100%; }
+.private-delivery-tag { margin-left: 6px; vertical-align: middle; }
@keyframes fee-refresh-spin { to { transform: rotate(360deg); } }
@media (max-width: 720px) { .fee-toolbar { align-items: flex-start; flex-direction: column; } .fee-form { grid-template-columns: 1fr; } .fee-form :deep(.el-form-item:last-child) { grid-column: auto; } }
diff --git a/src/modules/unified-orders/pages/UnifiedOrdersView.test.ts b/src/modules/unified-orders/pages/UnifiedOrdersView.test.ts
index 8bd4338e..c37c6617 100644
--- a/src/modules/unified-orders/pages/UnifiedOrdersView.test.ts
+++ b/src/modules/unified-orders/pages/UnifiedOrdersView.test.ts
@@ -108,6 +108,9 @@ describe('UnifiedOrdersView contract', () => {
expect(source).not.toContain('批量审核接口待接入')
expect(source).toContain('@selection-change="handleOrderSelectionChange"')
expect(source).toContain('batchApprovePlatformUnifiedOrders')
+ expect(source).toContain('getPlatformUnifiedOrderBatchApprovalPreview')
+ expect(source).toContain('中文品名')
+ expect(source).toContain('确认批量审核')
expect(source).toContain('批量审核通过')
expect(source).toContain('title="订单列表暂时无法加载"')
expect(source).toContain('empty-text="暂无符合条件的订单"')
diff --git a/src/modules/unified-orders/pages/UnifiedOrdersView.vue b/src/modules/unified-orders/pages/UnifiedOrdersView.vue
index 3ac9862d..b45ba476 100644
--- a/src/modules/unified-orders/pages/UnifiedOrdersView.vue
+++ b/src/modules/unified-orders/pages/UnifiedOrdersView.vue
@@ -8,6 +8,7 @@ import {
downloadPlatformProductImage,
approvePlatformUnifiedOrder,
batchApprovePlatformUnifiedOrders,
+ getPlatformUnifiedOrderBatchApprovalPreview,
addPlatformUnifiedOrderNote,
listPlatformUnifiedOrders,
updatePlatformUnifiedOrderPlanning,
@@ -16,6 +17,8 @@ import {
type UnifiedOrderCoLoadGroupSummary,
type UnifiedOrderMainStatus,
type UnifiedOrderResource,
+ type UnifiedOrderBatchApprovalPreviewItem,
+ type UnifiedOrderBatchReviewItem,
} from '@/modules/unified-orders/api/unifiedOrders'
import { cancelPlatformCoLoadGroup, createPlatformCoLoadGroup, getPlatformCoLoadGroupByInboundCode, type CoLoadBusinessSummary, type CoLoadGroup } from '@/modules/unified-orders/api/coLoadGroups'
import OrderFulfillmentTreePanel from '@/modules/unified-orders/components/OrderFulfillmentTreePanel.vue'
@@ -150,6 +153,12 @@ const approvalOpen = ref(false)
const approvalLoadingId = ref('')
const approvalSaving = ref(false)
const batchApprovalSaving = ref(false)
+const batchApprovalLoading = ref(false)
+const batchApprovalOpen = ref(false)
+const batchApprovalError = ref(null)
+const batchApprovalPreviewRows = ref([])
+const batchApprovalSelectedRows = ref([])
+const batchApprovalTableRef = ref<{ toggleRowSelection: (row: UnifiedOrderBatchApprovalPreviewItem, selected?: boolean) => void }>()
const exportSubmitting = ref(false)
const selectedApprovalOrders = ref([])
const selectedOrders = ref([])
@@ -1809,27 +1818,62 @@ async function cancelCoLoadGroup() {
}
}
-async function batchApproveOrders() {
+function batchReviewItem(order: UnifiedOrderResource): UnifiedOrderBatchReviewItem {
+ return { orderId: String(order.orderId), orderVersion: Number(order.orderVersion || 0) }
+}
+
+function handleBatchApprovalSelection(rows: UnifiedOrderBatchApprovalPreviewItem[]) {
+ batchApprovalSelectedRows.value = rows
+}
+
+async function openBatchApproval() {
const selected = [...selectedApprovalOrders.value]
- if (!selected.length || batchApprovalSaving.value) return
- batchApprovalSaving.value = true
+ if (!selected.length || batchApprovalLoading.value || batchApprovalSaving.value) return
+ batchApprovalOpen.value = true
+ batchApprovalLoading.value = true
+ batchApprovalError.value = null
+ batchApprovalPreviewRows.value = []
+ batchApprovalSelectedRows.value = []
try {
- await ElMessageBox.confirm(
- `确认批量审核通过已勾选的 ${selected.length} 个订单吗？审核后订单将进入待测量。`,
- '批量审核订单',
- { confirmButtonText: '确认批量审核', cancelButtonText: '取消', type: 'warning' },
- )
const groups = new Map()
selected.forEach((order) => {
const tenantId = String(order.tenantId)
groups.set(tenantId, [...(groups.get(tenantId) || []), order])
})
+ const previews = await Promise.all([...groups].map(([tenantId, orders]) => (
+ getPlatformUnifiedOrderBatchApprovalPreview(tenantId, orders.map(batchReviewItem))
+ )))
+ batchApprovalPreviewRows.value = previews.flatMap((preview) => preview.items)
+ await nextTick()
+ batchApprovalPreviewRows.value.forEach((row) => {
+ if (row.canApprove) batchApprovalTableRef.value?.toggleRowSelection(row, true)
+ })
+ } catch (error) {
+ batchApprovalError.value = getApiErrorDetails(error, '批量审核预览加载失败，请刷新订单后重试')
+ } finally {
+ batchApprovalLoading.value = false
+ }
+}
+
+async function batchApproveOrders() {
+ const selected = [...batchApprovalSelectedRows.value]
+ if (!selected.length || batchApprovalSaving.value) return
+ batchApprovalSaving.value = true
+ try {
+ const groups = new Map()
+ selected.forEach((order) => {
+ const tenantId = String(order.customerId)
+ groups.set(tenantId, [...(groups.get(tenantId) || []), order])
+ })
let successCount = 0
let failureCount = 0
const failures: string[] = []
for (const [tenantId, orders] of groups) {
try {
- const result = await batchApprovePlatformUnifiedOrders(tenantId, orders.map((order) => String(order.orderId)))
+ const result = await batchApprovePlatformUnifiedOrders(tenantId, orders.map((order) => ({
+ orderId: order.orderId,
+ orderVersion: order.orderVersion,
+ })))
successCount += result.successCount
failureCount += result.failureCount
failures.push(...result.failedOrders.map((failure) => failure.message))
@@ -1838,13 +1882,12 @@ async function batchApproveOrders() {
failures.push(getApiErrorDetails(error, '该客户订单批量审核失败').message)
}
}
+ batchApprovalOpen.value = false
await loadOrders()
const reason = [...new Set(failures.filter(Boolean))].slice(0, 3).join('；')
if (!failureCount) ElMessage.success(`已批量审核通过 ${successCount} 个订单`)
else if (successCount) ElMessage.warning(`批量审核完成：成功 ${successCount} 个，失败 ${failureCount} 个${reason ? `。${reason}` : ''}`)
else ElMessage.error(`批量审核失败：${failureCount} 个订单未通过${reason ? `。${reason}` : ''}`)
- } catch (error) {
- if (error !== 'cancel' && error !== 'close') ElMessage.error(getApiErrorDetails(error, '批量审核失败').message)
} finally {
batchApprovalSaving.value = false
}
@@ -2243,6 +2286,7 @@ onBeforeUnmount(() => {
@@ -2464,7 +2508,7 @@ onBeforeUnmount(() => {
导出（已选 {{ selectedOrders.length }}）
- 批量审核通过（{{ selectedApprovalOrders.length }}）
+ 批量审核通过（{{ selectedApprovalOrders.length }}）
合柜报关（{{ selectedOrders.length }}）
@@ -2554,6 +2598,22 @@ onBeforeUnmount(() => {
+
+
+
+
+ 预览 {{ batchApprovalPreviewRows.length }} 票已勾选 {{ batchApprovalSelectedRows.length }} 票
+
+
+ {{ row.inboundCode || '—' }}
+ {{ row.customerName || '—' }}
+ {{ row.chineseGoodsNames.length ? row.chineseGoodsNames.join('、') : '—' }}
+ {{ row.channelName || row.channelCode || '—' }}
+ {{ row.destinationWarehouseName || row.destinationWarehouseCode || '—' }}
+ {{ row.canApprove ? '可审核' : row.blockReason || '不可审核' }}
+
+
+
{{ row.inboundCode || '待生成入仓码' }}
@@ -2675,6 +2735,9 @@ onBeforeUnmount(() => {
.subsequent-fulfillment { min-height: 72px; margin-top: 16px; padding-top: 14px; border-top: 1px solid var(--cc-border); }
.subsequent-fulfillment h3 { margin: 0 0 10px; font-size: 15px; }
.fulfillment-facts { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); margin: 0 0 10px; border: 1px solid var(--cc-border); border-radius: 6px; overflow: hidden; }
+.batch-approval-summary { display: flex; align-items: center; justify-content: space-between; gap: 16px; margin: 12px 0 8px; color: var(--cc-muted); font-size: 13px; white-space: nowrap; }
+.batch-approval-summary strong { color: var(--cc-text); }
+.batch-approval-table :deep(.cell) { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
.fulfillment-facts > div { min-width: 0; padding: 9px 10px; border-right: 1px solid var(--cc-border); background: #fff; }
.fulfillment-facts > div.wide { grid-column: span 2; }
.fulfillment-facts dt { color: var(--cc-muted); font-size: 12px; }
From 44420919f6b5af20174823e14428b6f6ce30258a Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Tue, 8 Sep 2026 17:43:04 +0800
Subject: [PATCH 27/31] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=AE=A2?=
=?UTF-8?q?=E6=88=B7=E4=B8=93=E5=B1=9E=E5=A4=B4=E7=A8=8B=E6=8A=A5=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/platformPriceBooks.test.ts | 18 +++--
.../carrier-rates/api/platformPriceBooks.ts | 15 +++--
.../pages/CarrierRatesView.test.ts | 11 +++-
.../carrier-rates/pages/CarrierRatesView.vue | 65 ++++++++++++++++---
4 files changed, 88 insertions(+), 21 deletions(-)
diff --git a/src/modules/fba-pricing/carrier-rates/api/platformPriceBooks.test.ts b/src/modules/fba-pricing/carrier-rates/api/platformPriceBooks.test.ts
index faf2a07c..43216167 100644
--- a/src/modules/fba-pricing/carrier-rates/api/platformPriceBooks.test.ts
+++ b/src/modules/fba-pricing/carrier-rates/api/platformPriceBooks.test.ts
@@ -20,6 +20,7 @@ import {
const version = {
id: '9007199254740995',
+ customerId: '2096953508805279745',
versionNo: '2',
originalFileName: '2026-08-price-book.xlsx',
sourceFileId: '9007199254740996',
@@ -88,16 +89,17 @@ const detail = {
describe('platform price-book API', () => {
beforeEach(() => vi.clearAllMocks())
- it('uses the platform price-book list endpoint without customer scope and preserves long ids', async () => {
+ it('uses the selected customer price-book scope and preserves long ids', async () => {
http.get.mockResolvedValue({ data: [version] })
- const result = await listPlatformPriceBooks({ status: ' PENDING_CONFIRMATION ' })
+ const result = await listPlatformPriceBooks({ customerId: '2096953508805279745', status: ' PENDING_CONFIRMATION ' })
expect(http.get).toHaveBeenCalledWith('/platform/v1/fba-pricing/carrier-rates/price-books', {
- params: { status: 'PENDING_CONFIRMATION' },
+ params: { customerId: '2096953508805279745', status: 'PENDING_CONFIRMATION' },
})
expect(result[0]).toMatchObject({
id: '9007199254740995',
+ customerId: '2096953508805279745',
sourceFileId: '9007199254740996',
createdBy: '10001',
versionNo: 2,
@@ -105,12 +107,12 @@ describe('platform price-book API', () => {
})
})
- it('omits an empty status filter for the complete version history', async () => {
+ it('defaults an empty scope to the public price-book history', async () => {
http.get.mockResolvedValue({ data: [] })
await listPlatformPriceBooks({ status: ' ' })
- expect(http.get).toHaveBeenCalledWith('/platform/v1/fba-pricing/carrier-rates/price-books', { params: {} })
+ expect(http.get).toHaveBeenCalledWith('/platform/v1/fba-pricing/carrier-rates/price-books', { params: { customerId: '0' } })
})
it('uploads one workbook, loads its parsed detail, and normalizes parsed rows', async () => {
@@ -118,10 +120,12 @@ describe('platform price-book API', () => {
http.get.mockResolvedValue({ data: detail })
const file = new File(['book'], 'price-book.xlsx', { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
- const uploadResult = await uploadPlatformPriceBook(file)
+ const uploadResult = await uploadPlatformPriceBook(file, '2096953508805279745')
const detailResult = await getPlatformPriceBook('9007199254740995')
- expect(http.post).toHaveBeenCalledWith('/platform/v1/fba-pricing/carrier-rates/price-books', expect.any(FormData))
+ expect(http.post).toHaveBeenCalledWith('/platform/v1/fba-pricing/carrier-rates/price-books', expect.any(FormData), {
+ params: { customerId: '2096953508805279745' },
+ })
const form = http.post.mock.calls[0][1] as FormData
expect(form.get('file')).toBe(file)
expect(http.get).toHaveBeenCalledWith('/platform/v1/fba-pricing/carrier-rates/price-books/9007199254740995')
diff --git a/src/modules/fba-pricing/carrier-rates/api/platformPriceBooks.ts b/src/modules/fba-pricing/carrier-rates/api/platformPriceBooks.ts
index 81b64e6c..e1cf9459 100644
--- a/src/modules/fba-pricing/carrier-rates/api/platformPriceBooks.ts
+++ b/src/modules/fba-pricing/carrier-rates/api/platformPriceBooks.ts
@@ -11,6 +11,7 @@ type ApiNumber = string | number
export interface PlatformPriceBookVersion {
id: string
+ customerId: string
versionNo: number
originalFileName: string
sourceFileId: string | null
@@ -96,12 +97,14 @@ export interface PriceBookConfirmationRequest {
}
export interface PlatformPriceBookQuery {
+ customerId?: string
status?: PriceBookStatus | string
}
interface PriceBookVersionPayload extends Omit {
+ 'id' | 'customerId' | 'versionNo' | 'sourceFileId' | 'channelCount' | 'rateCount' | 'blockingErrorCount' | 'warningCount' | 'createdBy' | 'publishedBy'> {
id: ApiId
+ customerId: ApiId
versionNo: ApiNumber
sourceFileId?: ApiId | null
channelCount?: ApiNumber | null
@@ -165,6 +168,7 @@ function normalizeVersion(value: PriceBookVersionPayload): PlatformPriceBookVers
return {
...value,
id: String(value.id),
+ customerId: String(value.customerId),
versionNo: numberValue(value.versionNo),
sourceFileId: nullableId(value.sourceFileId),
channelCount: numberValue(value.channelCount),
@@ -233,8 +237,9 @@ function normalizeDetail(value: PriceBookDetailPayload): PlatformPriceBookDetail
export async function listPlatformPriceBooks(query: PlatformPriceBookQuery = {}): Promise {
const status = query.status?.trim()
+ const customerId = query.customerId?.trim() || '0'
const response = await http.get, ApiEnvelope>(basePath, {
- params: status ? { status } : {},
+ params: status ? { customerId, status } : { customerId },
})
return unwrapApiResponse(response).map(normalizeVersion)
}
@@ -246,10 +251,12 @@ export async function getPlatformPriceBook(versionId: string): Promise {
+export async function uploadPlatformPriceBook(file: File, customerId = '0'): Promise {
const form = new FormData()
form.append('file', file)
- const response = await http.post, ApiEnvelope>(basePath, form)
+ const response = await http.post, ApiEnvelope>(basePath, form, {
+ params: { customerId: customerId.trim() || '0' },
+ })
return normalizeDetail(unwrapApiResponse(response))
}
diff --git a/src/modules/fba-pricing/carrier-rates/pages/CarrierRatesView.test.ts b/src/modules/fba-pricing/carrier-rates/pages/CarrierRatesView.test.ts
index c41aaf8c..351807d3 100644
--- a/src/modules/fba-pricing/carrier-rates/pages/CarrierRatesView.test.ts
+++ b/src/modules/fba-pricing/carrier-rates/pages/CarrierRatesView.test.ts
@@ -72,7 +72,16 @@ describe('CarrierRatesView price-book source contract', () => {
expect(source).toContain('.channel-tabs { width: 100%; min-width: 0;')
expect(source).toContain('.channel-preview :deep(.el-table) { width: 100%; max-width: 100%; min-width: 0; }')
expect(source).not.toContain('tenantId')
- expect(source).not.toContain('客户选择')
+ })
+
+ it('supports public and customer-specific price-book scopes without exposing technical ids', () => {
+ expect(source).toContain('listPlatformTenants')
+ expect(source).toContain("customerId: '0'")
+ expect(source).toContain('平台公共报价')
+ expect(source).toContain('客户专属')
+ expect(source).toContain('uploadPlatformPriceBook(file, uploadCustomerId.value)')
+ expect(source).toContain('只替换同一报价范围')
+ expect(source).not.toContain('{{ detail.version.customerId }}')
})
it('shows parsing blockers and a channel-tabbed, read-only preview', () => {
diff --git a/src/modules/fba-pricing/carrier-rates/pages/CarrierRatesView.vue b/src/modules/fba-pricing/carrier-rates/pages/CarrierRatesView.vue
index 60379e53..49817d7c 100644
--- a/src/modules/fba-pricing/carrier-rates/pages/CarrierRatesView.vue
+++ b/src/modules/fba-pricing/carrier-rates/pages/CarrierRatesView.vue
@@ -3,6 +3,7 @@ import { computed, onMounted, ref, watch } from 'vue'
import { AlertTriangle, CircleCheck, Download, Eye, FileSpreadsheet, FileUp, RefreshCw, Ship, Warehouse } from '@lucide/vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
import { listAllPlatformWarehouses, type PlatformWarehouseResource } from '@/modules/warehouses'
import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
@@ -29,6 +30,7 @@ import {
} from '../api/platformPriceBooks'
type PriceBookFilters = QueryModel & {
+ customerId: string
status: PriceBookStatus | ''
}
@@ -55,6 +57,7 @@ const loadError = ref(null)
const uploadOpen = ref(false)
const uploadFile = ref(null)
const uploadFileError = ref('')
+const uploadCustomerId = ref('0')
const uploadInput = ref()
const uploading = ref(false)
const detailOpen = ref(false)
@@ -69,15 +72,29 @@ const mappingWarehouses = ref([])
const mappingWarehousesLoaded = ref(false)
const mappingWarehousesLoading = ref(false)
const mappingWarehousesError = ref(null)
+const customerOptions = ref([])
+const customersLoading = ref(false)
const originSelections = ref>({})
const overseasSelections = ref>({})
-const filters = ref({ status: '' })
+const filters = ref({ customerId: '0', status: '' })
const appliedFilters = ref({ ...filters.value })
let loadSequence = 0
let detailSequence = 0
let warehouseSequence = 0
-const queryFields: QueryField[] = [
+const queryFields = computed(() => [
+ {
+ key: 'customerId',
+ type: 'select',
+ width: 260,
+ label: '报价范围',
+ placeholder: '请选择报价范围',
+ props: { 'aria-label': '报价范围', filterable: true, loading: customersLoading.value },
+ options: [
+ { label: '平台公共报价', value: '0' },
+ ...customerOptions.value.map((customer) => ({ label: `客户专属 · ${customer.tenantName || '未命名客户'}`, value: String(customer.id) })),
+ ],
+ },
{
key: 'status',
type: 'select',
@@ -92,10 +109,11 @@ const queryFields: QueryField[] = [
{ label: '解析失败', value: 'FAILED' },
],
},
-]
+])
const columns: DataTableColumn[] = [
{ key: 'actions', label: '操作', width: 210, fixed: 'left', slotName: 'actions' },
+ { key: 'scope', label: '报价范围', minWidth: 190, slotName: 'scope' },
{ key: 'version', label: '价格表版本', minWidth: 180, slotName: 'version' },
{ key: 'originalFileName', prop: 'originalFileName', label: '原始文件', minWidth: 250, showOverflowTooltip: true, defaultVisible: false },
{ key: 'status', label: '状态', width: 110, slotName: 'status' },
@@ -109,6 +127,7 @@ const canEdit = computed(() => access.can('firstleg:fba-pricing:rate:edit'))
const pagedRows = computed(() => rows.value.slice((page.value - 1) * pageSize.value, page.value * pageSize.value))
const activeCount = computed(() => rows.value.filter((row) => row.status === 'ACTIVE').length)
const pendingCount = computed(() => rows.value.filter((row) => row.status === 'PENDING_CONFIRMATION').length)
+const selectedScopeLabel = computed(() => priceBookScopeLabel(appliedFilters.value.customerId))
const loadErrorMessage = computed(() => loadError.value?.message || '')
const isPendingDetail = computed(() => detail.value?.version.status === 'PENDING_CONFIRMATION')
const domesticWarehouses = computed(() => mappingWarehouses.value.filter((warehouse) => (
@@ -222,6 +241,25 @@ function formatEffectivePeriod(version: PlatformPriceBookVersion) {
return version.supersededAt ? `${start} 至 ${formatDateTime(version.supersededAt)}` : `${start} 起`
}
+function priceBookScopeLabel(customerId: string | null | undefined) {
+ if (!customerId || customerId === '0') return '平台公共报价'
+ const customer = customerOptions.value.find((item) => String(item.id) === String(customerId))
+ return customer ? `客户专属 · ${customer.tenantName || '未命名客户'}` : '客户专属报价'
+}
+
+async function loadCustomerOptions() {
+ customersLoading.value = true
+ try {
+ const result = await listPlatformTenants({ page: 1, size: 200, status: 'ACTIVE' })
+ customerOptions.value = result.records.filter((customer) => customer.status === 'ACTIVE')
+ } catch {
+ customerOptions.value = []
+ ElMessage.warning('客户列表加载失败，仍可维护平台公共报价')
+ } finally {
+ customersLoading.value = false
+ }
+}
+
function formatMoney(value: number, currency: string) {
return `${currency} ${value.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 4 })}`
}
@@ -291,7 +329,7 @@ async function loadPriceBooks() {
loading.value = true
loadError.value = null
try {
- const result = await listPlatformPriceBooks({ status: appliedFilters.value.status })
+ const result = await listPlatformPriceBooks({ customerId: appliedFilters.value.customerId, status: appliedFilters.value.status })
if (sequence !== loadSequence) return
rows.value = result
} catch (error) {
@@ -304,7 +342,10 @@ async function loadPriceBooks() {
}
async function applyQuery(model: QueryModel) {
- appliedFilters.value = { status: (model.status || '') as PriceBookStatus | '' }
+ appliedFilters.value = {
+ customerId: String(model.customerId || '0'),
+ status: (model.status || '') as PriceBookStatus | '',
+ }
page.value = 1
await loadPriceBooks()
}
@@ -317,6 +358,7 @@ function resetUpload() {
function openUpload() {
resetUpload()
+ uploadCustomerId.value = appliedFilters.value.customerId || '0'
uploadOpen.value = true
}
@@ -477,7 +519,7 @@ async function submitUpload() {
}
uploading.value = true
try {
- const result = await uploadPlatformPriceBook(file)
+ const result = await uploadPlatformPriceBook(file, uploadCustomerId.value)
uploadOpen.value = false
resetUpload()
await showUploadedDetail(result)
@@ -530,7 +572,7 @@ async function confirmPriceBook() {
if (!detail.value || !canConfirmDetail.value) return
try {
await ElMessageBox.confirm(
- '确认后，该价格表会立即成为唯一生效版本，并替换当前生效版本。历史版本和原始文件将继续保留。',
+ `确认后，该价格表会立即成为“${priceBookScopeLabel(detail.value.version.customerId)}”的唯一生效版本，并仅替换同一报价范围的当前生效版本。历史版本和原始文件将继续保留。`,
'确认并生效船期价格表',
{ type: 'warning', confirmButtonText: '确认并立即生效', cancelButtonText: '取消' },
)
@@ -592,6 +634,7 @@ watch(detailOpen, (open) => {
})
onMounted(() => {
+ void loadCustomerOptions()
void loadPriceBooks()
})
@@ -650,6 +693,7 @@ onMounted(() => {
V{{ (row as PlatformPriceBookVersion).versionNo }}
+ {{ priceBookScopeLabel((row as PlatformPriceBookVersion).customerId) }}
{{ priceBookStatusMeta((row as PlatformPriceBookVersion).status).label }}
{{ (row as PlatformPriceBookVersion).channelCount }}渠道{{ (row as PlatformPriceBookVersion).rateCount }}价格行
阻断 {{ (row as PlatformPriceBookVersion).blockingErrorCount }}警告 {{ (row as PlatformPriceBookVersion).warningCount }}
@@ -669,7 +713,8 @@ onMounted(() => {
@confirm="submitUpload"
>
-
+
+
选择 XLSX 文件
@@ -710,7 +755,7 @@ onMounted(() => {
@@ -830,6 +875,8 @@ onMounted(() => {
.issue-counts { color: var(--cc-muted); font-size: 12px; }
.issue-counts .is-blocking, .is-danger { color: var(--el-color-danger); font-weight: 700; }
.upload-content { display: grid; gap: 18px; }
+.upload-scope-field { display: grid; gap: 6px; color: var(--cc-muted); font-size: 12px; }
+.upload-scope-field :deep(.el-select) { width: 100%; }
.visually-hidden-input { position: absolute; width: 1px; height: 1px; overflow: hidden; clip: rect(0 0 0 0); white-space: nowrap; clip-path: inset(50%); }
.upload-file-control { display: flex; align-items: center; gap: 14px; }
.upload-file-name { display: grid; min-width: 0; gap: 3px; color: var(--cc-text); font-size: 13px; }
From cf612ce11ebe51ce8ba16d27407c5de0881c736b Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Tue, 8 Sep 2026 17:56:17 +0800
Subject: [PATCH 28/31] fix(overseas): show inventory business reference
---
.../InventoryCustomerName.behavior.test.ts | 24 +++++++++++++++++++
.../pages/InventoryDetailView.vue | 8 ++++---
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/modules/overseas-warehouse/pages/InventoryCustomerName.behavior.test.ts b/src/modules/overseas-warehouse/pages/InventoryCustomerName.behavior.test.ts
index 4a52f479..e400b141 100644
--- a/src/modules/overseas-warehouse/pages/InventoryCustomerName.behavior.test.ts
+++ b/src/modules/overseas-warehouse/pages/InventoryCustomerName.behavior.test.ts
@@ -64,7 +64,31 @@ describe('inventory customer-name snapshots', () => {
await flushPromises()
expect(wrapper.text()).toContain('华远贸易')
expect(wrapper.text()).toContain('洛杉矶仓')
+ expect(wrapper.text()).toContain('入库单号')
+ expect(wrapper.text()).toContain(balance.inboundOrderNo)
+ expect(wrapper.text()).toContain('美本土散板')
+ expect(wrapper.text()).not.toContain('美本土散版')
expect(wrapper.text()).not.toContain('ONT8目的仓')
expect(wrapper.text()).not.toContain(customerId)
+ expect(wrapper.text()).not.toContain(balance.id)
+ })
+
+ it('falls back to the inbound code and then an explicit empty business reference without exposing the inventory id', async () => {
+ vi.mocked(listInventoryBalances).mockResolvedValueOnce({ records: [{ ...balance, inboundOrderNo: '' }], page: 1, size: 10, total: 1, pages: 1 })
+ routing.route.params = { inventoryId: balance.id }
+ routing.route.query = { inboundCode: balance.inboundCode, skuCode: balance.skuCode }
+ const inboundCodeWrapper = mount(InventoryDetailView, { attachTo: document.body, global: { plugins: [createPinia(), ElementPlus] } })
+ await flushPromises()
+ expect(inboundCodeWrapper.text()).toContain('入仓码')
+ expect(inboundCodeWrapper.text()).toContain(balance.inboundCode)
+ expect(inboundCodeWrapper.text()).not.toContain(balance.id)
+
+ inboundCodeWrapper.unmount()
+ vi.mocked(listInventoryBalances).mockResolvedValueOnce({ records: [{ ...balance, inboundOrderNo: '', inboundCode: '' }], page: 1, size: 10, total: 1, pages: 1 })
+ routing.route.query = { skuCode: balance.skuCode }
+ const emptyWrapper = mount(InventoryDetailView, { attachTo: document.body, global: { plugins: [createPinia(), ElementPlus] } })
+ await flushPromises()
+ expect(emptyWrapper.text()).toContain('业务标识')
+ expect(emptyWrapper.text()).not.toContain(balance.id)
})
})
diff --git a/src/modules/overseas-warehouse/pages/InventoryDetailView.vue b/src/modules/overseas-warehouse/pages/InventoryDetailView.vue
index 6eae5485..a13990bf 100644
--- a/src/modules/overseas-warehouse/pages/InventoryDetailView.vue
+++ b/src/modules/overseas-warehouse/pages/InventoryDetailView.vue
@@ -8,9 +8,11 @@ import { listInventoryBalances, listInventoryLedger, listInventoryPositions, typ
const route = useRoute(); const router = useRouter(); const inventoryId = computed(() => String(route.params.inventoryId || ''))
const balance = ref(null); const positions = ref([]); const ledger = ref([]); const loading = ref(false); const loadError = ref(null)
function text(value: unknown) { return String(value ?? '').trim() || '—' }
+const referenceLabel = computed(() => String(balance.value?.inboundOrderNo || route.query.inboundOrderNo || '').trim() ? '入库单号' : String(balance.value?.inboundCode || route.query.inboundCode || '').trim() ? '入仓码' : '业务标识')
+const referenceValue = computed(() => text(balance.value?.inboundOrderNo || route.query.inboundOrderNo || balance.value?.inboundCode || route.query.inboundCode))
const productValues = computed(() => ({ 客户: text(balance.value?.customerName), 海外仓: text(balance.value?.overseasWarehouseName), SKU编码: text(balance.value?.skuCode), 产品名称: balance.value ? inventoryProductName(balance.value) : '—', 更新时间: formatOverseasDateTime(balance.value?.updatedAt) }))
-const stockValues = computed(() => ({ 在库总量: Number(balance.value?.totalPackages || 0), 可用库存: Number(balance.value?.availablePackages || 0), 暂扣库存: Number(balance.value?.holdPackages || 0), 美本土散版: '—', 在途库存: Number(balance.value?.inTransitPackages || 0), 采购库存: Number(balance.value?.procurementPackages || 0), 预计总量: Number(balance.value?.totalPackages || 0) + Number(balance.value?.inTransitPackages || 0) + Number(balance.value?.procurementPackages || 0) }))
-const productFields = ['客户', '海外仓', 'SKU编码', '产品名称', '更新时间']; const stockFields = ['在库总量', '可用库存', '暂扣库存', '美本土散版', '在途库存', '采购库存', '预计总量']
+const stockValues = computed(() => ({ 在库总量: Number(balance.value?.totalPackages || 0), 可用库存: Number(balance.value?.availablePackages || 0), 暂扣库存: Number(balance.value?.holdPackages || 0), 美本土散板: '—', 在途库存: Number(balance.value?.inTransitPackages || 0), 采购库存: Number(balance.value?.procurementPackages || 0), 预计总量: Number(balance.value?.totalPackages || 0) + Number(balance.value?.inTransitPackages || 0) + Number(balance.value?.procurementPackages || 0) }))
+const productFields = ['客户', '海外仓', 'SKU编码', '产品名称', '更新时间']; const stockFields = ['在库总量', '可用库存', '暂扣库存', '美本土散板', '在途库存', '采购库存', '预计总量']
const locationRows = computed(() => positions.value.map((item) => ({ id: String(item.id), location: text(item.warehouseLocationCode), status: text(item.status), palletNo: text(item.palletNo), cartons: Number(item.totalPackages || 0), quantity: Number(item.totalPackages || 0), available: Number(item.availablePackages || 0), inboundDate: formatOverseasDateTime(item.updatedAt), ageDays: '—' })))
const palletRows = computed(() => positions.value.map((item) => ({ id: String(item.id), palletNo: text(item.palletNo), cartons: Number(item.totalPackages || 0), cartonRange: '—', location: text(item.warehouseLocationCode), quantity: Number(item.totalPackages || 0) })))
const ledgerRows = computed(() => ledger.value.map((item) => ({ id: String(item.id), occurredAt: formatOverseasDateTime(item.occurredAt), businessType: inventoryBusinessTypeLabel(item.businessType), businessOrderNo: text(item.businessOrderNo), inboundOrderNo: text(item.inboundOrderNo), outboundOrderNo: text(item.outboundOrderNo), location: text(item.warehouseLocationCode), inboundQuantity: item.deltaPackages > 0 ? item.deltaPackages : 0, outboundQuantity: item.deltaPackages < 0 ? Math.abs(item.deltaPackages) : 0, balance: Number(item.afterPackages || 0), operator: '—', remark: text(item.remark) })))
@@ -21,7 +23,7 @@ async function load() { if (!inventoryId.value) { loadError.value = { message: '
function back() { void router.push({ name: 'overseas-inventory' }) }; onMounted(load)
-
+
商品信息
- {{ label }}
- {{ productValues[label as keyof typeof productValues] }}
库存状态汇总
- {{ label }}
- {{ stockValues[label as keyof typeof stockValues] }}
进销存单据明细
按该库存记录的入库单范围展示，出库字段仅为只读事实。
From 34f0ec49801704c7feeb594f4edb5ea7b71ef4af Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Tue, 8 Sep 2026 18:02:56 +0800
Subject: [PATCH 29/31] fix(overseas): label private delivery fee
---
.../pages/DeliveryOrderDetailView.test.ts | 8 +++++++-
.../overseas-warehouse/pages/DeliveryOrderDetailView.vue | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/modules/overseas-warehouse/pages/DeliveryOrderDetailView.test.ts b/src/modules/overseas-warehouse/pages/DeliveryOrderDetailView.test.ts
index 23c2b7f8..7caa4701 100644
--- a/src/modules/overseas-warehouse/pages/DeliveryOrderDetailView.test.ts
+++ b/src/modules/overseas-warehouse/pages/DeliveryOrderDetailView.test.ts
@@ -17,7 +17,10 @@ describe('DeliveryOrderDetailView', () => {
status: 'DELIVERING', overseasWarehouseName: '洛杉矶仓', palletCount: 1, packageCount: 2,
createdAt: '2026-09-01T10:00:00',
},
- skus: [], fees: [], operations: [],
+ skus: [], fees: [
+ { id: 'fee-private', feeDirection: 'RECEIVABLE', feeType: 'PRIVATE_LAST_MILE_DELIVERY', currency: 'USD', amount: 88 },
+ { id: 'fee-delivery', feeDirection: 'RECEIVABLE', feeType: 'DELIVERY_FEE', currency: 'USD', amount: 66 },
+ ], operations: [],
})
})
@@ -28,6 +31,9 @@ describe('DeliveryOrderDetailView', () => {
expect(wrapper.text()).toContain('DEL/1')
expect(wrapper.text()).toContain('派送中')
expect(wrapper.text()).toContain('洛杉矶仓')
+ await wrapper.find('.el-tabs__item:nth-child(3)').trigger('click')
+ expect(wrapper.text()).toContain('私人仓尾程派送费')
+ expect(wrapper.text()).toContain('派送费用')
wrapper.unmount()
})
diff --git a/src/modules/overseas-warehouse/pages/DeliveryOrderDetailView.vue b/src/modules/overseas-warehouse/pages/DeliveryOrderDetailView.vue
index 64152d13..9a3672e7 100644
--- a/src/modules/overseas-warehouse/pages/DeliveryOrderDetailView.vue
+++ b/src/modules/overseas-warehouse/pages/DeliveryOrderDetailView.vue
@@ -24,7 +24,7 @@ const statusLabels: Record = { WAIT_DELIVERY: '待派送', DELIV
const methodLabels: Record = { FBA_PICKUP: 'FBA自提', CUSTOMER_PICKUP: '客户自提', TRUCK: '卡车派送', TRUCK_PALLET: '卡派打托', TRUCK_FLOOR: '卡派地板', EXPRESS: '快递', OUTSOURCED: '外配', DEDICATED_TRUCK: '专车直送', LTL: '零担派送', SELF_DELIVERY: '自送', THIRD_PARTY: '第三方配送' }
const pickupLabels: Record = { ONE_PICKUP_ONE_DROP: '一提一卸', ONE_PICKUP_MULTI_DROP: '一提多卸', MULTI_PICKUP_ONE_DROP: '多提一卸', MULTI_PICKUP_MULTI_DROP: '多提多卸', WAREHOUSE_PICKUP: '仓库自提', DOOR_PICKUP: '上门提货', SELF_PICKUP: '自提' }
const loadingLabels: Record = { PALLET: '托盘', FLOOR: '地板', MIXED: '混装', CARTON: '散箱' }
-const feeLabels: Record = { DELIVERY_FEE: '派送费用', EXPRESS_FEE: '快递费用', LOADING_FEE: '装车费', APPOINTMENT_FEE: '买约费用', OTHER: '其他费用' }
+const feeLabels: Record = { DELIVERY_FEE: '派送费用', PRIVATE_LAST_MILE_DELIVERY: '私人仓尾程派送费', EXPRESS_FEE: '快递费用', LOADING_FEE: '装车费', APPOINTMENT_FEE: '买约费用', OTHER: '其他费用' }
const operationLabels: Record = { CREATE_DELIVERY: '创建派送单', ASSIGN_VEHICLE: '车队分配', DISPATCH: '开始派送', SIGN: '签收', COMPLETE_DELIVERY: '完成派送', UPDATE_DELIVERY_STATUS: '更新派送状态', CUSTOMER_VISIT: '客户回访', MARK_RETURN: '标记退货', CANCEL_OUTBOUND: '取消出库' }
const resultLabels: Record = { CREATED: '已创建' }
From 296a8246ada55047e2ed920a22009ec2f2253943 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Tue, 8 Sep 2026 18:16:33 +0800
Subject: [PATCH 30/31] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../InventoryCustomerName.behavior.test.ts | 18 ++++++++----------
.../pages/InventoryDetailView.vue | 9 +++++++--
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/modules/overseas-warehouse/pages/InventoryCustomerName.behavior.test.ts b/src/modules/overseas-warehouse/pages/InventoryCustomerName.behavior.test.ts
index e400b141..8cfe45f6 100644
--- a/src/modules/overseas-warehouse/pages/InventoryCustomerName.behavior.test.ts
+++ b/src/modules/overseas-warehouse/pages/InventoryCustomerName.behavior.test.ts
@@ -64,8 +64,7 @@ describe('inventory customer-name snapshots', () => {
await flushPromises()
expect(wrapper.text()).toContain('华远贸易')
expect(wrapper.text()).toContain('洛杉矶仓')
- expect(wrapper.text()).toContain('入库单号')
- expect(wrapper.text()).toContain(balance.inboundOrderNo)
+ expect(wrapper.find('.overseas-detail-title p').text()).toBe(`入库单号 / 入仓码 / SKU ${balance.inboundOrderNo} / ${balance.inboundCode} / ${balance.skuCode}`)
expect(wrapper.text()).toContain('美本土散板')
expect(wrapper.text()).not.toContain('美本土散版')
expect(wrapper.text()).not.toContain('ONT8目的仓')
@@ -73,22 +72,21 @@ describe('inventory customer-name snapshots', () => {
expect(wrapper.text()).not.toContain(balance.id)
})
- it('falls back to the inbound code and then an explicit empty business reference without exposing the inventory id', async () => {
- vi.mocked(listInventoryBalances).mockResolvedValueOnce({ records: [{ ...balance, inboundOrderNo: '' }], page: 1, size: 10, total: 1, pages: 1 })
+ it('combines the available references and then shows an explicit empty business reference without exposing the inventory id', async () => {
+ vi.mocked(listInventoryBalances).mockResolvedValueOnce({ records: [{ ...balance, inboundOrderNo: '', skuCode: '' }], page: 1, size: 10, total: 1, pages: 1 })
routing.route.params = { inventoryId: balance.id }
- routing.route.query = { inboundCode: balance.inboundCode, skuCode: balance.skuCode }
+ routing.route.query = { inboundCode: balance.inboundCode }
const inboundCodeWrapper = mount(InventoryDetailView, { attachTo: document.body, global: { plugins: [createPinia(), ElementPlus] } })
await flushPromises()
- expect(inboundCodeWrapper.text()).toContain('入仓码')
- expect(inboundCodeWrapper.text()).toContain(balance.inboundCode)
+ expect(inboundCodeWrapper.find('.overseas-detail-title p').text()).toBe(`入仓码 ${balance.inboundCode}`)
expect(inboundCodeWrapper.text()).not.toContain(balance.id)
inboundCodeWrapper.unmount()
- vi.mocked(listInventoryBalances).mockResolvedValueOnce({ records: [{ ...balance, inboundOrderNo: '', inboundCode: '' }], page: 1, size: 10, total: 1, pages: 1 })
- routing.route.query = { skuCode: balance.skuCode }
+ vi.mocked(listInventoryBalances).mockResolvedValueOnce({ records: [{ ...balance, inboundOrderNo: '', inboundCode: '', skuCode: '' }], page: 1, size: 10, total: 1, pages: 1 })
+ routing.route.query = {}
const emptyWrapper = mount(InventoryDetailView, { attachTo: document.body, global: { plugins: [createPinia(), ElementPlus] } })
await flushPromises()
- expect(emptyWrapper.text()).toContain('业务标识')
+ expect(emptyWrapper.find('.overseas-detail-title p').text()).toBe('业务标识 —')
expect(emptyWrapper.text()).not.toContain(balance.id)
})
})
diff --git a/src/modules/overseas-warehouse/pages/InventoryDetailView.vue b/src/modules/overseas-warehouse/pages/InventoryDetailView.vue
index a13990bf..89d55869 100644
--- a/src/modules/overseas-warehouse/pages/InventoryDetailView.vue
+++ b/src/modules/overseas-warehouse/pages/InventoryDetailView.vue
@@ -8,8 +8,13 @@ import { listInventoryBalances, listInventoryLedger, listInventoryPositions, typ
const route = useRoute(); const router = useRouter(); const inventoryId = computed(() => String(route.params.inventoryId || ''))
const balance = ref(null); const positions = ref([]); const ledger = ref([]); const loading = ref(false); const loadError = ref(null)
function text(value: unknown) { return String(value ?? '').trim() || '—' }
-const referenceLabel = computed(() => String(balance.value?.inboundOrderNo || route.query.inboundOrderNo || '').trim() ? '入库单号' : String(balance.value?.inboundCode || route.query.inboundCode || '').trim() ? '入仓码' : '业务标识')
-const referenceValue = computed(() => text(balance.value?.inboundOrderNo || route.query.inboundOrderNo || balance.value?.inboundCode || route.query.inboundCode))
+const businessReferences = computed(() => [
+ ['入库单号', balance.value?.inboundOrderNo || route.query.inboundOrderNo],
+ ['入仓码', balance.value?.inboundCode || route.query.inboundCode],
+ ['SKU', balance.value?.skuCode || route.query.skuCode],
+].map(([label, value]) => [String(label), String(value ?? '').trim()] as const).filter(([, value]) => value))
+const referenceLabel = computed(() => businessReferences.value.map(([label]) => label).join(' / ') || '业务标识')
+const referenceValue = computed(() => businessReferences.value.map(([, value]) => value).join(' / ') || '—')
const productValues = computed(() => ({ 客户: text(balance.value?.customerName), 海外仓: text(balance.value?.overseasWarehouseName), SKU编码: text(balance.value?.skuCode), 产品名称: balance.value ? inventoryProductName(balance.value) : '—', 更新时间: formatOverseasDateTime(balance.value?.updatedAt) }))
const stockValues = computed(() => ({ 在库总量: Number(balance.value?.totalPackages || 0), 可用库存: Number(balance.value?.availablePackages || 0), 暂扣库存: Number(balance.value?.holdPackages || 0), 美本土散板: '—', 在途库存: Number(balance.value?.inTransitPackages || 0), 采购库存: Number(balance.value?.procurementPackages || 0), 预计总量: Number(balance.value?.totalPackages || 0) + Number(balance.value?.inTransitPackages || 0) + Number(balance.value?.procurementPackages || 0) }))
const productFields = ['客户', '海外仓', 'SKU编码', '产品名称', '更新时间']; const stockFields = ['在库总量', '可用库存', '暂扣库存', '美本土散板', '在途库存', '采购库存', '预计总量']
From 6b43583cad99dbe09c9fe600b3f6ad03ed894db0 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Tue, 8 Sep 2026 18:45:00 +0800
Subject: [PATCH 31/31] test(admin): stabilize merged source contracts
---
.../carrier-rates/pages/CarrierRatesView.test.ts | 6 ++++--
src/modules/finance/pages/FinanceG3G4Operations.test.ts | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/modules/fba-pricing/carrier-rates/pages/CarrierRatesView.test.ts b/src/modules/fba-pricing/carrier-rates/pages/CarrierRatesView.test.ts
index 351807d3..613b886d 100644
--- a/src/modules/fba-pricing/carrier-rates/pages/CarrierRatesView.test.ts
+++ b/src/modules/fba-pricing/carrier-rates/pages/CarrierRatesView.test.ts
@@ -116,9 +116,11 @@ describe('CarrierRatesView price-book source contract', () => {
})
it('uses bordered striped tables and explicit semantic business buttons', () => {
- expect(source).toContain('row-key="id"\n border\n stripe')
+ expect(source).toContain('{{ detailActionLabel')
expect(source).toContain('原文件')
expect(source).toContain('确认并立即生效')
diff --git a/src/modules/finance/pages/FinanceG3G4Operations.test.ts b/src/modules/finance/pages/FinanceG3G4Operations.test.ts
index f53b6169..e83b63b3 100644
--- a/src/modules/finance/pages/FinanceG3G4Operations.test.ts
+++ b/src/modules/finance/pages/FinanceG3G4Operations.test.ts
@@ -125,7 +125,7 @@ describe('finance G3/G4 page operations', () => {
{ statementLineId: '602', adjustedAmount: 180, reason: '操作费更正' },
],
})
- })
+ }, 15_000)
it('loads AR linkage, uploads a voucher and allocates a real receipt to its statement', async () => {
const pinia = piniaWithPermissions(['platform:finance:settlement-ar:list', 'platform:finance:receipt:create'])