From 11f8b7856e2dd97aaf59980421fbfbd9d52a4701 Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Mon, 31 Aug 2026 16:44:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/UnifiedOrdersView.coLoad.test.ts | 16 ++++++++-------- .../unified-orders/pages/UnifiedOrdersView.vue | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/modules/unified-orders/pages/UnifiedOrdersView.coLoad.test.ts b/src/modules/unified-orders/pages/UnifiedOrdersView.coLoad.test.ts index 25c89700..808d5bf7 100644 --- a/src/modules/unified-orders/pages/UnifiedOrdersView.coLoad.test.ts +++ b/src/modules/unified-orders/pages/UnifiedOrdersView.coLoad.test.ts @@ -61,11 +61,11 @@ describe('UnifiedOrdersView co-load group behavior', () => { const wrapper = mountView() await flushPromises() await wrapper.get('[data-testid="select"]').trigger('click') - await wrapper.findAll('button').find((button) => button.text().includes('设为同柜不可拆组'))!.trigger('click') + await wrapper.findAll('button').find((button) => button.text().includes('合柜报关'))!.trigger('click') await wrapper.get('[data-testid="dialog-confirm"]').trigger('click') await flushPromises() expect(createPlatformCoLoadGroup).toHaveBeenCalledWith(['5001', '5002']) - expect(wrapper.text()).toContain('设为同柜不可拆组（2）') + expect(wrapper.text()).toContain('合柜报关（2）') expect(wrapper.text()).toContain('成员路线不一致') expect(wrapper.text()).toContain('A0409 request-coload trace-coload') expect(wrapper.text()).not.toContain('5001') @@ -82,7 +82,7 @@ describe('UnifiedOrdersView co-load group behavior', () => { const wrapper = mountView() await flushPromises() await wrapper.get('[data-testid="select"]').trigger('click') - const createButton = wrapper.findAll('button').find((button) => button.text().includes('设为同柜不可拆组'))! + const createButton = wrapper.findAll('button').find((button) => button.text().includes('合柜报关'))! expect(createButton.attributes('disabled')).toBeDefined() expect(wrapper.text()).not.toContain(reason) await createButton.trigger('click') @@ -93,12 +93,12 @@ describe('UnifiedOrdersView co-load group behavior', () => { const wrapper = mountView() await flushPromises() expect(wrapper.text()).not.toContain('请至少勾选 2 票订单后再设为同柜组') - expect(wrapper.findAll('button').find((button) => button.text().includes('设为同柜不可拆组'))!.attributes('disabled')).toBeDefined() + expect(wrapper.findAll('button').find((button) => button.text().includes('合柜报关'))!.attributes('disabled')).toBeDefined() ;(wrapper.vm as unknown as { handleOrderSelectionChange: (selected: typeof rows) => void }).handleOrderSelectionChange([rows[0]]) await wrapper.vm.$nextTick() expect(wrapper.text()).not.toContain('当前仅选择 1 票') - expect(wrapper.findAll('button').find((button) => button.text().includes('设为同柜不可拆组'))!.attributes('disabled')).toBeDefined() + expect(wrapper.findAll('button').find((button) => button.text().includes('合柜报关'))!.attributes('disabled')).toBeDefined() expect(wrapper.text()).not.toContain('5001') expect(wrapper.text()).not.toContain('7000') }) @@ -121,7 +121,7 @@ describe('UnifiedOrdersView co-load group behavior', () => { const wrapper = mountView() await flushPromises() await wrapper.get('[data-testid="select"]').trigger('click') - await wrapper.findAll('button').find((button) => button.text().includes('设为同柜不可拆组'))!.trigger('click') + await wrapper.findAll('button').find((button) => button.text().includes('合柜报关'))!.trigger('click') await wrapper.get('[data-testid="dialog-confirm"]').trigger('click') await flushPromises() expect(createPlatformCoLoadGroup).toHaveBeenCalledWith(['5001', '5002']) @@ -132,7 +132,7 @@ describe('UnifiedOrdersView co-load group behavior', () => { const wrapper = mountView() await flushPromises() await wrapper.get('[data-testid="select"]').trigger('click') - expect(wrapper.findAll('button').find((button) => button.text().includes('设为同柜不可拆组'))!.attributes('disabled')).toBeDefined() + expect(wrapper.findAll('button').find((button) => button.text().includes('合柜报关'))!.attributes('disabled')).toBeDefined() expect(wrapper.text()).not.toContain('所选订单的渠道不同') expect(createPlatformCoLoadGroup).not.toHaveBeenCalled() }) @@ -158,7 +158,7 @@ describe('UnifiedOrdersView co-load group behavior', () => { await flushPromises() expect(wrapper.findAll('button').find((button) => button.text().includes('批量审核通过'))!.attributes('disabled')).toBeUndefined() expect(wrapper.findAll('button').find((button) => button.text().includes('批量审核通过'))!.text()).toContain('（3）') - expect(wrapper.findAll('button').find((button) => button.text().includes('设为同柜不可拆组'))!.attributes('disabled')).toBeDefined() + expect(wrapper.findAll('button').find((button) => button.text().includes('合柜报关'))!.attributes('disabled')).toBeDefined() expect(wrapper.text()).not.toContain('平台收货仓不同') expect(wrapper.text()).not.toContain('渠道不同') }) diff --git a/src/modules/unified-orders/pages/UnifiedOrdersView.vue b/src/modules/unified-orders/pages/UnifiedOrdersView.vue index b607f766..bccb6079 100644 --- a/src/modules/unified-orders/pages/UnifiedOrdersView.vue +++ b/src/modules/unified-orders/pages/UnifiedOrdersView.vue @@ -1430,7 +1430,7 @@ onBeforeUnmount(() => { @@ -1479,7 +1479,7 @@ onBeforeUnmount(() => { - +
{{ row.inboundCode || '待生成入仓码' }}