From cdc47651d6aa723754f3609148b28a35220138bb Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 14 九月 2026 23:49:43 +0800
Subject: [PATCH] 允许诊室有人也可以选择

---
 src/views/ecg/room/RoomLoginSelect.vue |   68 +++++++++++++++++++++------------
 1 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/src/views/ecg/room/RoomLoginSelect.vue b/src/views/ecg/room/RoomLoginSelect.vue
index f29fa56..0602391 100644
--- a/src/views/ecg/room/RoomLoginSelect.vue
+++ b/src/views/ecg/room/RoomLoginSelect.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="display: flex; flex-direction: column; align-items: center;">
+  <div style="display: flex; flex-direction: column; align-items: center; height: 100vh; overflow-y: auto;">
     <div style="display: flex; flex-wrap: wrap; justify-content: center; margin-bottom: 20px">
       <div class=roomwrap v-for="(value, key) in bedMap" :key="key">
         <RoomBedSelect :title="key" :bedList="value" :curBed="curSel" :curUser='curUser' @event-haveseat="haveSeat" @event-leaveseat="leaveSeat" @event-setcurseat="setCurSeat"/>
@@ -18,7 +18,6 @@
 import { RoomApi, RoomVO } from '@/api/ecg/room'
 import {useUserStore} from "@/store/modules/user";
 import {ElMessage, ElMessageBox} from "element-plus";
-import {isStringEmpty} from "@/utils/stringUtil";
 import {cloneDeep} from "lodash-es";
 import {DoctorApi} from "@/api/ecg/doctor";
 import {useRoomStore} from "@/store/modules/room";
@@ -74,13 +73,18 @@
   isEmptyOpeningBed.value = true
   for (const key in data) {
     isEmptyOpeningBed.value = false
-    const roomVOArray = data[key] as RoomVO[];
-    roomVOArray.forEach((roomVO) => {
-      if (roomVO.docId === curUser.id) {
-        curSel.value = roomVO
-        roomStore.setRoomInfoAction(curSel.value)
-      }
-    })
+
+    if (roomStore.getIsSetRoom) {
+      const roomVOArray = data[key] as RoomVO[];
+      roomVOArray.forEach((roomVO) => {
+        if (roomVO.docId === curUser.id
+            && roomVO.roomId === roomStore.room!.roomId
+            && roomVO.bedNo === roomStore.room!.bedNo) {
+          curSel.value = roomVO
+          roomStore.setRoomInfoAction(curSel.value)
+        }
+      })
+    }
   }
 }
 
@@ -190,9 +194,9 @@
 */
 }
 
-const leaveSeatConfirm = async () => {
-  if (curSel.value.docId !== null) {
-      let data = await DoctorApi.bedDoctorOff(curSel.value)
+const leaveSeatConfirm = async (roomVO: RoomVO) => {
+  if (roomVO.docId !== null) {
+      let data = await DoctorApi.bedDoctorOff(roomVO)
       if (data !== 0) {
           ElMessage({
               message: '鍐呴儴閿欒!' + data,
@@ -209,18 +213,32 @@
 }
 
 const haveSeat = async (newRoomVO: RoomVO) => {
-  ElMessageBox.confirm(
-      '鍏ュ骇, 鏄惁缁х画?',
-      '鎻愮ず',
-      {
-        confirmButtonText: '纭畾',
-        cancelButtonText: '鍙栨秷',
-        type: 'warning'
-      }
-  ).then(async () => {
-    haveSeatConfirm(newRoomVO)
-  }).catch(() => {
-  });
+  // 1. 鎻愬彇涓嶅悓鐨勬彁绀鸿
+  const message = newRoomVO.docId != null
+    ? '宸茬粡鏈変汉浜�, 鏄惁纭畾瑕佺户缁叆搴�?'
+    : '鍏ュ骇, 鏄惁缁х画?';
+
+  try {
+    // 2. 绛夊緟鐢ㄦ埛鐐瑰嚮纭
+    await ElMessageBox.confirm(message, '鎻愮ず', {
+      confirmButtonText: '纭畾',
+      cancelButtonText: '鍙栨秷',
+      type: 'warning'
+    });
+
+    if (newRoomVO.docId != null) {
+      await leaveSeatConfirm(newRoomVO);
+    }
+
+    // 4. 绂诲骇鎴愬姛锛堟垨鍘熸湰灏辨病浜猴級锛屾渶鍚庢墽琛屽叆搴�
+    await haveSeatConfirm(newRoomVO);
+
+  } catch (err) {
+    // 鍙湁鐢ㄦ埛涓诲姩鐐瑰嚮鍙栨秷鏃舵墠蹇界暐锛屽叾浠栨姤閿欏彲浠ユ墦鍗板嚭鏉ユ柟渚挎帓鏌�
+    if (err !== 'cancel') {
+      console.error('鍏ュ骇娴佺▼寮傚父:', err);
+    }
+  }
 }
 
 const leaveSeat = (roomVO: RoomVO) => {
@@ -233,7 +251,7 @@
         type: 'warning'
       }
   ).then(() => {
-    leaveSeatConfirm()
+    leaveSeatConfirm(roomVO)
   }).catch(() => {
   });
 }

--
Gitblit v1.9.3