Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test

src/modules/overseas-warehouse/pages/InboundOrderDetailView.shortage.test.ts

@@ -0,0 +1,25 @@
+import ElementPlus from 'element-plus'
+import { flushPromises, mount } from '@vue/test-utils'
+import { expect, it, vi } from 'vitest'
+import { getInboundPlan } from '../api/inboundPlans'
+import InboundOrderDetailView from './InboundOrderDetailView.vue'
+
+vi.mock('vue-router', () => ({ useRoute: () => ({ params: { orderId: 'IP-1' }, query: { customerId: '9007199254741001' } }), useRouter: () => ({ push: vi.fn() }) }))
+vi.mock('../api/inboundPlans', () => ({ getInboundPlan: vi.fn(), moveInboundPallet: vi.fn() }))
+vi.mock('@/modules/appointment-calendar', () => ({ appointmentReturnTarget: () => null }))
+vi.mock('../components/InboundShortageConfirmation.vue', () => ({ default: { name: 'InboundShortageConfirmation', props: ['detail'], emits: ['refresh'], template: '<button data-shortage @click="$emit(\'refresh\')">确认短少入库</button>' } }))
+
+it('provides the scoped plan facts and reloads after shortage confirmation', async () => {
+  const detail = { id: '1', planNo: 'IP-1', customerId: '9007199254741001', sourceOrderId: '2', version: 4,
+    status: 'PENDING_RECONCILIATION', expectedPackageCount: 21, pickedPackageCount: 20,
+    lineCount: 0, palletCount: 0, totalGrossWeightKg: 0, totalNetWeightKg: 0, totalVolumeCbm: 0, lines: [], pallets: [], allocations: [] }
+  vi.mocked(getInboundPlan).mockResolvedValue(detail)
+  const wrapper = mount(InboundOrderDetailView, { global: { plugins: [ElementPlus], stubs: { DataTable: true, AppDialog: true, BusinessDocumentFees: true } } })
+  await flushPromises()
+  expect(wrapper.findComponent({ name: 'InboundShortageConfirmation' }).props('detail')).toEqual(detail)
+  expect(wrapper.text()).toContain('待差异核对')
+  await wrapper.get('[data-shortage]').trigger('click'); await flushPromises()
+  expect(getInboundPlan).toHaveBeenCalledTimes(2)
+  expect(getInboundPlan).toHaveBeenLastCalledWith('IP-1', '9007199254741001')
+  wrapper.unmount()
+})

src/modules/overseas-warehouse/pages/InboundOrderDetailView.test.ts

@@ -23,7 +23,7 @@ describe('InboundOrderDetailView fees', () => {
   })
 
   it('uses the loaded inbound plan identity without substituting its source order', async () => {
-    const wrapper = mount(InboundOrderDetailView, { global: { plugins: [ElementPlus], stubs: { DataTable: true, AppDialog: true } } })
+    const wrapper = mount(InboundOrderDetailView, { global: { plugins: [ElementPlus], stubs: { DataTable: true, AppDialog: true, InboundShortageConfirmation: true } } })
     await flushPromises()
     expect(getInboundPlan).toHaveBeenCalledWith('PLAN-1', '9007199254741001')
     expect(wrapper.findComponent({ name: 'BusinessDocumentFees' }).props()).toEqual({
@@ -35,7 +35,7 @@ describe('InboundOrderDetailView fees', () => {
 
   it('does not expose fee operations when the customer scope is absent', async () => {
     route.query = {}
-    const wrapper = mount(InboundOrderDetailView, { global: { plugins: [ElementPlus], stubs: { DataTable: true, AppDialog: true } } })
+    const wrapper = mount(InboundOrderDetailView, { global: { plugins: [ElementPlus], stubs: { DataTable: true, AppDialog: true, InboundShortageConfirmation: true } } })
     await flushPromises()
     expect(getInboundPlan).not.toHaveBeenCalled()
     expect(wrapper.findComponent({ name: 'BusinessDocumentFees' }).exists()).toBe(false)

src/modules/overseas-warehouse/pages/LastMileOrdersView.behavior.test.ts

@@ -157,10 +157,10 @@ async function mountView() {
   return wrapper
 }
 
-async function openPending() {
+async function openAfterDeparture() {
   const wrapper = await mountView()
-  const pendingTab = wrapper.findAll('[role="tab"]').find((item) => item.text() === '开船前')
-  await pendingTab!.trigger('click')
+  const departedTab = wrapper.findAll('[role="tab"]').find((item) => item.text() === '开船后')
+  await departedTab!.trigger('click')
   await flushPromises()
   return wrapper
 }
@@ -308,9 +308,13 @@ describe('LastMileOrdersView pending order and container conversion', () => {
       await flushPromises()
       expect(listLastMileOrders).toHaveBeenLastCalledWith(expect.objectContaining({ orderType: 'FIRST_LEG', sailingStage: stage, detained: false }))
       expect(toolbar.props('availableFields')?.some((field) => field.key === 'orderType')).toBe(false)
-      await button(wrapper, '导出订单')!.trigger('click')
-      await flushPromises()
-      expect(submitExport).toHaveBeenLastCalledWith('LAST_MILE_ORDER_LIST', '尾程订单', vi.mocked(listLastMileOrders).mock.lastCall![0])
+      if (stage === 'BEFORE_DEPARTURE') {
+        expect(button(wrapper, '导出订单')).toBeUndefined()
+      } else {
+        await button(wrapper, '导出订单')!.trigger('click')
+        await flushPromises()
+        expect(submitExport).toHaveBeenLastCalledWith('LAST_MILE_ORDER_LIST', '尾程订单', vi.mocked(listLastMileOrders).mock.lastCall![0])
+      }
     }
     await wrapper.findAll('[role="tab"]').find((tab) => tab.text() === '全部')!.trigger('click')
     await flushPromises()
@@ -359,6 +363,18 @@ describe('LastMileOrdersView pending order and container conversion', () => {
     expect(button(wrapper, '高级筛选')).toBeUndefined()
   })
 
+  it.each([null, 'ESTIMATED_DEPARTURE'])('keeps a first-leg order without actual departure read-only: %s', async containerNode => {
+    vi.mocked(listLastMileOrders).mockResolvedValue({ records: [{ id: 'before-1', customerId, orderNo: 'LM-BEFORE', currentStatus: 'PENDING_ASSIGNMENT', orderType: 'FIRST_LEG', containerNode }], page: 1, size: 10, total: 1, pages: 1 })
+    const wrapper = await mountView()
+    const actions = wrapper.get('.el-table__body-wrapper .row-actions')
+    expect(actions.findAll('button').map(button => button.text().trim())).toEqual(['查看'])
+    await selectRows(wrapper, [(wrapper.findComponent(DataTable).props('data') as object[])[0]])
+    expect((wrapper.vm as unknown as { selectedRows: object[] }).selectedRows).toEqual([expect.objectContaining({ orderTypeCode: 'FIRST_LEG', containerNode: containerNode || '—' })])
+    expect(wrapper.find('.data-table__business-actions').exists()).toBe(false)
+    expect(createManualInboundPlan).not.toHaveBeenCalled()
+    expect(transferLastMileOrders).not.toHaveBeenCalled()
+  })
+
   it('keeps the original carton count and adds only the signed difference in the list', async () => {
     canAccess.mockReturnValue(false)
     vi.mocked(listLastMileOrders).mockResolvedValue({ records: [{
@@ -381,7 +397,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
     [['inbound-order:create', 'last-mile-order:edit'], ['查看', '入库', '修改节点'], false],
   ])('only collapses row actions above three for %j', async (allowed, labels, overflow) => {
     canAccess.mockImplementation(code => allowed.some(action => code === 'platform:overseas-warehouse:' + action))
-    vi.mocked(listLastMileOrders).mockResolvedValue({ records: [{ id: 'order-1', customerId, orderNo: 'LM-1', currentStatus: 'PENDING_ASSIGNMENT', orderType: 'FIRST_LEG' }], page: 1, size: 10, total: 1, pages: 1 })
+    vi.mocked(listLastMileOrders).mockResolvedValue({ records: [{ id: 'order-1', customerId, orderNo: 'LM-1', currentStatus: 'PENDING_ASSIGNMENT', orderType: 'FIRST_LEG', containerNode: 'ACTUAL_DEPARTURE' }], page: 1, size: 10, total: 1, pages: 1 })
     const wrapper = await mountView()
     const actions = wrapper.get('.el-table__body-wrapper .row-actions')
     expect(actions.findAll('button').map(button => button.text().trim())).toEqual(labels)
@@ -507,7 +523,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
   ])('only shows a new hold after inbound completion for %s', async (currentStatus, visible) => {
     canAccess.mockImplementation(code => code === 'platform:overseas-warehouse:last-mile-order:edit')
     vi.mocked(listLastMileOrders).mockResolvedValue({ records: [{
-      id: 'order-1', customerId, orderNo: 'LM-1', currentStatus, orderType: 'FIRST_LEG', detained: false,
+      id: 'order-1', customerId, orderNo: 'LM-1', currentStatus, orderType: 'FIRST_LEG', containerNode: 'ACTUAL_DEPARTURE', detained: false,
     }], page: 1, size: 10, total: 1, pages: 1 })
 
     const wrapper = await mountView()
@@ -520,7 +536,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
   it('keeps release hold available for an already detained order', async () => {
     canAccess.mockImplementation(code => code === 'platform:overseas-warehouse:last-mile-order:edit')
     vi.mocked(listLastMileOrders).mockResolvedValue({ records: [{
-      id: 'order-held', customerId, orderNo: 'LM-HELD', currentStatus: 'READY_FOR_DISPATCH', orderType: 'FIRST_LEG', detained: true,
+      id: 'order-held', customerId, orderNo: 'LM-HELD', currentStatus: 'READY_FOR_DISPATCH', orderType: 'FIRST_LEG', containerNode: 'ACTUAL_DEPARTURE', detained: true,
     }], page: 1, size: 10, total: 1, pages: 1 })
 
     const wrapper = await mountView()
@@ -533,7 +549,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
   it('removes generation and hold actions after an inbound plan has been submitted', async () => {
     canAccess.mockReturnValue(true)
     vi.mocked(listLastMileOrders).mockResolvedValue({ records: [{
-      id: 'order-planned', customerId, orderNo: 'LM-PLANNED', currentStatus: 'INBOUND_PLANNED', orderType: 'FIRST_LEG', detained: false,
+      id: 'order-planned', customerId, orderNo: 'LM-PLANNED', currentStatus: 'INBOUND_PLANNED', orderType: 'FIRST_LEG', containerNode: 'ACTUAL_DEPARTURE', detained: false,
     }], page: 1, size: 10, total: 1, pages: 1 })
 
     const wrapper = await mountView()
@@ -546,8 +562,8 @@ describe('LastMileOrdersView pending order and container conversion', () => {
     expect((button(wrapper, '入库')!.element as HTMLButtonElement).disabled).toBe(true)
   })
 
-  it('keeps the original pending order table and does not render a view switch or container table', async () => {
-    const wrapper = await openPending()
+  it('keeps after-departure order actions in the existing table without a container view switch', async () => {
+    const wrapper = await openAfterDeparture()
     expect(wrapper.text()).toContain('尾程单号')
     expect(wrapper.text()).toContain('海外仓')
     expect(wrapper.text()).toContain('转仓')
@@ -556,7 +572,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
     expect(wrapper.text()).not.toContain('按订单')
     expect(wrapper.text()).not.toContain('待分配整柜')
     expect(wrapper.text()).not.toContain('柜子工作台')
-    expect(listLastMileOrders).toHaveBeenLastCalledWith(expect.objectContaining({ page: 1, size: 10, currentStatus: undefined, orderType: 'FIRST_LEG', sailingStage: 'BEFORE_DEPARTURE' }))
+    expect(listLastMileOrders).toHaveBeenLastCalledWith(expect.objectContaining({ page: 1, size: 10, currentStatus: undefined, orderType: 'FIRST_LEG', sailingStage: 'AFTER_DEPARTURE' }))
     expect(listContainerPlanProgress).not.toHaveBeenCalled()
   })
 
@@ -613,7 +629,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
   })
 
   it('opens the required single-order inbound-plan form without invoking the cabinet conversion', async () => {
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await selectRows(wrapper, [selectedRow()])
     await button(wrapper, '入库')!.trigger('click')
     await flushPromises()
@@ -633,7 +649,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
   })
 
   it('shows cabinet-frozen facts but never sends arrival time or per-order warehouse overrides', async () => {
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await selectRows(wrapper, [selectedRow()])
     await button(wrapper, '入库')!.trigger('click')
     await flushPromises()
@@ -655,7 +671,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
   })
 
   it('blocks a held order from generating its inbound plan', async () => {
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await selectRows(wrapper, [selectedRow({
       detained: true,
       orderTypeCode: 'ONE_CLICK_DROPSHIP',
@@ -676,7 +692,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
     [{ ...arrivalTime, estimatedWarehouseArrivalAt: null, version: 0, planCount: 1, plannedDate: '2026-11-02' }, '2026-11-02'],
   ])('reads the latest cabinet arrival on opening and permits planning with %s', async (arrival, expectedText) => {
     vi.mocked(listContainerArrivalTimes).mockResolvedValue([arrival])
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await openArrivalPlan(wrapper, arrival.estimatedWarehouseArrivalAt ? selectedRow() : selectedRow({ estimatedWarehouseAt: '', warehouseEta: '—' }))
 
     expect(listContainerArrivalTimes).toHaveBeenCalledWith([bookingId])
@@ -697,7 +713,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
     { arrivals: [{ ...arrivalTime, version: -1 }] },
   ])('blocks manual planning when the authoritative cabinet arrival is missing or inconsistent: $arrivals', async ({ arrivals }) => {
     vi.mocked(listContainerArrivalTimes).mockResolvedValue(arrivals)
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await openArrivalPlan(wrapper)
 
     const confirm = [...document.body.querySelectorAll('button')]
@@ -708,7 +724,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
 
   it('shows arrival read failures and does not reuse the list timestamp', async () => {
     vi.mocked(listContainerArrivalTimes).mockRejectedValue(new ApiResponseError('到仓来源暂不可读', 'A0503', 503))
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await openArrivalPlan(wrapper)
     const dialog = wrapper.findAllComponents(AppDialog).find(item => item.props('title').startsWith('入库计划 ·'))!
     expect(dialog.text()).toContain('到仓来源暂不可读')
@@ -721,7 +737,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
   it('keeps confirmation blocked during arrival loading and ignores an older opening of the same order', async () => {
     let resolveOld!: (value: typeof arrivalTime[]) => void
     vi.mocked(listContainerArrivalTimes).mockReturnValueOnce(new Promise(resolve => { resolveOld = resolve }))
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await openArrivalPlan(wrapper)
     const dialog = wrapper.findAllComponents(AppDialog).find(item => item.props('title').startsWith('入库计划 ·'))!
     expect(dialog.props('confirmDisabled')).toBe(true)
@@ -750,7 +766,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
         }],
       }],
     } as never)
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await selectRows(wrapper, [selectedRow({ orderTypeCode: 'ONE_CLICK_DROPSHIP', pallets: 2 })])
     await button(wrapper, '入库')!.trigger('click')
     await flushPromises()
@@ -768,7 +784,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
   })
 
   it('opens a cabinet selector without requiring order selection and loads server summaries only then', async () => {
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await openContainerDialog(wrapper)
     expect(listContainerPlanProgress).toHaveBeenCalledTimes(1)
     expect(listContainerPlanProgress).toHaveBeenCalledWith({ page: 1, size: 50, containerNo: undefined })
@@ -781,7 +797,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
   })
 
   it('selects one cabinet and sends one long-id convert-container request without using current-page row counts', async () => {
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await openContainerDialog(wrapper)
     await chooseContainer(wrapper)
     const confirm = [...document.body.querySelectorAll('button')].find((item) => item.textContent?.includes('确认生成')) as HTMLButtonElement
@@ -807,7 +823,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
     vi.mocked(convertLastMileContainerToInboundPlans).mockRejectedValueOnce(new ApiResponseError(
       '柜级生成失败', code, 200, undefined, `request-${code}`, `trace-${code}`,
     ))
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await openContainerDialog(wrapper)
     await chooseContainer(wrapper)
     const confirm = [...document.body.querySelectorAll('button')].find((item) => item.textContent?.includes('确认生成')) as HTMLButtonElement
@@ -826,7 +842,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
       if (id === bookingId) resolveFirst = resolve
       else resolveSecond = resolve
     }) as never)
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await openContainerDialog(wrapper)
     const selects = wrapper.findAllComponents({ name: 'ElSelect' })
     const containerSelect = selects[selects.length - 1]
@@ -848,7 +864,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
     vi.mocked(convertLastMileContainerToInboundPlans)
       .mockRejectedValueOnce(new Error('network uncertain'))
       .mockResolvedValueOnce([{ planNo: 'LIP-RETRY', pallets: [{ id: 'PALLET-R', palletNo: 'PLT-RETRY' }] }] as never)
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await openContainerDialog(wrapper)
     await chooseContainer(wrapper)
     const findConfirm = () => [...document.body.querySelectorAll('button')]
@@ -931,7 +947,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
       .mockResolvedValueOnce(resourceCommittedPreview)
       .mockResolvedValue({ ...resourceCommittedPreview, resourceRetry: undefined })
     vi.mocked(convertLastMileContainerToInboundPlans).mockResolvedValue(originalResourcePlans as never)
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await openContainerDialog(wrapper); await chooseContainer(wrapper)
     cabinetDialog(wrapper).vm.$emit('update:modelValue', false); await flushPromises()
     await openContainerDialog(wrapper); await chooseContainer(wrapper)
@@ -955,7 +971,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
 
   it('keeps ordinary zero-pending previews without resourceRetry disabled in both UI and handler', async () => {
     vi.mocked(getContainerInboundPlanPreview).mockResolvedValue({ ...resourceCommittedPreview, resourceRetry: undefined })
-    const wrapper = await openPending(); await openContainerDialog(wrapper); await chooseContainer(wrapper)
+    const wrapper = await openAfterDeparture(); await openContainerDialog(wrapper); await chooseContainer(wrapper)
     expect(cabinetDialog(wrapper).props('confirmDisabled')).toBe(true)
     expect(cabinetDialog(wrapper).props('confirmText')).toBe('确认生成')
     cabinetDialog(wrapper).vm.$emit('confirm'); await flushPromises()
@@ -964,7 +980,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
 
   it('uses the visible missing-container label in the preview tooltip without exposing the booking ID', async () => {
     vi.mocked(getContainerInboundPlanPreview).mockResolvedValue({ ...preview, containerNo: null } as never)
-    const wrapper = await openPending(); await openContainerDialog(wrapper); await chooseContainer(wrapper)
+    const wrapper = await openAfterDeparture(); await openContainerDialog(wrapper); await chooseContainer(wrapper)
     const identity = document.body.querySelector('.container-preview__identity')!
     expect(identity.textContent).toBe('未录入货柜号')
     expect(identity.getAttribute('title')).toBe('未录入货柜号')
@@ -973,7 +989,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
 
   it('keeps server readiness blocks effective even for a resource retry', async () => {
     vi.mocked(getContainerInboundPlanPreview).mockResolvedValue({ ...resourceCommittedPreview, ready: false, blockedOrderCount: 1 })
-    const wrapper = await openPending(); await openContainerDialog(wrapper); await chooseContainer(wrapper)
+    const wrapper = await openAfterDeparture(); await openContainerDialog(wrapper); await chooseContainer(wrapper)
     expect(cabinetDialog(wrapper).props('confirmDisabled')).toBe(true)
     cabinetDialog(wrapper).vm.$emit('confirm'); await flushPromises()
     expect(convertLastMileContainerToInboundPlans).not.toHaveBeenCalled()
@@ -982,7 +998,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
   it('guards resource retry at the handler when the caller lacks create permission', async () => {
     canAccess.mockImplementation(code => code !== 'platform:overseas-warehouse:inbound-order:create')
     vi.mocked(getContainerInboundPlanPreview).mockResolvedValue(resourceCommittedPreview)
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     const view = wrapper.vm as unknown as { openContainerConversion(): void }
     view.openContainerConversion(); await flushPromises(); await chooseContainer(wrapper)
     expect(cabinetDialog(wrapper).props('confirmDisabled')).toBe(true)
@@ -995,7 +1011,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
     let resolveOptions!: (value: Awaited<ReturnType<typeof listContainerPlanProgress>>) => void
     vi.mocked(getContainerInboundPlanPreview).mockReturnValue(new Promise(resolve => { resolvePreview = resolve }))
     vi.mocked(listContainerPlanProgress).mockReturnValue(new Promise(resolve => { resolveOptions = resolve }))
-    const wrapper = await openPending(); await openContainerDialog(wrapper); await chooseContainer(wrapper)
+    const wrapper = await openAfterDeparture(); await openContainerDialog(wrapper); await chooseContainer(wrapper)
     expect(cabinetDialog(wrapper).props('confirmDisabled')).toBe(true)
     cabinetDialog(wrapper).vm.$emit('confirm'); await flushPromises()
     expect(convertLastMileContainerToInboundPlans).not.toHaveBeenCalled()
@@ -1011,7 +1027,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
     const success = vi.spyOn(ElMessage, 'success').mockImplementation(() => ({ close: vi.fn() } as never))
     vi.mocked(getContainerInboundPlanPreview).mockResolvedValue(resourceCommittedPreview)
     vi.mocked(convertLastMileContainerToInboundPlans).mockRejectedValueOnce(new ApiResponseError('资源确认失败', 'S0503', 503))
-    const wrapper = await openPending(); await openContainerDialog(wrapper); await chooseContainer(wrapper)
+    const wrapper = await openAfterDeparture(); await openContainerDialog(wrapper); await chooseContainer(wrapper)
     cabinetDialog(wrapper).vm.$emit('confirm'); await flushPromises()
     expect(cabinetDialog(wrapper).props('modelValue')).toBe(true)
     expect(cabinetDialog(wrapper).props('confirmDisabled')).toBe(false)
@@ -1233,7 +1249,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
   })
 
   it('loads only active FBA master data and submits exact string fields for a cross-customer transfer', async () => {
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await selectRows(wrapper, [selectedRow(), selectedRow({ id: '2092873463568596995', customerId: '2092618717861048322' })])
     await button(wrapper, '转仓')!.trigger('click')
     await flushPromises()
@@ -1257,7 +1273,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
   })
 
   it('clears all selected warehouse facts when the FBA candidate is cleared', async () => {
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await selectRows(wrapper, [selectedRow()])
     await button(wrapper, '转仓')!.trigger('click')
     await flushPromises()
@@ -1273,7 +1289,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
 
   it('renders an explicit empty state when there are no active FBA candidates', async () => {
     vi.mocked(listAllPlatformWarehouses).mockResolvedValueOnce([])
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await selectRows(wrapper, [selectedRow()])
     await button(wrapper, '转仓')!.trigger('click')
     await flushPromises()
@@ -1285,7 +1301,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
     vi.mocked(listAllPlatformWarehouses).mockRejectedValueOnce(new ApiResponseError(
       'FBA candidate failed', 'A0503', 200, undefined, 'request-fba', 'trace-fba',
     ))
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await selectRows(wrapper, [selectedRow()])
     await button(wrapper, '转仓')!.trigger('click')
     await flushPromises()
@@ -1355,21 +1371,22 @@ describe('LastMileOrdersView pending order and container conversion', () => {
     await dialog.findAll('button').find(item => item.text() === '保存')!.trigger('click'); await flushPromises()
     expect(updateLastMileOrderHold).toHaveBeenCalledWith(row.id, { held: !detained, chargeable: false, reason: '原因', expectedVersion: 0 }, expect.stringContaining('last-mile-hold-'))
   })
-  it('renders all eight node times and submits the complete set with zero version', async () => {
+  it('edits only customs nodes while preserving hidden node facts and zero version', async () => {
+    vi.mocked(getLastMileOrderManualNodes).mockResolvedValue({ orderId: '2092873463568596994', manualOverrideEnabled: true, nodes: [{ nodeCode: 'ACTUAL_DEPARTURE', nodeAt: '2026-10-19T08:00:00' }], version: 0 })
     const wrapper = await mountView()
     const row = selectedRow()
     await (wrapper.vm as unknown as { openManualNodes(row: object): Promise<void> }).openManualNodes(row)
     await flushPromises()
     const dialog = wrapper.findAllComponents(AppDialog).find(item => item.props('title').startsWith('修改节点 ·'))!
-    expect(dialog.findAll('.manual-nodes-editor tbody tr')).toHaveLength(8)
+    expect(dialog.findAll('.manual-nodes-editor tbody tr').map(row => row.find('th').text())).toEqual(['国内报关完成', '国外清关完成'])
     const dates = dialog.findAllComponents({ name: 'ElDatePicker' })
-    expect(dates).toHaveLength(8)
+    expect(dates).toHaveLength(2)
     dates[0]!.vm.$emit('update:modelValue', '2026-10-20T08:00:00')
     await dialog.get('button[aria-label="展开全屏"]').trigger('click')
     await dialog.findAll('button').find(item => item.text() === '保存')!.trigger('click'); await flushPromises()
     expect(updateLastMileOrderManualNodes).toHaveBeenCalledWith(row.id, 0, [
       { nodeCode: 'DOMESTIC_CUSTOMS_COMPLETED', nodeAt: '2026-10-20T08:00:00' },
-      { nodeCode: 'ESTIMATED_DEPARTURE', nodeAt: null }, { nodeCode: 'ACTUAL_DEPARTURE', nodeAt: null },
+      { nodeCode: 'ESTIMATED_DEPARTURE', nodeAt: null }, { nodeCode: 'ACTUAL_DEPARTURE', nodeAt: '2026-10-19T08:00:00' },
       { nodeCode: 'ESTIMATED_ARRIVAL', nodeAt: null }, { nodeCode: 'OVERSEAS_CUSTOMS_COMPLETED', nodeAt: null },
       { nodeCode: 'ACTUAL_ARRIVAL_WAITING_UNLOAD', nodeAt: null }, { nodeCode: 'PICKUP_APPOINTED', nodeAt: null }, { nodeCode: 'UNLOADED', nodeAt: null },
     ], expect.stringContaining('last-mile-manual-nodes-'))
@@ -1381,7 +1398,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
       groups: Array.from({ length: 13 }, (_, index) => ({ ...group, destinationWarehouseCode: 'FBA-' + index, orderCount: 1, pendingOrderCount: 1, pendingPalletCount: 1, sourcePalletCount: 1, supplementPalletCount: 0,
         orders: [{ ...group.orders[0]!, orderId: 'order-' + index, businessOrderNo: '业务单-' + index, sourcePalletCount: 1, targetPalletCount: 1, supplementPalletCount: 0 }] })),
     })
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await openContainerDialog(wrapper); await chooseContainer(wrapper)
     const dialog = cabinetDialog(wrapper)
     expect(dialog.findAll('[aria-label="目的地分组明细"]')).toHaveLength(13)
@@ -1394,7 +1411,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
   it('keeps transfer drafts locked during submission and editable after rejection', async () => {
     let reject!: (reason: unknown) => void
     vi.mocked(transferLastMileOrders).mockReturnValueOnce(new Promise((_, no) => { reject = no }))
-    const wrapper = await openPending()
+    const wrapper = await openAfterDeparture()
     await selectRows(wrapper, [selectedRow()])
     await button(wrapper, '转仓')!.trigger('click'); await flushPromises()
     const dialog = wrapper.findAllComponents(AppDialog).find(item => item.props('title').startsWith('转仓 ·'))!

src/modules/overseas-warehouse/pages/LastMileOrdersView.vue

@@ -143,6 +143,7 @@ const manualNodeDefinitions: Array<{ code: ManualNodeCode; label: string }> = [
   { code: 'PICKUP_APPOINTED', label: '预约提柜' },
   { code: 'UNLOADED', label: '卸柜' },
 ]
+const visibleManualNodeDefinitions = manualNodeDefinitions.filter(({ code }) => ['DOMESTIC_CUSTOMS_COMPLETED', 'OVERSEAS_CUSTOMS_COMPLETED'].includes(code))
 const manualNodeValues = reactive<Record<ManualNodeCode, string | null>>(Object.fromEntries(manualNodeDefinitions.map(({ code }) => [code, null])) as Record<ManualNodeCode, string | null>)
 const transferOpen = ref(false)
 const transferWarehouseLoading = ref(false)
@@ -1330,7 +1331,6 @@ onMounted(() => { void load() })
   </AppDialog>
   <AppDialog class="inbound-plan-dialog admin-density-dialog admin-workbench is-dialog" v-model="inboundPlanOpen" :title="`入库计划 · ${actionTarget?.orderNo || '—'}`" width="min(1160px, calc(100vw - 48px))" top="6vh" fullscreenable confirm-text="保存并生成入库单" :loading="inboundPlanPreviewLoading || inboundPlanArrivalLoading" :confirm-loading="actionLoading" :confirm-disabled="inboundPlanSubmitDisabled" @confirm="submitInboundPlan">
     <div class="inbound-plan-content">
-    <el-alert title="保存后生成入库单；首个入库计划生成后，整柜预计到仓时间不可更改。" type="info" :closable="false" show-icon />
     <el-alert v-if="inboundPlanPreviewError" :title="inboundPlanPreviewError" type="error" :closable="false" show-icon />
     <el-alert v-if="inboundPlanArrivalError" :title="inboundPlanArrivalError" type="error" :closable="false" show-icon />
     <el-form class="inbound-plan-form command-form density-form density-dialog-sections" label-position="left" label-width="110px" :disabled="actionLoading">
@@ -1342,7 +1342,7 @@ onMounted(() => { void load() })
       </section>
       <section class="density-dialog-section" aria-label="入库计划登记"><h3 class="density-dialog-section__title">计划设置</h3>
         <table class="density-table density-table--editable last-mile-command-table"><tbody>
-          <tr><td><el-form-item label="托数" required><span v-if="inboundPlanIsDropship" class="frozen-pallet-count">{{ inboundPlanForm.palletCount }}</span><el-input-number v-else v-model="inboundPlanForm.palletCount" :min="inboundPlanMinimumPalletCount" :max="999" controls-position="right" /><span class="inbound-plan-pallet-note density-dialog-note" v-if="inboundPlanIsDropship">一件代发固定按头程已封托托盘数整体入库，不可增减。</span><span class="inbound-plan-pallet-note density-dialog-note" v-else>按柜级预览至少 {{ inboundPlanMinimumPalletCount }} 托，可增加，不能减少。</span></el-form-item></td><td><el-form-item label="托盘类型"><el-select v-model="inboundPlanForm.palletType" placeholder="请选择托盘类型"><el-option label="标准托盘" value="STANDARD" /><el-option label="木托盘" value="WOOD" /><el-option label="纸托盘" value="PAPER" /></el-select></el-form-item></td></tr>
+          <tr><td><el-form-item label="托数" required><div class="inbound-plan-pallet-field"><span v-if="inboundPlanIsDropship" class="frozen-pallet-count">{{ inboundPlanForm.palletCount }}</span><el-input-number v-else v-model="inboundPlanForm.palletCount" :min="inboundPlanMinimumPalletCount" :max="999" controls-position="right" /><span class="inbound-plan-pallet-note density-dialog-note" v-if="inboundPlanIsDropship">一件代发固定按头程已封托托盘数整体入库，不可增减。</span><span class="inbound-plan-pallet-note density-dialog-note" v-else>按柜级预览至少 {{ inboundPlanMinimumPalletCount }} 托，可增加，不能减少。</span></div></el-form-item></td><td><el-form-item label="托盘类型"><el-select v-model="inboundPlanForm.palletType" placeholder="请选择托盘类型"><el-option label="标准托盘" value="STANDARD" /><el-option label="木托盘" value="WOOD" /><el-option label="纸托盘" value="PAPER" /></el-select></el-form-item></td></tr>
           <tr><td><el-form-item label="是否外配"><el-switch v-model="inboundPlanForm.assigned" inline-prompt active-text="是" inactive-text="否" /></el-form-item></td><td><el-form-item label="允许合托"><el-switch v-model="inboundPlanForm.mergeRequired" inline-prompt active-text="是" inactive-text="否" /><InlineHelp title="合托提示说明">仅作为现场可选提示，不强制工人合托。</InlineHelp></el-form-item></td></tr>
           <tr><td colspan="2"><el-form-item label="是否加急"><el-switch v-model="inboundPlanForm.urgent" inline-prompt active-text="是" inactive-text="否" /></el-form-item></td></tr>
           <tr><td colspan="2"><el-form-item label="备注"><el-input v-model="inboundPlanForm.remark" type="textarea" :rows="3" maxlength="1000" show-word-limit /></el-form-item></td></tr>
@@ -1360,8 +1360,7 @@ onMounted(() => { void load() })
     </tbody></table></el-form></section>
   </AppDialog>
   <AppDialog class="admin-density-dialog admin-workbench is-dialog" v-model="manualNodesOpen" :title="`修改节点 · ${actionTarget?.orderNo || '—'}`" width="min(700px, calc(100vw - 28px))" fullscreenable confirm-text="保存" :loading="manualNodesLoading" :confirm-loading="actionLoading" @confirm="submitManualNodes">
-    <el-alert title="保存后该订单只显示人工节点，不再跟随柜级节点；请至少填写一个节点时间。" type="warning" :closable="false" show-icon />
-    <section class="density-dialog-section" data-tone="work" aria-label="人工节点登记"><h3 class="density-dialog-section__title">人工节点</h3><el-form class="density-form" :disabled="actionLoading"><table class="density-table density-table--editable manual-nodes-editor"><thead><tr><th>节点</th><th>节点时间</th></tr></thead><tbody><tr v-for="node in manualNodeDefinitions" :key="node.code"><th scope="row">{{ node.label }}</th><td><el-date-picker v-model="manualNodeValues[node.code]" :aria-label="`${node.label}时间`" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="年/月/日 --:--" /></td></tr></tbody></table></el-form></section>
+    <section class="density-dialog-section" aria-label="人工节点登记"><h3 class="density-dialog-section__title">人工节点</h3><el-form class="density-form" :disabled="actionLoading"><table class="density-table density-table--editable manual-nodes-editor"><thead><tr><th>节点</th><th>节点时间</th></tr></thead><tbody><tr v-for="node in visibleManualNodeDefinitions" :key="node.code"><th scope="row">{{ node.label }}</th><td><el-date-picker v-model="manualNodeValues[node.code]" :aria-label="`${node.label}时间`" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="年/月/日 --:--" /></td></tr></tbody></table></el-form></section>
   </AppDialog>
   <AppDialog class="admin-density-dialog admin-workbench is-dialog" v-model="reworkOpen" :title="`换标退回重做 · ${reworkForm.relabelNo || '—'}`" width="min(620px, calc(100vw - 28px))" fullscreenable confirm-text="确认退回重做" :confirm-loading="reworkSaving" :confirm-disabled="!reworkForm.relabelNo || !reworkForm.remark.trim()" @confirm="submitReworkRelabel">
     <section class="density-dialog-section" data-tone="work" aria-label="换标重做登记"><h3 class="density-dialog-section__title">退回重做</h3><el-form class="density-form" label-position="left" label-width="100px" :disabled="reworkSaving"><table class="density-table density-table--editable"><tbody>
@@ -1382,7 +1381,9 @@ onMounted(() => { void load() })
 .inbound-plan-arrival { display: flex; align-items: center; flex-wrap: wrap; gap: var(--admin-space-3); }
 .inbound-plan-form :deep(.el-form-item__content) { min-width: 0; }
 .inbound-plan-form :deep(.el-select) { width: 100%; }
-.inbound-plan-pallet-note { flex-basis: 100%; margin-top: var(--admin-space-2); }
+.inbound-plan-pallet-field { display: flex; flex-wrap: wrap; align-items: center; gap: var(--admin-space-2) var(--admin-space-3); min-width: 0; }
+.inbound-plan-pallet-field :deep(.el-input-number) { width: 140px; flex: 0 0 140px; }
+.inbound-plan-pallet-note { margin: 0; line-height: 1.5; }
 .manual-nodes-editor th { width: 180px; }
 .relabel-suborder { min-height: 30px; line-height: 30px; white-space: nowrap; }
 .last-mile-toolbar { min-width: 0; }