From 69e048e21e8b6fe4a1e2c1f403785206995cf91c Mon Sep 17 00:00:00 2001
From: zhaoyun <zhaoyun@gentronhealth.com>
Date: Fri, 22 May 2026 09:42:14 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#568:=20=E4=BF=AE=E5=A4=8D=E9=97=A8?=
 =?UTF-8?q?=E8=AF=8A=E6=97=A5=E7=BB=93=E9=A1=B5=E9=9D=A2=E6=8E=92=E7=89=88?=
 =?UTF-8?q?=E6=B7=B7=E4=B9=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- el-col span从3改为6，增加列宽避免内容挤压
- 移除.label的固定宽度120px和.value的float:right
- 每列使用inline-flex布局，标签和数值自然对齐
- 增加gutter间距和flex-wrap响应式换行

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../views/clinicmanagement/dayEnd/index.vue   | 110 ++++++++----------
 1 file changed, 47 insertions(+), 63 deletions(-)

diff --git a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
index 790b0c83..2777b42d 100755
--- a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
@@ -63,169 +63,154 @@
     </el-row> -->
     <div v-loading="loading">
       <el-row
-        :gutter="10"
-        outpatientNo="mb8"
+        :gutter="20"
         style="
-          margin: 20px 0;
+          margin: 16px 0;
           display: flex;
           align-items: center;
-          justify-content: flex-start;
+          flex-wrap: wrap;
           padding: 0 20px;
         "
       >
-        <!-- <el-col :span="3">
-          <span>经办人编号：</span>
-        </el-col> -->
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">经办人姓名：</span>
-          <span class="value"> {{ userStore.nickName }}</span>
+          <span class="value">{{ userStore.nickName }}</span>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">科室：</span>
           <span class="value">{{ userStore.orgName }}</span>
         </el-col>
-        <el-col :span="4.5">
+        <el-col :span="8" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">时间：</span>
-          <span class="value"> {{ queryTime[0] + '~' + queryTime[1] }} </span>
+          <span class="value">{{ queryTime[0] + '~' + queryTime[1] }}</span>
         </el-col>
       </el-row>
       <el-row
-        :gutter="10"
-        outpatientNo="mb8"
+        :gutter="20"
         style="
-          margin: 20px 0;
+          margin: 16px 0;
           display: flex;
           align-items: center;
-          justify-content: flex-start;
+          flex-wrap: wrap;
           padding: 0 20px;
         "
       >
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">实际现金收入：</span>
-          <span class="value"> {{ formatValue(reportValue.cashSum) }}</span>
+          <span class="value">{{ formatValue(reportValue.cashSum) }}</span>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">现金：</span>
           <span class="value">{{ formatValue(reportValue.rmbCashSum) }}</span>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">微信：</span>
           <span class="value">{{ formatValue(reportValue.vxCashSum) }}</span>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">支付宝：</span>
           <span class="value">{{ formatValue(reportValue.aliCashSum) }}</span>
         </el-col>
       </el-row>
       <el-row
-        :gutter="10"
-        outpatientNo="mb8"
+        :gutter="20"
         style="
-          margin: 20px 0;
+          margin: 16px 0;
           display: flex;
           align-items: center;
-          justify-content: flex-start;
+          flex-wrap: wrap;
           padding: 0 20px;
         "
       >
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">统筹支付：</span>
           <span class="value">{{ formatValue(reportValue.tcSum) }}</span>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">账户支付：</span>
           <span class="value">{{ formatValue(reportValue.zhSum) }}</span>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">基金支付总额：</span>
           <span class="value">{{ formatValue(reportValue.fundSum) }}</span>
         </el-col>
-        <!-- <el-col :span="3">
-          <span>医保人次：{{ reportValue.aliCashSum }}</span>
-        </el-col> -->
       </el-row>
       <el-row
-        :gutter="10"
-        outpatientNo="mb8"
+        :gutter="20"
         style="
-          margin: 20px 0;
+          margin: 16px 0;
           display: flex;
           align-items: center;
-          justify-content: flex-start;
+          flex-wrap: wrap;
           padding: 0 20px;
         "
       >
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">诊查费：</span>
           <span class="value">{{ formatValue(reportValue.DIAGNOSTIC_FEE) }}</span>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">检查费：</span>
           <span class="value">{{ formatValue(reportValue.CHECK_FEE) }}</span>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">化验费：</span>
           <span class="value">{{ formatValue(reportValue.DIAGNOSTIC_TEST_FEE) }}</span>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">治疗费：</span>
           <span class="value">{{ formatValue(reportValue.MEDICAL_EXPENSE_FEE) }}</span>
         </el-col>
       </el-row>
       <el-row
-        :gutter="10"
-        outpatientNo="mb8"
+        :gutter="20"
         style="
-          margin: 20px 0;
+          margin: 16px 0;
           display: flex;
           align-items: center;
-          justify-content: flex-start;
+          flex-wrap: wrap;
           padding: 0 20px;
         "
       >
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">西药费：</span>
           <span class="value">{{ formatValue(reportValue.WEST_MEDICINE) }}</span>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">中药饮片费：</span>
           <span class="value">{{ formatValue(reportValue.CHINESE_MEDICINE_SLICES_FEE) }}</span>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">中成药费：</span>
           <span class="value">{{ formatValue(reportValue.CHINESE_MEDICINE_FEE) }}</span>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">卫生材料费：</span>
           <span class="value">{{ formatValue(reportValue.SANITARY_MATERIALS_FEE) }}</span>
         </el-col>
       </el-row>
       <el-row
-        :gutter="10"
-        outpatientNo="mb8"
+        :gutter="20"
         style="
-          margin: 20px 0;
+          margin: 16px 0;
           display: flex;
           align-items: center;
-          justify-content: flex-start;
+          flex-wrap: wrap;
           padding: 0 20px;
         "
       >
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">诊疗费：</span>
           <span class="value">{{ formatValue(reportValue.GENERAL_CONSULTATION_FEE) }}</span>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">挂号费：</span>
           <span class="value">{{ formatValue(reportValue.REGISTRATION_FEE) }}</span>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="6" style="display: inline-flex; align-items: center; gap: 4px; margin-bottom: 8px;">
           <span class="label">其他费用：</span>
           <span class="value">{{ formatValue(reportValue.OTHER_FEE) }}</span>
         </el-col>
-        <!-- <el-col :span="3">
-          <span>现金：</span>
-        </el-col> -->
       </el-row>
     </div>
   </div>
@@ -423,13 +408,12 @@ getPharmacyCabinetLists();
   margin-bottom: 10px;
 }
 .label {
-  display: inline-block;
-  width: 120px !important;
+  color: #606266;
+  white-space: nowrap;
 }
 .value {
-  float: right;
-}
-.el-col {
-  margin-right: 50px;
+  color: #303133;
+  font-weight: 500;
+  white-space: nowrap;
 }
 </style>