解决海外仓前端提交冲突

This commit is contained in:
2026-08-28 14:41:40 +08:00
13 changed files with 122 additions and 71 deletions
@@ -14,13 +14,13 @@ import ListPageLayout from '@/shared/components/ListPageLayout.vue'
import LoadErrorState from '@/shared/components/LoadErrorState.vue'
import OperationErrorToast from '@/shared/components/OperationErrorToast.vue'
import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/components/QueryToolbar.vue'
import { createPallet, getPallet, listCustomerWarehouses, listPallets, updatePallet, type CustomerWarehouseDto, type PalletDto } from '../api/pallets'
import { createPallet, getPallet, listPallets, listReceivingOverseasWarehouses, updatePallet, type PalletDto, type ReceivingOverseasWarehouseDto } from '../api/pallets'
import { overseasWarehousePermissions as permission } from '../permissions'
import type { PalletListItem } from '../types'
const access = useAccessPreviewStore()
const router = useRouter()
const warehouses = ref<CustomerWarehouseDto[]>([])
const warehouses = ref<ReceivingOverseasWarehouseDto[]>([])
const fbaWarehouses = ref<PlatformWarehouseResource[]>([])
const rows = ref<PalletListItem[]>([])
const loading = ref(false)
@@ -63,7 +63,7 @@ async function loadWarehouses() {
contextLoading.value = true; loadError.value = null; loadErrorKind.value = 'context'
try {
const [warehousePage, platformFbaWarehouses] = await Promise.all([
listCustomerWarehouses(),
listReceivingOverseasWarehouses(),
listAllPlatformWarehouses({ warehouseType: 'FBA', status: 'ACTIVE' }),
])
warehouses.value = warehousePage.records