From cab2a92e9ab72e817d4b9eea1e2d38f837729142 Mon Sep 17 00:00:00 2001
From: zhaoyun <zhaoyun@gentronhealth.com>
Date: Fri, 22 May 2026 11:12:06 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#568:=20=E6=A0=B9=E5=9B=A0+?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B9=E6=A1=88=E6=91=98=E8=A6=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/clinicmanagement/dayEnd/index.vue   | 240 ++++++++++--------
 1 file changed, 129 insertions(+), 111 deletions(-)

diff --git a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
index cf0d058f..7f7453ca 100755
--- a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
@@ -38,55 +38,131 @@
       </el-form-item>
     </el-form>
 
-    <div v-loading="loading" class="report-container">
-      <div class="report-title">门诊收费日结单</div>
-      <div class="report-section">
-        <div class="report-row cols-4">
-          <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-2"><span class="label">时间：</span><span class="value">{{ queryTime[0] + '~' + queryTime[1] }}</span></div>
-        </div>
+    <div v-loading="loading" style="width: 1200px">
+      <div style="text-align: center">
+        <h2>门诊收费日结单</h2>
       </div>
+      <div class="section-title">基本信息</div>
+      <el-row
+        :gutter="10"
+        style="margin: 12px 0; display: flex; align-items: center; padding: 0 20px"
+      >
+        <el-col :span="4">
+          <span class="label">经办人姓名：</span>
+          <span class="value">{{ userStore.nickName }}</span>
+        </el-col>
+        <el-col :span="4">
+          <span class="label">科室：</span>
+          <span class="value">{{ userStore.orgName }}</span>
+        </el-col>
+        <el-col :span="5">
+          <span class="label">时间：</span>
+          <span class="value">{{ queryTime[0] + '~' + queryTime[1] }}</span>
+        </el-col>
+      </el-row>
       <div class="divider"></div>
-      <div class="report-section">
-        <div class="section-title">收费汇总</div>
-        <div class="report-row cols-4">
-          <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>
+      <div class="section-title">收费汇总</div>
+      <el-row
+        :gutter="10"
+        style="margin: 12px 0; display: flex; align-items: center; 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="divider"></div>
-      <div class="report-section">
-        <div class="section-title">医保支付</div>
-        <div class="report-row cols-4">
-          <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-2"><span class="label">基金支付总额：</span><span class="value">{{ formatValue(reportValue.fundSum) }}</span></div>
-        </div>
-      </div>
+      <div class="section-title">医保支付</div>
+      <el-row
+        :gutter="10"
+        style="margin: 12px 0; display: flex; align-items: center; 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="divider"></div>
-      <div class="report-section">
-        <div class="section-title">费用明细</div>
-        <div class="report-row cols-4">
-          <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="report-row cols-4">
-          <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="report-row cols-4">
-          <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-2"><span class="label">其他费用：</span><span class="value">{{ formatValue(reportValue.OTHER_FEE) }}</span></div>
-        </div>
-      </div>
+      <div class="section-title">费用明细</div>
+      <el-row
+        :gutter="10"
+        style="margin: 12px 0; display: flex; align-items: center; 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="10"
+        style="margin: 12px 0; display: flex; align-items: center; 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="10"
+        style="margin: 12px 0; display: flex; align-items: center; 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>
   </div>
 </template>
@@ -263,22 +339,6 @@ getList();
 getPharmacyCabinetLists();
 </script>
 <style scoped>
-.report-container {
-  max-width: 1200px;
-  padding: 24px 32px;
-  background: #fff;
-  border-radius: 4px;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.08);
-}
-.report-title {
-  text-align: center;
-  font-size: 18px;
-  font-weight: bold;
-  margin: 16px 0;
-}
-.report-section {
-  margin: 8px 0;
-}
 .section-title {
   font-size: 15px;
   font-weight: bold;
@@ -287,61 +347,19 @@ getPharmacyCabinetLists();
   padding-left: 8px;
   border-left: 3px solid #409eff;
 }
-.report-row {
-  display: grid;
-  margin: 12px 0;
-  gap: 8px 16px;
-}
-.cols-4 {
-  grid-template-columns: repeat(4, 1fr);
-}
-.span-2 {
-  grid-column: span 2;
-}
-.report-item {
-  display: flex;
-  align-items: center;
-  box-sizing: border-box;
-  min-width: 0;
-  overflow: hidden;
-}
 .label {
   display: inline-block;
-  width: 120px;
-  flex-shrink: 0;
-  color: #606266;
-  white-space: nowrap;
-  text-align: right;
+  width: 120px !important;
 }
 .value {
-  color: #303133;
-  font-weight: 500;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
+  float: right;
+}
+.el-col {
+  margin-right: 50px;
 }
 .divider {
-  height: 1px;
-  background-color: #dcdfe6;
-  margin: 12px 0;
-}
-@media screen and (max-width: 1200px) {
-  .cols-4 {
-    grid-template-columns: repeat(2, 1fr);
-  }
-  .span-2 {
-    grid-column: span 1;
-  }
-}
-@media screen and (max-width: 768px) {
-  .cols-4 {
-    grid-template-columns: 1fr;
-  }
-  .span-2 {
-    grid-column: span 1;
-  }
-  .label {
-    width: 100px;
-  }
+  height: 3px;
+  background-color: #000;
+  margin: 20px 0;
 }
 </style>