From 09dc74e264b6262cbe41c9c8476e24705871d4a6 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 08 十一月 2026 23:31:17 +0800
Subject: [PATCH] yxh
---
src/views/ecg/room/RoomLoginSelect.vue | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/src/views/ecg/room/RoomLoginSelect.vue b/src/views/ecg/room/RoomLoginSelect.vue
index 9d0755e..5996cbd 100644
--- a/src/views/ecg/room/RoomLoginSelect.vue
+++ b/src/views/ecg/room/RoomLoginSelect.vue
@@ -33,7 +33,7 @@
<div class="room-select__scroll">
<div class="room-select__list">
<div class="room-select__item" v-for="(bed, index) in bedList" :key="`${bed.roomId}-${bed.bedNo}-${index}`">
- <RoomBedSelect :bed="bed" :curBed="curSel" :curUser='curUser' @event-haveseat="haveSeat" @event-leaveseat="leaveSeat" @event-setcurseat="setCurSeat"/>
+ <RoomBedSelect :bed="bed" :curBed="curSel" :curUser='curUser' @event-haveseat="haveSeat" @event-leaveseat="leaveSeat" @event-setcurseat="setCurSeat" @event-takeover="takeOverConfirm"/>
</div>
<el-empty v-if="isEmptyOpeningBed" class="room-select__empty" description="宸ヤ綅娌℃湁寮�鏀�"/>
</div>
@@ -397,8 +397,8 @@
tempRoomVO.docId = curUser.id
tempRoomVO.docName = curUser.nickname
- // 銆愭湰娆¢渶姹傘�戣蛋 store 鐨勫叆搴у姩浣滐細鏈嶅姟绔叆搴ф垚鍔熷悗浼�**鑷姩閲婃斁鎴戣繖涓处鍙风殑鍏跺畠宸ヤ綅**
- // 锛堜竴浜轰竴宸ヤ綅锛夛紝骞舵妸宸ヤ綅淇℃伅鍐欒繘浼氳瘽缂撳瓨銆�
+ // 銆愭湰闇�姹偮蜂竴浜哄宸ヤ綅銆戣蛋 store 鐨勫叆搴у姩浣滐細鏈嶅姟绔�**涓嶅啀閲婃斁**鎴戣处鍙蜂笅鐨勫叾瀹冨伐浣嶏紝
+ // 鍥犳杩欓噷鏄�"鏂板涓�涓垜鐨勫伐浣�"锛堝�肩彮澶氬矖浣嶏級锛屽苟鎶婂伐浣嶄俊鎭啓杩涗細璇濈紦瀛樸��
const seated = await roomStore.seatRoom(tempRoomVO)
if (!seated) {
// 澶辫触鏃惰嚜鍔ㄨ皟璇婃柇鎺ュ彛锛屾妸搴撻噷鐪熷疄琛屼笌缁撹涓�璧风粰鍑猴紙渚夸簬鐜板満涓�閿畾浣嶏級
@@ -425,6 +425,39 @@
gotoAfterSeat(newRoomVO.opType, false)
}
+/**
+ * 銆愭湰闇�姹偮锋帴鐝嚜鍔╂帴绠°�戝"鍒汉鍗犵敤"鐨勫伐浣嶆墽琛屾帴绠°��
+ *
+ * 鍦烘櫙锛氫笂涓�鐝尰鐢熶笅鐝病鐐广�岀搴с�嶏紝涓嬩竴鐝尰鐢熷湪鍚屼竴宸ヤ綅鎺ョ彮 鈥斺�� 鍘熸潵鍙兘鎵剧鐞嗗憳娓呯┖銆�
+ * 鐜板湪锛氫簩娆$‘璁� 鈫� 鍚庣寮哄埗鍘熷崰鐢ㄤ汉绂诲骇骞舵妸宸ヤ綅缁欐垜 鈫� 鍒锋柊鍒楄〃/鎴戠殑宸ヤ綅銆�
+ */
+const takeOverConfirm = async (roomVO: RoomVO) => {
+ const bedText = `${roomVO.roomName || '璇婂' + roomVO.roomId} 路 ${roomVO.bedNo}`
+ const owner = roomVO.docName || '鍏朵粬鍖荤敓'
+ try {
+ await ElMessageBox.confirm(
+ `宸ヤ綅銆�${bedText}銆嶅綋鍓嶇敱銆�${owner}銆嶅崰鐢ㄣ�俓n` +
+ `纭鎺ョ锛熸帴绠″悗銆�${owner}銆嶅皢琚己鍒剁搴э紙鍏堕〉闈細鎻愮ず閲嶆柊灏卞潗锛夛紝宸ヤ綅绔嬪嵆褰掍綘浣跨敤銆俙,
+ '鎺ョ宸ヤ綅',
+ { confirmButtonText: '纭鎺ョ', cancelButtonText: '鍙栨秷', type: 'warning' }
+ )
+ } catch {
+ return
+ }
+ const ok = await roomStore.takeOverBed(roomVO.roomId, roomVO.bedNo)
+ if (!ok) {
+ ElMessage({ message: '鎺ョ澶辫触锛岃绋嶅悗閲嶈瘯鎴栬仈绯荤鐞嗗憳', type: 'error', duration: 4000 })
+ return
+ }
+ ElMessage.success(`宸叉帴绠″伐浣嶏細${bedText}`)
+ resetCurSel()
+ curSel.value = { ...roomVO, docId: curUser.id, docName: curUser.nickname }
+ await roomStore.fetchMySeat()
+ await getList()
+ // 鎺ョ鍚庤繘鍏ヨ宀椾綅瀵瑰簲鐨勫伐浣滃彴锛堟帴绠′細甯︿笂璇ュ伐浣�"灏辫瘖涓�"鎮h�咃級
+ gotoAfterSeat(roomVO.opType, true)
+}
+
const leaveSeatConfirm = async (roomVO: RoomVO) => {
// 銆愭湰娆¢渶姹傘�戠搴у彧鑳芥竻**鑷繁鐨�** doc_id锛堟湇鍔$ setBedDoctorOff 宸插姞 doc_id 鏉′欢锛夛紝
// 杩欓噷鍏堟嫤涓�閬擄紝閬垮厤"鏃佽/鍏朵粬鍖荤敓"鐐圭搴ф妸姝e湪鎿嶄綔鐨勪汉韪㈡帀銆�
--
Gitblit v1.9.3