From 852634643246340c3ffe2e7095fd2f2c44c15d9b Mon Sep 17 00:00:00 2001
From: Euni4U <958079825@qq.com>
Date: Mon, 24 Feb 2025 16:07:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=B9=E6=97=B6=E9=97=B4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=B0=83=E6=95=B4=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Charge/Charge.vue                   | 13 ++++--
 .../Department-entry/Department-entryUI.vue   |  4 +-
 .../exam-package/exam-packageUI.vue           | 41 ++++++++++++-------
 3 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/src/views/Charge/Charge.vue b/src/views/Charge/Charge.vue
index 584a07a..4c9bd7f 100644
--- a/src/views/Charge/Charge.vue
+++ b/src/views/Charge/Charge.vue
@@ -247,7 +247,7 @@
       <div class="form-footer">
         <div class="operator-info">
           <span>收费人员：{{ user?.nickname }}</span>
-          <span v-if="selectedPatient?.chargetime" class="charge-time">
+          <span v-if="selectedPatient?.chargeType" class="charge-time">
             收费时间：{{ formatDateTime(selectedPatient.chargetime) }}
           </span>
         </div>
@@ -623,7 +623,13 @@ const handlePrint = () => {
   ElMessage.info('打印功能开发中')
 }
 
-// 修改确认收费方法
+// 添加格式化时间的辅助函数
+const formatSubmitDateTime = (date) => {
+  const pad = (num) => String(num).padStart(2, '0')
+  const d = new Date(date)
+  return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`
+}
+
 const handleSubmitCharge = async () => {
   try {
     if (!form.value.chargeType) {
@@ -636,12 +642,11 @@ const handleSubmitCharge = async () => {
       return
     }
     
-    // 更新患者收费信息
     const updateData = {
       id: selectedPatient.value.id,
       chargeType: form.value.chargeType,
       totalPrice: form.value.actualAmount,
-      chargetime: new Date().toISOString()
+      chargetime: new Date().getTime()
     }
     
     await PatientApi.updatePatient(updateData)
diff --git a/src/views/Department-entry/Department-entryUI.vue b/src/views/Department-entry/Department-entryUI.vue
index a41385b..4016295 100644
--- a/src/views/Department-entry/Department-entryUI.vue
+++ b/src/views/Department-entry/Department-entryUI.vue
@@ -6,14 +6,14 @@
           
           <div class="filter-options">
             <div class="header-title">人员列表</div>
-            <label class="radio-label">
+            <!-- <label class="radio-label">
               <input type="radio" name="status" checked/>
               <span>未检</span>
             </label>
             <label class="radio-label">
               <input type="radio" name="status"/>
               <span>已检</span>
-            </label>
+            </label> -->
           </div>
           <div class="view-options">
             <div class="view-buttons">
diff --git a/src/views/project-management/exam-package/exam-packageUI.vue b/src/views/project-management/exam-package/exam-packageUI.vue
index 24d17fb..6a758c6 100644
--- a/src/views/project-management/exam-package/exam-packageUI.vue
+++ b/src/views/project-management/exam-package/exam-packageUI.vue
@@ -85,17 +85,20 @@
       </el-table>
 
       <div class="pagination-container">
-        <el-pagination
-          v-model:current-page="currentPage"
-          v-model:page-size="pageSize"
-          :page-sizes="[10, 20, 30, 50]"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          small
-          background
-        />
+        <div class="pagination-right">
+          <span class="total-info">共 {{ tableData.length }} 条</span>
+          <el-pagination
+            v-model:current-page="currentPage"
+            v-model:page-size="pageSize"
+            :page-sizes="[10, 20, 30, 50]"
+            :total="total"
+            layout="sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            small
+            background
+          />
+        </div>
       </div>
 
       <NewPackage ref="newPackageRef" @refresh-list="refreshList" />
@@ -689,12 +692,22 @@ const handleCommand = (command, item) => {
 
 .pagination-container {
   margin-top: 20px;
-  display: flex;
-  justify-content: flex-end; /* 内容靠右对齐 */
-  padding: 15px 20px; /* 增加左右内边距 */
+  padding: 15px 20px;
   background-color: #fff;
 }
 
+.pagination-right {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  gap: 15px;
+}
+
+.total-info {
+  color: #606266;
+  font-size: 13px;
+}
+
 .el-pagination {
   justify-content: flex-end; /* 分页组件内部靠右对齐 */
 }