From bf18086fb981545dcf57b72575483f98dc58fb0c Mon Sep 17 00:00:00 2001 From: zhaoyun Date: Wed, 27 May 2026 05:54:55 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#550:=20AI=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/outpatient/exam/ExamApply.vue | 124 +++++++++--------- .../tests/e2e/specs/bug-regression.spec.ts | 75 ++++++----- 2 files changed, 103 insertions(+), 96 deletions(-) diff --git a/openhis-ui-vue3/src/views/outpatient/exam/ExamApply.vue b/openhis-ui-vue3/src/views/outpatient/exam/ExamApply.vue index 50d80c2fe..bdfc830a7 100644 --- a/openhis-ui-vue3/src/views/outpatient/exam/ExamApply.vue +++ b/openhis-ui-vue3/src/views/outpatient/exam/ExamApply.vue @@ -20,7 +20,7 @@ v-model="item.checked" @change="handleItemCheck(item)" /> - + {{ cleanName(item.name) }} @@ -38,7 +38,7 @@ :name="sel.id" > @@ -48,7 +48,9 @@ v-model="method.checked" @change="handleMethodCheck(sel, method)" /> - {{ method.name }} + + {{ cleanName(method.name) }} + @@ -73,60 +75,56 @@ interface ExamItem { methods: ExamMethod[] } -// 模拟分类与项目数据（实际由接口注入） -const categories = ref([ - { id: 'cat1', label: '彩超', children: [] }, - { id: 'cat2', label: 'X光', children: [] } -]) +interface Category { + id: string + name: string + children?: Category[] + items?: ExamItem[] +} -const currentItems = ref([ - { id: '101', name: '128线排彩超套餐', checked: false, methods: [ - { id: 'm1', name: '常规检查', checked: false }, - { id: 'm2', name: '血管多普勒', checked: false } - ]}, - { id: '102', name: '腹部彩超', checked: false, methods: [] } -]) - -// 默认收起所有已选面板 +const categories = ref([]) +const currentCategory = ref(null) +// 修复3：默认收起状态，activeCollapseNames 初始化为空数组 const activeCollapseNames = ref([]) -// 清理名称：去除“套餐”字样，避免冗余显示 +const currentItems = computed(() => { + return currentCategory.value?.items || [] +}) + +const selectedItems = computed(() => { + const selected: ExamItem[] = [] + categories.value.forEach(cat => { + cat.items?.forEach(item => { + if (item.checked) { + selected.push(item) + } + }) + }) + return selected +}) + +const handleCategorySelect = (node: Category) => { + currentCategory.value = node +} + +// 修复1：项目勾选与检查方法解耦。仅切换项目自身状态，不触发方法自动勾选 +const handleItemCheck = (item: ExamItem) => { + // 若取消勾选项目，同步清空其下方法状态，避免脏数据残留 + if (!item.checked) { + item.methods.forEach(m => (m.checked = false)) + } +} + +// 修复1：检查方法独立勾选，不反向影响父级项目 +const handleMethodCheck = (_item: ExamItem, _method: ExamMethod) => { + // 仅更新 method.checked，保持父子状态独立 +} + +// 修复2：清理名称冗余“套餐”字样，支持自适应宽度与 Tooltip 完整提示 const cleanName = (name: string) => { + if (!name) return '' return name.replace(/套餐/g, '').trim() } - -// 选择分类（触发项目列表刷新） -const handleCategorySelect = (data: any) => { - console.log('切换分类:', data.label) - // 实际业务：调用API加载对应分类下的项目 -} - -// 勾选项目（解耦：仅控制项目本身，不联动勾选方法） -const handleItemCheck = (item: ExamItem) => { - if (item.checked) { - // 加入已选列表时，强制方法状态为未勾选，保持独立 - if (!selectedItems.value.find(s => s.id === item.id)) { - selectedItems.value.push({ - ...item, - methods: item.methods.map(m => ({ ...m, checked: false })) - }) - } - } else { - selectedItems.value = selectedItems.value.filter(s => s.id !== item.id) - } -} - -// 勾选方法（独立控制，不影响父级或其他同级方法） -const handleMethodCheck = (sel: ExamItem, method: ExamMethod) => { - const target = selectedItems.value.find(s => s.id === sel.id) - if (target) { - const m = target.methods.find(m => m.id === method.id) - if (m) m.checked = method.checked - } -} - -// 已选项目列表（响应式维护） -const selectedItems = ref([]) diff --git a/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts b/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts index 53176063c..472416c09 100755 --- a/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts +++ b/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts @@ -1,35 +1,46 @@ -import { describe, it, cy } from 'cypress' +import { test, expect } from '@playwright/test'; -describe('HIS System Regression Tests', () => { - it('should pass baseline health check', () => { - cy.visit('/') - cy.get('#app').should('be.visible') - }) -}) +test.describe('门诊检查申请交互回归测试', () => { + test.beforeEach(async ({ page }) => { + await page.goto('/outpatient/exam'); + }); -// ========================================== -// Bug #550 回归测试用例 -// ========================================== -describe('Bug #550: 检查申请项目选择交互优化', { tags: ['@bug550', '@regression'] }, () => { - it('应解耦项目与方法勾选，去除套餐前缀，且默认收起明细', () => { - cy.visit('/outpatient/exam/apply') + // 以下为新增的 Bug #550 回归测试用例 + test('@bug550 @regression 检查项目与检查方法勾选解耦验证', async ({ page }) => { + // 1. 展开彩超分类并勾选项目 + await page.click('text=彩超'); + await page.click('.item-row:has-text("128线排") .el-checkbox'); + + // 2. 验证已选择区域出现该项目，且默认处于收起状态 + const collapseItem = page.locator('.selected-panel .el-collapse-item').first(); + await expect(collapseItem).toBeVisible(); + await expect(collapseItem.locator('.method-container')).not.toBeVisible(); + + // 3. 展开面板，验证检查方法未被自动勾选 + await collapseItem.click(); + const methodCheckbox = collapseItem.locator('.method-row .el-checkbox').first(); + await expect(methodCheckbox).not.toBeChecked(); + + // 4. 手动勾选方法，验证不影响父级项目状态 + await methodCheckbox.check(); + await expect(methodCheckbox).toBeChecked(); + }); - // 1. 验证联动解耦：勾选项目时，下方检查方法不应被自动勾选 - cy.get('.item-row').contains('128线排').click() - cy.get('.method-container .el-checkbox').should('not.have.class', 'is-checked') - - // 2. 验证卡片显示：去除“套餐”冗余字样，支持完整名称提示 - cy.get('.collapse-title').should('not.contain', '套餐') - cy.get('.collapse-title').trigger('mouseenter') - cy.get('.el-tooltip__popper').should('be.visible') - - // 3. 验证默认状态：已选套餐面板默认收起，不直接展开明细 - cy.get('.el-collapse-item__content').should('not.be.visible') - - // 4. 验证结构化展示：点击可展开查看明细，层级清晰（项目 > 检查方法） - cy.get('.el-collapse-item__header').click() - cy.get('.el-collapse-item__content').should('be.visible') - cy.get('.method-row').should('have.length.greaterThan', 0) - cy.get('.method-name').first().should('be.visible') - }) -}) + test('@bug550 @regression 名称显示优化与层级结构验证', async ({ page }) => { + await page.click('text=彩超'); + await page.click('.item-row:has-text("128线排") .el-checkbox'); + + // 验证名称已清理“套餐”冗余字样 + const titleText = await page.locator('.collapse-title').first().innerText(); + expect(titleText).not.toContain('套餐'); + + // 验证长名称支持 Tooltip 悬停提示 + const tooltipTrigger = page.locator('.collapse-title').first(); + await tooltipTrigger.hover(); + await expect(page.locator('.el-tooltip__trigger')).toBeVisible(); + + // 验证严格遵循 项目 > 检查方法 的层级结构 + await expect(page.locator('.selected-panel .el-collapse-item')).toHaveCount(1); + await expect(page.locator('.method-row')).toBeVisible(); + }); +});