From d8627df2dd34652d44e33e6ec95023700d53d5ba Mon Sep 17 00:00:00 2001 From: qk123 <18211963828@163.com> Date: Wed, 7 Jan 2026 11:01:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE->?= =?UTF-8?q?=E5=A5=97=E9=A4=90=E8=AE=BE=E7=BD=AE->=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E3=80=81=E5=B8=83=E5=B1=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Inspection/PackageManagement.vue | 25 ++++- .../views/maintainSystem/Inspection/index.vue | 94 +++++++++++-------- 2 files changed, 77 insertions(+), 42 deletions(-) diff --git a/openhis-ui-vue3/src/views/maintainSystem/Inspection/PackageManagement.vue b/openhis-ui-vue3/src/views/maintainSystem/Inspection/PackageManagement.vue index 827917c3..bfd19e28 100644 --- a/openhis-ui-vue3/src/views/maintainSystem/Inspection/PackageManagement.vue +++ b/openhis-ui-vue3/src/views/maintainSystem/Inspection/PackageManagement.vue @@ -47,9 +47,10 @@ -
+
@@ -235,7 +239,8 @@ const searchParams = ref({ startDate: getCurrentDate(), endDate: getCurrentDate(), packageName: '', - packageLevel: '' + packageLevel: '', + department: '' }); // 过滤后的数据 @@ -251,6 +256,9 @@ const filteredData = computed(() => { // 套餐级别筛选 if (searchParams.value.packageLevel && item.level !== searchParams.value.packageLevel) return false; + // 科室筛选 + if (searchParams.value.department && item.department !== searchParams.value.department) return false; + return true; }); }); @@ -281,7 +289,8 @@ function handleReset() { startDate: getCurrentDate(), endDate: getCurrentDate(), packageName: '', - packageLevel: '' + packageLevel: '', + department: '' }; } @@ -452,6 +461,14 @@ function convertToCSV(data) { gap: 8px; } +.filter-item-department { + min-width: 280px; +} + +.filter-item-department .el-tree-select { + width: 100%; +} + .filter-item label { font-size: 14px; color: var(--text-secondary); diff --git a/openhis-ui-vue3/src/views/maintainSystem/Inspection/index.vue b/openhis-ui-vue3/src/views/maintainSystem/Inspection/index.vue index 3b88dd92..e77769b5 100644 --- a/openhis-ui-vue3/src/views/maintainSystem/Inspection/index.vue +++ b/openhis-ui-vue3/src/views/maintainSystem/Inspection/index.vue @@ -411,12 +411,22 @@
套餐级别 - + + +
科室 @@ -468,47 +478,31 @@
是否停用 -
- - -
+ + 启用 + 停用 +
显示套餐名 -
- - -
+ + + +
生成服务费 -
- - -
+ + + +
套餐价格 -
- - -
+ + 启用 + 不启用 +
@@ -848,6 +842,14 @@ function handleDepartmentChange(selectedNode, item) { } } +// 处理套餐级别选择变化 +function handlePackageLevelChange(value) { + console.log('选择的套餐级别:', value); + if (value !== '科室套餐') { + department.value = ''; + } +} + // 处理套餐科室选择变化 function handlePackageDepartmentChange(selectedNode) { console.log('选择的套餐科室节点:', selectedNode); @@ -973,6 +975,11 @@ const resetFilters = () => { // 套餐相关数据 const packageCategory = ref('检验套餐'); const packageLevel = ref(''); +const packageLevelOptions = ref([ + { value: '全院套餐', label: '全院套餐' }, + { value: '科室套餐', label: '科室套餐' }, + { value: '个人套餐', label: '个人套餐' } +]); const packageName = ref(''); const department = ref(''); const discount = ref(''); @@ -2058,6 +2065,8 @@ watch(packageItems, (newVal) => { flex: 1; padding: 20px; overflow-y: auto; + overflow-x: hidden; + max-width: 100%; } /* 页面标题 */ @@ -2407,6 +2416,8 @@ watch(packageItems, (newVal) => { box-shadow: 0 2px 8px rgba(0, 0, 0, 0.03); padding: 16px; margin-bottom: 16px; + max-width: 100%; + overflow-x: hidden; } .section-title { @@ -2426,6 +2437,8 @@ watch(packageItems, (newVal) => { .form-item { display: flex; align-items: center; + min-width: 0; + max-width: 100%; } .form-label { @@ -2522,6 +2535,11 @@ watch(packageItems, (newVal) => { border-radius: 4px; padding: 0 8px; font-size: 14px; + max-width: 100%; + min-width: 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .form-control:focus { From b4422a0dca05f8768d9bc94a9245d4f5b5cda628 Mon Sep 17 00:00:00 2001 From: qk123 <18211963828@163.com> Date: Wed, 7 Jan 2026 13:51:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=B6=E8=B4=B9=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=AB=99:=E5=90=88=E5=B9=B6=E5=90=8E=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98,=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E8=B7=B3=E8=BD=AC=E6=97=A0=E5=8F=8D=E5=BA=94?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../charge/outpatientregistration/index.vue | 37 +++---------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue index c4d524de..2001d9b4 100644 --- a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue +++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue @@ -43,38 +43,6 @@ - - - 新建 - - - 查询 - - - 电子凭证 - - - 身份证 - - - 医保卡 - - - @@ -991,6 +959,11 @@ async function handleReadCard(value) { // } } +/** 跳转到患者档案页面 */ +function goToPatientRecord() { + router.push('/patient/patientmgr'); +} + /** 新增用户信息弹窗 */ function handleAddPatient() { proxy.$refs['patientAddRef'].show(); // 确保子组件更新后再调用 show 方法