优化

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

@@ -69,7 +69,7 @@ describe('MeasurementReviewPanel', () => {
     const toolbar = wrapper.get('.review-toolbar')
     expect(toolbar.text()).toContain('待审核')
     expect(toolbar.text()).toContain('修改重量')
-    expect(toolbar.text()).toContain('通过并进入待分柜')
+    expect(toolbar.findAll('button').map(button => button.text())).toContain('通过')
     expect(toolbar.text()).toContain('刷新')
     expect(toolbar.text()).toContain('客户：柏悦客户')
     expect(toolbar.text()).toContain('渠道：海运')
@@ -99,10 +99,10 @@ describe('MeasurementReviewPanel', () => {
     const warning = vi.spyOn(ElMessage, 'warning')
     const wrapper = mount(MeasurementReviewPanel, { props: { customerId: '10001', inboundId: '90001', fulfillmentType: 'ONE_CLICK_DROPSHIP' }, global: { plugins: [ElementPlus] } })
     await flushPromises()
-    expect(wrapper.text()).not.toContain('通过并进入待分柜')
-    await wrapper.findAll('button').find((button) => button.text().includes('通过并进入待一件代发组托'))!.trigger('click')
+    expect(wrapper.text()).not.toContain('通过并进入')
+    await wrapper.findAll('button').find((button) => button.text() === '通过')!.trigger('click')
     await flushPromises()
-    expect(confirmation).toHaveBeenCalledWith(expect.stringContaining('进入待一件代发组托'), '确认测量审核通过', expect.objectContaining({ confirmButtonText: '通过并进入待一件代发组托' }))
+    expect(confirmation).toHaveBeenCalledWith(expect.stringContaining('进入待一件代发组托'), '确认测量审核通过', expect.objectContaining({ confirmButtonText: '通过' }))
     expect(initialPricingSucceeded ? success : warning).toHaveBeenCalledWith(expect.stringContaining('入库单已进入待一件代发组托'))
     expect(approveMeasurement).toHaveBeenCalledTimes(1)
     expect(wrapper.emitted('changed')).toHaveLength(1)
@@ -209,7 +209,7 @@ describe('MeasurementReviewPanel', () => {
 
     await wrapper.get('.mock-weight-change').trigger('click')
     await flushPromises()
-    await wrapper.findAll('button').find((button) => button.text().includes('通过并进入待分柜'))?.trigger('click')
+    await wrapper.findAll('button').find((button) => button.text() === '通过')?.trigger('click')
     await flushPromises()
 
     expect(getMeasurementReviewDetail).toHaveBeenCalledTimes(2)
@@ -227,7 +227,7 @@ describe('MeasurementReviewPanel', () => {
     await flushPromises()
     expect(wrapper.find('.review-toolbar__actions').exists()).toBe(false)
     expect(wrapper.get('.review-toolbar__context').text()).toContain('客户：柏悦客户')
-    expect(wrapper.vm.approvalButtonLabel).toBe('通过并进入待分柜')
+    expect(wrapper.vm.approvalButtonLabel).toBe('通过')
     wrapper.vm.enableWeightCorrection()
     await flushPromises()
     expect(wrapper.getComponent({ name: 'WeightOcrPanel' }).props('correctionMode')).toBe(true)
@@ -245,7 +245,7 @@ describe('MeasurementReviewPanel', () => {
     const wrapper = mount(MeasurementReviewPanel, { props: { customerId: '10001', inboundId: '90001' }, global: { plugins: [ElementPlus] } })
     await flushPromises()
 
-    const approveButton = wrapper.findAll('button').find((button) => button.text().includes('通过并进入待分柜'))!
+    const approveButton = wrapper.findAll('button').find((button) => button.text() === '通过')!
     await approveButton.trigger('click')
     await approveButton.trigger('click')
 
@@ -263,12 +263,12 @@ describe('MeasurementReviewPanel', () => {
     const wrapper = mount(MeasurementReviewPanel, { props: { customerId: '10001', inboundId: '90001' }, global: { plugins: [ElementPlus] } })
     await flushPromises()
 
-    await wrapper.findAll('button').find((button) => button.text().includes('通过并进入待分柜'))!.trigger('click')
+    await wrapper.findAll('button').find((button) => button.text() === '通过')!.trigger('click')
     await flushPromises()
 
     expect(wrapper.emitted('changed')).toBeUndefined()
     expect(wrapper.find('.review-panel').exists()).toBe(true)
-    expect(wrapper.findAll('button').some((button) => button.text().includes('通过并进入待分柜'))).toBe(true)
+    expect(wrapper.findAll('button').some((button) => button.text() === '通过')).toBe(true)
   })
 
   it('blocks approval while the order detail navigation is loading', async () => {
@@ -279,7 +279,7 @@ describe('MeasurementReviewPanel', () => {
     })
     await flushPromises()
 
-    await wrapper.findAll('button').find((button) => button.text().includes('通过并进入待分柜'))!.trigger('click')
+    await wrapper.findAll('button').find((button) => button.text() === '通过')!.trigger('click')
 
     expect(approveMeasurement).not.toHaveBeenCalled()
   })

src/modules/inbounds/review/MeasurementReviewPanel.vue

@@ -49,7 +49,7 @@ const canReview = computed(() => access.can('firstleg:inbound:measurement-review
 const customerId = computed(() => props.customerId || props.tenantId || '')
 const isPending = computed(() => detail.value?.measureReviewStatus === 'PENDING' && detail.value?.processStatus === 'MEASURE_PENDING')
 const approvalTargetLabel = computed(() => props.fulfillmentType === 'ONE_CLICK_DROPSHIP' ? '待一件代发组托' : '待分柜')
-const approvalButtonLabel = computed(() => `通过并进入${approvalTargetLabel.value}`)
+const approvalButtonLabel = computed(() => '通过')
 const isRejected = computed(() => detail.value?.measureReviewStatus === 'REJECTED' && detail.value?.processStatus === 'MEASURE_REJECTED')
 const reviewStatusLabel = computed(() => inboundStatusLabel(detail.value?.measureReviewStatus, inboundReviewStatusLabels, '未提交'))
 const displayCustomerName = computed(() => detail.value?.companyName?.trim() || props.customerName?.trim() || '客户未命名')