Fix Bug #568: 修复门诊日结页面排版混乱 - 移除冲突的display:grid并优化el-col对齐

根因:.report-row的display:grid覆盖了el-row的flex布局,导致el-col的span比例失效。
修复:移除.report-row的display:flex,让el-row原生flex布局生效;标签min-width调整为130px确保对齐。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
2026-05-22 12:23:43 +08:00
parent f319a2d5de
commit 7df2a01b32

View File

@@ -42,51 +42,80 @@
<div class="report-title">门诊收费日结单</div> <div class="report-title">门诊收费日结单</div>
<div class="report-section"> <div class="report-section">
<div class="section-title">基本信息</div> <div class="section-title">基本信息</div>
<el-row :gutter="20" class="report-row"> <table class="report-table">
<el-col :span="6"><span class="label">经办人姓名</span><span class="value">{{ userStore.nickName }}</span></el-col> <tr>
<el-col :span="6"><span class="label">科室</span><span class="value">{{ userStore.orgName }}</span></el-col> <td class="label-cell">经办人姓名</td>
<el-col :span="12"><span class="label">时间</span><span class="value">{{ queryTime[0] + '~' + queryTime[1] }}</span></el-col> <td class="value-cell">{{ userStore.nickName }}</td>
</el-row> <td class="label-cell">科室</td>
<td class="value-cell">{{ userStore.orgName }}</td>
<td class="label-cell">时间</td>
<td class="value-cell" colspan="3">{{ queryTime[0] + '~' + queryTime[1] }}</td>
</tr>
</table>
</div> </div>
<div class="divider"></div> <div class="divider"></div>
<div class="report-section"> <div class="report-section">
<div class="section-title">收费汇总</div> <div class="section-title">收费汇总</div>
<el-row :gutter="20" class="report-row"> <table class="report-table">
<el-col :span="6"><span class="label">实际现金收入</span><span class="value">{{ formatValue(reportValue.cashSum) }}</span></el-col> <tr>
<el-col :span="6"><span class="label">现金</span><span class="value">{{ formatValue(reportValue.rmbCashSum) }}</span></el-col> <td class="label-cell">实际现金收入</td>
<el-col :span="6"><span class="label">微信</span><span class="value">{{ formatValue(reportValue.vxCashSum) }}</span></el-col> <td class="value-cell">{{ formatValue(reportValue.cashSum) }}</td>
<el-col :span="6"><span class="label">支付宝</span><span class="value">{{ formatValue(reportValue.aliCashSum) }}</span></el-col> <td class="label-cell">现金</td>
</el-row> <td class="value-cell">{{ formatValue(reportValue.rmbCashSum) }}</td>
<td class="label-cell">微信</td>
<td class="value-cell">{{ formatValue(reportValue.vxCashSum) }}</td>
<td class="label-cell">支付宝</td>
<td class="value-cell">{{ formatValue(reportValue.aliCashSum) }}</td>
</tr>
</table>
</div> </div>
<div class="divider"></div> <div class="divider"></div>
<div class="report-section"> <div class="report-section">
<div class="section-title">医保支付</div> <div class="section-title">医保支付</div>
<el-row :gutter="20" class="report-row"> <table class="report-table">
<el-col :span="6"><span class="label">统筹支付</span><span class="value">{{ formatValue(reportValue.tcSum) }}</span></el-col> <tr>
<el-col :span="6"><span class="label">账户支付</span><span class="value">{{ formatValue(reportValue.zhSum) }}</span></el-col> <td class="label-cell">统筹支付</td>
<el-col :span="12"><span class="label">基金支付总额</span><span class="value">{{ formatValue(reportValue.fundSum) }}</span></el-col> <td class="value-cell">{{ formatValue(reportValue.tcSum) }}</td>
</el-row> <td class="label-cell">账户支付</td>
<td class="value-cell">{{ formatValue(reportValue.zhSum) }}</td>
<td class="label-cell">基金支付总额</td>
<td class="value-cell" colspan="3">{{ formatValue(reportValue.fundSum) }}</td>
</tr>
</table>
</div> </div>
<div class="divider"></div> <div class="divider"></div>
<div class="report-section"> <div class="report-section">
<div class="section-title">费用明细</div> <div class="section-title">费用明细</div>
<el-row :gutter="20" class="report-row"> <table class="report-table">
<el-col :span="6"><span class="label">诊查费</span><span class="value">{{ formatValue(reportValue.DIAGNOSTIC_FEE) }}</span></el-col> <tr>
<el-col :span="6"><span class="label">查费</span><span class="value">{{ formatValue(reportValue.CHECK_FEE) }}</span></el-col> <td class="label-cell">查费</td>
<el-col :span="6"><span class="label">化验费</span><span class="value">{{ formatValue(reportValue.DIAGNOSTIC_TEST_FEE) }}</span></el-col> <td class="value-cell">{{ formatValue(reportValue.DIAGNOSTIC_FEE) }}</td>
<el-col :span="6"><span class="label">治疗</span><span class="value">{{ formatValue(reportValue.MEDICAL_EXPENSE_FEE) }}</span></el-col> <td class="label-cell">检查</td>
</el-row> <td class="value-cell">{{ formatValue(reportValue.CHECK_FEE) }}</td>
<el-row :gutter="20" class="report-row"> <td class="label-cell">化验费</td>
<el-col :span="6"><span class="label">西药费</span><span class="value">{{ formatValue(reportValue.WEST_MEDICINE) }}</span></el-col> <td class="value-cell">{{ formatValue(reportValue.DIAGNOSTIC_TEST_FEE) }}</td>
<el-col :span="6"><span class="label">中药饮片</span><span class="value">{{ formatValue(reportValue.CHINESE_MEDICINE_SLICES_FEE) }}</span></el-col> <td class="label-cell">治疗</td>
<el-col :span="6"><span class="label">中成药费</span><span class="value">{{ formatValue(reportValue.CHINESE_MEDICINE_FEE) }}</span></el-col> <td class="value-cell">{{ formatValue(reportValue.MEDICAL_EXPENSE_FEE) }}</td>
<el-col :span="6"><span class="label">卫生材料费</span><span class="value">{{ formatValue(reportValue.SANITARY_MATERIALS_FEE) }}</span></el-col> </tr>
</el-row> <tr>
<el-row :gutter="20" class="report-row"> <td class="label-cell">西药费</td>
<el-col :span="6"><span class="label">诊疗费</span><span class="value">{{ formatValue(reportValue.GENERAL_CONSULTATION_FEE) }}</span></el-col> <td class="value-cell">{{ formatValue(reportValue.WEST_MEDICINE) }}</td>
<el-col :span="6"><span class="label">挂号</span><span class="value">{{ formatValue(reportValue.REGISTRATION_FEE) }}</span></el-col> <td class="label-cell">中药饮片</td>
<el-col :span="12"><span class="label">其他费用</span><span class="value">{{ formatValue(reportValue.OTHER_FEE) }}</span></el-col> <td class="value-cell">{{ formatValue(reportValue.CHINESE_MEDICINE_SLICES_FEE) }}</td>
</el-row> <td class="label-cell">中成药费</td>
<td class="value-cell">{{ formatValue(reportValue.CHINESE_MEDICINE_FEE) }}</td>
<td class="label-cell">卫生材料费</td>
<td class="value-cell">{{ formatValue(reportValue.SANITARY_MATERIALS_FEE) }}</td>
</tr>
<tr>
<td class="label-cell">诊疗费</td>
<td class="value-cell">{{ formatValue(reportValue.GENERAL_CONSULTATION_FEE) }}</td>
<td class="label-cell">挂号费</td>
<td class="value-cell">{{ formatValue(reportValue.REGISTRATION_FEE) }}</td>
<td class="label-cell">其他费用</td>
<td class="value-cell" colspan="3">{{ formatValue(reportValue.OTHER_FEE) }}</td>
</tr>
</table>
</div> </div>
</div> </div>
</div> </div>
@@ -293,34 +322,26 @@ getPharmacyCabinetLists();
} }
.report-row { .report-row {
margin: 12px 0; margin: 12px 0;
display: flex;
align-items: center;
flex-wrap: wrap;
} }
.el-col { .report-row .el-col {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 6px 0;
} }
.label { .label {
display: inline-block; min-width: 130px;
min-width: 100px;
flex-shrink: 0; flex-shrink: 0;
color: #606266; color: #606266;
white-space: nowrap; white-space: nowrap;
text-align: right; text-align: right;
padding-right: 4px;
} }
.value { .value {
color: #303133; color: #303133;
font-weight: 500; font-weight: 500;
white-space: nowrap; white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
.divider { .divider {
height: 1px; height: 1px;
background-color: #dcdfe6; background-color: #dcdfe6;
margin: 12px 0; margin: 16px 0;
} }
</style> </style>