Fix Bug #568: 修复门诊日结页面排版混乱问题 - 使用div+CSS flexbox替代el-row布局
- 使用 div + CSS flexbox 替代 el-row/el-col 布局 - 添加 report-container/report-row/report-item 语义化类名 - 移除 float: right 导致的对齐错乱 - 使用 min-width 替代固定 width,自适应标签长度 - 添加分隔线区分不同费用类别 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -38,160 +38,46 @@
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<div v-loading="loading" style="width: 1200px">
|
||||
<el-row
|
||||
:gutter="5"
|
||||
style="
|
||||
margin: 20px 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
padding: 0 20px;
|
||||
"
|
||||
>
|
||||
<el-col :span="5">
|
||||
<span class="label">经办人姓名:</span>
|
||||
<span class="value">{{ userStore.nickName }}</span>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<span class="label">科室:</span>
|
||||
<span class="value">{{ userStore.orgName }}</span>
|
||||
</el-col>
|
||||
<el-col :span="7">
|
||||
<span class="label">时间:</span>
|
||||
<span class="value">{{ queryTime[0] + '~' + queryTime[1] }}</span>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div v-loading="loading" class="report-container">
|
||||
<div class="report-title">门诊收费日结单</div>
|
||||
<div class="report-row">
|
||||
<div class="report-item"><span class="label">经办人姓名:</span><span class="value">{{ userStore.nickName }}</span></div>
|
||||
<div class="report-item"><span class="label">科室:</span><span class="value">{{ userStore.orgName }}</span></div>
|
||||
<div class="report-item"><span class="label">时间:</span><span class="value">{{ queryTime[0] + '~' + queryTime[1] }}</span></div>
|
||||
</div>
|
||||
<div class="divider"></div>
|
||||
<el-row
|
||||
:gutter="5"
|
||||
style="
|
||||
margin: 20px 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
padding: 0 20px;
|
||||
"
|
||||
>
|
||||
<el-col :span="5">
|
||||
<span class="label">实际现金收入:</span>
|
||||
<span class="value">{{ formatValue(reportValue.cashSum) }}</span>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<span class="label">现金:</span>
|
||||
<span class="value">{{ formatValue(reportValue.rmbCashSum) }}</span>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<span class="label">微信:</span>
|
||||
<span class="value">{{ formatValue(reportValue.vxCashSum) }}</span>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<span class="label">支付宝:</span>
|
||||
<span class="value">{{ formatValue(reportValue.aliCashSum) }}</span>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div class="report-row">
|
||||
<div class="report-item"><span class="label">实际现金收入:</span><span class="value">{{ formatValue(reportValue.cashSum) }}</span></div>
|
||||
<div class="report-item"><span class="label">现金:</span><span class="value">{{ formatValue(reportValue.rmbCashSum) }}</span></div>
|
||||
<div class="report-item"><span class="label">微信:</span><span class="value">{{ formatValue(reportValue.vxCashSum) }}</span></div>
|
||||
<div class="report-item"><span class="label">支付宝:</span><span class="value">{{ formatValue(reportValue.aliCashSum) }}</span></div>
|
||||
</div>
|
||||
<div class="divider"></div>
|
||||
<el-row
|
||||
:gutter="5"
|
||||
style="
|
||||
margin: 20px 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
padding: 0 20px;
|
||||
"
|
||||
>
|
||||
<el-col :span="5">
|
||||
<span class="label">统筹支付:</span>
|
||||
<span class="value">{{ formatValue(reportValue.tcSum) }}</span>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<span class="label">账户支付:</span>
|
||||
<span class="value">{{ formatValue(reportValue.zhSum) }}</span>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<span class="label">基金支付总额:</span>
|
||||
<span class="value">{{ formatValue(reportValue.fundSum) }}</span>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div class="report-row">
|
||||
<div class="report-item"><span class="label">统筹支付:</span><span class="value">{{ formatValue(reportValue.tcSum) }}</span></div>
|
||||
<div class="report-item"><span class="label">账户支付:</span><span class="value">{{ formatValue(reportValue.zhSum) }}</span></div>
|
||||
<div class="report-item"><span class="label">基金支付总额:</span><span class="value">{{ formatValue(reportValue.fundSum) }}</span></div>
|
||||
</div>
|
||||
<div class="divider"></div>
|
||||
<el-row
|
||||
:gutter="5"
|
||||
style="
|
||||
margin: 20px 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
padding: 0 20px;
|
||||
"
|
||||
>
|
||||
<el-col :span="5">
|
||||
<span class="label">诊查费:</span>
|
||||
<span class="value">{{ formatValue(reportValue.DIAGNOSTIC_FEE) }}</span>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<span class="label">检查费:</span>
|
||||
<span class="value">{{ formatValue(reportValue.CHECK_FEE) }}</span>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<span class="label">化验费:</span>
|
||||
<span class="value">{{ formatValue(reportValue.DIAGNOSTIC_TEST_FEE) }}</span>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<span class="label">治疗费:</span>
|
||||
<span class="value">{{ formatValue(reportValue.MEDICAL_EXPENSE_FEE) }}</span>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row
|
||||
:gutter="5"
|
||||
style="
|
||||
margin: 20px 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
padding: 0 20px;
|
||||
"
|
||||
>
|
||||
<el-col :span="5">
|
||||
<span class="label">西药费:</span>
|
||||
<span class="value">{{ formatValue(reportValue.WEST_MEDICINE) }}</span>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<span class="label">中药饮片费:</span>
|
||||
<span class="value">{{ formatValue(reportValue.CHINESE_MEDICINE_SLICES_FEE) }}</span>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<span class="label">中成药费:</span>
|
||||
<span class="value">{{ formatValue(reportValue.CHINESE_MEDICINE_FEE) }}</span>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<span class="label">卫生材料费:</span>
|
||||
<span class="value">{{ formatValue(reportValue.SANITARY_MATERIALS_FEE) }}</span>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row
|
||||
:gutter="5"
|
||||
style="
|
||||
margin: 20px 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
padding: 0 20px;
|
||||
"
|
||||
>
|
||||
<el-col :span="5">
|
||||
<span class="label">诊疗费:</span>
|
||||
<span class="value">{{ formatValue(reportValue.GENERAL_CONSULTATION_FEE) }}</span>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<span class="label">挂号费:</span>
|
||||
<span class="value">{{ formatValue(reportValue.REGISTRATION_FEE) }}</span>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<span class="label">其他费用:</span>
|
||||
<span class="value">{{ formatValue(reportValue.OTHER_FEE) }}</span>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div class="report-row">
|
||||
<div class="report-item"><span class="label">诊查费:</span><span class="value">{{ formatValue(reportValue.DIAGNOSTIC_FEE) }}</span></div>
|
||||
<div class="report-item"><span class="label">检查费:</span><span class="value">{{ formatValue(reportValue.CHECK_FEE) }}</span></div>
|
||||
<div class="report-item"><span class="label">化验费:</span><span class="value">{{ formatValue(reportValue.DIAGNOSTIC_TEST_FEE) }}</span></div>
|
||||
<div class="report-item"><span class="label">治疗费:</span><span class="value">{{ formatValue(reportValue.MEDICAL_EXPENSE_FEE) }}</span></div>
|
||||
</div>
|
||||
<div class="divider"></div>
|
||||
<div class="report-row">
|
||||
<div class="report-item"><span class="label">西药费:</span><span class="value">{{ formatValue(reportValue.WEST_MEDICINE) }}</span></div>
|
||||
<div class="report-item"><span class="label">中药饮片费:</span><span class="value">{{ formatValue(reportValue.CHINESE_MEDICINE_SLICES_FEE) }}</span></div>
|
||||
<div class="report-item"><span class="label">中成药费:</span><span class="value">{{ formatValue(reportValue.CHINESE_MEDICINE_FEE) }}</span></div>
|
||||
<div class="report-item"><span class="label">卫生材料费:</span><span class="value">{{ formatValue(reportValue.SANITARY_MATERIALS_FEE) }}</span></div>
|
||||
</div>
|
||||
<div class="divider"></div>
|
||||
<div class="report-row">
|
||||
<div class="report-item"><span class="label">诊疗费:</span><span class="value">{{ formatValue(reportValue.GENERAL_CONSULTATION_FEE) }}</span></div>
|
||||
<div class="report-item"><span class="label">挂号费:</span><span class="value">{{ formatValue(reportValue.REGISTRATION_FEE) }}</span></div>
|
||||
<div class="report-item"><span class="label">其他费用:</span><span class="value">{{ formatValue(reportValue.OTHER_FEE) }}</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -378,22 +264,44 @@ getPharmacyCabinetLists();
|
||||
font-size: large;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.report-container {
|
||||
max-width: 1200px;
|
||||
padding: 0 20px;
|
||||
}
|
||||
.report-title {
|
||||
text-align: center;
|
||||
font-size: 18px;
|
||||
font-weight: bold;
|
||||
margin: 16px 0;
|
||||
}
|
||||
.report-row {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
margin: 12px 0;
|
||||
gap: 8px 0;
|
||||
}
|
||||
.report-item {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
box-sizing: border-box;
|
||||
padding-right: 16px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
.label {
|
||||
display: inline-block;
|
||||
width: 120px !important;
|
||||
color: #606266;
|
||||
white-space: nowrap;
|
||||
min-width: 100px;
|
||||
text-align: right;
|
||||
}
|
||||
.value {
|
||||
float: right;
|
||||
color: #303133;
|
||||
font-weight: 500;
|
||||
}
|
||||
.el-col {
|
||||
margin-right: 50px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.divider {
|
||||
height: 3px;
|
||||
background-color: #000;
|
||||
margin: 20px 0;
|
||||
height: 1px;
|
||||
background-color: #dcdfe6;
|
||||
margin: 12px 0;
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user