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 @@ -
+
-
+
{{ prescription.name }} @@ -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%;" > +
@@ -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); + } } 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 {