优化

src/modules/inbounds/components/InboundTaskList.test.ts

@@ -23,6 +23,18 @@ describe('InboundTaskList measurement scope', () => {
     expect(source).not.toContain('selectedInbound.customerId || selectedInbound.tenantId')
   })
 
+  it('embeds the weight OCR workflow in the actual measurement task without closing on weight changes', () => {
+    const source = readFileSync(resolve('src/modules/inbounds/components/InboundTaskList.vue'), 'utf8')
+
+    expect(source).toContain("import WeightOcrPanel from '../weight/components/WeightOcrPanel.vue'")
+    expect(source).toContain('<WeightOcrPanel')
+    expect(source).toContain(':customer-id="selectedInbound.tenantId"')
+    expect(source).toContain('@changed="handleWeightChanged"')
+    expect(source).toContain('@summary-changed="handleWeightSummaryChanged"')
+    expect(source).toContain('measurementPanelRef.value?.updateActualGrossWeight(actualGrossWeightKg)')
+    expect(source).not.toContain('<WeightOcrPanel\n            :customer-id="selectedInbound.tenantId"\n            :inbound-id="selectedInbound.id"\n            @changed="handleTaskChanged"')
+  })
+
   it('loads only active customers and exposes a searchable name-only select', () => {
     const source = readFileSync(resolve('src/modules/inbounds/components/InboundTaskList.vue'), 'utf8')
     const queryFieldsSource = source.slice(source.indexOf('const queryFields'), source.indexOf('const columns'))

src/modules/inbounds/components/InboundTaskList.vue

@@ -18,6 +18,7 @@ import InboundMeasurementPanel from '../measurement/InboundMeasurementPanel.vue'
 import MeasurementReviewPanel from '../review/MeasurementReviewPanel.vue'
 import { inboundProcessStatusLabels, inboundReviewStatusLabels, inboundStatusLabel } from '../status'
 import { buildInboundTaskQuery, loadAllActiveCustomers, type InboundTaskMode } from '../task-list'
+import WeightOcrPanel from '../weight/components/WeightOcrPanel.vue'
 
 type FilterModel = QueryModel & {
   customerId: string
@@ -42,6 +43,7 @@ const customerLoadError = ref<ApiErrorDetails | null>(null)
 const warehouseOptions = ref<Array<{ label: string; value: string }>>([])
 const selectedInbound = ref<InboundOrderSummary | null>(null)
 const taskDialogOpen = ref(false)
+const measurementPanelRef = ref<InstanceType<typeof InboundMeasurementPanel> | null>(null)
 let requestSerial = 0
 let optionsRequestSerial = 0
 let disposed = false
@@ -183,6 +185,14 @@ function handleTaskChanged() {
   void loadTasks()
 }
 
+function handleWeightChanged() {
+  void loadTasks()
+}
+
+function handleWeightSummaryChanged(actualGrossWeightKg: number | null) {
+  measurementPanelRef.value?.updateActualGrossWeight(actualGrossWeightKg)
+}
+
 watch([page, pageSize], () => { void loadTasks() })
 onMounted(() => { void loadOptions(); void loadTasks() })
 onActivated(() => {
@@ -283,12 +293,22 @@ onBeforeUnmount(() => { disposed = true; requestSerial += 1; optionsRequestSeria
         :inbound-id="selectedInbound.id"
         @changed="handleTaskChanged"
       />
-      <InboundMeasurementPanel
-        v-else-if="selectedInbound"
-        :tenant-id="selectedInbound.tenantId"
-        :inbound-id="selectedInbound.id"
-        @changed="handleTaskChanged"
-      />
+      <div v-else-if="selectedInbound" class="measurement-task-workspace">
+        <section class="surface-panel inbound-task-weight" aria-label="称重图片与 OCR 核对">
+          <WeightOcrPanel
+            :customer-id="selectedInbound.tenantId"
+            :inbound-id="selectedInbound.id"
+            @changed="handleWeightChanged"
+            @summary-changed="handleWeightSummaryChanged"
+          />
+        </section>
+        <InboundMeasurementPanel
+          ref="measurementPanelRef"
+          :tenant-id="selectedInbound.tenantId"
+          :inbound-id="selectedInbound.id"
+          @changed="handleTaskChanged"
+        />
+      </div>
     </el-dialog>
   </AdminPage>
 </template>
@@ -301,9 +321,12 @@ onBeforeUnmount(() => { disposed = true; requestSerial += 1; optionsRequestSeria
 .primary-cell { display: grid; gap: 3px; min-width: 0; }
 .primary-cell strong, .primary-cell span { overflow-wrap: anywhere; }
 .primary-cell span, .muted-action { color: var(--cc-muted); font-size: 12px; }
+.measurement-task-workspace { display: grid; min-width: 0; gap: 20px; }
+.inbound-task-weight { min-width: 0; padding: 20px; }
 @media (max-width: 520px) {
   .row-actions { align-items: stretch; flex-direction: column; }
   .row-actions :deep(.el-button) { width: 100%; }
+  .inbound-task-weight { padding: 14px; }
 }
 </style>