From e86b0b920a5ef29425b71d224c80e3d7c9dc4c5f Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Wed, 7 May 2025 17:27:12 +0800
Subject: [PATCH] dev

---
 src/components/outpatient/MedicalQueue.vue | 54 ++++++++++++----------
 src/components/registration/Edit.vue       |  9 ++--
 src/components/registration/List.vue       |  2 +-
 3 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue
index 69b0f9d..b43fc1a 100644
--- a/src/components/outpatient/MedicalQueue.vue
+++ b/src/components/outpatient/MedicalQueue.vue
@@ -1,18 +1,19 @@
 <template>
-  <Panel :title="'就诊队列'">
-    <div class="tabs">
+  <Panel :title="'就诊队列'" style="height: 100%">
+    <div class="panel-content" style="display: flex;flex-direction: column;height: 100%">
+      <div class="tabs">
       <span v-for="(item,index) in statusList" :class="props.status == index+1 ? 'tabs-item' : ''"
             @click="tab(item)">{{ item.label }}&nbsp;{{ item.num }}</span>
-    </div>
-    <div class="search">
-      <img src="/static/images/outpatient/search.png" class="search-icon" alt="搜索图标">
-      <input class="search-input" v-model="search" placeholder="搜索门诊单" style="font-size: 16px">
-    </div>
-    <div class="list">
-      <el-scrollbar>
-        <ul v-loading="loading">
-          <li class="list-item" :class="curItem.id == item.id ? 'active' : ''" v-for="(item, index) in list"
-              :key="index" @click="clickLi(item)">
+      </div>
+      <div class="search">
+        <img src="/static/images/outpatient/search.png" class="search-icon" alt="搜索图标">
+        <input class="search-input" v-model="search" placeholder="搜索门诊单" style="font-size: 16px">
+      </div>
+      <div class="list">
+        <ul style="height: 100%">
+          <el-scrollbar style="height: 100%">
+            <li class="list-item" :class="curItem.id == item.id ? 'active' : ''" v-for="(item, index) in list"
+                :key="index" @click="clickLi(item)">
                 <span>
                   <img v-if="item.gender==1" class="avatar" src="/static/images/outpatient/man.png"
                        alt="头像"/>
@@ -21,12 +22,13 @@
                    {{ item.name }}
                 </span>
 
-            <span class="item_time">
+              <span class="item_time">
                 {{ formatListTime(item.createDatetime) || '-' }}
             </span>
-          </li>
+            </li>
+          </el-scrollbar>
         </ul>
-      </el-scrollbar>
+      </div>
     </div>
   </Panel>
 </template>
@@ -34,7 +36,7 @@
 import {nextTick, onMounted, ref, watch} from "vue";
 import Panel from "@/components/common/Panel.vue";
 import {post} from "@/utils/request.ts";
-import {formatListTime, getToday} from "@/utils/dateUtils.ts";
+import {formatListTime, getToday, getThisMonth} from "@/utils/dateUtils.ts";
 import {apiConfig} from "@/assets/config/apiConfig.ts";
 import {ElMessageBox} from "element-plus";
 
@@ -48,7 +50,7 @@ const search = ref('')
 const curItem = ref<any>('')
 const emit = defineEmits(['getId', 'changeDetail', 'getStatus'])
 const tab = (item: any) => {
-  nextTick(()=>{
+  nextTick(() => {
     emit('getStatus', item.value)
     init()
     if (item.value == 3) {
@@ -79,9 +81,9 @@ const statusList = ref<any>([
 ])
 const itemId = defineModel()
 onMounted(() => {
-  curItem.value = itemId
   initStatusList()
-  init()
+  curItem.value = itemId
+  // init()
 })
 const loading = ref(true)
 const init = () => {
@@ -89,18 +91,20 @@ const init = () => {
   post(apiConfig.DoctorList, {
     query: {
       status: props.status,
+      beginTime: '2024-05-07 23:59:59',
+      endTime: data.value.end
     }
   }).then((res: any) => {
     loading.value = false
     list.value = res.list
   })
 }
-const data=ref<any>(getToday())
+const data = ref<any>(getToday())
 const initStatusList = () => {
-  post('statistics/getTipCount',{beginTime:data.value.start,endTime:data.value.end}).then((res:any)=>{
-    list.value[0].num=res.waitDiagnosisCount
-    list.value[1].num=res.diagnosingCount
-    list.value[2].num=res.completeDiaCount
+  post('statistics/getTipCount', {beginTime: '2024-05-07 23:59:59', endTime: data.value.end}).then((res: any) => {
+    statusList.value[0].num = res.waitDiagnosisCount
+    statusList.value[1].num = res.diagnosingCount
+    statusList.value[2].num = res.completeDiaCount
   })
 }
 const clickLi = (item: any) => {
@@ -109,7 +113,6 @@ const clickLi = (item: any) => {
 }
 
 watch(() => props.status, () => {
-  initStatusList()
   init() // 重新初始化数据
 })
 </script>
@@ -168,6 +171,7 @@ watch(() => props.status, () => {
 }
 
 .list {
+  flex: 1;
   display: flex;
   min-height: 0;
   flex-direction: column;
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index 3e79bf2..dbccdd3 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -135,8 +135,8 @@
         <el-dropdown v-if="isShowCard" placement="top-start" @show="showCardBtn" @hide="hide">
           <div class="left" style="outline: none;">
             <span class="btnCard" type="primary">
-              <img class="image" src="/public/static/images/registration/card.png" alt="" srcset="">进行读卡
-              <img class="image1" :src="'/public/static/images/registration/'+(showBtn?2:1)+'.png'" alt="" srcset="">
+              <img class="image" src="/static/images/registration/card.png" alt="" srcset="">进行读卡
+              <img class="image1" :src="'/static/images/registration/'+(showBtn?2:1)+'.png'" alt="" srcset="">
             </span>
           </div>
           <template #dropdown>
@@ -145,7 +145,7 @@
           </template>
         </el-dropdown>
         <div class="closeBtn" v-else @click="deleteCard" style="outline: none;">
-          <img class="image" src="/public/static/images/registration/card.png" alt="" srcset="">
+          <img class="image" src="/static/images/registration/card.png" alt="" srcset="">
           退出医保
         </div>
         <div class="bottom-right">
@@ -228,6 +228,7 @@ const emit = defineEmits(['close'])
 const close = () => {
   isShow.value = false
   edit_data.value = {}
+  isShowCard.value=true
   emit('close')
 }
 const form = ref()
@@ -293,7 +294,7 @@ const socialCardUpdate = (e: any) => {
   if (e) {
     isShowCard.value = false
     edit_data.value = e.data.baseinfo
-    edit_data.value.gender = e.data.baseinfo.gend
+    edit_data.value.gender = Number(e.data.baseinfo.gend)
     edit_data.value.name = e.data.baseinfo.psn_name
     edit_data.value.certType = e.data.baseinfo.psn_cert_type
     edit_data.value.certNo = e.data.baseinfo.certno
diff --git a/src/components/registration/List.vue b/src/components/registration/List.vue
index 46591ab..fc9c37c 100644
--- a/src/components/registration/List.vue
+++ b/src/components/registration/List.vue
@@ -9,7 +9,7 @@
         <template #default="scope">
           <div style="display: flex;align-items: center;">
             <img style="width: 25px;height: 25px;margin-right: 10px"
-                 :src="scope.row.gender === 1 ? '/public/static/images/member/man.png' :scope.row.gender === 2 ? '/public/static/images/member/women.png':'无'"
+                 :src="scope.row.gender === 1 ? '/static/images/member/man.png' :scope.row.gender === 2 ? '/static/images/member/women.png':'无'"
                  alt="" srcset="">
             <span> {{ scope.row.name }}</span>
           </div>