优化

src/modules/warehouses/pages/WarehousesView.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, onMounted, reactive, ref, watch } from 'vue'
+import { computed, reactive, ref, watch } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { MapPin, Pencil, Plus, Power, Warehouse as WarehouseIcon } from '@lucide/vue'
 import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
@@ -17,16 +17,18 @@ import {
   type SavePlatformWarehouseRequest,
 } from '@/modules/warehouses/api/platformWarehouses'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import { PlatformTenantSelector } from '@/modules/iam'
 import type { Warehouse } from '@/modules/warehouses/types'
 
-const fixedTenantId = 10001
 const access = useAccessPreviewStore()
 const editorOpen = ref(false)
 const saving = ref(false)
 const loading = ref(false)
+const editLoading = ref(false)
 const page = ref(1)
 const pageSize = ref(10)
-const loadedTenantId = ref<number | null>(null)
+const selectedTenantId = ref('')
+const loadedTenantId = ref<string | null>(null)
 const loadError = ref<ApiErrorDetails | null>(null)
 const detailWarningCount = ref(0)
 const statusLoadingIds = ref(new Set<string>())
@@ -82,7 +84,13 @@ const { captureBaseline } = useUnsavedWorkRegistration({
   requiredPermission: editorPermission,
 })
 
-const warehouseReady = computed(() => loadedTenantId.value === fixedTenantId && !loading.value)
+const warehouseReady = computed(() => Boolean(selectedTenantId.value)
+  && loadedTenantId.value === selectedTenantId.value
+  && !loading.value)
+const tenantSwitchDisabled = computed(() => editorOpen.value
+  || editLoading.value
+  || saving.value
+  || statusLoadingIds.value.size > 0)
 const filteredRows = computed(() => rows.value.filter((warehouse) => {
   const keyword = appliedFilters.value.keyword.trim().toLowerCase()
   const matchesKeyword = !keyword || [warehouse.code, warehouse.name, warehouse.province, warehouse.city, warehouse.address]
@@ -159,14 +167,21 @@ function validateWarehouseForm() {
     .every(Boolean)
 }
 
-async function loadWarehouses() {
+function apiTenantId(value: string) {
+  const numeric = Number(value)
+  return Number.isSafeInteger(numeric) ? numeric : value
+}
+
+async function loadWarehouses(tenantId = selectedTenantId.value) {
+  if (!tenantId) return
   const sequence = ++loadSequence
   loading.value = true
   loadError.value = null
   try {
-    const result = await listPlatformWarehouses(fixedTenantId, 1, 200)
+    const requestTenantId = apiTenantId(tenantId)
+    const result = await listPlatformWarehouses(requestTenantId, 1, 200)
     const details = await Promise.allSettled(
-      result.records.map((warehouse) => getPlatformWarehouse(fixedTenantId, warehouse.id)),
+      result.records.map((warehouse) => getPlatformWarehouse(requestTenantId, warehouse.id)),
     )
     if (sequence !== loadSequence) return
     rows.value = result.records.map((warehouse, index) => {
@@ -174,7 +189,7 @@ async function loadWarehouses() {
       return toRow(warehouse, detailResult?.status === 'fulfilled' ? detailResult.value : null)
     })
     detailWarningCount.value = details.filter((item) => item.status === 'rejected').length
-    loadedTenantId.value = fixedTenantId
+    loadedTenantId.value = tenantId
     page.value = 1
   } catch (error) {
     if (sequence !== loadSequence) return
@@ -189,7 +204,7 @@ function requireCurrentTenant() {
     ElMessage.warning('仓库数据尚未加载完成，请稍后重试')
     return null
   }
-  return fixedTenantId
+  return apiTenantId(selectedTenantId.value)
 }
 
 function openCreate() {
@@ -217,24 +232,30 @@ async function ensureDetail(warehouse: WarehouseRow) {
 }
 
 async function openEdit(warehouse: WarehouseRow) {
-  const detail = await ensureDetail(warehouse)
-  if (!detail) return
-  const address = detail.addresses[0]
-  Object.assign(form, warehouse, {
-    province: address?.stateProvince || '',
-    city: address?.city || '',
-    address: address?.addressLine1 || '',
-  })
-  clearWarehouseFormErrors()
-  captureBaseline()
-  editorOpen.value = true
+  const tenantAtStart = selectedTenantId.value
+  editLoading.value = true
+  try {
+    const detail = await ensureDetail(warehouse)
+    if (!detail || selectedTenantId.value !== tenantAtStart || loadedTenantId.value !== tenantAtStart) return
+    const address = detail.addresses[0]
+    Object.assign(form, warehouse, {
+      province: address?.stateProvince || '',
+      city: address?.city || '',
+      address: address?.addressLine1 || '',
+    })
+    clearWarehouseFormErrors()
+    captureBaseline()
+    editorOpen.value = true
+  } finally {
+    editLoading.value = false
+  }
 }
 
 function nullable(value: string) {
   return value.trim() || null
 }
 
-function buildSaveRequest(tenantId: number): SavePlatformWarehouseRequest {
+function buildSaveRequest(tenantId: number | string): SavePlatformWarehouseRequest {
   const existing = form.id ? rows.value.find((item) => item.id === form.id)?.detail : null
   const warehouse = existing?.warehouse
   const currentAddress = existing?.addresses[0]
@@ -332,13 +353,19 @@ async function toggleStatus(warehouse: WarehouseRow) {
   }
 }
 
-onMounted(() => {
-  void loadWarehouses()
+watch(selectedTenantId, (tenantId) => {
+  editorOpen.value = false
+  rows.value = []
+  loadedTenantId.value = null
+  detailWarningCount.value = 0
+  page.value = 1
+  void loadWarehouses(tenantId)
 })
 </script>
 
 <template>
   <div class="business-page">
+    <PlatformTenantSelector v-model="selectedTenantId" :disabled="tenantSwitchDisabled" />
     <el-alert v-if="loadError" type="error" :closable="false" show-icon class="state-alert">
       <template #title>仓库数据加载失败</template>
       <p>{{ loadErrorDescription }}</p>
@@ -355,7 +382,7 @@ onMounted(() => {
       <div class="panel-heading">
         <div>
           <h2>平台收货仓</h2>
-          <p>租户 {{ fixedTenantId }} · 共 {{ filteredRows.length }} 个收货仓</p>
+          <p>租户 {{ selectedTenantId || '—' }} · 共 {{ filteredRows.length }} 个收货仓</p>
         </div>
         <el-button
           v-if="access.can('platform:warehouse:create')"