From a092e74a9014ebf93ec83878ad2fad3fb6131b7c Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Tue, 20 May 2025 11:30:36 +0800
Subject: [PATCH] dev

---
 src/components/charge/PersonalPayment.vue     | 17 ++++--
 .../charge/RecordsLog/PaymentDetail.vue       | 58 +++++++++++++++++++
 src/components/outpatient/MedicalQueue.vue    |  1 +
 src/views/outpatient/index.vue                |  7 +--
 src/views/settings/section.vue                | 24 ++++----
 5 files changed, 87 insertions(+), 20 deletions(-)
 create mode 100644 src/components/charge/RecordsLog/PaymentDetail.vue

diff --git a/src/components/charge/PersonalPayment.vue b/src/components/charge/PersonalPayment.vue
index 3f24507..0fe220c 100644
--- a/src/components/charge/PersonalPayment.vue
+++ b/src/components/charge/PersonalPayment.vue
@@ -62,12 +62,14 @@
     <template #footer>
       <div class="bottom">
         <div class="btn">
-          <span @click="cecalOrder">取消支付</span>
-          <span @click="completeSettlement">完成订单</span>
+          <span class="default-btn" @click="openDetail">查看详情</span>
+          <span class="default-btn" @click="cecalOrder">取消支付</span>
+          <span class="default-btn" @click="completeSettlement">完成订单</span>
         </div>
       </div>
     </template>
   </Mask>
+  <PaymentDetail ref="detailRef"></PaymentDetail>
 </template>
 <script setup lang="ts">
 import Mask from "@/components/common/Mask.vue";
@@ -76,6 +78,7 @@ import {priceBtnListNoSocial} from "@/assets/config/constants.ts";
 import CloseBtn from "@/components/CloseBtn.vue";
 import {post} from "@/utils/request.ts";
 import {ElMessage, ElMessageBox} from "element-plus";
+import PaymentDetail from "@/components/charge/RecordsLog/PaymentDetail.vue";
 
 const socialPayInfo = ref<any>(null)
 
@@ -132,9 +135,9 @@ const cecalOrder = () => {
   // })
   close()
 }
-const close=() => {
+const close = () => {
   show.value = false
-  cash.value =0
+  cash.value = 0
 }
 defineExpose({open})
 
@@ -187,6 +190,12 @@ const btnsList = [
     imgActive: '/static/images/slices/5-active.png',
   },
 ]
+const detailRef = ref()
+const openDetail = () => {
+  nextTick(() => {
+    detailRef.value?.init()
+  })
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/src/components/charge/RecordsLog/PaymentDetail.vue b/src/components/charge/RecordsLog/PaymentDetail.vue
new file mode 100644
index 0000000..6c37312
--- /dev/null
+++ b/src/components/charge/RecordsLog/PaymentDetail.vue
@@ -0,0 +1,58 @@
+<script setup lang="ts">
+import { ref } from "vue";
+import Mask from "@/components/common/Mask.vue";
+
+const show  = ref(false);
+const init = () => {
+  show.value = true;
+}
+defineExpose({init})
+</script>
+
+<template>
+  <Mask  :is-show="show" :width=918 :height="413" @close="show=false" title="支付详情">
+    <div class="detail-content">
+      <div class="left">1</div>
+      <div class="center">2</div>
+      <div class="right">
+        <div class="top">3</div>
+        <div class="bottom">4</div>
+      </div>
+    </div>
+  </Mask>
+</template>
+
+<style scoped lang="scss">
+.detail-content{
+  height: 100%;
+  padding: 24px;
+  display: flex;
+  div{
+    flex: 1;
+    min-width: 0;
+    border-radius: 8px;
+  }
+  .left{
+    background: #F9FAFC;
+  }
+  .center{
+    margin: 0 24px;
+    background: #FEFCF8;
+  }
+  .right{
+    display: flex;
+    flex-direction: column;
+    dev{
+      flex: 1;
+      min-height: 0;
+    }
+    .top{
+      background: #F7FEFA;
+      margin-bottom: 24px;
+    }
+    .bottom{
+      background: #FFEEEF;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue
index 9db77ca..5532e20 100644
--- a/src/components/outpatient/MedicalQueue.vue
+++ b/src/components/outpatient/MedicalQueue.vue
@@ -174,6 +174,7 @@ const changeCurItemOrStatus = (item: any, status: any) => {
   clickLi(item, false)
   if (curStatus != null) {
     curStatus.value = status
+    init()
   }
 }
 defineExpose({changeCurItemOrStatus})
diff --git a/src/views/outpatient/index.vue b/src/views/outpatient/index.vue
index 71af115..b5fbb15 100644
--- a/src/views/outpatient/index.vue
+++ b/src/views/outpatient/index.vue
@@ -19,7 +19,7 @@
         </div>
       </el-scrollbar>
       <div class="bottom">
-        <Settlement v-model="formData.totalPrice" @cancelReception="cancelReception" @save="save"
+        <Settlement v-model="formData.preTotalPrice" @cancelReception="cancelReception" @save="save"
                     :status="curRegister?.status ==2"
                     @edit="edit"></Settlement>
       </div>
@@ -98,7 +98,7 @@ const save = () => {
 
   }
   post('medical/record/save', {data: data}).then((res: any) => {
-    ElMessage.success("保存成功")
+    ElMessage.success("接诊完毕,请到收费页面收费")
     medicalQueueRef.value?.changeCurItemOrStatus(null, 2);
   })
 }
@@ -169,8 +169,7 @@ const getOrderTotalPrice = () => {
   formData.value.goodsDetail?.forEach((item: any) => {
     totalPrice += item.selectedPrice * item.selectedNum
   })
-  formData.value.preTotalPrice = Math.round((totalPrice * 100) / 100)
-  formData.value.totalPrice = totalPrice
+  formData.value.preTotalPrice = totalPrice.toFixed(2);
 }
 const caseRef = ref<any>("")
 const copyForm = (item: any) => {
diff --git a/src/views/settings/section.vue b/src/views/settings/section.vue
index f3405f2..37a8266 100644
--- a/src/views/settings/section.vue
+++ b/src/views/settings/section.vue
@@ -25,24 +25,24 @@
     </div>
     <div class="table">
       <el-table :data="tableData" style="width: 100%" @row-click="rowClick">
-        <el-table-column prop="bedCnt" label="病床数量" width="80"/>
+        <el-table-column prop="name" label="科室类型" show-overflow-tooltip/>
+        <el-table-column prop="bedCnt" label="病床数量" width="80" show-overflow-tooltip/>
         <el-table-column prop="beginDate" label="开始日期" width="100" show-overflow-tooltip/>
         <el-table-column prop="caty" label="类别" show-overflow-tooltip></el-table-column>
         <el-table-column prop="code" label="编码" width="180" show-overflow-tooltip/>
         <el-table-column prop="creationDate" label="创建日期" width="120" show-overflow-tooltip/>
-        <el-table-column prop="delFlag" label="删除标志"/>
-        <el-table-column prop="drPsncnt" label="医生人数"/>
+        <el-table-column prop="delFlag" label="删除标志" show-overflow-tooltip/>
+        <el-table-column prop="drPsncnt" label="医生人数" show-overflow-tooltip/>
         <el-table-column prop="endDate" label="结束日期" width="120" show-overflow-tooltip/>
-        <el-table-column prop="info" label="信息"/>
-        <el-table-column prop="medServScp" label="医疗服务范围" width="150"/>
-        <el-table-column prop="memo" label="备注"/>
-        <el-table-column prop="name" label="内科"/>
-        <el-table-column prop="nursPsncnt" label="护士人数"/>
-        <el-table-column prop="pharPsncnt" label="药剂师人数" width="100"/>
-        <el-table-column prop="resperName" label="负责人姓名" width="100"/>
+        <el-table-column prop="info" label="信息" show-overflow-tooltip/>
+        <el-table-column prop="medServScp" label="医疗服务范围" width="150" show-overflow-tooltip/>
+        <el-table-column prop="memo" label="备注" show-overflow-tooltip/>
+        <el-table-column prop="nursPsncnt" label="护士人数" show-overflow-tooltip/>
+        <el-table-column prop="pharPsncnt" label="药剂师人数" width="100" show-overflow-tooltip/>
+        <el-table-column prop="resperName" label="负责人姓名" width="100" show-overflow-tooltip/>
         <el-table-column prop="resperTel" label="负责人电话" width="100" show-overflow-tooltip/>
-        <el-table-column prop="socialBedCnt" label="社会病床数量" width="200"/>
-        <el-table-column prop="tecnPsncnt" label="技术人员人数" width="200"/>
+        <el-table-column prop="socialBedCnt" label="社会病床数量" width="200" show-overflow-tooltip/>
+        <el-table-column prop="tecnPsncnt" label="技术人员人数" width="200" show-overflow-tooltip/>
       </el-table>
     </div>
     <div class="bottom">