diff --git a/src/modules/overseas-warehouse/components/WarehouseTransferReviewDialog.vue b/src/modules/overseas-warehouse/components/WarehouseTransferReviewDialog.vue index 65d4e6b0..8ea9fcbe 100644 --- a/src/modules/overseas-warehouse/components/WarehouseTransferReviewDialog.vue +++ b/src/modules/overseas-warehouse/components/WarehouseTransferReviewDialog.vue @@ -62,7 +62,7 @@ watch(() => props.modelValue, (value) => { if (value) { form.decision = 'APPROVE 审核通过驳回 - + diff --git a/src/modules/overseas-warehouse/pages/OutboundsView.vue b/src/modules/overseas-warehouse/pages/OutboundsView.vue index b19e95a3..4d45daae 100644 --- a/src/modules/overseas-warehouse/pages/OutboundsView.vue +++ b/src/modules/overseas-warehouse/pages/OutboundsView.vue @@ -18,7 +18,7 @@ import { cancelOutbound, createOneClickDropshipOutbound, createReturnOutbound, l import { type InventoryBalanceDto, type InventoryPositionDto } from '../api/inventory' import { formatOverseasDateTime } from '../lastMilePresentation' import { overseasWarehousePermissions as permission } from '../permissions' -import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam/api/platformIam' +import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam' import { listPlatformWarehouses, type PlatformWarehouseSummaryResource } from '@/modules/warehouses' import { getReturnCarton, listReturnCartons, listReturnStock, type ReturnCartonDetail, type ReturnCartonRow, type ReturnStockRow } from '../api/returnInventory' diff --git a/src/modules/overseas-warehouse/pages/phase5Behavior.test.ts b/src/modules/overseas-warehouse/pages/phase5Behavior.test.ts index 67d8730a..802af7d6 100644 --- a/src/modules/overseas-warehouse/pages/phase5Behavior.test.ts +++ b/src/modules/overseas-warehouse/pages/phase5Behavior.test.ts @@ -20,7 +20,7 @@ describe('phase-five outbound, delivery, exception and visit behavior', () => { expect(detail).toContain('getOutbound(outboundNo.value)') expect(detail).toContain('cancelOutbound(outboundNo.value, reason)') expect(detail).not.toContain('customerId') - expect(list).toContain('createOneClickDropshipOutbound(selectedCustomerId.value') + expect(list).toContain("createOneClickDropshipOutbound([...customerIds][0] || ''") expectOperationColumnFirst('OutboundsView.vue') }) diff --git a/src/modules/overseas-warehouse/pages/prototypeContract.test.ts b/src/modules/overseas-warehouse/pages/prototypeContract.test.ts index 53fb654f..f669c673 100644 --- a/src/modules/overseas-warehouse/pages/prototypeContract.test.ts +++ b/src/modules/overseas-warehouse/pages/prototypeContract.test.ts @@ -349,9 +349,10 @@ describe('overseas warehouse first-batch prototype contract', () => { expect(value).toContain('aria-label="尾程订单状态"') expect(value).toContain('全部') expect(value).toContain('待分配') - expect(value.indexOf("label: '入库单号'")).toBeLessThan(value.indexOf("label: '出库单号'")) - expect(value.indexOf("label: '出库单号'")).toBeLessThan(value.indexOf("label: '派送单号'")) - expect(value.indexOf("label: '派送单号'")).toBeLessThan(value.indexOf("label: '换标单号'")) + const columns = value.slice(value.indexOf('const columns:'), value.indexOf('const selectedContainerIds')) + expect(columns.indexOf("label: '入库单号'")).toBeLessThan(columns.indexOf("label: '出库单号'")) + expect(columns.indexOf("label: '出库单号'")).toBeLessThan(columns.indexOf("label: '派送单号'")) + expect(columns.indexOf("label: '派送单号'")).toBeLessThan(columns.indexOf("label: '换标单号'")) expect(value).not.toMatch(/router\.push\([^)]*(outbound|dispatch)/) })