From 327e88e6d4719020c3283591866abc8b0bed63e9 Mon Sep 17 00:00:00 2001
From: wzk <2438381872@qq.com>
Date: Fri, 28 Nov 2025 15:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A1=B9=E7=9B=AE=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE-=E5=A5=97=E9=A4=90=E8=AE=BE=E7=BD=AE-=E5=A5=97?=
 =?UTF-8?q?=E9=A4=90=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2=E6=94=BE=E5=A4=A7?=
 =?UTF-8?q?=E6=88=96=E7=BC=A9=E5=B0=8F=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../prescription/prescriptionlist.vue         | 26 ++++++-
 .../components/PackageManagement.vue          | 71 +++++++++++++++++--
 .../checkprojectSettings/index.vue            |  5 ++
 3 files changed, 92 insertions(+), 10 deletions(-)

diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
index bf135118..523c5af6 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -8,9 +8,9 @@
     </div>
     
     <!-- 可滚动的内容区域 -->
-    <div class="prescription-scroll-container" style="flex: 1; overflow-y: auto; overflow-x: hidden; max-height: calc(100vh - 300px);">
+    <div class="prescription-scroll-container" style="flex: 1; overflow-y: auto; overflow-x: auto; max-height: calc(100vh - 300px); width: 100%;">
       <!-- 循环显示所有西药方 -->
-      <div v-for="(prescription, pIndex) in westernPrescriptions" :key="prescription.id" style="margin-bottom: 20px; border: 1px solid #e4e7ed; border-radius: 8px; padding: 10px;">
+      <div v-for="(prescription, pIndex) in westernPrescriptions" :key="prescription.id" style="margin-bottom: 20px; border: 1px solid #e4e7ed; border-radius: 8px; padding: 10px; min-width: fit-content;">
       <!-- 西药方标题栏 -->
       <div style="margin-bottom: 10px; display: flex; align-items: center; justify-content: space-between; background: #f5f7fa; padding: 10px 12px; border-radius: 4px;">
         <span style="font-weight: 600; font-size: 14px; color: #409eff;">{{ prescription.name }}</span>
@@ -79,6 +79,7 @@
         @row-dblclick="(row, event) => clickRowDb(row, event, prescription.id)"
         v-loading="loading"
         :expand-row-keys="prescription.expandOrder || []"
+        style="width: 100%; min-width: 100%;"
       >
       <el-table-column type="expand" width="1" style="width: 0">
         <template #default="scope">
@@ -3437,14 +3438,19 @@ defineExpose({ getListInfo, getDiagnosisInfo, getSignedPrescriptionInfo });
   margin-bottom: 0px;
 }
 
-/* 优化滚动条样式 */
+/* 优化滚动条样式 - 支持水平和垂直滚动 */
 .prescription-scroll-container {
   scrollbar-width: thin;
   scrollbar-color: #c1c1c1 #f1f1f1;
+  /* 确保内容可以超出容器宽度，触发水平滚动 */
+  overflow-x: auto;
+  overflow-y: auto;
 }
 
+/* 垂直滚动条样式 */
 .prescription-scroll-container::-webkit-scrollbar {
   width: 8px;
+  height: 8px;
 }
 
 .prescription-scroll-container::-webkit-scrollbar-track {
@@ -3460,4 +3466,18 @@ defineExpose({ getListInfo, getDiagnosisInfo, getSignedPrescriptionInfo });
 .prescription-scroll-container::-webkit-scrollbar-thumb:hover {
   background: #a8a8a8;
 }
+
+/* 水平滚动条样式 */
+.prescription-scroll-container::-webkit-scrollbar:horizontal {
+  height: 8px;
+}
+
+/* 确保表格可以水平滚动 */
+.prescription-scroll-container .el-table {
+  min-width: 100%;
+}
+
+.prescription-scroll-container .el-table__body-wrapper {
+  overflow-x: auto;
+}
 </style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/components/PackageManagement.vue b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/components/PackageManagement.vue
index dc3a2b62..4b25b0f2 100644
--- a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/components/PackageManagement.vue
+++ b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/components/PackageManagement.vue
@@ -78,13 +78,14 @@
 
     <!-- 表格展示区 -->
     <div class="table-section">
-      <el-table 
-        :data="tableData" 
-        border 
-        style="width: 100%"
-        v-loading="loading"
-        :max-height="600"
-      >
+      <div class="table-wrapper">
+        <el-table 
+          :data="tableData" 
+          border 
+          style="width: 100%"
+          v-loading="loading"
+          :max-height="600"
+        >
         <el-table-column prop="id" label="ID" width="80" align="center" />
         <el-table-column prop="organization" label="卫生机构" width="120" align="center" />
         <el-table-column prop="maintainDate" label="日期" width="120" align="center" />
@@ -169,6 +170,7 @@
           </template>
         </el-table-column>
       </el-table>
+      </div>
     </div>
 
     <!-- 底部分页 -->
@@ -568,6 +570,10 @@ function handleDelete(row) {
   padding: 24px;
   background-color: #f5f7fa;
   min-height: 100vh;
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+  box-sizing: border-box;
 }
 
 .filter-section {
@@ -576,6 +582,8 @@ function handleDelete(row) {
   padding: 20px;
   margin-bottom: 16px;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.03);
+  width: 100%;
+  box-sizing: border-box;
 }
 
 .filter-section :deep(.el-form-item) {
@@ -587,6 +595,17 @@ function handleDelete(row) {
   border-radius: 8px;
   padding: 20px;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.03);
+  width: 100%;
+  box-sizing: border-box;
+  overflow: hidden;
+}
+
+.table-wrapper {
+  width: 100%;
+  overflow-x: auto;
+  overflow-y: auto;
+  max-height: calc(100vh - 400px);
+  min-height: 400px;
 }
 
 .pagination-section {
@@ -599,6 +618,40 @@ function handleDelete(row) {
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.03);
 }
 
+/* 优化滚动条样式 - 支持水平和垂直滚动 */
+.table-wrapper {
+  scrollbar-width: thin;
+  scrollbar-color: #c1c1c1 #f1f1f1;
+}
+
+.table-wrapper::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+
+.table-wrapper::-webkit-scrollbar-track {
+  background: #f1f1f1;
+  border-radius: 4px;
+}
+
+.table-wrapper::-webkit-scrollbar-thumb {
+  background: #c1c1c1;
+  border-radius: 4px;
+}
+
+.table-wrapper::-webkit-scrollbar-thumb:hover {
+  background: #a8a8a8;
+}
+
+/* 确保表格可以水平滚动 */
+.table-wrapper :deep(.el-table) {
+  min-width: 100%;
+}
+
+.table-wrapper :deep(.el-table__body-wrapper) {
+  overflow-x: auto;
+}
+
 /* 响应式设计 */
 @media (max-width: 1200px) {
   .filter-section :deep(.el-form) {
@@ -617,6 +670,10 @@ function handleDelete(row) {
   .pagination-section {
     padding: 16px;
   }
+  
+  .table-wrapper {
+    max-height: calc(100vh - 350px);
+  }
 }
 </style>
 
diff --git a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue
index 89294775..b40b9f56 100644
--- a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue
+++ b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue
@@ -562,6 +562,11 @@ select {
   flex: 1;
   margin-left: 160px;
   padding: 24px;
+  width: calc(100% - 160px);
+  height: 100vh;
+  overflow-x: auto;
+  overflow-y: auto;
+  box-sizing: border-box;
 }
 
 .header {