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

2026-08-11 11:59:39 +08:00
parent 347200a8c6 e3757cc9f9
commit 5633fb97a9
47 changed files with 1193 additions and 236 deletions
@@ -13,6 +13,12 @@ import {
  removeSmartLoadingItem,
 } from '../api/platformContainerLoading'

+const { routerPush } = vi.hoisted(() => ({ routerPush: vi.fn() }))
+
+vi.mock('vue-router', () => ({
+  useRouter: () => ({ push: routerPush }),
+}))
+
 vi.mock('@/core/access/accessPreview', () => ({
  useAccessPreviewStore: () => ({ can: () => true }),
 }))
@@ -75,6 +81,7 @@ describe('GlobalSmartLoadingView', () => {
      { label: '待装柜', value: 'WAIT_LOADING' },
      { label: '预装柜中', value: 'EDITING' },
      { label: '拣货中', value: 'LOADING' },
+      { label: '装柜完成', value: 'COMPLETED' },
    ])

    expect(wrapper.text()).not.toContain('税率')
@@ -92,22 +99,36 @@ describe('GlobalSmartLoadingView', () => {
    expect(wrapper.text()).toContain('CB-1 装柜方案')
  })

-  it('keeps loading containers editable and hides completed containers', async () => {
-    const loadingContainer = { ...container, id: '9007199254740995', cabinetNo: 'CB-LOADING', planStatus: 'LOADING' as const }
-    const completedContainer = { ...container, id: '9007199254740996', cabinetNo: 'CB-COMPLETED', planStatus: 'COMPLETED' as const }
-    vi.mocked(listContainers).mockResolvedValue({ records: [completedContainer, loadingContainer], page: 1, size: 100, total: 2, pages: 1 })
-    vi.mocked(getSmartLoadingPlanByBooking).mockResolvedValue({ ...plan, bookingId: loadingContainer.id, status: 'LOADING' })
-
+  it('keeps picking containers editable while hiding the push action', async () => {
+    const pushed = { ...container, id: '9007199254740995', planId: '9007199254740996', cabinetNo: 'CB-2', planStatus: 'LOADING' as const }
+    const pickingPlan = { ...plan, bookingId: pushed.id, status: 'LOADING' as const }
+    vi.mocked(listContainers).mockResolvedValue({ records: [pushed], page: 1, size: 100, total: 1, pages: 1 })
+    vi.mocked(getSmartLoadingPlanByBooking).mockResolvedValue(pickingPlan)
    const wrapper = mount(GlobalSmartLoadingView, { global: { plugins: [ElementPlus] } })
    await flushPromises()

-    expect(getSmartLoadingPlanByBooking).toHaveBeenCalledWith(loadingContainer.id)
-    expect(wrapper.text()).toContain('CB-LOADING')
+    expect(getSmartLoadingPlanByBooking).toHaveBeenCalledWith(pushed.id)
+    expect(listSmartLoadingCandidates).toHaveBeenCalledWith(pushed.warehouseId)
+    expect(wrapper.text()).toContain('CB-2')
    expect(wrapper.text()).toContain('拣货中')
-    expect(wrapper.text()).not.toContain('CB-COMPLETED')
    expect(wrapper.text()).toContain('智能推荐')
    expect(wrapper.text()).toContain('加入')
-    expect(wrapper.text()).not.toContain('推送预装')
+    expect(wrapper.findAll('button').some((item) => item.text().trim() === '推送预装')).toBe(false)
+  })
+
+  it('routes completed containers to the read-only loading list', async () => {
+    const completed = { ...container, id: '9007199254740997', planId: '9007199254740998', cabinetNo: 'CB-3', planStatus: 'COMPLETED' as const }
+    vi.mocked(listContainers).mockResolvedValue({ records: [completed], page: 1, size: 100, total: 1, pages: 1 })
+    const wrapper = mount(GlobalSmartLoadingView, { global: { plugins: [ElementPlus] } })
+    await flushPromises()
+
+    expect(getSmartLoadingPlanByBooking).not.toHaveBeenCalled()
+    expect(wrapper.text()).toContain('该柜次已完成装柜')
+    await wrapper.findAll('button').find((item) => item.text().includes('查看装柜清单'))!.trigger('click')
+    expect(routerPush).toHaveBeenCalledWith({
+      name: 'loading-lists',
+      query: { planId: completed.planId, warehouseId: completed.warehouseId },
+    })
  })

  it('refreshes the latest plan after A0409 without losing the selected container', async () => {