{{ detail.title }}
{{ detail.body || '暂无消息内容' }}
操作日志
{{ customerName }}已归属当前客户的档案与业务操作记录
请联系管理员开通平台操作日志查看权限。
整柜报关
客户退税资料与平台买单事实按柜冻结；报关完成和国内离仓分别展示。
退税总票 {{ customs.taxRefundCount }}已覆盖 {{ customs.coveredTaxRefundCount }}缺失 {{ missingCoverageCount }}
缺退税资料清单
-| 客户 | 订单号 | 入仓码 |
|---|---|---|
| {{ item.customerName }} | {{ item.orderNo }} | {{ item.inboundCode }} |
| 客户 | 订单号 | 入仓码 |
|---|---|---|
| {{ item.customerName }} | {{ item.orderNo }} | {{ item.inboundCode }} |
已冻结退税资料与报关完成文件
-| 操作 | 客户退税资料 | 报关完成文件 | 关联入仓码 | 版本 | 客户 | 完成情况 | ||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 操作 | 客户退税资料 | 报关完成文件 | 关联入仓码 | 版本 | 客户 | 完成情况 | |||
|---|---|---|---|---|---|---|---|---|---|
{{ document.source.fileName }} |
- {{ document.completion.fileName }} 未上传 |
+ {{ document.source.fileName }} |
+ {{ document.completion.fileName }} 未上传 |
{{ document.inboundCodes.join('、') || '—' }} | 退税资料 v{{ document.source.version }} / 报关完成 v{{ document.completion.version }} | {{ documentCustomers(document) }} | {{ document.completion ? '已上传报关完成文件' : '待上传报关完成文件' }} |
+
新增费用
- 提交 通过 驳回 调整 作废 —提交 通过 驳回 调整 作废 —{{ row.customerName || '—' }}
{{ feeItemLabel(row.feeItemCode) }}
{{ row.direction === 'RECEIVABLE' ? '应收' : '应付' }}
@@ -178,10 +179,10 @@ onMounted(load)
{{ reviewLabels[row.reviewStatus] || row.reviewStatus }} {{ row.reviewReason || '—' }}
-
- {{ form.paymentVoucherFileIds.length ? '重新上传凭证' : '上传付款凭证' }} {{ voucherNames[fileId] || `付款凭证 ${index + 1}` }} 移除
+ {{ form.paymentVoucherFileIds.length ? '重新上传凭证' : '上传付款凭证' }} {{ voucherNames[fileId] || `付款凭证 ${index + 1}` }} 移除
-
+
{{ title }}
按真实货柜展示港口、堆存、修箱、吊机和码头拖车费用，金额按币种分别列示。
正在读取付款凭证…
+
异常管理
{{ overview.exception.reason || '未填写异常原因' }}{{ overview.exception.markedByName || '操作人信息缺失' }} · {{ formatTime(overview.exception.markedAt) }}
时间动作操作人原因
暂无异常处理记录
- {{ eventLabel(history.action) }}{{ history.operatorName || '操作人信息缺失' }}{{ history.reason }}
-
+
| 操作 | 资料类型 | 资料内容 | 更新人 | 更新时间 | 状态 | |||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ item.label }} | {{ documentsByType.get(item.type)?.fileName || '—' }}{{ deliveryOrderBlockedReason }} | {{ documentsByType.get(item.type)?.uploadedByName || '—' }} | {{ documentsByType.get(item.type) ? formatTime(documentsByType.get(item.type)?.uploadedAt) : '—' }} | |||||||||||||||||||||||||||||||||||||
| PU 资料 | {{ overview.container.pickupCodeUpdatedByName || '—' }} | @@ -159,20 +160,20 @@ onBeforeUnmount(() => { photoGeneration += 1; revokePhotoUrls() }) diff --git a/src/modules/container-loading/components/ContainerSimulationCreate.vue b/src/modules/container-loading/components/ContainerSimulationCreate.vue index 235fc793..e9ec050e 100644 --- a/src/modules/container-loading/components/ContainerSimulationCreate.vue +++ b/src/modules/container-loading/components/ContainerSimulationCreate.vue @@ -9,7 +9,7 @@ import AppDialog from '@/shared/components/AppDialog.vue' import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue' import LoadErrorState from '@/shared/components/LoadErrorState.vue' import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http' -import { CONTAINER_SPECIFICATIONS, applyContainerSpecification, containerSpecification } from '@/shared/domain/containerSpecifications' +import { CONTAINER_SPECIFICATIONS, DEFAULT_CONTAINER_TYPE, applyContainerSpecification, containerSpecification } from '@/shared/domain/containerSpecifications' import { createContainerSimulation } from '../api/platformContainerLoading' import type { ContainerSimulationCreateRequest } from '../types' import { SMART_LOADING_CHANNEL_GROUPS } from '../smartLoadingChannelGroups' @@ -30,7 +30,7 @@ const simulationError = ref|||||||||||||||||||||||||||||||||||||||
| 操作 | 开始天数 | 结束天数 | 价格 |
|---|---|---|---|
{{ groupIndex === 0 ? '仓租（CBM/天）' : '退货仓储费（托/天）' }} · {{ group.length }}档
| 操作 | 开始天数 | 结束天数 | 价格 |
|---|---|---|---|
入库箱数{{ summary.inboundBoxes }}
已出库箱数{{ summary.outboundBoxes }}
当前库存{{ summary.availableBoxes }}
累计入库体积{{ summary.inboundVolumeCbm.toFixed(2) }} m³
入库箱数{{ summary.inboundBoxes }}
已出库箱数{{ summary.outboundBoxes }}
当前库存{{ summary.availableBoxes }}
累计入库体积{{ summary.inboundVolumeCbm.toFixed(2) }} m³
- {{ taskStatusMeta(row as PlatformExportTask).label }}
@@ -300,7 +300,7 @@ onBeforeUnmount(() => {
- {
+ 详情
+ 下载
+ {{ retryLabel(row as PlatformExportTask) }}
{{ typeLabel((row as PlatformExportTask).exportType) }}
-
+
- 任务编号
- {{ detailTask.taskNo }}
- 申请人
- {{ detailTask.requestedUsername || detailTask.requestedBy }}
- 申请时间
- {{ formatDate(detailTask.requestedAt) }}
-
-
-
-
+
+
+
-
+
同时重置密码
@@ -456,8 +458,8 @@ onMounted(loadInitialData)
diff --git a/src/modules/inbounds/components/InboundTaskList.vue b/src/modules/inbounds/components/InboundTaskList.vue
index b4612a97..b2bfce49 100644
--- a/src/modules/inbounds/components/InboundTaskList.vue
+++ b/src/modules/inbounds/components/InboundTaskList.vue
@@ -4,7 +4,7 @@ import '../measurement/measurementDensity.css'
import { computed, onActivated, onBeforeUnmount, onMounted, ref, watch } from 'vue'
import { useRouter } from 'vue-router'
import { ElMessage, ElMessageBox } from 'element-plus'
-import { CircleCheckBig, Eye, Ruler, SearchCheck } from '@lucide/vue'
+import { CircleCheckBig } from '@lucide/vue'
import { useAccessPreviewStore } from '@/core/access/accessPreview'
import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
import { listPlatformWarehouses } from '@/modules/warehouses'
@@ -374,14 +374,12 @@ onBeforeUnmount(() => { disposed = true; requestSerial += 1; optionsRequestSeria
当前显示 {{ result.records.length }} 条 · 共 {{ result.total }} 条
-
+
+ 编辑
-
-
@@ -391,9 +393,9 @@ onMounted(loadInitialData)
-
-
- (
+ `/platform/v1/first-leg/pda-dropship/inbound-orders/${encodeURIComponent(inboundId)}/pallets/print`,
+ { params: { accountId: tenantId }, responseType: 'blob', timeout: 60_000 },
+ )
+}
diff --git a/src/modules/inbounds/index.ts b/src/modules/inbounds/index.ts
index ba2c231d..1aadb9cf 100644
--- a/src/modules/inbounds/index.ts
+++ b/src/modules/inbounds/index.ts
@@ -1,5 +1,6 @@
export { getInboundMeasurement, saveInboundMeasurementDraft, updateMeasurementCalculationStrategy, updateMeasurementOuterDimensions } from './measurement/api'
export { createInboundHoldIdempotencyKey, downloadInboundCartonLabelsBatch, downloadPlatformInboundHoldEvidence, getPlatformInboundHold, holdPlatformInbound, releasePlatformInbound, uploadPlatformInboundHoldEvidence } from './core/api'
+export { default as DropshipPalletPrintPanel } from './core/DropshipPalletPrintPanel.vue'
export { default as InboundMeasurementPanel } from './measurement/InboundMeasurementPanel.vue'
export { default as InboundMeasurementDialog } from './measurement/InboundMeasurementDialog.vue'
export { default as MeasurementEvidenceThumbnail } from './measurement/components/MeasurementEvidenceThumbnail.vue'
diff --git a/src/modules/inbounds/measurement/InboundMeasurementDialog.test.ts b/src/modules/inbounds/measurement/InboundMeasurementDialog.test.ts
index 53cf5e20..afa33645 100644
--- a/src/modules/inbounds/measurement/InboundMeasurementDialog.test.ts
+++ b/src/modules/inbounds/measurement/InboundMeasurementDialog.test.ts
@@ -7,6 +7,8 @@ const panelSource = readFileSync(resolve(process.cwd(), 'src/modules/inbounds/me
const taskListSource = readFileSync(resolve(process.cwd(), 'src/modules/inbounds/components/InboundTaskList.vue'), 'utf8')
const orderListSource = readFileSync(resolve(process.cwd(), 'src/modules/unified-orders/pages/UnifiedOrdersView.vue'), 'utf8')
+const densitySource = readFileSync(resolve(process.cwd(), 'src/styles/adminDensity.css'), 'utf8')
+
describe('InboundMeasurementDialog', () => {
it('owns the complete measurement workspace behind one centered dialog', () => {
expect(source).toContain("import AppDialog from '@/shared/components/AppDialog.vue'")
@@ -14,7 +16,8 @@ describe('InboundMeasurementDialog', () => {
expect(source).toContain('class="inbound-measurement-workspace-dialog admin-density-dialog admin-density-workspace inbound-density"')
expect(source).toContain('width="min(1560px, calc(100vw - 48px))"')
expect(source).toContain('height: 92vh')
- expect(source).toContain('padding: 10px 20px')
+ expect(densitySource).toContain('.admin-density-dialog.el-dialog .el-dialog__header')
+ expect(densitySource).toContain('padding: var(--admin-space-4, 10px) 48px var(--admin-space-4, 10px) var(--admin-space-6, 16px)')
expect(source).toContain(' `测量 · ${props.inboundCode?.trim() || '入仓
async function mayClose() {
if (!measurementPanelRef.value?.isDirty) return true
try {
- await ElMessageBox.confirm('当前测量数据尚未保存，关闭后将丢失修改。确定关闭吗？', '关闭测量', {
+ await ElMessageBox.confirm('当前测量数据尚未保存，关闭后将丢失修改。确定关闭吗？', '关闭测量', { customClass: 'admin-density-confirm',
type: 'warning',
confirmButtonText: '放弃修改并关闭',
cancelButtonText: '继续编辑',
@@ -127,9 +127,9 @@ function handleSubmitted() {
diff --git a/src/modules/loading-lists/components/LoadingListDetailDrawer.vue b/src/modules/loading-lists/components/LoadingListDetailDrawer.vue
index 45084210..387551fe 100644
--- a/src/modules/loading-lists/components/LoadingListDetailDrawer.vue
+++ b/src/modules/loading-lists/components/LoadingListDetailDrawer.vue
@@ -18,6 +18,7 @@ const props = defineProps<{
detail: LoadingDetail | null
error: ApiErrorDetails | null
canEdit: boolean
+ dense?: boolean
embedded?: boolean
canEditTransport?: boolean
transportNote?: string
@@ -148,16 +149,16 @@ function formatNumber(value?: number | null, digits = 3) {
-
+
-
+
{{ taskLabel }}
-
-
+ 查看
无操作权限
@@ -453,14 +451,13 @@ onBeforeUnmount(() => { disposed = true; requestSerial += 1; optionsRequestSeria
diff --git a/src/modules/inbounds/core/api.test.ts b/src/modules/inbounds/core/api.test.ts
index 2c817de1..3fce2fed 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, downloadInboundCartonLabelsBatch, downloadPlatformInboundHoldEvidence, getPlatformInbound, getPlatformInboundHold, holdPlatformInbound, listPlatformInboundDropshipPallets, listPlatformInbounds, releasePlatformInbound, uploadPlatformInboundHoldEvidence } from './api'
+import { downloadAllDropshipPalletLabels, downloadDropshipPalletLabel, downloadInboundCartonLabels, downloadInboundCartonLabelsBatch, downloadPlatformInboundHoldEvidence, getPlatformInbound, getPlatformInboundHold, holdPlatformInbound, listPlatformInboundDropshipPallets, listPlatformInbounds, releasePlatformInbound, uploadPlatformInboundHoldEvidence } from './api'
vi.mock('@/shared/api/http', () => ({
ApiResponseError: class ApiResponseError extends Error {
@@ -87,6 +87,21 @@ describe('platform inbound query API', () => {
expect(http.get).toHaveBeenCalledWith('/platform/v1/first-leg/pda-dropship/inbound-orders/19001/pallets', { params: { accountId: '10001' } })
})
+ it('downloads one or all inbound-scoped dropship pallet documents for desktop printing', async () => {
+ const pdf = new Blob(['pdf'], { type: 'application/pdf' })
+ vi.mocked(http.get).mockResolvedValue(pdf)
+
+ await expect(downloadDropshipPalletLabel('10001', '19001', '21001')).resolves.toBe(pdf)
+ await expect(downloadAllDropshipPalletLabels('10001', '19001')).resolves.toBe(pdf)
+
+ expect(http.get).toHaveBeenNthCalledWith(1,
+ '/platform/v1/first-leg/pda-dropship/inbound-orders/19001/pallets/21001/print',
+ { params: { accountId: '10001' }, responseType: 'blob', timeout: 60_000 })
+ expect(http.get).toHaveBeenNthCalledWith(2,
+ '/platform/v1/first-leg/pda-dropship/inbound-orders/19001/pallets/print',
+ { params: { accountId: '10001' }, responseType: 'blob', timeout: 60_000 })
+ })
+
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 e72c6eda..f5e37f27 100644
--- a/src/modules/inbounds/core/api.ts
+++ b/src/modules/inbounds/core/api.ts
@@ -291,3 +291,10 @@ export async function downloadDropshipPalletLabel(tenantId: string, inboundId: s
{ params: { accountId: tenantId }, responseType: 'blob', timeout: 60_000 },
)
}
+
+export async function downloadAllDropshipPalletLabels(tenantId: string, inboundId: string) {
+ return http.get{{ title }}
{{ mode === 'preload' ? '核对运输信息、确认预装并维护逐条仓库备注' : '查看已完成装柜明细和柜次费用' }}
- {{ row.unitType === 'SEALED_PALLET' ? '封托托盘' : '箱件' }} 整托不可拆
{{ formatNumber(row.grossWeightKg) }}
@@ -236,59 +237,58 @@ function formatNumber(value?: number | null, digits = 3) {
diff --git a/src/modules/loading-lists/components/LoadingListsView.test.ts b/src/modules/loading-lists/components/LoadingListsView.test.ts
index ab90c7b6..7dff6f1d 100644
--- a/src/modules/loading-lists/components/LoadingListsView.test.ts
+++ b/src/modules/loading-lists/components/LoadingListsView.test.ts
@@ -136,7 +136,8 @@ describe('LoadingListsView', () => {
})
it('uses bordered list actions with a stable 320px layout', () => {
- expect(source).toContain('size="small" type="primary" plain')
+ expect(source).toContain(":class=\"{ 'density-action': isPreload }\"")
+ expect(source).toContain(':type="isPreload ? undefined : \'primary\'" :plain="!isPreload"')
expect(source).not.toContain(' {
expect(detailSource).toContain('min-height: 26px')
expect(detailSource).toContain('> div > span:first-child::after { content: "："; }')
expect(detailSource).not.toContain('> div > span::after { content: "："; }')
- expect(detailSource).toContain('background: #fff')
+ expect(detailSource).toContain('background: var(--admin-surface, #fff)')
expect(detailSource).toContain('overflow-wrap: anywhere')
expect(detailSource).toContain("className: 'identifier-column'")
expect(detailSource).toContain('showOverflowTooltip: true')
@@ -217,7 +218,7 @@ describe('LoadingListsView', () => {
expect(detailSource).toContain('')
expect(detailSource).not.toContain('class="detail-section surface-panel"')
expect(detailSource).not.toContain('class="history-section surface-panel"')
- expect(detailSource).toContain('padding: 16px 0 0')
+ expect(detailSource).toContain('padding: var(--admin-space-6, 16px) 0 0')
expect(detailSource).toContain("fixed: 'left', width: 132")
})
diff --git a/src/modules/loading-lists/components/LoadingListsView.vue b/src/modules/loading-lists/components/LoadingListsView.vue
index 66036bfc..53841ce0 100644
--- a/src/modules/loading-lists/components/LoadingListsView.vue
+++ b/src/modules/loading-lists/components/LoadingListsView.vue
@@ -219,8 +219,8 @@ onMounted(() => {
装柜货物明细 {{ detail.items.length }} 条
仓库备注将随装柜完成资料下发海外仓
- ')
expect(source).toContain('@back="goBack"')
expect(source).toContain("router.push({ name: 'loading-plans' })")
- expect(source).toContain('@media (min-width: 1920px) { .preload-detail-page { width: 100%; max-width: none; gap: 12px; } }')
+ expect(source).toContain('@media (min-width: 1920px) { .preload-detail-page { width: 100%; max-width: none; gap: var(--admin-space-5, 12px); } }')
expect(source).not.toContain('AppDrawer')
})
diff --git a/src/modules/loading-lists/pages/PreloadPlanDetailView.vue b/src/modules/loading-lists/pages/PreloadPlanDetailView.vue
index a1240fd2..cf3cf835 100644
--- a/src/modules/loading-lists/pages/PreloadPlanDetailView.vue
+++ b/src/modules/loading-lists/pages/PreloadPlanDetailView.vue
@@ -278,7 +278,7 @@ watch([planId, warehouseId], () => void loadDetail())
+
-
{{ detail.summary.preloadNo }}
{{ detail.summary.cabinetNo || '—' }}
@@ -290,13 +290,13 @@ watch([planId, warehouseId], () => void loadDetail())
diff --git a/src/modules/loading-lists/status.test.ts b/src/modules/loading-lists/status.test.ts
index 601698c5..571fb044 100644
--- a/src/modules/loading-lists/status.test.ts
+++ b/src/modules/loading-lists/status.test.ts
@@ -1,7 +1,22 @@
import { describe, expect, it } from 'vitest'
+import { mount } from '@vue/test-utils'
+import StatusBadge from '@/shared/components/StatusBadge.vue'
import { loadingListStatusLabel } from './status'
describe('loading list status labels', () => {
+ it.each([
+ ['WAIT_LOADING', '待装柜', 'warning'],
+ ['EDITING', '预装柜中', 'warning'],
+ ['LOADING', '拣货中', 'info'],
+ ['COMPLETED', '装柜完成', 'success'],
+ ['NEW_LOADING_STATE', '未知状态', 'neutral'],
+ ])('renders %s with its shared status tone', (status, label, tone) => {
+ const wrapper = mount(StatusBadge, { props: { status: loadingListStatusLabel(status) } })
+ expect(wrapper.text()).toBe(label)
+ expect(wrapper.classes()).toContain(`is-${tone}`)
+ wrapper.unmount()
+ })
+
it('translates known states and hides unknown backend enums', () => {
expect(loadingListStatusLabel('EDITING')).toBe('预装柜中')
expect(loadingListStatusLabel('COMPLETED')).toBe('装柜完成')
diff --git a/src/modules/master-data/counterparties/pages/PartnersView.test.ts b/src/modules/master-data/counterparties/pages/PartnersView.test.ts
index f0b39b09..aaac30ce 100644
--- a/src/modules/master-data/counterparties/pages/PartnersView.test.ts
+++ b/src/modules/master-data/counterparties/pages/PartnersView.test.ts
@@ -195,6 +195,8 @@ describe('PartnersView real API integration', () => {
const sections = detailContent?.querySelectorAll('section')
const otherInfo = sections?.item(sections.length - 1)
expect(detailContent).not.toBeNull()
+ expect(detailContent?.closest('.el-drawer')?.classList.contains('admin-density-drawer')).toBe(true)
+ expect(detailContent?.querySelectorAll('.density-fields')).toHaveLength(3)
expect(otherInfo?.querySelectorAll('.detail-grid > .detail-span')).toHaveLength(2)
expect(otherInfo?.textContent).toContain('更新时间')
expect(otherInfo?.textContent).toContain('长期合作单位')
@@ -278,13 +280,10 @@ describe('PartnersView real API integration', () => {
})
it('keeps all three row actions visible without a premature more menu', () => {
- expect(source).toContain('详情 ')
+ expect(actions).toContain('>编辑')
+ expect(actions).toContain(':data-tone=')
+ expect(actions).not.toMatch(/<(?:el-dropdown|Pencil|Power|Eye|Trash2|Download|CircleX)\b/)
+ })})
diff --git a/src/modules/master-data/counterparties/pages/PartnersView.vue b/src/modules/master-data/counterparties/pages/PartnersView.vue
index bf1662a7..274c6676 100644
--- a/src/modules/master-data/counterparties/pages/PartnersView.vue
+++ b/src/modules/master-data/counterparties/pages/PartnersView.vue
@@ -1,7 +1,8 @@
-
+
-
-
+ 详情
+ 编辑
+ {{ (row as PlatformPartnerResource).status === 'ACTIVE' ? '停用' : '启用' }}
+
+
启用 停用
-
+
- 重新加载选项
+
{{ channel.channelName }}{{ channel.channelCode }} 重新加载
-
-
+
-
diff --git a/src/modules/ocean-bookings/containerRequirements.test.ts b/src/modules/ocean-bookings/containerRequirements.test.ts
index 9a556411..4363467a 100644
--- a/src/modules/ocean-bookings/containerRequirements.test.ts
+++ b/src/modules/ocean-bookings/containerRequirements.test.ts
@@ -4,9 +4,9 @@ import { containerRequirementError, createBlankContainerRequirement, selectConta
describe('ocean booking container requirements', () => {
it('starts with one requirement and applies the fixed platform specification', () => {
const requirement = createBlankContainerRequirement()
- expect(requirement).toEqual({ containerType: '40HC', containerKind: 'FCL', quantity: 1, capacityCbm: 76, maxWeightKg: 28000 })
- selectContainerRequirementType(requirement, '20GP')
- expect(requirement).toMatchObject({ containerType: '20GP', capacityCbm: 33, maxWeightKg: 28000 })
+ expect(requirement).toEqual({ containerType: '40HQ', containerKind: 'FCL', quantity: 1, capacityCbm: 68, maxWeightKg: 19500 })
+ selectContainerRequirementType(requirement, '40GP')
+ expect(requirement).toMatchObject({ containerType: '40GP', capacityCbm: 58, maxWeightKg: 19500 })
})
it('requires positive quantities and fixed specifications', () => {
diff --git a/src/modules/ocean-bookings/containerRequirements.ts b/src/modules/ocean-bookings/containerRequirements.ts
index 06c30b3f..73a55b1a 100644
--- a/src/modules/ocean-bookings/containerRequirements.ts
+++ b/src/modules/ocean-bookings/containerRequirements.ts
@@ -1,8 +1,8 @@
import type { OceanBookingContainerRequirement } from './types'
-import { applyContainerSpecification, containerSpecification } from '@/shared/domain/containerSpecifications'
+import { applyContainerSpecification, containerSpecification, DEFAULT_CONTAINER_TYPE } from '@/shared/domain/containerSpecifications'
export function createBlankContainerRequirement(): OceanBookingContainerRequirement {
- return { containerType: '40HC', containerKind: 'FCL', quantity: 1, capacityCbm: 76, maxWeightKg: 28000 }
+ return { containerType: DEFAULT_CONTAINER_TYPE, containerKind: 'FCL', quantity: 1, capacityCbm: 68, maxWeightKg: 19500 }
}
export function selectContainerRequirementType(requirement: OceanBookingContainerRequirement, containerType: string) {
diff --git a/src/modules/ocean-bookings/pages/OceanBookingDetailView.release.test.ts b/src/modules/ocean-bookings/pages/OceanBookingDetailView.release.test.ts
index f70510f3..8fd9fb34 100644
--- a/src/modules/ocean-bookings/pages/OceanBookingDetailView.release.test.ts
+++ b/src/modules/ocean-bookings/pages/OceanBookingDetailView.release.test.ts
@@ -37,11 +37,11 @@ function booking(status: OceanBookingStatus = 'DRAFT', version = 3, billOfLading
const resource = {
id: '123', bookingNo: 'OB-123', status, version, customerId: '456', customerName: '测试客户',
billOfLadingNo, shipperName: '发货人', consigneeName: '收货人', containerCount: 2,
- channelCode: 'SEA_FCL', channelName: '海运整箱', warehouseId: '8', warehouseName: '义乌仓',
+ channelCode: 'MATSON_CLX', channelName: '美森正班', warehouseId: '8', warehouseName: '义乌仓',
shippingCompanyId: '10', shippingCompanyName: '测试船公司', carrierCode: 'MATSON' as const,
bookingAgentId: '20', bookingAgentName: '订舱代理', vesselName: 'TEST VESSEL', voyageNo: 'V001',
departurePortCode: 'CNSHA', departurePortName: '上海', destinationPortCode: 'USLAX', destinationPortName: '洛杉矶',
- placeOfDelivery: 'ONT8', serviceTerm: 'CY-CY', freightTerm: 'PREPAID',
+ placeOfDelivery: 'ONT8',
estimatedSailingAt: '2026-09-01T08:00:00', estimatedArrivalAt: '2026-09-20T08:00:00', remark: null,
createdAt: null, updatedAt: null, orderNo: null, carrierName: null, bookingAgent: null,
pol: '上海', pod: '洛杉矶', mblShipper: null, mblConsignee: null, soNo: null, cutoffAt: null,
@@ -55,7 +55,7 @@ function booking(status: OceanBookingStatus = 'DRAFT', version = 3, billOfLading
{ partyType: 'CONSIGNEE', partyName: '收货人' },
{ partyType: 'NOTIFY_PARTY', partyName: '通知人' },
],
- containerRequirements: [{ requirementId: '31', containerType: '40HC', containerKind: 'FCL', quantity: 2, remainingQuantity: 2, capacityCbm: 76, maxWeightKg: 28000 }],
+ containerRequirements: [{ requirementId: '31', containerType: '40HQ', containerKind: 'FCL', quantity: 2, remainingQuantity: 2, capacityCbm: 68, maxWeightKg: 19500 }],
containers: [],
documents: [{ id: '41', oceanBookingId: '123', fileId: '51', documentType: 'BOOKING_CONFIRMATION', fileName: '订舱确认.pdf', fileHash: null, sizeBytes: 128, contentType: 'application/pdf', valid: true, uploadedBy: '7', uploadedByName: '平台', uploadedAt: '2026-08-31T10:00:00', invalidatedBy: null, invalidatedByName: null, invalidatedAt: null }],
histories: [], statusHistory: [],
@@ -97,10 +97,17 @@ describe('OceanBookingDetailView one-click release', () => {
vi.mocked(listPlatformTenants).mockResolvedValue({ records: [], page: 1, size: 200, total: 0, pages: 0 })
vi.mocked(listPlatformPartners).mockResolvedValue({ records: [], page: 1, size: 200, total: 0, pages: 0 })
vi.mocked(listPlatformWarehouses).mockResolvedValue({ records: [], page: 1, size: 200, total: 0, pages: 0 })
- vi.mocked(listWarehouseLogisticsChannels).mockResolvedValue([{ channelCode: 'SEA_FCL', channelName: '海运整箱' }])
+ vi.mocked(listWarehouseLogisticsChannels).mockResolvedValue([{ channelCode: 'MATSON_CLX_TRUCK', channelName: '美森正班海卡' }])
vi.mocked(listOceanBookingAgents).mockResolvedValue([{ supplierId: '20', name: '订舱代理', carrierCodes: ['MATSON'] }])
})
+ it('shows the matching fixed logistics group instead of the underlying price-book channel', async () => {
+ const { wrapper } = await mountView()
+ expect(wrapper.text()).toContain('美森正班')
+ expect(wrapper.text()).not.toContain('美森正班海卡')
+ wrapper.unmount()
+ })
+
it('saves dirty form data and releases with the returned latest version', async () => {
vi.mocked(updateOceanBookingDraft).mockResolvedValue(booking('DRAFT', 4, 'NEW-BL'))
vi.mocked(releaseOceanBooking).mockResolvedValue(booking('RELEASED', 5, 'NEW-BL'))
diff --git a/src/modules/ocean-bookings/pages/OceanBookingDetailView.test.ts b/src/modules/ocean-bookings/pages/OceanBookingDetailView.test.ts
index d177d2e0..4c4e2eca 100644
--- a/src/modules/ocean-bookings/pages/OceanBookingDetailView.test.ts
+++ b/src/modules/ocean-bookings/pages/OceanBookingDetailView.test.ts
@@ -117,8 +117,8 @@ describe('OceanBookingDetailView draft and release contract', () => {
it('keeps a DRAFT detail read-only when the user lacks write permission', () => {
expect(source).toContain('const formWritable = computed(() => canSave.value)')
- expect(source).toContain(':disabled="!formWritable" class="booking-groups"')
- expect(source).toContain('.booking-groups{display:grid;grid-template-columns:minmax(0,1.35fr) minmax(0,1fr);gap:14px}')
+ expect(source).toContain(':disabled="!formWritable" class="booking-groups density-form"')
+ expect(source).toContain('.booking-groups{display:grid;grid-template-columns:minmax(0,1.35fr) minmax(0,1fr);gap:var(--admin-space-5)}')
expect(source).toContain('.booking-group:last-child{grid-column:1/-1}')
expect(source).toContain('.container-table-wrap{max-width:100%;overflow-x:auto')
expect(source).toContain('v-if="formWritable" class="container-actions"')
diff --git a/src/modules/ocean-bookings/pages/OceanBookingDetailView.vue b/src/modules/ocean-bookings/pages/OceanBookingDetailView.vue
index 93f02bd3..343c3c07 100644
--- a/src/modules/ocean-bookings/pages/OceanBookingDetailView.vue
+++ b/src/modules/ocean-bookings/pages/OceanBookingDetailView.vue
@@ -1,8 +1,9 @@
-
+
查看已作废资料（{{ invalidDocuments.length }}）
- {{ item.fileName }}{{ item.invalidatedByName || item.invalidatedBy || '系统' }} · {{ item.invalidatedAt || '—' }}
-
@@ -392,14 +395,14 @@ onMounted(() => { void load(); void loadOptions() })
基本信息
{{ channelsError }}重新加载
该仓库暂无有效物流渠道，请更换仓库或联系管理员。
{{ channelsError }}重新加载
该仓库暂无有效物流渠道，请更换仓库或联系管理员。
条款与柜型需求
-
+
-
+ 柜型需求
-
+
- 新增柜型需求 {{ form.data.containerRequirements.length }} / 20 项
- {{ statusLabel(event.fromStatus) }} → {{ statusLabel(event.toStatus) }}
-
+
+
{{ form.data.billOfLadingNo || '—' }}
@@ -493,6 +492,6 @@ onMounted(() => { void load(); void loadOptions() })
diff --git a/src/modules/ocean-bookings/pages/OceanBookingsView.test.ts b/src/modules/ocean-bookings/pages/OceanBookingsView.test.ts
index 11dbdd4f..789fd507 100644
--- a/src/modules/ocean-bookings/pages/OceanBookingsView.test.ts
+++ b/src/modules/ocean-bookings/pages/OceanBookingsView.test.ts
@@ -32,7 +32,7 @@ describe('OceanBookingsView', () => {
})
it('edits DRAFT rows and views RELEASED rows', () => {
- expect(source).toContain('
+import '@/styles/adminDensity.css'
import { computed, onActivated, onMounted, reactive, ref, watch } from 'vue'
import { useRouter } from 'vue-router'
-import { Eye, Pencil, Plus, Printer } from '@lucide/vue'
+import { Plus } from '@lucide/vue'
import { useAccessPreviewStore } from '@/core/access/accessPreview'
import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/components/QueryToolbar.vue'
import DataTable from '@/shared/components/DataTable.vue'
@@ -68,14 +69,14 @@ watch([page, pageSize], () => void load()); onMounted(() => void loadCustomers()
onActivated(() => void load())
-
+
{{ row.status === 'DRAFT' ? '编辑' : '查看' }} 打印单据
-
+
diff --git a/src/modules/ocean-bookings/types.ts b/src/modules/ocean-bookings/types.ts
index 2d56fbe2..526ba594 100644
--- a/src/modules/ocean-bookings/types.ts
+++ b/src/modules/ocean-bookings/types.ts
@@ -1,3 +1,5 @@
+import type { ContainerType } from '@/shared/domain/containerSpecifications'
+
export type OceanBookingStatus = 'DRAFT' | 'RELEASED'
export type OceanBookingPrintType = 'SHIPPING_INSTRUCTION' | 'BILL_OF_LADING_CONFIRMATION'
export type OceanBookingDocumentType = 'BOOKING_CONFIRMATION' | 'BILL_OF_LADING'
@@ -21,7 +23,7 @@ export interface OceanBookingDocument {
}
export interface OceanBookingDocumentMutation { document: OceanBookingDocument; bookingVersion: number }
export interface OceanBookingDocumentInvalidation { documentId: string; bookingVersion: number }
-export type OceanBookingContainerType = '20GP' | '40GP' | '40HC' | '40NR' | '45HC'
+export type OceanBookingContainerType = ContainerType
export type OceanBookingCarrierCode = 'MATSON' | 'SML' | 'ZIM' | 'COSCO' | 'EMC' | 'HEDE' | 'OTHER'
export interface OceanBookingAgentOption {
@@ -58,7 +60,7 @@ export interface OceanBookingDraftData {
estimatedSailingAt: string | null; estimatedArrivalAt: string | null
shippingCompanyId?: string | null; shippingCompanyName?: string | null; carrierCode?: OceanBookingCarrierCode | null; bookingAgentId?: string | null; bookingAgentName?: string | null
departurePortCode?: string | null; departurePortName?: string | null; destinationPortCode?: string | null; destinationPortName?: string | null
- placeOfDelivery?: string | null; serviceTerm: string | null; freightTerm: string | null
+ placeOfDelivery?: string | null
remark?: string | null
}
export interface OceanBookingResource {
@@ -70,7 +72,7 @@ export interface OceanBookingResource {
shippingCompanyId: string | null; shippingCompanyName: string | null; carrierCode: OceanBookingCarrierCode | null; bookingAgentId: string | null; bookingAgentName: string | null
vesselName: string | null; voyageNo: string | null; departurePortCode: string | null; departurePortName: string | null
destinationPortCode: string | null; destinationPortName: string | null; placeOfDelivery: string | null
- serviceTerm: string | null; freightTerm: string | null; estimatedSailingAt: string | null; estimatedArrivalAt: string | null
+ estimatedSailingAt: string | null; estimatedArrivalAt: string | null
remark: string | null
createdAt: string | null; updatedAt: string | null
orderNo: string | null; carrierName: string | null; bookingAgent: string | null; pol: string | null; pod: string | null
diff --git a/src/modules/overseas-business/overseasBusinessDensity.css b/src/modules/overseas-business/overseasBusinessDensity.css
new file mode 100644
index 00000000..7955c34f
--- /dev/null
+++ b/src/modules/overseas-business/overseasBusinessDensity.css
@@ -0,0 +1,11 @@
+/* Shared business form layout for purchase and local transport editors. */
+.admin-density.overseas-business-editor { width: 100%; max-width: 1120px; }
+.overseas-business-editor .overseas-business-form-layout { gap: 0; border: 1px solid var(--cc-border); border-radius: var(--admin-radius); background: var(--admin-surface); }
+.overseas-business-editor .form-reference { min-width: 0; color: var(--cc-muted); font-size: var(--admin-font-body); overflow-wrap: anywhere; }
+.overseas-business-editor .form-panel { min-width: 0; padding: var(--admin-space-5); }
+.overseas-business-editor .form-grid { display: grid; min-width: 0; gap: 0 var(--admin-space-5); }
+.overseas-business-editor .form-grid :is(.el-select, .el-date-editor, .el-input-number) { width: 100%; }
+.overseas-business-editor .form-grid small { display: block; margin-top: var(--admin-space-1); color: var(--cc-muted); font-size: var(--admin-font-caption); }
+.overseas-business-editor .field-error { display: block; margin-top: var(--admin-space-1); color: var(--el-color-danger); font-size: var(--admin-font-caption); }
+.overseas-business-editor .form-grid .field-error { color: var(--el-color-danger); }
+.overseas-business-editor .form-actions { display: flex; justify-content: flex-end; gap: var(--admin-space-3); padding-top: var(--admin-space-5); border-top: 1px solid var(--cc-border); }
diff --git a/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts b/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
index bc89e6f6..c4a65bca 100644
--- a/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
+++ b/src/modules/overseas-business/pages/OverseasBusinessViews.test.ts
@@ -11,7 +11,7 @@ import { listPlatformTenants } from '@/modules/iam'
import AppDialog from '@/shared/components/AppDialog.vue'
import type { LocalLooseboardDetail, LocalLooseboardOrder, LocalTransportDetail, LocalTransportOrder, OverseasPurchaseDetail } from '../types'
import {
- createLocalLooseboardOrder, createUsTruckOrder, getLocalLooseboardOrder, getOverseasPurchase, getUsTruckOrder,
+ createOverseasPurchaseFee, uploadOverseasPurchaseFile, createLocalLooseboardOrder, createUsTruckOrder, getLocalLooseboardOrder, getOverseasPurchase, getUsTruckOrder,
listLocalLooseboardOrders, listOverseasPurchaseCustomerOptions, listOverseasPurchaseWarehouseOptions,
listOverseasPurchases, listUsTruckOrders, reviewOverseasPurchase, updateLocalLooseboardOrder, updateOverseasPurchase, updateUsTruckOrder,
} from '../api/platformOverseasBusiness'
@@ -46,7 +46,7 @@ const purchase: OverseasPurchaseDetail = {
}
const truck: LocalTransportOrder = { id: '9007199254740995', customerId: '10002', orderNo: 'TK-200', transportType: 'PORT_PICKUP', origin: 'Long Beach', destination: 'Ontario', containerType: '40HQ', palletCount: 2, packageCount: 20, receivedPalletCount: 0, allocatedPalletCount: 0, shippedPalletCount: 0, totalWeightKg: '1200.000', totalVolumeCbm: '16.500', budgetAmount: '850.00', currency: 'USD', contactName: 'Bob', contactInfo: '10010', requestedDate: '2026-08-28', status: 'PENDING_REVIEW', version: 1, createdAt: '2026-08-01T10:00:00', updatedAt: '2026-08-02T10:00:00' }
const truckDetail: LocalTransportDetail = { ...truck, originAddress: 'Pier A', destinationAddress: 'Warehouse B', remark: null, createdBy: '7', pallets: [], histories: [] }
-const looseboard: LocalLooseboardOrder = { id: '9007199254740997', customerId: '10003', orderNo: 'LB-300', transportMode: 'SHARED_TRUCK', palletRequired: 'YES', transportType: 'WAREHOUSE_TO_WAREHOUSE', origin: 'LA', destination: 'ONT', containerType: null, packageCount: 8, totalWeightKg: '80.5', totalVolumeCbm: '3.2', budgetAmount: '50.00', currency: 'USD', contactName: null, contactInfo: null, requestedDate: null, status: 'PENDING_ACCEPTANCE', version: 0, createdAt: '2026-08-01T10:00:00', updatedAt: '2026-08-01T10:00:00' }
+const looseboard: LocalLooseboardOrder = { id: '9007199254740997', customerId: '10003', orderNo: 'LB-300', transportMode: 'SHARED_TRUCK', palletRequired: 'YES', transportType: 'WAREHOUSE_TO_WAREHOUSE', origin: 'LA', destination: 'ONT', containerType: '40HQ', packageCount: 8, totalWeightKg: '80.5', totalVolumeCbm: '3.2', budgetAmount: '50.00', currency: 'USD', contactName: null, contactInfo: null, requestedDate: null, status: 'PENDING_ACCEPTANCE', version: 0, createdAt: '2026-08-01T10:00:00', updatedAt: '2026-08-01T10:00:00' }
const looseboardDetail: LocalLooseboardDetail = { ...looseboard, originAddress: null, destinationAddress: null, remark: null, createdBy: '7', histories: [] }
function activatePermissions() { const pinia = createPinia(); setActivePinia(pinia); const auth = useAuthStore(); auth.token = 'test-token'; auth.permissions = ['platform:overseas-business:purchase:list', 'platform:overseas-business:purchase:edit', 'platform:overseas-business:purchase:review', 'platform:overseas-business:truck:list', 'platform:overseas-business:truck:create', 'platform:overseas-business:truck:edit', 'platform:overseas-business:looseboard:list', 'platform:overseas-business:looseboard:create', 'platform:overseas-business:looseboard:edit']; useAccessPreviewStore().initializeAfterLogin(); return pinia }
@@ -64,13 +64,50 @@ describe('overseas business mounted pages', () => {
vi.mocked(listPlatformTenants).mockReset().mockResolvedValue({ records: [{ id: '10001', tenantName: '可选客户', status: 'ACTIVE' } as never], page: 1, size: 200, total: 1, pages: 1 })
})
+
+ it('keeps all procurement facts in dense groups and business references in the heading', async () => {
+ routing.route.params = { purchaseId: 'internal-purchase-route' }; routing.route.query = { customerId: '10001' }
+ const wrapper = mountPage(PurchaseOrderDetailView)
+ await flushPromises()
+ expect(wrapper.get('.density-detail-title').text()).toBe('OP-100')
+ expect(wrapper.get('[aria-label="采购订单概览"]').text()).toContain('洛杉矶采购仓')
+ expect(wrapper.findAll('.density-fields')).toHaveLength(4)
+ expect(wrapper.findAll('.density-fields dt')).toHaveLength(23)
+ expect(wrapper.findAll('.density-fields .wide')).toHaveLength(4)
+ expect(wrapper.text()).not.toContain('internal-purchase-route')
+ await wrapper.get('.density-back').trigger('click')
+ expect(routing.push).toHaveBeenCalledWith({ name: 'overseas-business-purchases' })
+ })
+
+ it('retains the voucher upload and fee dialog workflow with teleported density', async () => {
+ routing.route.params = { purchaseId: 'OP-100' }; routing.route.query = { customerId: '10001' }
+ const voucher = { id: 'voucher-1', fileId: 'file-1', fileName: 'voucher.pdf', category: 'VOUCHER' as const, contentType: 'application/pdf', sizeBytes: 3, createdAt: '2026-09-14T10:00:00' }
+ vi.mocked(uploadOverseasPurchaseFile).mockReset().mockResolvedValue(voucher)
+ vi.mocked(createOverseasPurchaseFee).mockReset().mockResolvedValue({ id: 'fee-1', feeNo: 'FEE-1', feeItemCode: 'COURIER', feeItemName: '快递费', amount: '25', currency: 'CNY', voucherFileId: 'file-1', voucherFileName: 'voucher.pdf', remark: null, walletStatus: 'FREEZE_PENDING', walletErrorMessage: null, createdAt: '2026-09-14T10:00:00' })
+ const wrapper = mountPage(PurchaseOrderDetailView)
+ await flushPromises()
+ const input = wrapper.findAll('input[type="file"]')[1]!
+ const file = new File(['pdf'], 'voucher.pdf', { type: 'application/pdf' })
+ Object.defineProperty(input.element, 'files', { value: [file], configurable: true })
+ await input.trigger('change'); await flushPromises()
+ expect(uploadOverseasPurchaseFile).toHaveBeenCalledWith('OP-100', '10001', 'VOUCHER', file)
+ const dialog = wrapper.findAllComponents(AppDialog)[1]!
+ expect(dialog.props('modelValue')).toBe(true)
+ expect(document.querySelector('.admin-density-dialog .density-form')).not.toBeNull()
+ dialog.findComponent({ name: 'ElInputNumber' }).vm.$emit('update:modelValue', 25)
+ await wrapper.vm.$nextTick()
+ dialog.vm.$emit('confirm'); await flushPromises()
+ expect(createOverseasPurchaseFee).toHaveBeenCalledWith('OP-100', '10001', expect.objectContaining({ amount: 25, voucherFileId: 'file-1' }))
+ expect(dialog.props('modelValue')).toBe(false)
+ })
+
it('mounts procurement list with customer candidates and real data', async () => { const wrapper = mountPage(PurchaseOrdersView); await flushPromises(); expect(listOverseasPurchaseCustomerOptions).toHaveBeenCalled(); expect(listOverseasPurchases).toHaveBeenCalledWith({ page: 1, size: 20, customerId: '', orderNo: '', purchaseCategory: '', productName: '' }); expect(wrapper.text()).toContain('OP-100'); expect(wrapper.text()).toContain('待出库'); expect(wrapper.text()).toContain('2026-08-01 10:00') })
it('refreshes the cached procurement list after returning from detail or edit', () => { expect(purchaseListSource).toContain('onActivated'); expect(purchaseListSource).toMatch(/onActivated\(\(\) => \{ if \(activatedOnce\) void load\(\)/) })
it('refreshes the cached procurement detail after an edit completes', () => { expect(purchaseDetailSource).toContain('onActivated'); expect(purchaseDetailSource).toMatch(/onActivated\(\(\) => \{ if \(activatedOnce\) void load\(\)/) })
it('paginates procurement results', async () => { vi.mocked(listOverseasPurchases).mockResolvedValue({ records: [purchase], page: 1, size: 20, total: 40, pages: 2 }); const wrapper = mountPage(PurchaseOrdersView); await flushPromises(); await wrapper.find('button[aria-label="第 2 页"]').trigger('click'); await flushPromises(); expect(listOverseasPurchases).toHaveBeenLastCalledWith(expect.objectContaining({ page: 2 })) })
it('renders procurement empty and traceable 403 states', async () => { vi.mocked(listOverseasPurchases).mockResolvedValueOnce({ records: [], page: 1, size: 20, total: 0, pages: 0 }); let wrapper = mountPage(PurchaseOrdersView); await flushPromises(); expect(wrapper.text()).toContain('暂无符合筛选条件的海外采购订单'); wrapper.unmount(); vi.mocked(listOverseasPurchases).mockRejectedValue(new ApiResponseError('forbidden', 'A0403', 403, null, 'REQ-403')); wrapper = mountPage(PurchaseOrdersView); await flushPromises(); expect(wrapper.text()).toContain('当前账号无权访问该数据'); expect(wrapper.text()).toContain('REQ-403') })
it('mounts procurement detail operation history without exposing internal operator ids', async () => { routing.route.params = { purchaseId: 'OP-100' }; routing.route.query = { customerId: '10001' }; const wrapper = mountPage(PurchaseOrderDetailView); await flushPromises(); expect(getOverseasPurchase).toHaveBeenCalledWith('OP-100', '10001'); expect(wrapper.text()).toContain('操作流水'); expect(wrapper.text()).toContain('编辑'); expect(wrapper.text()).not.toContain('INTERNAL-OPERATOR-7') })
- it('reviews a pending procurement from its detail page', async () => { const pending = { ...purchase, status: 'PENDING_REVIEW' as const, inboundQuantity: 0, inventoryQuantity: 0, version: 2 }; routing.route.params = { purchaseId: 'OP-100' }; routing.route.query = { customerId: '10001' }; vi.mocked(getOverseasPurchase).mockResolvedValue(pending); vi.mocked(reviewOverseasPurchase).mockResolvedValue({ ...pending, status: 'APPROVED', version: 3 }); const wrapper = mountPage(PurchaseOrderDetailView); await flushPromises(); await wrapper.findAll('button').find((button) => button.text().includes('通过'))?.trigger('click'); await wrapper.vm.$nextTick(); const reviewDialog = wrapper.findAllComponents(AppDialog)[0]; expect(reviewDialog.props('modelValue')).toBe(true); reviewDialog.vm.$emit('confirm'); await flushPromises(); expect(reviewOverseasPurchase).toHaveBeenCalledWith('OP-100', '10001', expect.objectContaining({ version: 2, decision: 'APPROVE', idempotencyKey: expect.any(String) })); expect(wrapper.text()).toContain('已通过'); expect(wrapper.find('.header-actions').text()).toBe('返回') })
+ it('reviews a pending procurement from its detail page', async () => { const pending = { ...purchase, status: 'PENDING_REVIEW' as const, inboundQuantity: 0, inventoryQuantity: 0, version: 2 }; routing.route.params = { purchaseId: 'OP-100' }; routing.route.query = { customerId: '10001' }; vi.mocked(getOverseasPurchase).mockResolvedValue(pending); vi.mocked(reviewOverseasPurchase).mockResolvedValue({ ...pending, status: 'APPROVED', version: 3 }); const wrapper = mountPage(PurchaseOrderDetailView); await flushPromises(); await wrapper.findAll('button').find((button) => button.text().includes('通过'))?.trigger('click'); await wrapper.vm.$nextTick(); const reviewDialog = wrapper.findAllComponents(AppDialog)[0]; expect(reviewDialog.props('modelValue')).toBe(true); reviewDialog.vm.$emit('confirm'); await flushPromises(); expect(reviewOverseasPurchase).toHaveBeenCalledWith('OP-100', '10001', expect.objectContaining({ version: 2, decision: 'APPROVE', idempotencyKey: expect.any(String) })); expect(wrapper.text()).toContain('已通过'); expect(wrapper.find('.header-actions').exists()).toBe(false); expect(wrapper.get('.density-back').text()).toBe('返回列表') })
it('submits procurement explicit null clears and keeps a 409 visible without local overwrite', async () => { routing.route.params = { purchaseId: 'OP-100' }; routing.route.query = { customerId: '10001' }; vi.mocked(updateOverseasPurchase).mockRejectedValue(new ApiResponseError('订单版本冲突，请刷新后重试', 'B0409', 409)); const wrapper = mountPage(PurchaseOrderEditView); await flushPromises(); const productUrl = wrapper.findAll('.el-form-item').find((item) => item.text().startsWith('商品链接'))!.find('input'); const domesticCarrier = wrapper.findAll('.el-form-item').find((item) => item.text().startsWith('国内承运商'))!.find('input'); await productUrl.setValue(''); await domesticCarrier.setValue(''); wrapper.findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', null); wrapper.findComponent({ name: 'ElDatePicker' }).vm.$emit('update:modelValue', null); await wrapper.vm.$nextTick(); await wrapper.findAll('button').find((button) => button.text().trim() === '保存')?.trigger('click'); await flushPromises(); expect(updateOverseasPurchase).toHaveBeenCalledWith('OP-100', '10001', expect.objectContaining({ version: 3, productUrl: null, domesticCarrier: null, estimatedArrivalAt: null, purchaseWarehouseId: null })); expect(document.body.textContent).toContain('订单版本冲突，请刷新后重试'); expect((productUrl.element as HTMLInputElement).value).toBe(''); expect((domesticCarrier.element as HTMLInputElement).value).toBe(''); expect(routing.push).not.toHaveBeenCalled() })
it('keeps procurement list usable when customer candidates fail', async () => { vi.mocked(listOverseasPurchaseCustomerOptions).mockRejectedValue(new Error('candidate unavailable')); const wrapper = mountPage(PurchaseOrdersView); await flushPromises(); expect(listOverseasPurchases).toHaveBeenCalled(); expect(wrapper.text()).toContain('OP-100'); expect(wrapper.text()).not.toContain('candidate unavailable') })
it('loads procurement edit data but blocks unsafe warehouse selection when candidates fail', async () => { routing.route.params = { purchaseId: 'OP-100' }; routing.route.query = { customerId: '10001' }; vi.mocked(listOverseasPurchaseWarehouseOptions).mockRejectedValue(new Error('candidate unavailable')); const wrapper = mountPage(PurchaseOrderEditView); await flushPromises(); expect(getOverseasPurchase).toHaveBeenCalledWith('OP-100', '10001'); expect(wrapper.text()).toContain('采购仓候选加载失败'); expect(wrapper.text()).toContain('OP-100') })
diff --git a/src/modules/overseas-business/pages/PurchaseOrderDetailView.vue b/src/modules/overseas-business/pages/PurchaseOrderDetailView.vue
index bcc61857..f6745f59 100644
--- a/src/modules/overseas-business/pages/PurchaseOrderDetailView.vue
+++ b/src/modules/overseas-business/pages/PurchaseOrderDetailView.vue
@@ -1,4 +1,5 @@
-
-
+
+
| 操作 | 柜型 | 箱种 | 数量 | 容量 | 限重 | 剩余可关联 |
|---|---|---|---|---|---|---|
|
|
@@ -445,7 +444,7 @@ onMounted(() => { void load(); void loadOptions() })
状态历史
当前进度：{{ statusLabel(detail.status) }}
{{ event.operatorName || '系统' }} · {{ event.reason }}
| 时间 | 状态变化 | 操作人 | 备注 |
|---|---|---|---|
| {{ event.occurredAt }} | {{ statusLabel(event.fromStatus) }} → {{ statusLabel(event.toStatus) }} | {{ event.operatorName || '系统' }} | {{ event.reason || '—' }} |
| 暂无状态历史 | |||
海外采购订单详情
订单编号：{{ detail?.orderNo || purchaseId || '—' }}
+
+
+ {{ detail?.orderNo || '—' }}
- 客户
- {{ display(detail.customerName) }}
- 采购仓库
- {{ display(detail.purchaseWarehouseName) }}
- 采购数量
- {{ display(detail.purchaseQuantity) }}
- 入库量
- {{ display(detail.inboundQuantity) }}
- 出库量
- {{ display(detail.outboundQuantity) }}
- 库存量
- {{ display(detail.inventoryQuantity) }}
+
-
-
+
-
+ 删除
+
- 详情 编辑
共 {{ total }} 条海外采购订单
-
+
-
+ {{ item.label }} 是 否 {{ item.label }} {{ form.currency }} {{ item.label }} 是 否 {{ item.label }} {{ form.currency }}
+
编辑
+
{{ item.label }}{{ item.value }}
-
+
编辑 {{ (row as MonthlyExchangeRate).status === 'ACTIVE' ? '停用' : '启用' }}
1 USD = {{ (row as MonthlyExchangeRate).usdToCnyAverage }} CNY{{ (row as MonthlyExchangeRate).status === 'ACTIVE' ? '启用' : '停用' }}
{
vi.mocked(api.getVehicle).mockResolvedValue(vehicle)
})
+ it.each([
+ [OverseasQuotesView, ['详情', '编辑', '停用']],
+ [VehiclesView, ['查看', '编辑', '状态']],
+ [ExchangeRatesView, ['编辑', '停用']],
+ ])('keeps all available actions visible without an unnecessary overflow menu', async (component, labels) => {
+ const wrapper = mountView(component)
+ await flushPromises()
+ const actions = wrapper.get('.density-actions')
+ const expected = component === OverseasQuotesView ? ['详情', '编辑', '启用'] : labels
+ expect(actions.findAll('button').map(button => button.text().trim())).toEqual(expected)
+ expect(actions.findAll('button').every(button => button.classes().includes('density-action'))).toBe(true)
+ expect(actions.find('el-dropdown-stub').exists()).toBe(false)
+ })
+
it('keeps quote edit open, sends only update fields, and shows A0409 request ID', async () => {
vi.mocked(api.updateQuote).mockRejectedValue(new ApiResponseError('记录版本已变化', 'A0409', 200, null, 'req-quote-409'))
const wrapper = mountView(OverseasQuotesView)
diff --git a/src/modules/overseas-master-data/pages/OverseasQuotesView.vue b/src/modules/overseas-master-data/pages/OverseasQuotesView.vue
index 2f0b0e0b..49b13606 100644
--- a/src/modules/overseas-master-data/pages/OverseasQuotesView.vue
+++ b/src/modules/overseas-master-data/pages/OverseasQuotesView.vue
@@ -1,6 +1,7 @@
-
+
详情 编辑 {{(row as OverseasWarehouseQuote).status==='ACTIVE'?'停用':'启用'}}
{{(row as OverseasWarehouseQuote).status==='ACTIVE'?'启用':'停用'}}
仓储作业费用
删除 中转派送价格
删除 仓储作业费用
删除 中转派送价格
删除 {{(row as VehicleDetail).status}} {{(row as VehicleDetail).region==='OVERSEAS'?'海外':'国内'}}查看 编辑 状态 {{vehicleStatusLabels[(row as VehicleDetail).status]}} {{(row as VehicleDetail).region==='OVERSEAS'?'海外':'国内'}} = {
+ IN_SERVICE: '在役',
+ DISPATCHED: '外派中',
+ MAINTENANCE: '维修中',
+ INACTIVE: '停用',
+ RETURNED: '已归还',
+}
diff --git a/src/modules/overseas-warehouse/AGENTS.md b/src/modules/overseas-warehouse/AGENTS.md
index 24844581..56b1b3ca 100644
--- a/src/modules/overseas-warehouse/AGENTS.md
+++ b/src/modules/overseas-warehouse/AGENTS.md
@@ -1,5 +1,10 @@
# Admin 海外仓模块指引
+## 样式入口
+
+- 导航“海外仓”的 10 个菜单及关联详情/弹框采用公共密度样式，逐操作范围见 [海外仓样式核对记录](../../../../../docs/Admin海外仓样式核对记录.md)。不要扩展到客户服务、海外业务或未注册产品/箱号页面。
+- 独立页面直接导入 `@/styles/adminDensity.css`；`OverseasDetailShell`、`OverseasReadOnlyDetail` 与共享 `InboundCodeRelationshipDialog` 仅为显式 `dense` 调用启用。正文在 `el-tab-pane` 内的页签必须同时使用 `density-contained-tabs`。
+
## 读取与路径基准
- 本文件适用于 `src/modules/overseas-warehouse/`，路径默认相对此目录；其他模块以 `../` 开头。应用公共规则见 `../../../AGENTS.md`。
@@ -13,17 +18,19 @@
| 关键词 | 页面/路由入口 | API 与联查 |
|---|---|---|
| 仓储转运审核、通过与驳回 | `pages/LastMileOrdersView.vue`、`components/WarehouseTransferReviewDialog.vue` | `api/warehouseTransfers.ts` 的列表、详情及 `/warehouse-transfers/{transferNo}/review`；审核按钮要求 `permissions.ts` 的 `warehouseTransferApprove` 且行类型为 `WAREHOUSE_TRANSFER`、状态为 `PENDING_REVIEW`。请求携带该行客户范围和转运单号，审核结论为 `APPROVE/REJECT`，驳回原因必填；这是尾程订单内的审核弹框，不是独立审核路由或排车转派送入口 |
-| 尾程订单控制与柜级入仓计划转换 | `pages/LastMileOrdersView.vue`、`pages/LastMileOrderDetailView.vue` | 柜子工作台按 `sourceContainerBookingId` 消费 `/orders/container-summaries`；服务端分页返回全部稳定来源柜，计划已经齐全的柜仍保留用于接柜仓查询和修改，并按冻结 `plannedArrivalAt` 升序、空值最后排序。详情返回全柜订单且不受列表分页截断；单票手工计划保存后，由服务端在整柜最后一票计划齐全时自动生成并绑定全柜托盘码，一票柜立即生成；`resourcePendingPlanCount` 只表示自动生成异常的重试入口，不是正常人工步骤。柜级确认弹框先调用 `/inbound-plans/container-preview`，按服务端 FBA/一件代发/私人地址分组展示头程已有、海外仓补充和最终托数以及 `readiness/blockers`；散货最终托数不得少于头程已有托盘码，差额连续补码且不阻断流程；一件代发必须严格按不可变头程封托托盘数整体入库，单票表单托数锁定且服务端再次失败关闭校验。前端不计算托数、不逐票建计划、不预占托盘，再把同一 `snapshotVersion/snapshotHash` 原样提交 `/inbound-plans/convert-container`，快照冲突后重新获取预览。服务端只为剩余订单逐票生成独立计划，并为异常遗留的人工计划补齐真实托盘，整批原子且重放不得产生第二批资源。单票完整入库计划、暂扣/解除和八行人工节点均从 `api/lastMileOrders.ts` 提交订单版本与幂等键；入仓码只读展示并提交订单冻结值，不允许人工改写，暂扣资格、接柜仓锁定原因和操作能力只消费服务端结果，人工节点一经保存不得回退柜级节点。转仓候选只取 `../iam/api/platformIam.ts` 的平台公共 `ACTIVE + FBA` 仓主档；Backend `lastleg-service/` |
+| 尾程订单控制与柜级入仓计划转换 | `pages/LastMileOrdersView.vue`、`pages/LastMileOrderDetailView.vue` | 柜子工作台按 `sourceContainerBookingId` 消费 `/orders/container-summaries`；服务端分页返回全部稳定来源柜，计划已经齐全的柜仍保留用于接柜仓查询和修改，并按冻结 `plannedArrivalAt` 升序、空值最后排序。详情返回全柜订单且不受列表分页截断；单票手工计划保存后，由服务端在整柜最后一票计划齐全时自动生成并绑定全柜托盘码，一票柜立即生成；`resourcePendingPlanCount` 只表示自动生成异常的重试入口，不是正常人工步骤。柜级确认弹框先调用 `/inbound-plans/container-preview`，按服务端 FBA/一件代发/私人地址分组展示头程已有、海外仓补充和最终托数以及 `readiness/blockers`；散货最终托数不得少于头程已有托盘码，差额连续补码且不阻断流程；一件代发必须严格按不可变头程封托托盘数整体入库，单票表单托数锁定且服务端再次失败关闭校验。前端不计算托数、不逐票建计划、不预占托盘，再把同一 `snapshotVersion/snapshotHash` 原样提交 `/inbound-plans/convert-container`，快照冲突后重新获取预览。服务端只为剩余订单逐票生成独立计划，并为异常遗留的人工计划补齐真实托盘，整批原子且重放不得产生第二批资源。单票完整入库计划、暂扣/解除和八行人工节点均从 `api/lastMileOrders.ts` 提交订单版本与幂等键；预计到仓时间只读展示来源柜冻结值，不进入人工计划请求，服务端按整柜校验并写入同一日期；入仓码只读展示并提交订单冻结值，不允许人工改写，暂扣资格、接柜仓锁定原因和操作能力只消费服务端结果，人工节点一经保存不得回退柜级节点。转仓候选只取 `../iam/api/platformIam.ts` 的平台公共 `ACTIVE + FBA` 仓主档；Backend `lastleg-service/` |
| 入仓单、入仓计划、FBA 预约 | `pages/InboundOrdersView.vue`、`pages/InboundOrderDetailView.vue` | 列表/预约 `api/inboundOrders.ts`，计划列表/详情 `api/inboundPlans.ts`；Backend `lastleg-service/inboundplan/` |
-| 排车查询、智能预排与转派送 | `pages/DispatchesView.vue`、`pages/DispatchDetailView.vue`、`components/SmartDispatchDialog.vue` | `api/dispatches.ts`；Backend `lastleg-service/dispatch/`、`delivery/`；覆盖详情、候选、草稿柜、托盘锁、`pre-arrange` 和 `transfer-delivery`。页面能力必须由正式路由、API 调用和测试共同证明 |
-| 海外出库与派送 | `pages/OutboundsView.vue`、`pages/OutboundDetailView.vue`、`pages/DeliveryOrdersView.vue`、`pages/DeliveryOrderDetailView.vue` | `api/outbounds.ts`、`api/deliveryOrders.ts`；出库列表按类型筛选并展示中文类型。一件代发新建弹窗直接跨客户加载服务端可用候选，不单独展示客户筛选，海外仓必选并优先默认洛杉矶仓；订单条件可按订单号、入库单号、客户、托盘号、SKU 或品名查询/重置，以托盘+SKU 行分页多选。提交时从所选行解析唯一客户，并校验所选行属于当前唯一海外仓，不要求先选客户。退货出库客户下拉同时展示客户名称与联系电话并支持手机号检索，客户和仓库选项独立容错加载；选择客户后须立即按当前默认/已选海外仓加载库存。SKU 与箱号查询均使用输入态/已查询态分离，只允许点击查询按钮后生效；支持英文逗号批量条件，查询时清除空格并按任一条件命中，左右列表分别提供每页 5/10/20/50 条选择。SKU 列表只展示 `availableQuantity > 0` 的未占用可用数量，合箱后已扣减为零的 SKU 不再作为可选库存显示，实际作业以可用箱唛选择和箱内 SKU 明细扣减为准。取消、派送列表/详情及退回入口对应 Backend `lastleg-service/delivery/`、`dropship/` |
+| 排车查询、智能预排与转派送 | `pages/DispatchesView.vue`、`pages/DispatchDetailView.vue`、`components/SmartDispatchDialog.vue` | `api/dispatches.ts`；Backend `lastleg-service/dispatch/`、`delivery/`；覆盖详情、候选、草稿柜、托盘锁、`pre-arrange` 和 `transfer-delivery`。路线只读并由已排托盘关联的 FBA 仓去重后以英文逗号连接，预排和普通编辑均不接收人工路线。一次转派送仍生成一张车辆级出库单，响应的 `deliveries` 按目的 FBA 仓返回多张派送单。页面能力必须由正式路由、API 调用和测试共同证明 |
+| 海外出库与派送 | `pages/OutboundsView.vue`、`pages/OutboundDetailView.vue`、`pages/DeliveryOrdersView.vue`、`pages/DeliveryOrderDetailView.vue` | `api/outbounds.ts`、`api/deliveryOrders.ts`；出库详情使用 `deliveries` 展示按目的 FBA 仓拆出的全部派送单，派送列表和详情必须显示目的 FBA 仓。人工状态入口不提供完成派送；签收资料保存成功后提示自动完成并刷新列表。出库列表按类型筛选并展示中文类型。一件代发新建弹窗直接跨客户加载服务端可用候选，不单独展示客户筛选，海外仓必选并优先默认洛杉矶仓；订单条件可按订单号、入库单号、客户、托盘号、SKU 或品名查询/重置，以托盘+SKU 行分页多选。提交时从所选行解析唯一客户，并校验所选行属于当前唯一海外仓，不要求先选客户。退货出库客户下拉同时展示客户名称与联系电话并支持手机号检索，客户和仓库选项独立容错加载；选择客户后须立即按当前默认/已选海外仓加载库存。SKU 与箱号查询均使用输入态/已查询态分离，只允许点击查询按钮后生效；支持英文逗号批量条件，查询时清除空格并按任一条件命中，左右列表分别提供每页 5/10/20/50 条选择。SKU 列表只展示 `availableQuantity > 0` 的未占用可用数量，合箱后已扣减为零的 SKU 不再作为可选库存显示，实际作业以可用箱唛选择和箱内 SKU 明细扣减为准。取消、派送列表/详情及退回入口对应 Backend `lastleg-service/delivery/`、`dropship/` |
| 异常退回与客户回访 | `pages/ExceptionOrdersView.vue`、`pages/CustomerVisitsView.vue` | `api/exceptionOrders.ts`、`api/customerVisits.ts`；异常关系解析、异常建档、派送退回、完成/状态和回访附件对应 Backend `lastleg-service/exceptionorder/`、`customervisit/` |
| 库存余额、库位与流水 | `pages/InventoryView.vue`、`pages/InventoryDetailView.vue`、`pages/InventoryTransactionsView.vue` | `api/inventory.ts`；业务库存归 `lastleg-service/inventory/`，实物资源归 `warehouse-overseas-service/` |
| 托盘、箱唛、产品与换标 | `pages/PalletsView.vue`、`pages/CartonsView.vue`、`pages/ProductsView.vue`、`pages/RelabelOrdersView.vue` 及详情页 | `api/pallets.ts`、`api/relabelOrders.ts`；换标详情展示 PDA 完工照片与复核人，状态区分待客户确认和待出库；路由是否公开以 `routes.ts` 为准 |
## 履约硬边界
-- API 为 `api/dispatches.ts`、`api/outbounds.ts`、`api/deliveryOrders.ts`；Backend `lastleg-service/dispatch/`、`delivery/`、`dropship/`。一件代发独立出库，从服务端库存位置选择并携带幂等键；普通出库及换标单经头程排车转出库，按托盘快照绑定头程箱唛，PDA 按托盘作业，详情展示箱唛与已拣数量；排车转派送按稳定 `dispatchNo` 进入服务端命令，可在 `PENDING_DEPARTURE`、`PICKING`、`READY_TO_DEPART` 状态执行并须在 PDA 发车前生成待出库单
+- 托盘管理单张打印：`pages/PalletsView.vue` 每行“打印”经 `api/pallets.ts` 的 `getPalletLabelPdf` 下载当前托盘一页 PDF；使用该行仓库 ID 与托盘 ID，权限复用托盘列表。Backend `warehouse-overseas-service` 的 `PalletLabelPrintService` 读取公共托盘并调用现有 Print `INBOUND_MARK_V1`，不在前端生成标签、改码或维护第二套模板。
+
+- API 为 `api/dispatches.ts`、`api/outbounds.ts`、`api/deliveryOrders.ts`；Backend `lastleg-service/dispatch/`、`delivery/`、`dropship/`。一件代发独立出库，从服务端库存位置选择并携带幂等键；普通出库及换标单经头程排车转出库，按托盘快照绑定头程箱唛，PDA 按托盘作业，详情展示箱唛与已拣数量；排车转派送按稳定 `dispatchNo` 进入服务端命令，可在 `PENDING_DEPARTURE`、`PICKING`、`READY_TO_DEPART` 状态执行并须在 PDA 发车前生成一张待出库单及按目的 FBA 仓拆分的派送单
- API 为 `api/exceptionOrders.ts`、`api/customerVisits.ts`；Backend `lastleg-service/exceptionorder/`、`customervisit/`。异常处理只消费服务端 `allowedActions/version`；完成时至少上传一份异常证据。派送退回先从服务端原出库拣货事实选择入仓单和可退箱数，不允许自由填写 SKU/数量；退回海外仓时必须选择服务端校验的目标托盘和库位，库存恢复、异常完成与派送 `RETURNED` 由服务端原子推进。回访附件和派送完成/状态均走海外真实 API
## 验证
diff --git a/src/modules/overseas-warehouse/api/customerVisits.test.ts b/src/modules/overseas-warehouse/api/customerVisits.test.ts
index 389a5bf2..dd45827e 100644
--- a/src/modules/overseas-warehouse/api/customerVisits.test.ts
+++ b/src/modules/overseas-warehouse/api/customerVisits.test.ts
@@ -27,10 +27,10 @@ describe('customer visit API', () => {
expect(overseasHttp.get).toHaveBeenNthCalledWith(2, '/platform/v1/last-leg/customer-visits/9', { params: { customerId: '100' } })
})
- it('updates delivery status so selecting delivered can generate a visit', async () => {
- vi.mocked(overseasHttp.put).mockResolvedValue({ code: '200', data: { deliveryStatus: 'DELIVERED' } })
- await updateDeliveryOrderStatus('DEL/1', '100', { status: 'DELIVERED', expectedVersion: 7, remark: '完成' })
- expect(overseasHttp.put).toHaveBeenCalledWith('/platform/v1/last-leg/delivery-orders/DEL%2F1/status', { status: 'DELIVERED', expectedVersion: 7, remark: '完成' }, { params: { customerId: '100' } })
+ it('updates a delivery to an operator-managed nonterminal status', async () => {
+ vi.mocked(overseasHttp.put).mockResolvedValue({ code: '200', data: { deliveryStatus: 'DELIVERING' } })
+ await updateDeliveryOrderStatus('DEL/1', '100', { status: 'DELIVERING', expectedVersion: 7, remark: '开始派送' })
+ expect(overseasHttp.put).toHaveBeenCalledWith('/platform/v1/last-leg/delivery-orders/DEL%2F1/status', { status: 'DELIVERING', expectedVersion: 7, remark: '开始派送' }, { params: { customerId: '100' } })
})
it('uploads and saves repeatable visit material', async () => {
diff --git a/src/modules/overseas-warehouse/api/customerVisits.ts b/src/modules/overseas-warehouse/api/customerVisits.ts
index 5e8674ff..df84a332 100644
--- a/src/modules/overseas-warehouse/api/customerVisits.ts
+++ b/src/modules/overseas-warehouse/api/customerVisits.ts
@@ -99,14 +99,6 @@ export async function uploadCustomerVisitAttachment(visitId: string, customerId:
return unwrapApiResponse(response)
}
-export async function completeDeliveryOrder(deliveryNo: string, customerId: string) {
- const response = await overseasHttp.post, ApiEnvelope<{ visitId: string; deliveryNo: string; deliveryStatus: string; visitStatus: string; replayed: boolean }>>(
- `/platform/v1/last-leg/delivery-orders/${encodeURIComponent(deliveryNo)}/complete`, undefined,
- { params: { customerId } },
- )
- return unwrapApiResponse(response)
-}
-
export async function updateDeliveryOrderStatus(deliveryNo: string, customerId: string, payload: { status: string; expectedVersion: number; remark?: string }) {
const response = await overseasHttp.put, ApiEnvelope<{ visitId?: string | null; deliveryNo: string; deliveryStatus: string; visitStatus?: string | null; replayed: boolean }>>(
`/platform/v1/last-leg/delivery-orders/${encodeURIComponent(deliveryNo)}/status`, payload,
diff --git a/src/modules/overseas-warehouse/api/deliveryOrders.ts b/src/modules/overseas-warehouse/api/deliveryOrders.ts
index 9aa54e71..02a8eaa5 100644
--- a/src/modules/overseas-warehouse/api/deliveryOrders.ts
+++ b/src/modules/overseas-warehouse/api/deliveryOrders.ts
@@ -30,6 +30,9 @@ export interface DeliveryOrderRow {
deliveryNo: string
outboundNo: string
dispatchNo: string
+ destinationWarehouseId?: string | null
+ destinationWarehouseCode?: string | null
+ destinationWarehouseName?: string | null
overseasWarehouseId?: string | null
overseasWarehouseName?: string | null
status: string
diff --git a/src/modules/overseas-warehouse/api/dispatches.test.ts b/src/modules/overseas-warehouse/api/dispatches.test.ts
index 67500466..4468258d 100644
--- a/src/modules/overseas-warehouse/api/dispatches.test.ts
+++ b/src/modules/overseas-warehouse/api/dispatches.test.ts
@@ -48,9 +48,9 @@ describe('dispatch overseas API', () => {
vi.mocked(overseasHttp.get).mockResolvedValue({ code: '200', message: 'success', data: [] })
vi.mocked(overseasHttp.post).mockResolvedValue({ code: '200', message: 'success', data: { id: '1', dispatchNo: 'PC-1' } })
await listDispatchCandidates({ planIds: '101,102', fbaWarehouseCode: 'ONT8', sourceStage: 'PLAN' })
- await preArrangeDispatch({ planPalletIds: ['190000000000000099'], route: 'LAX -> ONT8' })
+ await preArrangeDispatch({ planPalletIds: ['190000000000000099'] })
expect(overseasHttp.get).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/candidates', { params: { planIds: '101,102', fbaWarehouseCode: 'ONT8', sourceStage: 'PLAN' } })
- expect(overseasHttp.post).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/pre-arrange', { planPalletIds: ['190000000000000099'], route: 'LAX -> ONT8' })
+ expect(overseasHttp.post).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/pre-arrange', { planPalletIds: ['190000000000000099'] })
})
it('loads platform candidates without selected inbound plans', async () => {
@@ -78,15 +78,15 @@ describe('dispatch overseas API', () => {
it('edits and cancels only by dispatchNo without customer scope or status mutation', async () => {
vi.mocked(overseasHttp.put).mockResolvedValue({ code: '200', message: 'success', data: { id: '1', dispatchNo: 'PC/1' } })
vi.mocked(overseasHttp.delete).mockResolvedValue({ code: '200', message: 'success', data: null })
- await updateDispatch('PC/1', { vehiclePlate: 'CA-100', route: 'LAX → ONT8' })
+ await updateDispatch('PC/1', { vehiclePlate: 'CA-100' })
await cancelDispatch('PC/1')
- expect(overseasHttp.put).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/PC%2F1', { vehiclePlate: 'CA-100', route: 'LAX → ONT8' })
+ expect(overseasHttp.put).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/PC%2F1', { vehiclePlate: 'CA-100' })
expect(overseasHttp.put).not.toHaveBeenCalledWith(expect.anything(), expect.objectContaining({ status: expect.anything() }))
expect(overseasHttp.delete).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/PC%2F1')
})
it('transfers to delivery only by dispatchNo without customerId', async () => {
- vi.mocked(overseasHttp.post).mockResolvedValue({ code: '200', message: 'success', data: { dispatchNo: 'PC/1', outboundNo: 'OUT-1', deliveryNo: 'DEL-1' } })
+ vi.mocked(overseasHttp.post).mockResolvedValue({ code: '200', message: 'success', data: { dispatchNo: 'PC/1', outboundNo: 'OUT-1', outboundStatus: 'PICKED', palletCount: 2, packageCount: 20, deliveries: [{ deliveryNo: 'DEL-1', deliveryStatus: 'WAIT_DELIVERY', destinationWarehouseCode: 'ACY2', palletCount: 2, packageCount: 20 }], replayed: false } })
const payload = { idempotencyKey: 'transfer-1', plannedDeliveryAt: '2026-09-01T10:00:00', deliveryMethod: 'TRUCK_PALLET', pickupMethod: 'WAREHOUSE_PICKUP', loadingType: 'PALLET', fees: [{ feeType: 'DELIVERY_FEE', feeName: '派送费用', direction: 'RECEIVABLE' as const, currency: 'USD' as const, amount: 10 }] }
await transferDispatchToDelivery('PC/1', payload)
expect(overseasHttp.post).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/PC%2F1/transfer-delivery', payload)
@@ -94,15 +94,15 @@ describe('dispatch overseas API', () => {
it('loads drafts and preserves long container ids in create and delete paths', async () => {
vi.mocked(overseasHttp.get).mockResolvedValue({ code: '200', message: 'success', data: [] })
- vi.mocked(overseasHttp.post).mockResolvedValue({ code: '200', message: 'success', data: { id: '190000000000000099', capacity: 68, palletIds: [] } })
+ vi.mocked(overseasHttp.post).mockResolvedValue({ code: '200', message: 'success', data: { id: '190000000000000099', capacity: 30, palletIds: [] } })
vi.mocked(overseasHttp.delete).mockResolvedValue({ code: '200', message: 'success', data: null })
await listDispatchDrafts()
- await createDispatchDraftContainer('draft/1', 68)
+ await createDispatchDraftContainer('draft/1', 30)
await deleteDispatchDraftContainer('draft/1', '190000000000000099')
expect(overseasHttp.get).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/drafts')
- expect(overseasHttp.post).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/drafts/containers', { draftToken: 'draft/1', capacity: 68 })
+ expect(overseasHttp.post).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/drafts/containers', { draftToken: 'draft/1', capacity: 30 })
expect(overseasHttp.delete).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/drafts/draft%2F1/containers/190000000000000099')
})
})
diff --git a/src/modules/overseas-warehouse/api/dispatches.ts b/src/modules/overseas-warehouse/api/dispatches.ts
index 8411d55c..b5df3545 100644
--- a/src/modules/overseas-warehouse/api/dispatches.ts
+++ b/src/modules/overseas-warehouse/api/dispatches.ts
@@ -53,7 +53,6 @@ export interface DispatchDraftDto { draftToken: string; containers?: DispatchDra
export interface PreArrangeDispatchPayload {
planPalletIds: string[]
- route?: string
fbaAppointmentNo?: string
fbaAppointmentStatus?: string
vehicleAppointmentStatus?: string
@@ -106,7 +105,6 @@ export interface UpdateDispatchPayload {
driverName?: string | null
driverPhone?: string | null
carrierName?: string | null
- route?: string | null
departAt?: string | null
fbaAppointmentNo?: string | null
fbaAppointmentStatus?: string | null
@@ -225,7 +223,8 @@ export async function releaseDispatchDraft(draftToken: string) {
return unwrapApiResponse(response)
}
-export interface TransferDeliveryResult { dispatchNo: string; outboundNo: string; outboundStatus: string; deliveryNo: string; deliveryStatus: string; palletCount: number; packageCount: number; replayed: boolean }
+export interface TransferDeliveryItem { deliveryNo: string; deliveryStatus: string; destinationWarehouseId?: string | null; destinationWarehouseCode?: string | null; destinationWarehouseName?: string | null; palletCount: number; packageCount: number }
+export interface TransferDeliveryResult { dispatchNo: string; outboundNo: string; outboundStatus: string; palletCount: number; packageCount: number; deliveries: TransferDeliveryItem[]; replayed: boolean }
export interface TransferDeliveryPayload {
idempotencyKey: string
plannedDeliveryAt: string
@@ -247,7 +246,6 @@ export interface TransferDeliveryPayload {
paidAt?: string; paymentMethod?: 'ONLINE' | 'BANK_TRANSFER' | 'CASH' | 'OTHER'; paymentReferenceNo?: string
paymentVoucherFileIds?: string[]; chargeableQuantity?: number; quantityUnit?: string; unitPrice?: number
periodStart?: string; periodEnd?: string; remark?: string }>
- palletCartonMarks?: Record
}
export async function transferDispatchToDelivery(dispatchNo: string, payload: TransferDeliveryPayload) {
const response = await overseasHttp.post, ApiEnvelope>(
diff --git a/src/modules/overseas-warehouse/api/lastMileOrders.test.ts b/src/modules/overseas-warehouse/api/lastMileOrders.test.ts
index a3b10563..e424038b 100644
--- a/src/modules/overseas-warehouse/api/lastMileOrders.test.ts
+++ b/src/modules/overseas-warehouse/api/lastMileOrders.test.ts
@@ -87,12 +87,13 @@ describe('last-mile order overseas API', () => {
it('uses the manual inbound-plan endpoint with the complete form and idempotency evidence', async () => {
vi.mocked(overseasHttp.post).mockResolvedValue({ code: '200', message: 'success', data: {} })
const payload = { orderId: '190000000000000099', customerId: '190000000000000001', expectedOrderVersion: 4,
- plannedArrivalDate: '2026-09-08', palletCount: 8, palletType: 'STANDARD' as const,
+ palletCount: 8, palletType: 'STANDARD' as const,
assigned: false, mergeRequired: false, urgent: true, remark: '加急' }
await createManualInboundPlan(payload, 'plan-key-1')
expect(overseasHttp.post).toHaveBeenCalledWith('/platform/v1/last-leg/inbound-plans/manual', payload,
{ headers: { 'Idempotency-Key': 'plan-key-1' } })
expect(payload).not.toHaveProperty('inboundCode')
+ expect(payload).not.toHaveProperty('plannedArrivalDate')
expect(payload).not.toHaveProperty('plannedWarehouseId')
expect(payload).not.toHaveProperty('plannedWarehouseCode')
expect(payload).not.toHaveProperty('plannedWarehouseName')
diff --git a/src/modules/overseas-warehouse/api/lastMileOrders.ts b/src/modules/overseas-warehouse/api/lastMileOrders.ts
index 63c6d20e..f766721c 100644
--- a/src/modules/overseas-warehouse/api/lastMileOrders.ts
+++ b/src/modules/overseas-warehouse/api/lastMileOrders.ts
@@ -294,7 +294,6 @@ export interface ManualInboundPlanPayload {
customerId: string
orderId: string
expectedOrderVersion: number
- plannedArrivalDate: string
palletCount: number
palletType: 'STANDARD' | 'WOOD' | 'PAPER'
assigned: boolean
diff --git a/src/modules/overseas-warehouse/api/outbounds.test.ts b/src/modules/overseas-warehouse/api/outbounds.test.ts
index eca9bdf8..5255dc4f 100644
--- a/src/modules/overseas-warehouse/api/outbounds.test.ts
+++ b/src/modules/overseas-warehouse/api/outbounds.test.ts
@@ -14,7 +14,7 @@ describe('outbound overseas API', () => {
})
it('loads detail and cancels only by outboundNo without customerId', async () => {
- vi.mocked(overseasHttp.get).mockResolvedValue({ code: '200', data: { outbound: { id: '1', outboundNo: 'OUT/1', status: 'PICKED' }, delivery: null } })
+ vi.mocked(overseasHttp.get).mockResolvedValue({ code: '200', data: { outbound: { id: '1', outboundNo: 'OUT/1', status: 'PICKED' }, deliveries: [] } })
vi.mocked(overseasHttp.post).mockResolvedValue({ code: '200', data: null })
await getOutbound('OUT/1')
await cancelOutbound('OUT/1', '运营取消')
diff --git a/src/modules/overseas-warehouse/api/outbounds.ts b/src/modules/overseas-warehouse/api/outbounds.ts
index 484e495e..e8cca936 100644
--- a/src/modules/overseas-warehouse/api/outbounds.ts
+++ b/src/modules/overseas-warehouse/api/outbounds.ts
@@ -16,7 +16,7 @@ export interface OutboundPalletRow {
pickedPackageCount?: number | null
status?: string | null
}
-export interface OutboundDetail { outbound: OutboundRow; pallets?: OutboundPalletRow[]; delivery?: DeliveryOrderRow | null }
+export interface OutboundDetail { outbound: OutboundRow; pallets?: OutboundPalletRow[]; deliveries?: DeliveryOrderRow[] }
export interface OutboundQuery { page: number; size: number; documentNo?: string; lxCode?: string; warehouseId?: string; status?: string; outboundType?: string }
export interface ReturnOutboundCandidate { returnNo?: string | null; overseasWarehouseId?: string | null; cartonMark?: string | null; fbaCartonMark?: string | null; destinationWarehouseCode?: string | null; destinationWarehouseName?: string | null; totalQuantity?: number | null; status?: string | null }
export interface OneClickOutboundCandidate { inventoryPositionId: string; orderNo?: string | null; customerId?: string | null; customerName?: string | null; overseasWarehouseId?: string | null; overseasWarehouseName?: string | null; palletNo?: string | null; inboundCode?: string | null; skuCode?: string | null; productName?: string | null; availablePackages: number }
diff --git a/src/modules/overseas-warehouse/api/pallets.test.ts b/src/modules/overseas-warehouse/api/pallets.test.ts
index 22522801..26bb06b4 100644
--- a/src/modules/overseas-warehouse/api/pallets.test.ts
+++ b/src/modules/overseas-warehouse/api/pallets.test.ts
@@ -1,7 +1,7 @@
import { beforeEach, describe, expect, it, vi } from 'vitest'
import { listSharedReceivingOverseasWarehouseOptions } from '@/modules/iam'
import { overseasHttp } from '@/shared/api/overseasHttp'
-import { createPallet, getPallet, listPallets, listReceivingOverseasWarehouses, updatePallet } from './pallets'
+import { createPallet, getPallet, getPalletLabelPdf, listPallets, listReceivingOverseasWarehouses, updatePallet } from './pallets'
vi.mock('@/modules/iam', () => ({ listSharedReceivingOverseasWarehouseOptions: vi.fn() }))
vi.mock('@/shared/api/overseasHttp', () => ({ overseasHttp: { get: vi.fn(), post: vi.fn(), put: vi.fn() } }))
@@ -9,6 +9,19 @@ vi.mock('@/shared/api/overseasHttp', () => ({ overseasHttp: { get: vi.fn(), post
describe('overseas pallet API', () => {
beforeEach(() => { vi.clearAllMocks() })
+ it('downloads only the selected pallet through the overseas gateway', async () => {
+ const pdf = new Blob(['%PDF-label'], { type: 'application/pdf' })
+ vi.mocked(overseasHttp.get).mockResolvedValueOnce(pdf)
+ await expect(getPalletLabelPdf('200', '9007199254740993')).resolves.toBe(pdf)
+ expect(overseasHttp.get).toHaveBeenCalledWith('/platform/v1/warehouse-admin/200/pallets/9007199254740993/label', { responseType: 'blob', timeout: 60_000 })
+ })
+
+ it('surfaces a JSON business failure instead of saving it as a PDF', async () => {
+ const error = new Blob([JSON.stringify({ code: 'A0422', message: '托盘编码不支持打印', requestId: 'r1' })], { type: 'application/json' })
+ vi.mocked(overseasHttp.get).mockResolvedValueOnce(error)
+ await expect(getPalletLabelPdf('200', '9')).rejects.toMatchObject({ message: '托盘编码不支持打印', code: 'A0422', requestId: 'r1' })
+ })
+
it('uses the public warehouse scoped pallet CRUD contract', async () => {
const page = { records: [], page: 1, size: 20, total: 0, pages: 0 }
vi.mocked(overseasHttp.get).mockResolvedValue({ code: '200', data: page })
diff --git a/src/modules/overseas-warehouse/api/pallets.ts b/src/modules/overseas-warehouse/api/pallets.ts
index 37b1c135..abc0218a 100644
--- a/src/modules/overseas-warehouse/api/pallets.ts
+++ b/src/modules/overseas-warehouse/api/pallets.ts
@@ -78,6 +78,16 @@ export async function getPallet(warehouseId: string, palletId: string) {
return unwrapApiResponse(response)
}
+export async function getPalletLabelPdf(warehouseId: string, palletId: string) {
+ const blob = await overseasHttp.get(
+ `/platform/v1/warehouse-admin/${encodeURIComponent(warehouseId)}/pallets/${encodeURIComponent(palletId)}/label`,
+ { responseType: 'blob', timeout: 60_000 },
+ )
+ if (blob.type.includes('application/json')) unwrapApiResponse(JSON.parse(await blob.text()) as ApiEnvelope)
+ if (!blob.size || !blob.type.includes('application/pdf')) throw new Error('打印服务未返回有效 PDF，请重试')
+ return blob
+}
+
export async function createPallet(warehouseId: string, payload: SavePalletPayload) {
const response = await overseasHttp.post, ApiEnvelope>(
`/platform/v1/warehouse-admin/${encodeURIComponent(warehouseId)}/pallets`, payload,
diff --git a/src/modules/overseas-warehouse/components/DeliveryDocumentsDialog.test.ts b/src/modules/overseas-warehouse/components/DeliveryDocumentsDialog.test.ts
index 29b92160..17b97822 100644
--- a/src/modules/overseas-warehouse/components/DeliveryDocumentsDialog.test.ts
+++ b/src/modules/overseas-warehouse/components/DeliveryDocumentsDialog.test.ts
@@ -1,4 +1,4 @@
-import ElementPlus from 'element-plus'
+import ElementPlus, { ElMessage } from 'element-plus'
import { defineComponent, h } from 'vue'
import { DOMWrapper, flushPromises, mount } from '@vue/test-utils'
import { beforeEach, describe, expect, it, vi } from 'vitest'
@@ -51,6 +51,7 @@ describe('delivery document drafts', () => {
wrapper.unmount()
})
it('uses real upload controls to add, replace, delete and reload the saved three-category snapshot', async () => {
+ const success = vi.spyOn(ElMessage, 'success')
const receipt = { ...originalFile, fileId: 'receipt-1', fileName: 'pod.pdf' }
const courier = { ...originalFile, fileId: 'receipt-2', fileName: 'courier.pdf' }
const replacement = { ...originalFile, fileId: 'bol-2', fileName: 'signed-bol.pdf' }
@@ -72,6 +73,7 @@ describe('delivery document drafts', () => {
await dialog.findAll('button').find(button => button.text() === '保存资料')!.trigger('click'); await flushPromises()
expect(saveDeliveryDocuments).toHaveBeenCalledWith('DL/1', '100', { expectedVersion: 9, idempotencyKey: expect.any(String), bolNo: 'BOL-1', documents: [{ category: 'LOADING_PHOTO', fileIds: [] }, { category: 'BOL', fileIds: ['bol-2'] }, { category: 'RECEIPT', fileIds: ['receipt-2'] }] })
expect(wrapper.emitted('saved')).toHaveLength(1)
+ expect(success).toHaveBeenCalledWith('签收文件已保存，派送单已自动完成')
const persisted = response()
persisted.version = 10; persisted.uploadedCategoryCount = 2
persisted.categories = persisted.categories.map(group => ({ ...group, files: group.category === 'BOL' ? [replacement] : group.category === 'RECEIPT' ? [courier] : [], fileCount: group.category === 'LOADING_PHOTO' ? 0 : 1, status: group.category === 'LOADING_PHOTO' ? 'MISSING' : 'UPLOADED' }))
diff --git a/src/modules/overseas-warehouse/components/DeliveryDocumentsDialog.vue b/src/modules/overseas-warehouse/components/DeliveryDocumentsDialog.vue
index 7088276e..2829ace7 100644
--- a/src/modules/overseas-warehouse/components/DeliveryDocumentsDialog.vue
+++ b/src/modules/overseas-warehouse/components/DeliveryDocumentsDialog.vue
@@ -1,4 +1,5 @@
-
+
- {{ group.label }}{{ group.files.length ? '已上传' : '待上传' }} {{ group.files.length }}/20上传
+ {{ group.label }}{{ group.files.length ? '已上传' : '待上传' }} {{ group.files.length }}/20上传
替换 删除
+ 替换 删除
@@ -125,10 +127,10 @@ async function save() {
diff --git a/src/modules/overseas-warehouse/components/OrderReferenceText.vue b/src/modules/overseas-warehouse/components/OrderReferenceText.vue
index fbf99f24..56dc2689 100644
--- a/src/modules/overseas-warehouse/components/OrderReferenceText.vue
+++ b/src/modules/overseas-warehouse/components/OrderReferenceText.vue
@@ -6,6 +6,7 @@ const props = withDefaults(defineProps<{
value?: string | null
emptyText?: string
copyable?: boolean
+ compact?: boolean
copyLabel?: string
}>(), { value: null, emptyText: '—', copyable: false, copyLabel: '尾程单号' })
@@ -18,7 +19,7 @@ const fullTitle = computed(() => displayValue.value === props.emptyText ? undefi
- {{ displayValue }}
+
+
diff --git a/src/modules/overseas-warehouse/dispatchVehicleSpecs.ts b/src/modules/overseas-warehouse/dispatchVehicleSpecs.ts
new file mode 100644
index 00000000..30f5832e
--- /dev/null
+++ b/src/modules/overseas-warehouse/dispatchVehicleSpecs.ts
@@ -0,0 +1,9 @@
+export const dispatchVehicleSpecs = [
+ { value: 'LARGE_30', label: '大车（30托）', capacity: 30, maxWeightLb: 40000 },
+ { value: 'SMALL_15', label: '小车（15托）', capacity: 15, maxWeightLb: 10000 },
+] as const
+
+export const dispatchVehicleSizeOptions = dispatchVehicleSpecs.map(({ capacity }) => ({
+ label: `${capacity}托`,
+ value: `${capacity}托`,
+}))
diff --git a/src/modules/overseas-warehouse/lastMilePresentation.test.ts b/src/modules/overseas-warehouse/lastMilePresentation.test.ts
index 2ac709f5..17c475e8 100644
--- a/src/modules/overseas-warehouse/lastMilePresentation.test.ts
+++ b/src/modules/overseas-warehouse/lastMilePresentation.test.ts
@@ -80,7 +80,8 @@ describe('last-mile order presentation adapter', () => {
})
expect(row).toMatchObject({
pallets: 3, cartons: 0, volume: 12.75, quantity: '—', volumeWeight: 88.6,
- portEta: formatOverseasDateTime(estimatedArrivalAt), portAta: '—', warehouseEta: '—',
+ portEta: formatOverseasDateTime(estimatedArrivalAt), portAta: '—',
+ estimatedWarehouseAt: '', warehouseEta: '—',
})
})
diff --git a/src/modules/overseas-warehouse/lastMilePresentation.ts b/src/modules/overseas-warehouse/lastMilePresentation.ts
index 779770bf..7a0d9bf4 100644
--- a/src/modules/overseas-warehouse/lastMilePresentation.ts
+++ b/src/modules/overseas-warehouse/lastMilePresentation.ts
@@ -140,6 +140,7 @@ export function toLastMileOrderListItem(dto: LastMileOrderSummaryDto): LastMileO
volumeWeight: metric(dto.volumeWeightKg),
portEta: formatOverseasDateTime(dto.estimatedArrivalAt),
portAta: formatOverseasDateTime(dto.actualArrivalAt),
+ estimatedWarehouseAt: String(dto.estimatedWarehouseAt ?? '').trim(),
warehouseEta: formatOverseasDateTime(dto.estimatedWarehouseAt),
inboundOrderNo: text(dto.inboundOrderNo),
dispatchStatus: dto.dispatchStatus === 'SCHEDULED' ? '已排车' : '未排车',
diff --git a/src/modules/overseas-warehouse/layoutAcceptance.test.ts b/src/modules/overseas-warehouse/layoutAcceptance.test.ts
index 1a658133..81b0b92f 100644
--- a/src/modules/overseas-warehouse/layoutAcceptance.test.ts
+++ b/src/modules/overseas-warehouse/layoutAcceptance.test.ts
@@ -8,7 +8,7 @@ const component = (name: string) => readFileSync(resolve(process.cwd(), 'src/mod
describe('overseas warehouse 1920px layout acceptance', () => {
it('keeps action columns first and wide enough for every visible action', () => {
const widths: Record = {
- 'LastMileOrdersView.vue': 230,
+ 'LastMileOrdersView.vue': 330,
'InboundOrdersView.vue': 300,
'DispatchesView.vue': 380,
'OutboundsView.vue': 180,
@@ -27,10 +27,10 @@ describe('overseas warehouse 1920px layout acceptance', () => {
it('keeps all inbound-order row actions on one line', () => {
const source = page('InboundOrdersView.vue')
- expect(source).toContain('
-
商品信息
- {{ field[0] }}
- {{ display(field[1]) }}
库存信息
- {{ field[0] }}
- {{ display(field[1]) }}
订单信息
- {{ field[0] }}
- {{ display(field[1]) }}
快递信息
- {{ field[0] }}
- {{ display(field[1]) }}
商品信息
- {{ field[0] }}
- {{ display(field[1]) }}
库存信息
- {{ field[0] }}
- {{ display(field[1]) }}
订单信息
- {{ field[0] }}
- {{ display(field[1]) }}
快递信息
- {{ field[0] }}
- {{ display(field[1]) }}
出库明细
共 {{ outboundDetails.length }} 条，出库量 {{ outboundDetails.reduce((sum, item) => sum + item.quantity, 0) }}签收文件与费用凭证
费用明细
每条费用独立冻结，订单全部入库后结算。操作流水
展示创建、审核、入库与出库明细变更。订单编号：{{ detail?.orderNo || '—' }}
编辑海外采购订单
订单编号：{{ form.orderNo || purchaseId || '—' }}编辑海外采购订单
{{ form.orderNo || '—' }}出库总量：{{ outboundQuantity }} / {{ form.inboundQuantity }}
暂无出库明细，可添加多条出库记录
出库总量：{{ outboundQuantity }} / {{ form.inboundQuantity }}添加出库明细
暂无出库明细，可添加多条出库记录
{{ editing ? '编辑' : '新增' }}{{ domainLabel }}订单
订单编号：{{ form.orderNo || orderId }}{{ editing ? '编辑' : '新增' }}{{ domainLabel }}订单
{{ form.orderNo || '—' }}- {{ item.label }}
- {{ item.value }}
美元兑人民币月平均汇率
统一口径：1 USD = X CNY
汇率方向：1 USD = X CNY
汇率方向：1 USD = X CNY
{{item[0]}}{{item[1]}}
仓储作业费用
中转派送价格
仓储作业费用 + 添加费用
中转派送价格 + 添加派送价格
- {{item[0]}}
- {{item[1]}}
仓储作业费用
中转派送价格
仓储作业费用 + 添加费用
中转派送价格 + 添加派送价格
车辆详情
{{detail?.plateNumber||String(route.params.vehicleId||'—')}}
- {{item[0]}}
- {{item[1]}}
当前车辆主数据接口明确不包含派送履约记录。
当前车辆主数据接口明确不包含车辆更换历史。
{{ detail?.plateNumber || '—' }}
- {{item[0]}}
- {{item[1]}}
当前车辆主数据接口明确不包含派送履约记录。
当前车辆主数据接口明确不包含车辆更换历史。
{{ canEdit ? '上传、替换和删除将在保存资料后生效；关闭将放弃未保存修改。' : '当前账号仅可查看已保存资料。' }}{{ uploadedCount }}/3 已上传
尚未上传文件
{{ file.uploadedAt?.replace('T', ' ') || '—' }}{{ isSaved(group.category, file.fileId) ? '' : ' · 待保存' }}
- {{ detail.transferNo }}{{ customerName }} · {{ detail.packageCount }} 箱 · {{ detail.needRelabel ? '需要换标' : '无需换标' }}
货物明细
换标绑定明细
')
- 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('
')
+ expect(source).toContain('.row-actions { min-width: max-content; flex-wrap: nowrap; 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; }')
+ expect(readFileSync(resolve(process.cwd(), 'src/styles/adminDensity.css'), 'utf8')).toContain('.density-actions > :is(.el-button, .el-dropdown) { margin-left: 0; }')
})
it('assigns explicit desktop widths to dense query inputs', () => {
@@ -55,13 +55,16 @@ describe('overseas warehouse 1920px layout acceptance', () => {
it('uses four-field desktop density and full-width form controls', () => {
const sharedDetail = component('OverseasReadOnlyDetail.vue')
expect(sharedDetail).toContain('grid-template-columns: repeat(2, minmax(0, 1fr))')
- expect(page('LastMileOrderDetailView.vue')).toContain('.detail-fields { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr))')
- expect(page('InboundOrderDetailView.vue')).toContain('.detail-group:last-child .detail-fields{grid-template-columns:repeat(4,minmax(0,1fr))}')
+ expect(page('LastMileOrderDetailView.vue')).toContain('density-fields')
+ expect(page('InboundOrderDetailView.vue')).toContain('density-fields')
expect(page('DispatchDetailView.vue')).toContain('.document-section { grid-column: 1 / -1; }')
- expect(page('DispatchDetailView.vue')).toContain('.document-section .detail-fields { grid-template-columns: repeat(3, minmax(0, 1fr)); }')
- expect(page('DeliveryOrderDetailView.vue')).toContain('.info-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr))')
- expect(page('InventoryDetailView.vue')).toContain('grid-template-columns:repeat(2,minmax(0,1fr))')
- expect(page('OutboundsView.vue')).toContain('.create-outbound-form :deep(.el-input-number) { width: 100%; }')
+ expect(page('DispatchDetailView.vue')).toContain('density-fields')
+ expect(page('DeliveryOrderDetailView.vue')).toContain('density-fields')
+ expect(page('InventoryDetailView.vue')).toContain('density-fields')
+ const outbounds = page('OutboundsView.vue')
+ expect(outbounds).toContain('.create-outbound-form :deep(.el-form-item__content > .el-input-number) { width: 100%; }')
+ expect(outbounds).not.toContain('.create-outbound-form :deep(.el-select)')
+ expect(outbounds).toContain('.candidate-pagination :deep(.el-pagination__sizes .el-select), .return-pagination :deep(.el-pagination__sizes .el-select) { width: 128px; }')
expect(page('RelabelOrdersView.vue')).toContain('.el-form :deep(.el-date-editor) { width: 100%; }')
expect(page('PalletsView.vue')).toContain('.el-form :deep(.el-input-number) { width: 100%; }')
expect(page('RelabelOrdersView.vue')).toContain('.el-form :deep(.el-row) { margin-left: 0 !important; margin-right: 0 !important; }')
diff --git a/src/modules/overseas-warehouse/pages/CustomerVisitsView.test.ts b/src/modules/overseas-warehouse/pages/CustomerVisitsView.test.ts
index 0c448c33..e452508d 100644
--- a/src/modules/overseas-warehouse/pages/CustomerVisitsView.test.ts
+++ b/src/modules/overseas-warehouse/pages/CustomerVisitsView.test.ts
@@ -65,6 +65,10 @@ describe('CustomerVisitsView permissions and visit material', () => {
await wrapper.findAll('button').find(button => button.text() === '回访')!.trigger('click')
await flushPromises()
const input = wrapper.find('[data-dialog="客户回访"] input[type="file"]')
+ const inputClick = vi.spyOn(input.element as HTMLInputElement, 'click').mockImplementation(() => {})
+ await wrapper.findAll('button').find(button => button.text() === '选择文件')!.trigger('click')
+ expect(inputClick).toHaveBeenCalledOnce()
+ inputClick.mockRestore()
const file = new File(['data'], 'visit.pdf', { type: 'application/pdf' })
Object.defineProperty(input.element, 'files', { configurable: true, value: [file] })
await input.trigger('change')
diff --git a/src/modules/overseas-warehouse/pages/CustomerVisitsView.vue b/src/modules/overseas-warehouse/pages/CustomerVisitsView.vue
index 9bf805fa..82bc96c9 100644
--- a/src/modules/overseas-warehouse/pages/CustomerVisitsView.vue
+++ b/src/modules/overseas-warehouse/pages/CustomerVisitsView.vue
@@ -1,6 +1,7 @@
-
+
-
-
+
- {{ row.status === 'COMPLETED' ? '再次回访' : '回访' }}
@@ -176,15 +174,15 @@ onMounted(load)
-
+
-
-
-
+
{{ summary.visitable }}可回访订单
- {{ summary.pending }}待回访
- {{ summary.completed }}已完成回访
- - 可回访订单
- {{ summary.visitable }}
- 待回访
- {{ summary.pending }}
- 已完成回访
- {{ summary.completed }}
派送单号{{ detail.visit.deliveryNo }}
- 客户{{ detail.visit.customerName || '—' }}
- 完成时间{{ formatOverseasDateTime(detail.visit.deliveryCompletedAt) }}
- 目的地{{ detail.visit.destination || '—' }}
- -
+
- 派送单号
- {{ detail.visit.deliveryNo }}
- 客户
- {{ detail.visit.customerName || '—' }}
- 完成时间
- {{ formatOverseasDateTime(detail.visit.deliveryCompletedAt) }}
- 目的地
- {{ detail.visit.destination || '—' }}