From 589bcdb26f8e9d3e0d5ef46d27acc901c96d50ea Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 15 四月 2025 15:44:49 +0800
Subject: [PATCH] update

---
 src/views/ecg/doctor/components/QueuePanel.vue |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/views/ecg/doctor/components/QueuePanel.vue b/src/views/ecg/doctor/components/QueuePanel.vue
index 43b99be..663b521 100644
--- a/src/views/ecg/doctor/components/QueuePanel.vue
+++ b/src/views/ecg/doctor/components/QueuePanel.vue
@@ -2,8 +2,8 @@
 import {defineComponent, PropType} from "vue";
 import { QueueVO } from '@/api/ecg/queue'
 import {DICT_TYPE} from "@/utils/dict";
-import {PatientVO, DoctorApi} from "@/api/ecg/doctor";
-import {useCheckTypeStore} from "@/store/modules/checkType";
+import {PatientVO, DoctorApi, RoomBedVO} from "@/api/ecg/doctor";
+import {getCheckTypeName, getCheckTypeSeqPrefix} from "../../../../utils/checkTypeFormatter";
 
 defineComponent({
   name: 'QueuePanel'
@@ -11,21 +11,17 @@
 
 const emit = defineEmits(['event_RecallFinish']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋�
 
-const checkTypeStore = useCheckTypeStore();
-
 const message = useMessage() // 娑堟伅寮圭獥
 
 const  props = defineProps({
   queue: {
     type: Array as PropType<QueueVO[]>,
     required: true
-  }
-  /*,
-  modelValue: {
-    type: Object as PropType<RoomVO>,
+  },
+  room: {
+    type: Object as PropType<RoomBedVO>,
     required: true
   }
-*/
 })
 
 const recall = async (item) => {
@@ -33,7 +29,10 @@
     roomId: item.roomId,
     bedNo: item.bedNo,
     patId: item.patId,
-    jumpFlag: 0
+    checkType: item.bookCheckType,
+    //jumpFlag: 0,
+    roomId_operator: props.room.roomId,
+    bedNo_operator: props.room.bedNo,
   }
 
   let data = ""
@@ -42,7 +41,7 @@
   else if (item.status === 7)
     data = await DoctorApi.recallInstallPatient(patientVO);
 
-  emit("event_RecallFinish") // 瑁呮満 杩囧彿
+  emit("event_RecallFinish") // 鍙洖瀹屾垚
   message.info(data)
 }
 
@@ -50,10 +49,12 @@
 
 <template>
 <div v-for="(item, index) in queue" :key="index">
-  <span style="display:inline-block; width:100px;"> {{item.seqNum}} &nbsp; {{item.patName}}{{item.passed === 0 ? "":"*"}} </span>
+  <span style="display:inline-block; width:30px;"> {{item.seqNum}} </span>
+  <span style="display:inline-block; width:40px;"> {{getCheckTypeSeqPrefix(item.bookCheckType)}}{{item.bookSeqNum}} </span>
+  <span style="display:inline-block; width:70px;"> &nbsp; {{item.patName}}{{item.passed === 0 ? "":"*"}} </span>
   <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="item.patGender" />
 <!--  {{item.roomName}} {{item.bedNo}}-->
-  {{checkTypeStore.getCheckTypeName(item.bookCheckType)}}
+  {{getCheckTypeName(item.bookCheckType)}}
   <dict-tag :type="DICT_TYPE.ECG_QUEUE_STATUS" :value="item.status" />
   <el-button v-if="item.status === 5 || item.status === 7" @click="recall(item)"> 鍙洖 </el-button>
 </div>

--
Gitblit v1.9.3