优化

src/modules/first-leg/views/FirstLegOrdersView.vue

@@ -82,6 +82,7 @@ const inboundBillingError = ref('')
 const supportingDataLoading = ref(false)
 const supportingDataErrors = ref<string[]>([])
 const destinationWarehousesLoading = ref(false)
+const pageDataLoading = computed(() => supportingDataLoading.value || (!isCreatePage.value && store.loading))
 const editorBaseline = ref('')
 let cargoSequence = 0
 let inboundBillingRequestSequence = 0
@@ -296,8 +297,11 @@ async function loadPageData() {
   const destinationRequest = isCreatePage.value && form.destinationType !== 'PRIVATE'
     ? loadDestinationWarehouses(form.destinationType)
     : Promise.resolve()
+  const orderPageRequest = isCreatePage.value
+    ? store.loadWarehouseType('DOMESTIC', true)
+    : store.load()
   const [ordersResult, companyResult, destinationResult] = await Promise.allSettled([
-    store.load(),
+    orderPageRequest,
     companyRequest,
     destinationRequest,
   ])
@@ -306,7 +310,7 @@ async function loadPageData() {
   } else if (companyResult.status === 'rejected') {
     supportingDataErrors.value.push(`企业资料加载失败：${errorMessage(companyResult.reason)}`)
   }
-  if (ordersResult.status === 'rejected' && !store.loadError) supportingDataErrors.value.push(`订单加载失败：${errorMessage(ordersResult.reason)}`)
+  if (!isCreatePage.value && ordersResult.status === 'rejected' && !store.loadError) supportingDataErrors.value.push(`订单加载失败：${errorMessage(ordersResult.reason)}`)
   if (store.warehouseLoadError) supportingDataErrors.value.push(`公共仓库加载失败：${store.warehouseLoadError}`)
   if (store.draftLoadError) supportingDataErrors.value.push(`订单草稿加载失败：${store.draftLoadError}`)
   if (destinationResult.status === 'rejected') supportingDataErrors.value.push(`目的仓加载失败：${errorMessage(destinationResult.reason)}`)
@@ -554,8 +558,14 @@ async function openCreate() {
   replaceForm(emptyDraft())
   resetEditorValidation()
   await router.push({ name: 'first-leg-order-create' })
-  await loadDestinationWarehouses(form.destinationType)
-  await autofillWarehouseSelections()
+  try {
+    await loadDestinationWarehouses(form.destinationType)
+    await autofillWarehouseSelections()
+  } catch (error) {
+    const message = `目的仓加载失败：${errorMessage(error)}`
+    if (!supportingDataErrors.value.includes(message)) supportingDataErrors.value.push(message)
+    ElMessage.error('目的仓数据加载失败，请点击页面提示重新加载')
+  }
 }
 
 async function openEdit(order: FirstLegOrder) {
@@ -877,12 +887,12 @@ async function searchOrders(model: QueryModel) {
     <div v-if="isCreatePage && supportingDataErrors.length" class="supporting-data-error" role="alert">
       <AlertTriangle :size="20" />
       <div><strong>下单配套数据加载失败</strong><span v-for="message in supportingDataErrors" :key="message">{{ message }}</span></div>
-      <el-button :loading="supportingDataLoading || store.loading" @click="loadPageData">重新加载</el-button>
+      <el-button :loading="pageDataLoading" @click="loadPageData">重新加载</el-button>
     </div>
     <el-alert v-if="isCreatePage && !supportingDataLoading && availableWarehouses.length === 0" title="当前没有可用的平台收货仓" description="请联系平台维护并启用收货仓后再创建订单。" type="warning" :closable="false" show-icon />
 
     <FirstLegOrderEditorShell v-model="editorOpen" :page="isCreatePage" :title="editingId ? '编辑订单草稿' : '创建订单'" :before-close="requestCloseEditor" @back="closeEditor">
-      <el-form ref="orderFormRef" v-loading="isCreatePage && (supportingDataLoading || store.loading)" :model="form" :rules="orderFormRules" label-position="top" class="order-form prototype-order-form" scroll-to-error>
+      <el-form ref="orderFormRef" v-loading="isCreatePage && supportingDataLoading" :model="form" :rules="orderFormRules" label-position="top" class="order-form prototype-order-form" scroll-to-error>
         <section class="order-form-section prototype-section">
           <div class="order-section-heading"><div><h3>发货信息</h3><p>先选择货物如何送到国内收货仓，并填写本次运输安排。</p></div></div>
           <div class="prototype-form-flow shipping-form-flow">