Merge origin/dev into release/test preserving current workflows

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

@@ -4,12 +4,12 @@ import { resolve } from 'node:path'
 import { enableAutoUnmount, flushPromises, mount } from '@vue/test-utils'
 import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import QueryToolbar, { type QueryModel } from '@/shared/components/QueryToolbar.vue'
-import { cancelDispatch, getDispatchBolPdf, listDispatches, transferDispatchToDelivery, updateDispatch } from '../api/dispatches'
+import { cancelDispatch, getDispatchBolPdf, listDispatches, removeDispatchItem, transferDispatchToDelivery, updateDispatch } from '../api/dispatches'
 import DispatchesView from './DispatchesView.vue'
 
 const canPermission = vi.hoisted(() => vi.fn(() => true))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: canPermission }) }))
-vi.mock('../api/dispatches', () => ({ listDispatches: vi.fn(), getDispatchBolPdf: vi.fn(), updateDispatch: vi.fn(), cancelDispatch: vi.fn(), transferDispatchToDelivery: vi.fn() }))
+vi.mock('../api/dispatches', () => ({ listDispatches: vi.fn(), removeDispatchItem: vi.fn(), getDispatchBolPdf: vi.fn(), updateDispatch: vi.fn(), cancelDispatch: vi.fn(), transferDispatchToDelivery: vi.fn() }))
 
 class ResizeObserverStub implements ResizeObserver {
   observe() {}
@@ -48,6 +48,7 @@ describe('DispatchesView', () => {
     })
     vi.mocked(updateDispatch).mockReset()
     vi.mocked(getDispatchBolPdf).mockReset().mockResolvedValue(new Blob(['%PDF-test'], { type: 'application/pdf' }))
+    vi.mocked(removeDispatchItem).mockReset()
     vi.mocked(cancelDispatch).mockReset()
     vi.mocked(transferDispatchToDelivery).mockReset()
     canPermission.mockReset().mockReturnValue(true)
@@ -111,10 +112,13 @@ describe('DispatchesView', () => {
     expect(source).toContain('permission.dispatchEdit')
     expect(source).toContain('permission.dispatchCancel')
     expect(source).toContain('permission.dispatchTransferDelivery')
-    expect(source).toContain("function isPendingDeparture(row: DispatchListItem) { return row.statusCode === 'PENDING_DEPARTURE' }")
-    expect(source).toContain('access.can(permission.dispatchEdit) && isPendingDeparture(row)')
-    expect(source).toContain("access.can(permission.dispatchTransferDelivery) && ['PENDING_DEPARTURE', 'PICKING', 'READY_TO_DEPART'].includes(row.statusCode)")
-    expect(source).toContain('普通编辑不会修改排车状态')
+    expect(source).toMatch(/function isPendingDeparture\(row: DispatchListItem\)\s*{\s*return row\.statusCode === 'PENDING_DEPARTURE'/)
+    expect(source).toMatch(/access\.can\(permission\.dispatchEdit\)\s*&&\s*isPendingDeparture\(row\)/)
+    expect(source).toMatch(/access\.can\(permission\.dispatchTransferDelivery\)\s*&&\s*\['PENDING_DEPARTURE', 'PICKING', 'READY_TO_DEPART'\]\.includes\(row\.statusCode\)/)
+    expect(source).toContain('未生成出库单前可移除托盘')
+    expect(source).toContain('removeDispatchItem')
+    expect(source).toContain('托盘箱唛确认')
+    expect(source).toContain('palletCartonMarks')
     expect(source).not.toContain('departDispatch')
 
     canPermission.mockReturnValue(false)