优化

src/modules/unified-orders/pages/UnifiedOrdersView.test.ts

@@ -146,6 +146,10 @@ describe('UnifiedOrdersView contract', () => {
     expect(source).not.toContain('class="action-boundary"')
     expect(source).toContain("can('platform:firstleg:inbound:view')")
     expect(source).toContain('openMeasurement')
+    expect(source).toContain('<InboundMeasurementPanel')
+    expect(source).toContain('width="min(1180px, calc(100vw - 32px))"')
+    expect(source).toContain('measurementDialogOpen.value = true')
+    expect(source).not.toContain("router.push({ name: 'inbound-order-detail'")
     expect(source).not.toContain('待接入：智能分柜')
     expect(source).not.toContain('updateMainStatus')
     expect(source).not.toContain('人工进入分柜')

src/modules/unified-orders/pages/UnifiedOrdersView.vue

@@ -49,6 +49,7 @@ import {
 import {
   downloadWeightImage,
   getInboundMeasurement,
+  InboundMeasurementPanel,
   type InboundMeasurementDetail,
 } from '@/modules/inbounds'
 import {
@@ -113,6 +114,8 @@ const measurementLoading = ref(false)
 const measurementLoadedKey = ref('')
 const measurementImageUrls = ref<string[]>([])
 const measurementCollapsed = reactive({ customer: false, outer: false, actual: false })
+const measurementDialogOpen = ref(false)
+const measurementOrder = ref<UnifiedOrderResource | null>(null)
 let detailLoadingKey = ''
 let detailRequestSerial = 0
 const showAdvancedFilters = ref(false)
@@ -641,7 +644,14 @@ async function openDetail(row: UnifiedOrderResource) {
 
 function openMeasurement(row: UnifiedOrderResource) {
   if (!row.inboundId || !can('platform:firstleg:inbound:view')) return
-  void router.push({ name: 'inbound-order-detail', params: { inboundId: String(row.inboundId) }, query: { tenantId: String(row.tenantId) } })
+  measurementOrder.value = row
+  measurementDialogOpen.value = true
+}
+
+function handleMeasurementChanged() {
+  measurementDialogOpen.value = false
+  measurementOrder.value = null
+  void loadOrders()
 }
 
 function openInboundFromDetail() {
@@ -991,10 +1001,10 @@ onMounted(() => {
       <DataTable v-model:page="page" v-model:page-size="pageSize" :data="records" :columns="columns" preference-key="unified-orders-table" :loading="loading" :total="total" :page-sizes="[20, 50, 100]" row-key="orderId" border stripe empty-text="暂无符合条件的订单" aria-label="统一订单列表">
         <template #actions="{ row }">
           <div class="row-actions">
-            <el-button link type="primary" @click="openDetail(row as UnifiedOrderResource)"><Eye :size="15" />详情</el-button>
+            <el-button size="small" plain type="primary" @click="openDetail(row as UnifiedOrderResource)"><Eye :size="15" />详情</el-button>
             <el-button v-for="action in directUnifiedOrderActions(row as UnifiedOrderResource)" :key="action" size="small" plain :type="unifiedOrderActionType(action)" :loading="action === 'approve' && approvalLoadingId === String((row as UnifiedOrderResource).orderId)" @click="runMoreAction(action, row as UnifiedOrderResource)"><component :is="unifiedOrderRowActionIcons[action]" :size="15" />{{ unifiedOrderActionLabel(action) }}</el-button>
             <el-dropdown v-if="moreUnifiedOrderActions(row as UnifiedOrderResource).length" trigger="click" @command="runMoreAction($event, row as UnifiedOrderResource)">
-              <el-button link type="primary" :aria-label="moreUnifiedOrderActionsLabel(row as UnifiedOrderResource)" :title="moreUnifiedOrderActionsLabel(row as UnifiedOrderResource)"><MoreHorizontal :size="17" /></el-button>
+              <el-button size="small" plain type="primary" :aria-label="moreUnifiedOrderActionsLabel(row as UnifiedOrderResource)" :title="moreUnifiedOrderActionsLabel(row as UnifiedOrderResource)"><MoreHorizontal :size="17" /></el-button>
               <template #dropdown>
                 <el-dropdown-menu>
                   <el-dropdown-item v-for="action in moreUnifiedOrderActions(row as UnifiedOrderResource)" :key="action" :command="action"><component :is="unifiedOrderRowActionIcons[action]" :size="15" />{{ unifiedOrderActionLabel(action) }}</el-dropdown-item>
@@ -1051,6 +1061,24 @@ onMounted(() => {
       <el-alert title="确认订单资料无误后审核通过，订单将进入待测量阶段。" type="info" :closable="false" show-icon />
     </AppDialog>
 
+    <el-dialog
+      v-model="measurementDialogOpen"
+      :title="measurementOrder ? `测量 · ${measurementOrder.inboundCode || measurementOrder.orderNo}` : '测量'"
+      width="min(1180px, calc(100vw - 32px))"
+      top="4vh"
+      destroy-on-close
+      append-to-body
+      class="inbound-task-dialog"
+      @closed="measurementOrder = null"
+    >
+      <InboundMeasurementPanel
+        v-if="measurementOrder?.inboundId"
+        :tenant-id="String(measurementOrder.tenantId)"
+        :inbound-id="String(measurementOrder.inboundId)"
+        @changed="handleMeasurementChanged"
+      />
+    </el-dialog>
+
   </section>
   </AdminPage>
 </template>
@@ -1157,3 +1185,8 @@ onMounted(() => {
 @media (max-width: 720px) { .page-intro { align-items: stretch; flex-direction: column; } .page-intro :deep(.el-button) { width: 100%; min-height: 44px; } .status-tab { min-height: 46px; padding: 0 14px; } .table-actions :deep(.el-button) { width: 100%; min-height: 40px; } .row-actions { flex-wrap: wrap; } .order-detail-header { align-items: stretch; flex-direction: column; } .order-detail-heading { display: grid; grid-template-columns: auto 36px minmax(0, 1fr) auto; } .detail-header-actions { display: grid; grid-template-columns: 1fr; } .detail-header-actions :deep(.el-button) { min-height: 40px; } .detail-overview, .order-info-grid, .measurement-grid { grid-template-columns: 1fr; } .detail-overview article { border-right: 0; border-bottom: 1px solid var(--cc-border); } .detail-overview article:last-child { border-bottom: 0; } .order-info-grid > div.wide { grid-column: auto; } .detail-tabs button { padding: 0 18px; } .detail-panel { padding: 16px; } .measurement-section-title { align-items: flex-start; flex-wrap: wrap; padding: 12px; } .measurement-section-summary { width: 100%; flex-basis: calc(100% - 34px); flex-wrap: wrap; justify-content: flex-start; gap: 6px 16px; white-space: normal; } .measurement-section-title > svg { margin-left: auto; } .measurement-total { flex-wrap: wrap; justify-content: flex-start; gap: 6px 16px; } .measurement-total strong { width: 100%; } }
 @media (max-width: 420px) { .order-detail-heading { grid-template-columns: auto minmax(0, 1fr) auto; } .order-mark { display: none; } }
 </style>
+
+<style>
+.inbound-task-dialog { max-height: 92vh; overflow: hidden; }
+.inbound-task-dialog .el-dialog__body { max-height: calc(92vh - 62px); overflow: auto; padding: 20px 24px 24px; }
+</style>