From eeb3c909e39d9b02d160f59cbf3b5faacd297406 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Wed, 14 May 2025 11:42:42 +0800
Subject: [PATCH] dev

---
 public/static/images/charge/1-active.png      | Bin 0 -> 1862 bytes
 public/static/images/charge/1.png             | Bin 0 -> 1723 bytes
 src/components/charge/ChargeQueue.vue         |  65 ++++++++++++------
 src/components/charge/Settlement.vue          |   8 ++-
 src/components/charge/TotalPrice.vue          |  18 ++++-
 src/components/common/goods/GoodsDetail.vue   |   6 +-
 .../common/service/ServiceDetail.vue          |  10 ++-
 src/components/outpatient/MedicalQueue.vue    |   9 +--
 8 files changed, 84 insertions(+), 32 deletions(-)
 create mode 100644 public/static/images/charge/1-active.png
 create mode 100644 public/static/images/charge/1.png

diff --git a/public/static/images/charge/1-active.png b/public/static/images/charge/1-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..981932d658edcb2509943557fc26a8fe611bd531
GIT binary patch
literal 1862
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
A2mk;8

literal 0
HcmV?d00001

diff --git a/public/static/images/charge/1.png b/public/static/images/charge/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..399711410fa4e539cdb4ca9c031d96013fe47560
GIT binary patch
literal 1723
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
R-?IP!002ovPDHLkV1mWdDt-U}

literal 0
HcmV?d00001

diff --git a/src/components/charge/ChargeQueue.vue b/src/components/charge/ChargeQueue.vue
index d67e3ff..e1ecf6f 100644
--- a/src/components/charge/ChargeQueue.vue
+++ b/src/components/charge/ChargeQueue.vue
@@ -1,13 +1,12 @@
 <template>
   <Panel title="收费队列">
     <template #tools>
-      <el-button type="primary" plain size="small" @click="addChargeOrder">新增患者</el-button>
-      <el-button type="primary" size="small" plain @click="setDate">
-        {{ selectedDateStr }}
-        <el-icon class="el-icon--right">
-          <CaretBottom/>
+      <div @click="setDate" class="date-btn">
+        <span>{{ selectedDateStr }}</span>
+        <el-icon style="margin-left: 21px">
+          <Calendar/>
         </el-icon>
-      </el-button>
+      </div>
       <el-date-picker
           v-model="selectedDate"
           type="date"
@@ -25,17 +24,20 @@
           </span>
         </div>
         <div class="search">
-          <el-input
-              v-model="query.keyword"
-              style="height: 100%;width: 100%"
-              placeholder="根据姓名搜索"
-              @input="search"
-          />
+         <div class="search-input">
+           <el-input
+               v-model="query.keyword"
+               style="height: 100%;width: 100%"
+               placeholder="根据姓名搜索"
+               @input="search"
+           />
+         </div>
+          <div class="add" @click="addChargeOrder">新增患者</div>
           <!--         <el-button type="success" @click="addChargeOrder" size="small">+收费</el-button>-->
         </div>
         <div class="list" v-loading="loading">
           <el-scrollbar>
-            <ul >
+            <ul>
               <li class="list-item" :class="curItem.id == item.id ? 'active' : ''"
                   v-for="(item, index) in ChargeQueueList"
                   :key="index" @click="clickItem(item)">
@@ -65,13 +67,13 @@
 import {nextTick, onMounted, ref, watch} from "vue";
 import {post} from "@/utils/request.ts";
 import Panel from "@/components/common/Panel.vue";
-import {formatListTime, getCurrentDate, getEndOfDay, getToday} from "@/utils/dateUtils.ts";
-import {CaretBottom} from "@element-plus/icons-vue";
+import {formatListTime, getCurrentDate, getEndOfDay} from "@/utils/dateUtils.ts";
+import {Calendar} from "@element-plus/icons-vue";
 import {apiConfig} from "@/assets/config/apiConfig.ts";
 import Edit from "@/components/registration/Edit.vue";
 
 const curItem = ref<any>({});
-const emit = defineEmits(['clickItem','getStatus'])
+const emit = defineEmits(['clickItem', 'getStatus'])
 const clickItem = (item: any) => {
   curItem.value = item
   emit('clickItem', item, query.value.status);
@@ -105,8 +107,7 @@ const init = async () => {
   try {
     let data: any = await post(apiConfig.RecordGetChargeQueue, {query: query.value}, {catch_error: true})
     ChargeQueueList.value = data.list
-  }
-  catch {
+  } catch {
     ChargeQueueList.value = []
   } finally {
     loading.value = false
@@ -136,7 +137,7 @@ const statusList = ref([
 ])
 const tab = (item: any) => {
   query.value.status = item.value
-  curItem.value={}
+  curItem.value = {}
   emit('getStatus', item.value)
   init()
 }
@@ -199,7 +200,21 @@ const search = (v: any) => {
     height: 74px;
     width: 100%;
     display: flex;
-    margin: 0;
+    .search-input {
+      flex: 1;
+      min-width: 0;
+    }
+    .add{
+      width: 128px;
+      height: 42px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      background: #FFFFFF;
+      border-radius: 6px;
+      border: 1px solid #979797;
+      margin-left: 16px;
+    }
   }
 
   .list {
@@ -315,6 +330,16 @@ const search = (v: any) => {
     padding-bottom: 10px;
   }
 }
+.date-btn {
+  width: 98px;
+  height: 32px;
+  background: #FFFFFF;
+  border-radius: 6px;
+  border: 1px solid #EAEAEC;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 
 :deep(.el-input--prefix) {
   visibility: hidden;
diff --git a/src/components/charge/Settlement.vue b/src/components/charge/Settlement.vue
index 8622849..bf8ca4c 100644
--- a/src/components/charge/Settlement.vue
+++ b/src/components/charge/Settlement.vue
@@ -1,7 +1,7 @@
 <template>
   <Mask :width="696" :height="409" title="收费" :is-show="show" @close="close" :show-footer="true">
     <template #default>
-      <div class="content">
+      <div class="content" v-loading="loading">
         <div class="btns">
           <div
               class="btn"
@@ -68,7 +68,7 @@ const socialCard = ref<any>({
   mdtrtCertNo: null,
   payInfo: {}
 });
-
+const loading = ref(false);
 const show = ref(false)
 const printReceipt = ref(false);
 const payType = ref(null);
@@ -110,6 +110,7 @@ const completeSettlement = () => {
     socialSettlement();
   } else {
     //其他结算
+    loading.value = true;
     post('charge/completeOrder', {id: retailOrder.value.id, payType: payType.value}).then((res: any) => {
       orderCompleted()
     })
@@ -119,6 +120,7 @@ const completeSettlement = () => {
 
 
 const orderCompleted = () => {
+  loading.value = false;
   show.value = false;
   ElMessage.success("保存成功")
   emit('orderCompleted', printReceipt.value)
@@ -144,6 +146,7 @@ const socialSettlement = () => {
     ElMessage.warning("请刷卡")
     return;
   }
+  loading.value = true;
   const params = {
     mdtrtCertType: socialCard.value.mdtrtCertType,
     mdtrtCertNo: socialCard.value.mdtrtCertNo,
@@ -161,6 +164,7 @@ const socialSettlement = () => {
 }
 const psnPaymentRef = ref();
 const openPsnPayment = (payInfo: any, orderInfo: any) => {
+  loading.value = false;
   nextTick(() => {
     psnPaymentRef.value?.open(payInfo, orderInfo);
   })
diff --git a/src/components/charge/TotalPrice.vue b/src/components/charge/TotalPrice.vue
index a70caaa..e9ae2a0 100644
--- a/src/components/charge/TotalPrice.vue
+++ b/src/components/charge/TotalPrice.vue
@@ -24,8 +24,8 @@ const openSettlement =()=>{
     <div class="footer">
       <div>总金额：<span class="text icon">￥</span><span class="text">{{ totalAmount || '0' }}</span></div>
       <div class="btn-group" v-if="status">
-        <el-button type="primary" @click="openCheckOut">追溯码</el-button>
-        <el-button type="primary" @click="openSettlement">收费</el-button>
+        <span type="primary" @click="openCheckOut">追溯码</span>
+        <span type="primary" @click="openSettlement">收费</span>
       </div>
     </div>
   </Panel>
@@ -49,4 +49,18 @@ const openSettlement =()=>{
     color: #FF282E
   }
 }
+.btn-group{
+  span{
+    display: inline-block;
+    width: 119px;
+    height: 48px;
+    background: #4D6DE4;
+    border-radius: 8px;
+    margin-left: 24px;
+    color: #fff;
+    line-height: 48px;
+    text-align: center;
+    cursor: pointer;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/components/common/goods/GoodsDetail.vue b/src/components/common/goods/GoodsDetail.vue
index b84fa1b..cf327ba 100644
--- a/src/components/common/goods/GoodsDetail.vue
+++ b/src/components/common/goods/GoodsDetail.vue
@@ -76,7 +76,10 @@
       </el-table-column>
       <el-table-column label="操作" v-if="props.status">
         <template #default="scope">
-          <el-button type="danger" link @click="delGoods(scope.row)">X</el-button>
+          <el-button type="danger" link @click="delGoods(scope.row)">
+            <el-icon style="margin-right: 3px"><Delete /></el-icon>
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -103,6 +106,7 @@ import Panel from "@/components/common/Panel.vue";
 import {ref} from "vue";
 import {post} from "@/utils/request.ts";
 import {ElMessage} from "element-plus";
+import {Delete} from "@element-plus/icons-vue";
 
 const props = defineProps({
   status: {
diff --git a/src/components/common/service/ServiceDetail.vue b/src/components/common/service/ServiceDetail.vue
index 932e3c2..3a914a2 100644
--- a/src/components/common/service/ServiceDetail.vue
+++ b/src/components/common/service/ServiceDetail.vue
@@ -47,7 +47,10 @@
       </el-table-column>
       <el-table-column label="操作" v-if="props.status">
         <template #default="scope">
-          <el-button type="danger" link @click="delService(scope.row)">X</el-button>
+          <el-button type="danger" link @click="delService(scope.row)">
+            <el-icon style="margin-right: 3px"><Delete /></el-icon>
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -66,12 +69,13 @@
   </Panel>
 </template>
 <script setup lang="ts">
-import {defineProps, watchEffect, ref} from "vue";
+import {defineProps, ref} from "vue";
 import SearchInput from "@/components/SearchInput.vue";
 import Panel from "@/components/common/Panel.vue";
 import {post} from "@/utils/request.ts";
 import chrgitm_lv from "@/assets/config/directory/chrgitmLv.json"
-import {ElMessage} from "element-plus";
+import {ElMessage} from "element-plus"
+import {Delete} from "@element-plus/icons-vue";
 
 const props = defineProps({
   status: {
diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue
index c77ee6d..d9d0bd1 100644
--- a/src/components/outpatient/MedicalQueue.vue
+++ b/src/components/outpatient/MedicalQueue.vue
@@ -3,7 +3,7 @@
     <template #tools>
       <div @click="setDate" class="date-btn">
         <span>{{ selectedDateStr }}</span>
-        <el-icon style="margin-left: 24px">
+        <el-icon style="margin-left: 21px">
           <Calendar/>
         </el-icon>
       </div>
@@ -324,12 +324,13 @@ watch(() => selectedDate.value, (newValue, oldValue) => {
 
 .date-btn {
   width: 98px;
-  height: 33px;
+  height: 32px;
+  background: #FFFFFF;
+  border-radius: 6px;
+  border: 1px solid #EAEAEC;
   display: flex;
   justify-content: center;
   align-items: center;
-  border-radius: 4px;
-  border: 1px solid #ececee;
 }
 
 :deep(.el-input) {