1

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

@@ -20,6 +20,8 @@ describe('InboundMeasurementDialog', () => {
     expect(densitySource).toContain('padding: var(--admin-space-4, 10px) 48px var(--admin-space-4, 10px) var(--admin-space-6, 16px)')
     expect(source).toContain('<WeightOcrPanel')
     expect(source).toContain('<InboundMeasurementPanel')
+    expect(source).toContain('customerName?: string | null')
+    expect(source).toContain(':customer-name="customerName"')
     expect(source).toContain('class="measurement-dialog-weight"')
     expect(source).not.toContain('class="surface-panel measurement-dialog-weight"')
     expect(source).toContain('border-bottom: 1px solid var(--cc-border)')

src/modules/inbounds/measurement/InboundMeasurementDialog.vue

@@ -10,6 +10,7 @@ import WeightOcrPanel from '../weight/components/WeightOcrPanel.vue'
 const props = defineProps<{
   modelValue: boolean
   customerId: string
+  customerName?: string | null
   inboundId: string
   inboundCode?: string | null
   openWarehouseSuggestion?: boolean
@@ -92,6 +93,7 @@ function handleSubmitted() {
       <InboundMeasurementPanel
         ref="measurementPanelRef"
         :customer-id="customerId"
+        :customer-name="customerName"
         :inbound-id="inboundId"
         :open-warehouse-suggestion="openWarehouseSuggestion"
         @updated="handleUpdated"

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

@@ -52,6 +52,7 @@ function measurement(overrides: Partial<InboundMeasurementDetail> = {}): Inbound
     channelName: '美西海运',
     processStatus: 'MEASURING',
     measureReviewStatus: null,
+    customerFeeConfirmed: false,
     recommendedPalletType: 'STANDARD',
     reviewReason: null,
     reviewerId: null,
@@ -135,7 +136,7 @@ async function mountPanel(permissions = [
   'platform:firstleg:inbound:measure:edit',
   'platform:firstleg:inbound:measure:manual-entry',
   'platform:firstleg:inbound:measure:submit',
-]) {
+], props: Partial<{ customerId: string; inboundId: string; customerName: string }> = {}) {
   const pinia = createPinia()
   setActivePinia(pinia)
   const auth = useAuthStore()
@@ -143,7 +144,7 @@ async function mountPanel(permissions = [
   auth.permissions = permissions
   useAccessPreviewStore().initializeAfterLogin()
   const wrapper = mount(InboundMeasurementPanel, {
-    props: { customerId: '10001', inboundId: '7001' },
+    props: { customerId: '10001', inboundId: '7001', ...props },
     attachTo: document.body,
     global: { plugins: [pinia, ElementPlus] },
   })
@@ -195,6 +196,13 @@ describe('InboundMeasurementPanel', () => {
     expect(wrapper.find('button[aria-label="预览测量图片"]').exists()).toBe(true)
   })
 
+  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: '柏悦物流' })
+
+    expect(wrapper.find('.measurement-summary-context').text()).toContain('柏悦物流')
+  })
+
   it('warns when declared dimensions or gross weight differ from measurements by at least ten percent', async () => {
     vi.mocked(getInboundMeasurement).mockResolvedValueOnce(measurement({
       actualGrossWeightKg: 132,
@@ -499,7 +507,7 @@ describe('InboundMeasurementPanel', () => {
     await flushPromises()
 
     expect(ElMessageBox.confirm).toHaveBeenCalledWith(
-      expect.stringContaining('准备托盘与库位占用'),
+      expect.stringContaining('提交成功后本批次不能继续编辑'),
       '提交测量审核',
       expect.objectContaining({ confirmButtonText: '确认提交' }),
     )

src/modules/inbounds/measurement/InboundMeasurementPanel.vue

@@ -21,6 +21,7 @@ const props = defineProps<{
   customerId?: string
   tenantId?: string
   inboundId: string
+  customerName?: string | null
 }>()
 
 const emit = defineEmits<{
@@ -110,6 +111,7 @@ const canEdit = computed(() => access.can('platform:firstleg:inbound:measure:edi
 const canManualEntry = computed(() => access.can('platform:firstleg:inbound:measure:manual-entry'))
 const canSubmit = computed(() => access.can('platform:firstleg:inbound:measure:submit'))
 const customerId = computed(() => props.customerId || props.tenantId || '')
+const displayCustomerName = computed(() => detail.value?.companyName?.trim() || props.customerName?.trim() || '客户未命名')
 const hasContext = computed(() => Boolean(customerId.value && props.inboundId))
 const countEditableProcess = computed(() => ['PREPARING', 'WAIT_MEASURE', 'MEASURING', 'MEASURE_PENDING', 'MEASURE_REJECTED'].includes(detail.value?.processStatus || ''))
 const submitEditableProcess = computed(() => ['PREPARING', 'WAIT_MEASURE', 'MEASURING', 'MEASURE_REJECTED'].includes(detail.value?.processStatus || ''))
@@ -698,7 +700,7 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
           <section class="measurement-section measurement-summary-section">
             <header class="measurement-summary-header">
               <div class="measurement-summary-context">
-                <p><span>客户</span>{{ detail.companyName || '客户未命名' }}</p>
+                <p><span>客户</span>{{ displayCustomerName }}</p>
                 <p><span>渠道</span>{{ detail.channelName || detail.channelCode || '渠道未填写' }}</p>
               </div>
               <div class="measurement-summary-status">

src/modules/inbounds/measurement/types.ts

@@ -107,6 +107,7 @@ export interface InboundMeasurementDetail {
   expectedPalletCount?: number | null
   processStatus: InboundMeasurementProcessStatus
   measureReviewStatus: string | null
+  customerFeeConfirmed: boolean
   recommendedPalletType: string | null
   reviewReason: string | null
   reviewerId: MeasurementIdentifier | null