修复订单货柜预约与排车维护界面

src/modules/inbounds/measurement/InboundMeasurementPanel.test.ts

@@ -187,15 +187,29 @@ describe('InboundMeasurementPanel', () => {
     expect(wrapper.find('.measurement-table').text()).toContain('FBA18SCAN5678')
     expect(wrapper.find('.measurement-table').text()).toContain('0.6')
     expect(wrapper.find('.measurement-table').text()).not.toContain('周长')
-    await wrapper.find('.el-table__expand-icon').trigger('click')
-    await flushPromises()
-    expect(wrapper.text()).toContain('箱规周长')
-    expect(wrapper.text()).toContain('190 cm')
-    expect(wrapper.text()).toContain('MJ20210327')
-    expect(wrapper.text()).toContain('2026-08-04 10:30:00+08:00')
+    expect(wrapper.find('.el-table__expand-icon').exists()).toBe(false)
     expect(wrapper.find('button[aria-label="预览测量图片"]').exists()).toBe(true)
   })
 
+  it('keeps server over-limit warnings visible without declaration deviations or an expandable row', async () => {
+    const detail = measurement()
+    detail.items[0]!.overLimitWarning = '箱规超过渠道限制，请复核'
+    vi.mocked(getInboundMeasurement).mockResolvedValueOnce(detail)
+    const wrapper = await mountPanel()
+
+    expect(wrapper.find('.measurement-deviation-alert').exists()).toBe(false)
+    expect(wrapper.find('.el-table__expand-icon').exists()).toBe(false)
+    expect(wrapper.get('.measurement-table .measurement-limit-warning').text()).toBe('箱规超过渠道限制，请复核')
+    expect(wrapper.get('.measurement-table .measurement-limit-warning').attributes('role')).toBe('alert')
+
+    detail.items[0]!.overLimitWarning = null
+    vi.mocked(getInboundMeasurement).mockResolvedValueOnce(detail)
+    await wrapper.setProps({ inboundId: '7002' })
+    await flushPromises()
+    expect(wrapper.find('.measurement-limit-warning').exists()).toBe(false)
+    expect(wrapper.findAll('.measurement-table th').some(cell => cell.text() === '超限提醒')).toBe(false)
+  })
+
   it('uses the list customer name when a legacy measurement detail has no customer snapshot', async () => {
     vi.mocked(getInboundMeasurement).mockResolvedValueOnce(measurement({ companyName: '' }))
     const wrapper = await mountPanel(undefined, { customerName: '柏悦物流' })
@@ -407,20 +421,14 @@ describe('InboundMeasurementPanel', () => {
     expect((countInput.element as HTMLInputElement).value).toBe('9')
   })
 
-  it('shows the complete server-calculated measurement facts in the expanded row', async () => {
+  it('retains server-calculated facts in the draft without the removed expandable row', async () => {
     const wrapper = await mountPanel()
-    await wrapper.get('.el-table__expand-icon').trigger('click')
-    await flushPromises()
-
-    const text = wrapper.text()
-    expect(text).toContain('箱规')
-    expect(text).toContain('50×40×30cm')
-    expect(text).toContain('计算方式')
-    expect(text).toContain('实测原尺寸')
-    expect(text).toContain('计算后外箱')
-    expect(text).toContain('50 × 40 × 30 cm')
-    expect(text).toContain('计算规则版本')
-    expect(text).toContain('DIMENSION_ACTUAL_V1')
+    expect(wrapper.find('.el-table__expand-icon').exists()).toBe(false)
+    expect(wrapper.vm.form.items[0]).toMatchObject({
+      boxSpecification: '50×40×30cm', coefficientMode: 'ACTUAL',
+      calculatedOuterLengthCm: 50, calculatedOuterWidthCm: 40, calculatedOuterHeightCm: 30,
+      calculationRuleVersion: 'DIMENSION_ACTUAL_V1',
+    })
   })
 
   it('reuses the established first-leg detail surface and status patterns', async () => {
@@ -611,11 +619,9 @@ describe('InboundMeasurementPanel', () => {
     expect(wrapper.emitted('updated')).toBeUndefined()
   })
 
-  it('maps the formal deviceMeasuredAt response field into the read-only measurement time', async () => {
+  it('retains the formal deviceMeasuredAt response field in the measurement draft', async () => {
     const wrapper = await mountPanel()
-    await wrapper.get('.el-table__expand-icon').trigger('click')
-
-    expect(wrapper.text()).toContain('2026-08-04 10:30:00+08:00')
+    expect(wrapper.vm.form.items[0].measuredAt).toBe('2026-08-04T10:30:00+08:00')
     const source = await import('./InboundMeasurementPanel.vue?raw').then((module) => module.default)
     expect(source).toContain('measuredAt: item.deviceMeasuredAt')
     expect(source).not.toContain('measuredAt: item.measuredAt')

src/modules/inbounds/measurement/InboundMeasurementPanel.vue

@@ -614,10 +614,6 @@ function updateWeightEvidence(
   confirmedWeightAvailable.value = hasConfirmedWeight
 }
 
-function calculationModeLabel(value: EditableMeasurementItem['coefficientMode']) {
-  return value === 'ADD' ? '箱规尺寸' : value === 'MULTIPLY' ? '箱规系数' : '实测原尺寸'
-}
-
 function measurementRowClassName({ row }: { row: EditableMeasurementItem }) {
   return validationErrors.value[row.clientKey]?.length ? 'measurement-table__row--error' : ''
 }
@@ -789,23 +785,6 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
               class="measurement-table"
               :row-class-name="measurementRowClassName"
             >
-              <el-table-column type="expand" width="42">
-                <template #default="{ row }">
-                  <dl class="measurement-row-details">
-                    <div><dt>箱规</dt><dd>{{ row.boxSpecification || '—' }}</dd></div>
-                    <div><dt>机器编号</dt><dd>{{ row.machineNo || '人工录入' }}</dd></div>
-                    <div><dt>测量时间</dt><dd>{{ row.measuredAt ? row.measuredAt.replace('T', ' ') : '—' }}</dd></div>
-                    <div><dt>计算方式</dt><dd>{{ calculationModeLabel(row.coefficientMode) }}</dd></div>
-                    <div><dt>计算后外箱</dt><dd>{{ formatNumber(row.calculatedOuterLengthCm) }} × {{ formatNumber(row.calculatedOuterWidthCm) }} × {{ formatNumber(row.calculatedOuterHeightCm) }} cm</dd></div>
-                    <div><dt>单箱体积</dt><dd>{{ formatNumber(row.serverValues.unitVolumeCbm, 3, 3) }} m³</dd></div>
-                    <div><dt>箱规周长</dt><dd>{{ formatNumber(row.serverValues.girthCm) }} cm</dd></div>
-                    <div><dt>总材积重</dt><dd>{{ formatNumber(row.serverValues.volumeWeightKg) }} kg</dd></div>
-                    <div><dt>计算规则版本</dt><dd>{{ row.calculationRuleVersion || '—' }}</dd></div>
-                    <div><dt>超限提醒</dt><dd>{{ row.overLimitWarning || '—' }}</dd></div>
-                    <div><dt>备注</dt><dd>{{ row.remark || '—' }}</dd></div>
-                  </dl>
-                </template>
-              </el-table-column>
               <el-table-column prop="itemNo" label="#" width="70" align="center" />
               <el-table-column label="入仓码" min-width="154" show-overflow-tooltip>
                 <template #default="{ row }">{{ row.inboundCode || '—' }}</template>
@@ -822,6 +801,9 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
               <el-table-column label="尺寸 长×宽×高(cm)" width="166" align="center">
                 <template #default="{ row }">{{ formatNumber(row.lengthCm) }} × {{ formatNumber(row.widthCm) }} × {{ formatNumber(row.heightCm) }}</template>
               </el-table-column>
+              <el-table-column v-if="form.items.some(item => item.overLimitWarning?.trim())" label="超限提醒" min-width="200">
+                <template #default="{ row }"><span v-if="row.overLimitWarning?.trim()" class="measurement-limit-warning" role="alert">{{ row.overLimitWarning }}</span><span v-else>—</span></template>
+              </el-table-column>
               <el-table-column label="仓库修改外箱（长）" width="165" align="center">
                 <template #default="{ row }"><el-input-number v-model="row.outerLengthCm" aria-label="仓库修改外箱长" :min="0.001" :precision="3" :controls="false" placeholder="不修改" /></template>
               </el-table-column>
@@ -930,7 +912,7 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
 .measurement-comparison th, .measurement-comparison td { padding: var(--admin-space-3, 8px) var(--admin-space-5, 12px); border: 1px solid var(--workbench-border); text-align: left; overflow-wrap: anywhere; font-variant-numeric: tabular-nums; }
 .measurement-comparison thead th { background: var(--cc-list-table-header-bg); color: var(--cc-list-table-header-text); }
 .measurement-comparison thead th:nth-child(2) { background: #f7f9ff; color: #465fc4; }
-.measurement-comparison thead th:nth-child(3) { background: #f4fbf8; color: #18795d; }
+.measurement-comparison thead th:nth-child(3) { background: var(--admin-surface, #fff); color: #18795d; }
 .measurement-comparison__difference { color: var(--el-color-danger-dark-2); font-weight: 600; }
 .measurement-extra-facts { display: flex; flex-wrap: wrap; gap: var(--admin-space-3, 8px) var(--admin-space-6, 16px); color: var(--workbench-muted); font-size: var(--admin-font-caption, 12px); }
 .measurement-extra-facts strong { color: var(--workbench-text); }
@@ -990,10 +972,8 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
 .measurement-table :deep(.measurement-table__row--error > td.el-table__cell) { background: var(--el-color-danger-light-9); }
 .warehouse-suggestion-table { display: grid; gap: var(--admin-space-4, 10px); margin-top: 18px; }.warehouse-suggestion-table h3 { margin: 0; color: var(--workbench-text); font-size: var(--admin-font-section, 14px); }
 .measurement-box-code { font-weight: 650; }
+.measurement-limit-warning { white-space: normal; overflow-wrap: anywhere; color: var(--el-color-danger-dark-2); }
 .measurement-count-editor { width: 104px !important; }
-.measurement-row-details { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: var(--admin-space-3, 8px) 20px; margin: 0; padding: var(--admin-space-1, 4px) 18px var(--admin-space-3, 8px) 62px; }
-.measurement-row-details dt { color: var(--workbench-muted); font-size: var(--admin-font-caption, 11px); }
-.measurement-row-details dd { margin: 3px 0 0; overflow-wrap: anywhere; color: var(--workbench-text); font-size: var(--admin-font-caption, 12px); font-weight: 600; }
 .measurement-panel__footer { position: sticky; bottom: 0; z-index: 2; display: flex; align-items: center; justify-content: space-between; gap: var(--admin-space-6, 16px); padding: var(--admin-space-5, 12px) 20px; border-top: 1px solid var(--workbench-border); background: var(--admin-surface, #fff); }
 .measurement-panel__footer > span { display: inline-flex; align-items: center; gap: var(--admin-space-2, 6px); color: var(--workbench-muted); font-size: var(--admin-font-caption, 12px); }
 .measurement-panel__footer > span:has(svg) { color: #b54708; font-weight: 650; }
@@ -1001,7 +981,6 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
 
 @media (max-width: 960px) {
   .measurement-data-grid { grid-template-columns: repeat(3, minmax(0, 1fr)); }
-  .measurement-row-details { grid-template-columns: repeat(2, minmax(0, 1fr)); }
 }
 
 @media (max-width: 720px) {
@@ -1015,7 +994,6 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
   .manual-entry-table colgroup { display: none; }
   .manual-entry-table tr { display: grid; grid-template-columns: 36% minmax(0, 1fr); }
   .manual-entry-table :is(th, td) { min-width: 0; }
-  .measurement-row-details { grid-template-columns: 1fr; padding-left: 54px; }
 }
 
 @media (max-width: 420px) {

src/modules/inbounds/measurement/measurementDensity.css

@@ -1,5 +1,5 @@
 /* Measurement workspace: keep all sections inside the panel's content bounds. */
-.inbound-measurement-workspace-dialog.inbound-density .measurement-summary-section { min-width: 0; margin: 0; padding: var(--admin-space-4, 10px) var(--admin-space-5, 12px); border: 1px solid var(--admin-dialog-summary-border); border-radius: var(--admin-dialog-section-radius); background: var(--admin-dialog-summary-bg); }
+.inbound-measurement-workspace-dialog.inbound-density .measurement-summary-section { min-width: 0; margin: 0; padding: var(--admin-space-4, 10px) var(--admin-space-5, 12px); border: 1px solid var(--cc-border); border-radius: var(--admin-dialog-section-radius); background: var(--admin-surface, #fff); }
 .inbound-measurement-workspace-dialog.inbound-density .measurement-summary-header { flex-wrap: wrap; align-items: center; gap: var(--admin-space-3, 8px) var(--admin-space-6, 16px); }
 .inbound-measurement-workspace-dialog.inbound-density .measurement-summary-context { flex: 1 1 auto; }
 .inbound-measurement-workspace-dialog.inbound-density .measurement-summary-context p > span { flex-shrink: 0; }

src/modules/inbounds/review/MeasurementReviewPanel.test.ts

@@ -17,7 +17,7 @@ vi.mock('./api', () => ({
 vi.mock('../weight/components/WeightOcrPanel.vue', () => ({
   default: {
     name: 'WeightOcrPanel',
-    props: { customerId: String, inboundId: String, reviewMode: Boolean, correctionMode: Boolean },
+    props: { customerId: String, inboundId: String, reviewMode: Boolean, correctionMode: Boolean, tableMode: Boolean },
     emits: ['changed'],
     template: '<button class="mock-weight-change" @click="$emit(\'changed\')">重量证据</button>',
   },
@@ -193,6 +193,7 @@ describe('MeasurementReviewPanel', () => {
 
     const weightPanel = wrapper.getComponent({ name: 'WeightOcrPanel' })
     expect(weightPanel.props('reviewMode')).toBe(true)
+    expect(weightPanel.props('tableMode')).toBe(true)
     expect(weightPanel.props('correctionMode')).toBe(false)
     await wrapper.findAll('button').find((button) => button.text().includes('修改重量'))?.trigger('click')
     expect(weightPanel.props('correctionMode')).toBe(true)

src/modules/inbounds/review/MeasurementReviewPanel.vue

@@ -205,7 +205,7 @@ defineExpose({ confirmApprove, enableWeightCorrection, approvalButtonLabel, isPe
     <template v-else-if="detail">
       <el-alert v-if="detail.reviewReason" type="warning" :closable="false" show-icon :title="`最近审核说明：${detail.reviewReason}`" />
 
-      <section class="review-data density-dialog-section" data-tone="summary" aria-labelledby="review-data-title">
+      <section class="review-data density-dialog-section" aria-labelledby="review-data-title">
         <header class="review-section-heading density-dialog-section__title"><h3 id="review-data-title">审核数据总览</h3></header>
         <div class="workbench-evidence"><table class="review-comparison density-table" aria-label="客户申报与平台实测对比">
           <thead><tr><th scope="col">指标</th><th scope="col">客户申报</th><th scope="col">平台实测</th><th scope="col">差异（实测 − 申报）</th></tr></thead>
@@ -286,6 +286,7 @@ defineExpose({ confirmApprove, enableWeightCorrection, approvalButtonLabel, isPe
 
       <WeightOcrPanel
         review-mode
+        table-mode
         :correction-mode="correctionMode"
         :customer-id="customerId"
         :inbound-id="inboundId"

src/modules/inbounds/weight/components/WeightOcrPanel.behavior.test.ts

@@ -496,7 +496,7 @@ describe('WeightOcrPanel confirmation behavior', () => {
     expect(wrapper.text()).toContain('1747.500 KG')
   })
 
-  it('atomically corrects and confirms an approved weight during measurement review', async () => {
+  it('opens a table image and atomically corrects and confirms an approved weight during measurement review', async () => {
     const confirmed = {
       ...pendingWeight,
       recognitionStatus: 'CONFIRMED',
@@ -514,13 +514,14 @@ describe('WeightOcrPanel confirmation behavior', () => {
       weightResults: [confirmed],
     })
     vi.mocked(confirmWeightResult).mockResolvedValue({ ...confirmed, grossWeightKg: 125, netWeightKg: 113, version: 2 })
-    const wrapper = mountPanel(allWeightPermissions, { reviewMode: true, correctionMode: true })
+    const wrapper = mountPanel(allWeightPermissions, { reviewMode: true, correctionMode: true, tableMode: true })
     await flushPromises()
 
     expect(wrapper.find('input[type="file"]').exists()).toBe(false)
     expect(wrapper.text()).not.toContain('删除图片')
-    await wrapper.findAll('button').find((button) => button.text().includes('修改含托盘毛重'))?.trigger('click')
-    await flushPromises()
+    expect(wrapper.find('.weight-data-table').exists()).toBe(true)
+    expect(wrapper.find('.weight-grid').exists()).toBe(false)
+    await openWeightDialog(wrapper)
     await dialogWeightInput().setValue('125')
     const reason = document.body.querySelector<HTMLTextAreaElement>('textarea[placeholder="请填写本次毛重修正原因"]')
     expect(reason).not.toBeNull()