解决海外仓前端提交冲突

src/modules/overseas-warehouse/pages/RelabelOrdersView.vue

@@ -27,7 +27,6 @@ const customers = ref<PlatformTenantResource[]>([])
 const customersLoading = ref(false)
 const warehouses = ref<RelabelWarehouseOptionDto[]>([])
 const warehousesLoading = ref(false)
-const warehouseRequestSequence = ref(0)
 const page = ref(1)
 const pageSize = ref(10)
 const total = ref(0)
@@ -75,6 +74,7 @@ function openForm(mode: 'create' | 'edit', source?: object) {
     createIdempotencyKey.value = globalThis.crypto?.randomUUID?.() || `admin-relabel-${Date.now()}`
     warehouses.value = []
     void loadCustomers()
+    void loadWarehouses()
   }
   dialogOpen.value = true
 }
@@ -96,19 +96,17 @@ async function loadCustomers() {
   finally { customersLoading.value = false }
 }
 
-async function handleCustomerChange(customerId: string) {
-  const requestSequence = ++warehouseRequestSequence.value
+async function loadWarehouses() {
   form.warehouseId = ''
   warehouses.value = []
-  if (!customerId) { warehousesLoading.value = false; return }
   warehousesLoading.value = true
   try {
-    const records = (await listRelabelWarehouseOptions(customerId)).records.filter((item) => item.status === 'ACTIVE')
-    if (requestSequence === warehouseRequestSequence.value && customerId === form.customerId) warehouses.value = records
+    const records = (await listRelabelWarehouseOptions()).records.filter((item) => item.status === 'ACTIVE')
+    warehouses.value = records
   } catch (error) {
-    if (requestSequence === warehouseRequestSequence.value) ElMessage.error(getApiErrorDetails(error, '海外仓列表加载失败，请重试').message)
+    ElMessage.error(getApiErrorDetails(error, '公共海外收货仓加载失败，请重试').message)
   } finally {
-    if (requestSequence === warehouseRequestSequence.value) warehousesLoading.value = false
+    warehousesLoading.value = false
   }
 }
 
@@ -116,7 +114,7 @@ async function submitForm() {
   if (submitting.value) return
   try {
     if (dialogMode.value === 'create') {
-      if (!form.customerId || !form.warehouseId) { ElMessage.warning('请先选择客户和该客户的海外仓'); return }
+      if (!form.customerId || !form.warehouseId) { ElMessage.warning('请选择客户和公共海外收货仓'); return }
       if (!form.relatedOrderNo.trim() || !form.sku.trim() || !form.productName.trim() || !form.cartons || !form.labelDeadline || !form.contactName.trim() || !form.contactPhone.trim() || !form.shipmentNo.trim() || !form.newSkuCode.trim() || !form.labelRequirement) {
         ElMessage.warning('请完整填写换标单必填信息')
         return
@@ -188,8 +186,8 @@ watch(dialogOpen, (open) => { if (!open) createIdempotencyKey.value = '' })
     <el-form label-position="top"><h3>订单信息</h3><el-row :gutter="16">
       <el-col :span="12"><el-form-item label="换标单号"><el-input :model-value="dialogMode === 'create' ? '系统自动生成' : form.orderNo || '—'" readonly /></el-form-item></el-col>
       <el-col :span="12"><el-form-item label="关联订单" required><el-input v-model="form.relatedOrderNo" :disabled="dialogMode === 'edit'" placeholder="请输入关联订单号" /></el-form-item></el-col>
-      <el-col v-if="dialogMode === 'create'" :span="12"><el-form-item label="客户" required><el-select v-model="form.customerId" filterable :loading="customersLoading" placeholder="请选择 ACTIVE 客户" @change="handleCustomerChange"><el-option v-for="item in customers" :key="String(item.id)" :label="item.tenantName" :value="String(item.id)" /></el-select></el-form-item></el-col>
-      <el-col v-if="dialogMode === 'create'" :span="12"><el-form-item label="海外仓" required><el-select v-model="form.warehouseId" filterable :loading="warehousesLoading" :disabled="!form.customerId" placeholder="请先选择客户，再选择其海外仓"><el-option v-for="item in warehouses" :key="item.id" :label="`${item.warehouseName} · ${item.warehouseCode}`" :value="String(item.id)" /></el-select></el-form-item></el-col>
+      <el-col v-if="dialogMode === 'create'" :span="12"><el-form-item label="客户" required><el-select v-model="form.customerId" filterable :loading="customersLoading" placeholder="请选择 ACTIVE 客户"><el-option v-for="item in customers" :key="String(item.id)" :label="item.tenantName" :value="String(item.id)" /></el-select></el-form-item></el-col>
+      <el-col v-if="dialogMode === 'create'" :span="12"><el-form-item label="公共海外收货仓" required><el-select v-model="form.warehouseId" filterable :loading="warehousesLoading" placeholder="请选择 ACTIVE+RECEIVING 海外仓"><el-option v-for="item in warehouses" :key="item.id" :label="`${item.warehouseName} · ${item.warehouseCode}`" :value="String(item.id)" /></el-select></el-form-item></el-col>
       <el-col :span="12"><el-form-item label="商品SKU" required><el-input v-model="form.sku" :disabled="dialogMode === 'edit'" placeholder="请输入商品SKU" /></el-form-item></el-col>
       <el-col :span="12"><el-form-item label="中文品名" required><el-input v-model="form.productName" :disabled="dialogMode === 'edit'" placeholder="请输入中文品名" /></el-form-item></el-col>
       <el-col :span="12"><el-form-item label="箱数" required><el-input-number v-model="form.cartons" :disabled="dialogMode === 'edit'" :min="1" :precision="0" controls-position="right" /></el-form-item></el-col>