From 4c462e00dbb243fca58b1a81334b21164f0642ac Mon Sep 17 00:00:00 2001
From: zhaoyun <zhaoyun@gentronhealth.com>
Date: Fri, 22 May 2026 10:56:25 +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

根因：费用明细最后一行使用cols-3导致与上面cols-4行不对齐
修复：统一使用cols-4网格布局，对需要占两列的项使用span-2

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../views/clinicmanagement/dayEnd/index.vue    | 18 +++++++++---------
 .../applicationShow/testApplication.vue        |  2 --
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
index 60bb98c8..8f9f5693 100755
--- a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
@@ -41,10 +41,10 @@
     <div v-loading="loading" class="report-container">
       <div class="report-title">门诊收费日结单</div>
       <div class="report-section">
-        <div class="report-row cols-3">
+        <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 class="label">时间：</span><span class="value">{{ queryTime[0] + '~' + queryTime[1] }}</span></div>
+          <div class="report-item span-2"><span class="label">时间：</span><span class="value">{{ queryTime[0] + '~' + queryTime[1] }}</span></div>
         </div>
       </div>
       <div class="divider"></div>
@@ -60,10 +60,10 @@
       <div class="divider"></div>
       <div class="report-section">
         <div class="section-title">医保支付</div>
-        <div class="report-row cols-3">
+        <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 class="label">基金支付总额：</span><span class="value">{{ formatValue(reportValue.fundSum) }}</span></div>
+          <div class="report-item span-2"><span class="label">基金支付总额：</span><span class="value">{{ formatValue(reportValue.fundSum) }}</span></div>
         </div>
       </div>
       <div class="divider"></div>
@@ -81,10 +81,10 @@
           <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-3">
+        <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 class="label">其他费用：</span><span class="value">{{ formatValue(reportValue.OTHER_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>
@@ -302,12 +302,12 @@ getPharmacyCabinetLists();
   margin: 12px 0;
   gap: 8px 16px;
 }
-.cols-3 {
-  grid-template-columns: repeat(3, 1fr);
-}
 .cols-4 {
   grid-template-columns: repeat(4, 1fr);
 }
+.span-2 {
+  grid-column: span 2;
+}
 .report-item {
   display: flex;
   align-items: center;
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue
index acffdcc8..bef5a922 100755
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue
@@ -383,8 +383,6 @@ const isWithdrawableStatus = (row) => String(getBillStatus(row)) === '1';
 
 const isReportStatus = (row) => ['6', '8'].includes(String(getBillStatus(row)));
 
-const isIssuedStatus = (row) => String(getBillStatus(row)) === '1';
-
 /**
  * 是否可管理该申请单：申请者本人或管理员
  */