From 9865256c118774f8e178cfddfd8f7e9c4ed43772 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 19 May 2025 17:12:41 +0800
Subject: [PATCH] dev

---
 .../statistics/over/ChargeDetail.vue          | 18 ++++----
 src/components/statistics/over/Revenue.vue    |  1 -
 src/views/social/reconciliationRecord.vue     | 46 ++++++++++++++-----
 3 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/src/components/statistics/over/ChargeDetail.vue b/src/components/statistics/over/ChargeDetail.vue
index f418703..fcd3345 100644
--- a/src/components/statistics/over/ChargeDetail.vue
+++ b/src/components/statistics/over/ChargeDetail.vue
@@ -66,16 +66,16 @@
         <el-table :data="tableData" style="width: 100%">
           <el-table-column prop="chargeTime" label="收费时间" align="center" show-overflow-tooltip/>
           <el-table-column label="销售单号" prop="projectCode" show-overflow-tooltip></el-table-column>
-          <el-table-column label="患者姓名" prop="customer"></el-table-column>
-          <el-table-column prop="source" label="开单来源" />
-          <el-table-column prop="type" label="收费/退费" align="center"></el-table-column>
-          <el-table-column prop="originalPrice" label="原价" align="center"></el-table-column>
-          <el-table-column prop="discount" label="优惠" align="center"></el-table-column>
-          <el-table-column prop="receivable" label="应收" align="center"></el-table-column>
+          <el-table-column label="患者姓名" prop="customer" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="source" label="开单来源" show-overflow-tooltip />
+          <el-table-column prop="type" label="收费/退费" align="center" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="originalPrice" label="原价" align="center" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="discount" label="优惠" align="center" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="receivable" label="应收" align="center" show-overflow-tooltip></el-table-column>
 
-          <el-table-column prop="netReceipts" label="实收" align="center"></el-table-column>
-          <el-table-column prop="payType" label="支付类型" align="center"></el-table-column>
-          <el-table-column label="销售人" prop="salePersonId"></el-table-column>
+          <el-table-column prop="netReceipts" label="实收" align="center" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="payType" label="支付类型" align="center" show-overflow-tooltip></el-table-column>
+          <el-table-column label="销售人" prop="salePersonId" show-overflow-tooltip></el-table-column>
         </el-table>
       </div>
     </div>
diff --git a/src/components/statistics/over/Revenue.vue b/src/components/statistics/over/Revenue.vue
index d4fdbfd..154a479 100644
--- a/src/components/statistics/over/Revenue.vue
+++ b/src/components/statistics/over/Revenue.vue
@@ -45,7 +45,6 @@
               <div class="num">{{ data.socialRevenue || 0 }}<span class="unit color2">元</span></div>
               <div class="name color2">医保收入</div>
               <div class="text">日均：￥{{ (data.socialRevenue / averageNum).toFixed(2) || 0 }}</div>
-              <div class="text"><span>本金：￥0.00&nbsp;&nbsp;赠金：￥0.00</span></div>
             </div>
             <img class="image" src="/static/images/overView/3.png" alt="">
           </div>
diff --git a/src/views/social/reconciliationRecord.vue b/src/views/social/reconciliationRecord.vue
index f3812d8..9b50050 100644
--- a/src/views/social/reconciliationRecord.vue
+++ b/src/views/social/reconciliationRecord.vue
@@ -73,12 +73,12 @@
           {{ getKey(insutypes, scope.row.insuranceType) }}
         </template>
       </el-table-column>
-      <el-table-column label="经办机构" prop="handlingInstitution"></el-table-column>
-      <el-table-column label="医疗费用总额" prop="totalMedicalCost"></el-table-column>
-      <el-table-column label="基金支付总额" prop="totalFundPayment"></el-table-column>
-      <el-table-column label="个账支付总额" prop="totalPersonalAccountPayment"></el-table-column>
-      <el-table-column label="结算笔数" prop="settlementCount"></el-table-column>
-      <el-table-column label="对账结果" prop="reconciliationResult">
+      <el-table-column label="经办机构" prop="handlingInstitution" show-overflow-tooltip></el-table-column>
+      <el-table-column label="医疗费用总额" prop="totalMedicalCost" show-overflow-tooltip></el-table-column>
+      <el-table-column label="基金支付总额" prop="totalFundPayment" show-overflow-tooltip></el-table-column>
+      <el-table-column label="个账支付总额" prop="totalPersonalAccountPayment" show-overflow-tooltip></el-table-column>
+      <el-table-column label="结算笔数" prop="settlementCount" show-overflow-tooltip></el-table-column>
+      <el-table-column label="对账结果" prop="reconciliationResult" show-overflow-tooltip>
         <template #default="scope">
           <el-tag v-if="scope.row.reconciliationResult == null" type="info">未对账</el-tag>
           <el-tag v-if="scope.row.reconciliationResult == 0" type="success">{{ reconciliationResult[0] }}</el-tag>
@@ -88,10 +88,22 @@
           </el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="开始对账时间" prop="beginTime" show-overflow-tooltip>
+        <template #default="scope">
+          {{ formatDate(scope.row.beginTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="结束对账时间" prop="endTime" show-overflow-tooltip>
+        <template #default="scope">
+          {{ formatDate(scope.row.endTime) }}
+        </template>
+      </el-table-column>
       <el-table-column label="详细信息" prop="resultDesc" width="200" show-overflow-tooltip></el-table-column>
     </el-table>
-    <el-pagination background layout="prev, pager, next" v-model:current-page="pageNum" v-model:page-size="pageSize"
-                   @change="changePageNumHandler" :total="total"/>
+    <div class="footer">
+      <el-pagination background layout="prev, pager, next" v-model:current-page="pageNum" v-model:page-size="pageSize"
+                     @change="changePageNumHandler" :total="total"/>
+    </div>
   </div>
 </template>
 <script setup lang="ts">
@@ -101,6 +113,7 @@ import {reconciliationResult} from "@/assets/config/constants.ts";
 import clrType from "@/assets/config/directory/clrType.json"
 import insutypes from "@/assets/config/directory/insutypes.json"
 import {getKey} from "@/utils/discrotyUtil.ts";
+import {formatDate} from "@/utils/dateUtils.ts";
 
 const pageSize = ref(20);
 const pageNum = ref(1);
@@ -123,6 +136,7 @@ const insutypesOptions = Object.entries(insutypes as Insutypes).map(([key, value
   key: key,
   value: value
 }))
+
 interface queryParams {
   pageNum: number;
   pageSize: number;
@@ -163,7 +177,7 @@ onMounted(() => {
 
 //  搜索
 const searchModel = ref<any>({});
-const resetSearch= () => {
+const resetSearch = () => {
   searchModel.value = {}
   getList()
 }
@@ -172,7 +186,7 @@ const resetSearch= () => {
 .container-wrapper {
   width: 100%;
   height: 100%;
-  padding: 24px;
+  padding:24px 24px 0;
   border-radius: 8px;
   display: flex;
   flex-direction: column;
@@ -183,12 +197,20 @@ const resetSearch= () => {
     justify-content: space-between;
   }
 }
-:deep(.el-select__wrapper){
+
+:deep(.el-select__wrapper) {
   width: 150px;
   height: 42px;
 }
-:deep(.el-input__wrapper){
+
+:deep(.el-input__wrapper) {
   width: 150px;
   height: 42px;
 }
+.footer{
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  height: 60px;
+}
 </style>
\ No newline at end of file