优化

src/modules/customers/components/CustomerBillingRulesPanel.test.ts

@@ -2,25 +2,28 @@ import ElementPlus from 'element-plus'
 import { createPinia, setActivePinia } from 'pinia'
 import { enableAutoUnmount, flushPromises, mount } from '@vue/test-utils'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  getCustomerDimensionConfig,
-  updateCustomerDimensionConfig,
-  type CustomerDimensionConfig,
-} from '@/modules/dimension-config'
+import { getCustomerDimensionConfig, updateCustomerDimensionConfig, type CustomerDimensionConfig } from '@/modules/dimension-config'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { useAuthStore } from '@/core/auth/auth'
 import CustomerBillingRulesPanel from './CustomerBillingRulesPanel.vue'
 
-vi.mock('@/modules/dimension-config', () => ({
-  getCustomerDimensionConfig: vi.fn(),
-  updateCustomerDimensionConfig: vi.fn(),
-}))
+vi.mock('@/modules/dimension-config', () => ({ getCustomerDimensionConfig: vi.fn(), updateCustomerDimensionConfig: vi.fn() }))
 
-const rule: CustomerDimensionConfig = {
+const boxes = [
+  ['SMALL', '小箱', 30, 20, 20, '标准小箱'],
+  ['MEDIUM', '中箱', 40, 30, 30, '标准中箱'],
+  ['LARGE', '大箱', 50, 40, 40, '标准大箱'],
+  ['EXTRA_LARGE', '特大箱', 60, 50, 50, '特大箱'],
+] as const
+const config: CustomerDimensionConfig = {
   tenantId: '8',
-  edgeAdditionCm: 2,
-  version: 3,
-  updatedAt: '2026-08-07T10:20:00',
+  rules: boxes.map(([boxType, boxTypeName, innerLengthCm, innerWidthCm, innerHeightCm, remark], index) => ({
+    id: String(100 + index),
+    boxType, boxTypeName, innerLengthCm, innerWidthCm, innerHeightCm, edgeAdditionCm: 2,
+    outerLengthCm: innerLengthCm + 4, outerWidthCm: innerWidthCm + 4, outerHeightCm: innerHeightCm + 4,
+    volumeCbm: Number(((innerLengthCm + 4) * (innerWidthCm + 4) * (innerHeightCm + 4) / 1_000_000).toFixed(3)),
+    remark, version: 3, createdAt: '2026-08-07T10:00:00', updatedAt: '2026-08-07T10:20:00',
+  })),
 }
 
 enableAutoUnmount(afterEach)
@@ -29,79 +32,47 @@ describe('CustomerBillingRulesPanel', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     document.body.innerHTML = ''
-    const pinia = createPinia()
-    setActivePinia(pinia)
-    const auth = useAuthStore()
-    auth.token = 'token'
-    auth.permissions = ['firstleg:dimension-config:view', 'firstleg:dimension-config:edit']
+    const pinia = createPinia(); setActivePinia(pinia)
+    const auth = useAuthStore(); auth.token = 'token'; auth.permissions = ['firstleg:dimension-config:view', 'firstleg:dimension-config:edit']
     useAccessPreviewStore().initializeAfterLogin()
-    vi.mocked(getCustomerDimensionConfig).mockResolvedValue(rule)
-    vi.mocked(updateCustomerDimensionConfig).mockResolvedValue({ ...rule, version: 4 })
+    vi.mocked(getCustomerDimensionConfig).mockResolvedValue(config)
+    vi.mocked(updateCustomerDimensionConfig).mockResolvedValue(config)
   })
 
-  it('shows one customer dimension rule instead of the old pricing versions', async () => {
-    mount(CustomerBillingRulesPanel, {
-      attachTo: document.body,
-      props: { customerId: '8', customerName: '柏悦物流', customerCode: 'TEN8' },
-      global: { plugins: [ElementPlus] },
-    })
+  it('renders the four fixed carton dimension rows and calculated values', async () => {
+    mount(CustomerBillingRulesPanel, { attachTo: document.body, props: { customerId: '8', customerName: '柏悦物流' }, global: { plugins: [ElementPlus] } })
     await flushPromises()
-
     expect(getCustomerDimensionConfig).toHaveBeenCalledWith('8')
-    expect(document.body.textContent).toContain('尺寸计算规则')
-    expect(document.body.textContent).toContain('当前每侧加宽')
-    expect(document.body.textContent).toContain('+2cm')
-    expect(document.body.textContent).toContain('34 × 24 × 24 cm')
-    expect(document.body.textContent).toContain('0.020 CBM')
-    expect(document.body.textContent).not.toContain('规则版本')
-    expect(document.body.textContent).not.toContain('小箱')
+    expect(document.body.textContent).toContain('按箱规尺寸计算')
+    expect(document.body.textContent).toContain('小箱')
+    expect(document.body.textContent).toContain('特大箱')
+    expect(document.body.textContent).toContain('34 × 24 × 24')
+    expect(document.body.textContent).toContain('0.020')
+    expect(document.body.textContent).toContain('标准中箱')
   })
 
-  it('edits the single value and submits the optimistic lock version', async () => {
-    mount(CustomerBillingRulesPanel, {
-      attachTo: document.body,
-      props: { customerId: '8', customerName: '柏悦物流' },
-      global: { plugins: [ElementPlus] },
-    })
+  it('submits all four rows in one update request', async () => {
+    mount(CustomerBillingRulesPanel, { attachTo: document.body, props: { customerId: '8', customerName: '柏悦物流' }, global: { plugins: [ElementPlus] } })
     await flushPromises()
-
-    const editButton = [...document.querySelectorAll<HTMLButtonElement>('button')]
-      .find((button) => button.textContent?.trim() === '编辑规则')
-    editButton?.click()
+    ;[...document.querySelectorAll<HTMLButtonElement>('button')].find((button) => button.textContent?.trim() === '编辑规则')?.click()
     await flushPromises()
-
-    expect(document.body.textContent).toContain('编辑尺寸计算规则')
-    expect(document.body.textContent).toContain('实际内径 30 × 20 × 20 cm')
-    const saveButton = [...document.querySelectorAll<HTMLButtonElement>('button')]
-      .find((button) => button.textContent?.trim() === '保存规则')
-    saveButton?.click()
-    await flushPromises()
-
-    expect(updateCustomerDimensionConfig).toHaveBeenCalledWith('8', {
-      edgeAdditionCm: 2,
-      version: 3,
-    })
+    const saveButton = [...document.querySelectorAll<HTMLButtonElement>('button')].find((button) => button.textContent?.trim() === '保存规则')
+    saveButton?.click(); await flushPromises()
+    expect(updateCustomerDimensionConfig).toHaveBeenCalledWith('8', { rules: expect.arrayContaining([expect.objectContaining({ boxType: 'SMALL', version: 3 }), expect.objectContaining({ boxType: 'EXTRA_LARGE', version: 3 })]) })
+    const submittedRules = vi.mocked(updateCustomerDimensionConfig).mock.calls[0][1].rules
+    expect(submittedRules).toHaveLength(4)
+    expect(Object.keys(submittedRules[0]).sort()).toEqual([
+      'boxType', 'edgeAdditionCm', 'innerHeightCm', 'innerLengthCm', 'innerWidthCm', 'remark', 'version',
+    ])
   })
 
-  it('keeps the editor open when the versioned save fails', async () => {
-    vi.mocked(updateCustomerDimensionConfig).mockRejectedValueOnce(new Error('规则已被其他人更新'))
-    mount(CustomerBillingRulesPanel, {
-      attachTo: document.body,
-      props: { customerId: '8', customerName: '柏悦物流' },
-      global: { plugins: [ElementPlus] },
-    })
+  it('keeps the editor open when the whole-set save fails', async () => {
+    vi.mocked(updateCustomerDimensionConfig).mockRejectedValueOnce(new Error('规则版本冲突'))
+    mount(CustomerBillingRulesPanel, { attachTo: document.body, props: { customerId: '8', customerName: '柏悦物流' }, global: { plugins: [ElementPlus] } })
     await flushPromises()
-
-    const editButton = [...document.querySelectorAll<HTMLButtonElement>('button')]
-      .find((button) => button.textContent?.trim() === '编辑规则')
-    editButton?.click()
+    ;[...document.querySelectorAll<HTMLButtonElement>('button')].find((button) => button.textContent?.trim() === '编辑规则')?.click(); await flushPromises()
+    ;[...document.querySelectorAll<HTMLButtonElement>('button')].find((button) => button.textContent?.trim() === '保存规则')?.click()
     await flushPromises()
-    const saveButton = [...document.querySelectorAll<HTMLButtonElement>('button')]
-      .find((button) => button.textContent?.trim() === '保存规则')
-    saveButton?.click()
-    await flushPromises()
-
-    expect(document.body.textContent).toContain('编辑尺寸计算规则')
-    expect(updateCustomerDimensionConfig).toHaveBeenCalledWith('8', expect.objectContaining({ version: 3 }))
+    expect(document.body.textContent).toContain('编辑箱规尺寸')
   })
 })