Merge remote-tracking branch 'origin/release/test' into dev

# Conflicts:
#	src/modules/overseas-warehouse/pages/DispatchesView.vue
#	src/modules/overseas-warehouse/pages/OutboundsView.vue
#	src/modules/overseas-warehouse/pages/PalletDetailView.vue
This commit is contained in:
2026-09-02 15:23:05 +08:00
11 changed files with 69 additions and 29 deletions
@@ -18,7 +18,7 @@ const loading = ref(false)
const loadError = ref<ApiErrorDetails | null>(null)
const groups = [
{ title: '基础信息', fields: ['托盘编码', '托盘类型', '仓库', '容积(m³)', '采购价格', '所属FBA仓', '状态'] },
{ title: '使用信息', fields: ['库位ID', '创建时间', '更新时间', '备注'] },
{ title: '使用信息', fields: ['库位', '创建时间', '更新时间', '备注'] },
]
const values = computed(() => ({
托盘编码: detail.value?.palletCode || '—', 托盘类型: detail.value?.palletType || '—', 仓库: warehouseName.value,
@@ -33,7 +33,7 @@ async function load() {
const [pallet, warehouses] = await Promise.all([getPallet(warehouseId.value, palletId.value), listReceivingOverseasWarehouses()])
detail.value = pallet
const warehouse = warehouses.records.find((item) => String(item.id) === warehouseId.value)
warehouseName.value = warehouse ? `${warehouse.warehouseName}(${warehouse.warehouseCode})` : warehouseId.value
warehouseName.value = warehouse ? `${warehouse.warehouseName}(${warehouse.warehouseCode})` : '—'
} catch (error) { loadError.value = getApiErrorDetails(error, '托盘详情加载失败,请重试') }
finally { loading.value = false }
}