优化

src/modules/container-loading/pages/ContainersView.test.ts

@@ -10,7 +10,8 @@ import { listAllPlatformWarehouses } from '@/modules/warehouses'
 import { listPlatformPartners } from '@/modules/master-data'
 import { listSuppliers } from '@/modules/suppliers'
 import { getOceanBooking, listOceanBookingLinkCandidates, listOceanBookings } from '@/modules/ocean-bookings'
-import { getContainer, getContainerOverview, linkContainerOceanBooking, listContainers, updateContainer } from '../api/platformContainerLoading'
+import { getContainer, getContainerOverview, listContainers, updateContainer } from '../api/platformContainerLoading'
+import OceanBookingLinkDialog from '../components/OceanBookingLinkDialog.vue'
 import { getTerminalDrayage, getTerminalDrayageHistory, recordTerminalDrayageEmptyReturn, selectTerminalDrayageFleet, sendTerminalDrayageEmail, getTerminalDrayageEmails } from '../api/terminalDrayages'
 import AppDialog from '@/shared/components/AppDialog.vue'
 import { containerLoadingRoutes } from '../routes'
@@ -533,12 +534,10 @@ describe('ContainersView', () => {
     wrapper.unmount()
   })
 
-  it('opens the existing released-booking workflow when entered from container detail', () => {
+  it('owns the released-booking entry through the shared dialog without a detail redirect query', () => {
     const source = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/ContainersView.vue'), 'utf8')
-    expect(source).toContain('route.query.linkContainerId')
-    expect(source).toContain("const target = await getContainer(linkContainerId, 'DOMESTIC')")
-    expect(source).toContain('await openLink(target)')
-    expect(source).toContain("void router.replace({ name: 'domestic-container-workbench' })")
+    expect(source).toContain('<OceanBookingLinkDialog v-model="linkOpen" :container="linkTarget" @linked="loadRows" />')
+    expect(source).not.toContain('linkContainerId')
   })
 
   it.each(['EDITING', 'LOADING', 'COMPLETED'] as const)('keeps released-booking linking reachable alongside the %s process action', async (planStatus) => {
@@ -567,63 +566,6 @@ describe('ContainersView', () => {
     }
   })
 
-  it('normalizes an optional booking-link container number', async () => {
-    vi.mocked(linkContainerOceanBooking).mockResolvedValue({} as never)
-    const router = createTestRouter()
-    await router.push('/'); await router.isReady()
-    const wrapper = mount(ContainersView, { global: { plugins: [ElementPlus, router] } })
-    await flushPromises()
-    const vm = wrapper.vm as unknown as {
-      linkTarget: { id: string; version: number }
-      linkCandidates: Array<{ key: string; oceanBookingId: string; requirementId: string; disabled: boolean }>
-      linkCandidateKey: string
-      linkContainerNo: string
-      saveLink: () => Promise<void>
-    }
-    vm.linkTarget = { id: '9001', version: 7 }
-    vm.linkCandidates = [{ key: '101:202', oceanBookingId: '101', requirementId: '202', disabled: false }]
-    vm.linkCandidateKey = '101:202'
-    vm.linkContainerNo = '  mscu1234567  '
-
-    await vm.saveLink()
-
-    expect(linkContainerOceanBooking).toHaveBeenCalledWith('9001', {
-      oceanBookingId: '101', requirementId: '202', containerNo: 'MSCU1234567', expectedVersion: 7,
-    })
-    expect(vm.linkContainerNo).toBe('MSCU1234567')
-    wrapper.unmount()
-  })
-
-  it('links a released booking while leaving the real container number pending until pickup', async () => {
-    vi.mocked(linkContainerOceanBooking).mockResolvedValue({} as never)
-    const router = createTestRouter()
-    await router.push('/'); await router.isReady()
-    const wrapper = mount(ContainersView, { global: { plugins: [ElementPlus, router] } })
-    await flushPromises()
-    const vm = wrapper.vm as unknown as {
-      linkTarget: { id: string; version: number }
-      linkCandidates: Array<{ key: string; oceanBookingId: string; requirementId: string; disabled: boolean }>
-      linkCandidateKey: string
-      linkContainerNo: string
-      saveLink: () => Promise<void>
-    }
-    vm.linkTarget = { id: '9001', version: 7 }
-    vm.linkCandidates = [{ key: '101:202', oceanBookingId: '101', requirementId: '202', disabled: false }]
-    vm.linkCandidateKey = '101:202'
-    vm.linkContainerNo = ''
-
-    await vm.saveLink()
-
-    expect(linkContainerOceanBooking).toHaveBeenCalledWith('9001', {
-      oceanBookingId: '101', requirementId: '202', containerNo: null, expectedVersion: 7,
-    })
-    const source = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/ContainersView.vue'), 'utf8')
-    expect(source).toContain('真实集装箱号可待司机提柜时录入')
-    expect(source).toContain(':confirm-disabled="!linkCandidateKey"')
-    expect(source).toContain("row.containerNo || '待补录'")
-    wrapper.unmount()
-  })
-
   it('keeps document uploads on the routed detail page without duplicate list implementations', () => {
     const source = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/ContainersView.vue'), 'utf8')
     const detailSource = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/ContainerDetailView.vue'), 'utf8')
@@ -675,8 +617,8 @@ describe('ContainersView', () => {
     await flushPromises()
 
     expect(listOceanBookingLinkCandidates).toHaveBeenCalledWith({ warehouseId: '193000000000200002', channelCode: 'EXX_RAIL_NY', containerType: '45HC', page: 1, size: 200 })
-    expect((wrapper.vm as unknown as { linkCandidates: unknown[] }).linkCandidates).toEqual([])
-    expect(readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/ContainersView.vue'), 'utf8'))
+    expect((wrapper.findComponent(OceanBookingLinkDialog).vm as unknown as { candidates: unknown[] }).candidates).toEqual([])
+    expect(readFileSync(resolve(process.cwd(), 'src/modules/container-loading/components/OceanBookingLinkDialog.vue'), 'utf8'))
       .toContain('暂无符合当前装柜仓库、物流渠道和柜型的已放舱需求')
     expect(getOceanBooking).not.toHaveBeenCalled()
     wrapper.unmount()
@@ -701,6 +643,7 @@ describe('ContainersView', () => {
       .filter((item) => item.textContent?.includes('关联已放舱订舱')).at(-1)!
 
     linkAction.click()
+    await flushPromises()
     linkAction.click()
 
     expect(listOceanBookingLinkCandidates).toHaveBeenCalledTimes(1)
@@ -709,7 +652,7 @@ describe('ContainersView', () => {
     resolveCandidates({ records: [{ oceanBookingId: '315', bookingNo: 'OB-CAPACITY-SNAPSHOT', requirementId: '45315', containerType: '45HC', capacityCbm: 85, maxWeightKg: 28500, requiredQuantity: 1, allocatedQuantity: 0, remainingQuantity: 1, customerName: '客户', warehouseName: '东莞仓', channelName: '纽约铁路' }], page: 1, size: 200, total: 1, pages: 1 })
     await flushPromises()
     expect(document.body.textContent).toContain('OB-CAPACITY-SNAPSHOT · 45HC × 1')
-    expect((wrapper.vm as unknown as { linkCandidates: Array<{ disabled: boolean }> }).linkCandidates[0]?.disabled).toBe(false)
+    expect((wrapper.findComponent(OceanBookingLinkDialog).vm as unknown as { candidates: Array<{ key: string }> }).candidates[0]?.key).toBe('315:45315')
     wrapper.unmount()
   })
 
@@ -743,7 +686,7 @@ describe('ContainersView', () => {
     await flushPromises()
 
     expect(listOceanBookingLinkCandidates).toHaveBeenCalledTimes(2)
-    const candidateLabels = (wrapper.vm as unknown as { linkCandidates: Array<{ label: string }> }).linkCandidates.map((candidate) => candidate.label)
+    const candidateLabels = (wrapper.findComponent(OceanBookingLinkDialog).vm as unknown as { candidates: Array<{ label: string }> }).candidates.map((candidate) => candidate.label)
     expect(candidateLabels.some((label) => label.includes('OB-LATEST'))).toBe(true)
     expect(candidateLabels.some((label) => label.includes('OB-STALE'))).toBe(false)
     wrapper.unmount()