Merge remote-tracking branch 'origin/develop' into guanyu

This commit is contained in:
2026-06-19 17:56:05 +08:00

View File

@@ -196,6 +196,7 @@
v-model="open"
:title="title"
width="1200px"
class="surgery-dialog"
:close-on-click-modal="false"
@close="cancel"
>
@@ -1757,13 +1758,13 @@ defineExpose({
height: 100%;
width: 100%;
padding: 10px;
/* 顶部操作栏样式 */
.top-operation-bar {
height: 60px;
align-items: center;
margin-bottom: 16px;
.add-button {
background-color: #5b8fb9;
color: white;
@@ -1774,7 +1775,7 @@ defineExpose({
box-shadow: 0 4px 8px rgba(91, 143, 185, 0.3);
}
}
.refresh-button {
background-color: transparent;
border: 1px solid #dcdfe6;
@@ -1786,14 +1787,14 @@ defineExpose({
}
}
}
/* 表格样式 */
.vxe-table {
:deep(.cancelled-row) {
background-color: #f5f5f5;
color: #999;
text-decoration: line-through;
:deep(.cell) {
opacity: 0.6;
}
@@ -1801,47 +1802,48 @@ defineExpose({
}
}
/* 对话框样式 */
.el-dialog {
/* Bug #770: Dialog flex 布局 — 防止 footer 按钮遮盖表单字段 */
:deep(.surgery-dialog) {
display: flex;
flex-direction: column;
max-height: 85vh;
margin-top: 7.5vh;
}
:deep(.surgery-dialog .el-dialog__header) {
flex-shrink: 0;
padding: 16px 20px;
border-bottom: 1px solid #ebeef5;
}
:deep(.surgery-dialog .el-dialog__body) {
flex: 1;
min-height: 0;
overflow-y: auto;
padding: 20px;
}
:deep(.surgery-dialog .el-dialog__footer) {
flex-shrink: 0;
padding: 12px 20px;
border-top: 1px solid #ebeef5;
}
/* 对话框圆角 */
:deep(.surgery-dialog .el-dialog) {
border-radius: 12px;
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12);
}
.dialog-footer {
text-align: center;
padding: 20px 0;
}
/* Bug #770: Dialog flex 布局 — 防止 footer 按钮遮盖表单字段 */
:deep(.el-dialog) {
display: flex;
}
:deep(.el-dialog__header) {
flex-shrink: 0;
}
:deep(.el-dialog__body) {
flex: 1;
min-height: 0;
}
:deep(.el-dialog__footer) {
flex-shrink: 0;
border-top: 1px solid #ebeef5;
}
/* 响应式:小屏幕下对话框宽度自适应 */
@media (max-width: 1200px) {
:deep(.el-dialog) {
:deep(.surgery-dialog) {
width: 95vw !important;
margin: 2.5vh auto;
}
}
</style>
display: flex;
flex-direction: column;
max-height: 85vh;
overflow-y: auto;
padding: 20px;
padding: 12px 20px 12px;
</style>