From 936c01060eea0924b88ca5c35d221a972a6aba7d Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 05 十月 2026 10:47:22 +0800
Subject: [PATCH] 检查单列表调整

---
 src/views/ecg/doctor/Routine.vue |  202 +++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 173 insertions(+), 29 deletions(-)

diff --git a/src/views/ecg/doctor/Routine.vue b/src/views/ecg/doctor/Routine.vue
index b0244a0..e7c327c 100644
--- a/src/views/ecg/doctor/Routine.vue
+++ b/src/views/ecg/doctor/Routine.vue
@@ -7,9 +7,10 @@
 
 import TitlePanel from '@/views/ecg/doctor/components/TitlePanel.vue'
 import QueuePanel from '@/views/ecg/doctor/components/QueuePanel.vue'
+import DoctorPageLayout from '@/components/DoctorPageLayout/src/DoctorPageLayout.vue'
 import { DoctorApi, PatientStatisticVO, RoomBedVO, } from '@/api/ecg/doctor'
 import { QueueVO } from '@/api/ecg/queue'
-import { ElNotification } from 'element-plus'
+import { ElMessage, ElMessageBox, ElNotification } from 'element-plus'
 import RoutinePanel from '@/views/ecg/doctor/components/RoutinePanel.vue'
 import { useRoomStore } from '@/store/modules/room'
 
@@ -60,6 +61,96 @@
 const finishFlag = ref<boolean>(true)
 const passFlag = ref<boolean>(true)
 
+// ==================== 闇�姹�3锛氬仠姝㈠�欒瘖寮�鍏� ====================
+// 璇箟锛氬紑鍚悗銆愬凡鏈夊�欒瘖鐥呬汉缁х画鍙彿锛屼絾涓嶅啀鏂板鍊欒瘖鐥呬汉銆戯紱鍏抽棴鍚庢仮澶嶃��
+// 涓庝笂闈㈢殑"鏆傚仠/鎭㈠"鏄�**涓や釜鐙珛姒傚康**锛氭殏鍋滀細鎶婂氨璇婁腑鎮h�呭己鍒跺畬鎴愩��
+// 骞舵妸鍊欒瘖鎮h�呰涪鍑哄伐浣嶏紱鏈紑鍏冲彧鎷︽埅"鏂板"锛屼笉鍔ㄥ凡鏈夋偅鑰呫��
+const stopReady = ref<boolean>(false)
+const stopReadyFlag = ref<boolean>(true) // 闃茶繛鐐�
+
+const loadStopReady = async () => {
+  try {
+    stopReady.value = await DoctorApi.getStopReady(roomBedVO)
+  } catch (e) {
+    // 鏌ヨ澶辫触涓嶆墦鏂疆璇紱淇濇寔涓婁竴娆$姸鎬�
+  } finally {
+    stopReadyFlag.value = false
+  }
+}
+
+const onStopReadyChange = async (val: boolean) => {
+  stopReadyFlag.value = true
+  try {
+    if (val) {
+      await DoctorApi.stopReady(roomBedVO)
+      ElMessage.success('宸插仠姝㈠�欒瘖锛氫笉鍐嶆帴鏀舵柊鐨勫�欒瘖鎮h�咃紝宸叉湁鎮h�呬粛鍙甯稿彨鍙�')
+    } else {
+      await DoctorApi.resumeReady(roomBedVO)
+      ElMessage.success('宸叉仮澶嶅�欒瘖锛氬紑濮嬫帴鏀舵柊鐨勫�欒瘖鎮h��')
+    }
+    await initLoad()
+  } catch (e) {
+    // 澶辫触鍥炴粴寮�鍏虫樉绀�
+    stopReady.value = !val
+  } finally {
+    stopReadyFlag.value = false
+  }
+}
+
+// ==================== 闇�姹�2锛氭挙閿�鍙彿 / 鎾ら攢妫�鏌ュ畬鎴� ====================
+const undoFlag = ref<boolean>(false)
+
+/** 鎾ら攢璇偣"鍙彿"锛氭妸褰撳墠灏辫瘖涓殑鎮h�呴��鍥炲�欒瘖鍖� */
+const undoCall = async () => {
+  try {
+    await ElMessageBox.confirm(
+      '纭畾瑕佹挙閿�鏈鍙彿鍚楋紵璇ユ偅鑰呭皢鍥炲埌鍊欒瘖鍖猴紝鍙噸鏂板彨鍙枫��',
+      '鎾ら攢鍙彿',
+      { type: 'warning', confirmButtonText: '纭畾鎾ら攢', cancelButtonText: '鍙栨秷' }
+    )
+  } catch {
+    return // 鐢ㄦ埛鍙栨秷
+  }
+  undoFlag.value = true
+  try {
+    const msg = await DoctorApi.undoCallPatient(roomBedVO)
+    ElMessage.success(msg || '宸叉挙閿�鍙彿')
+    await initLoad()
+  } finally {
+    undoFlag.value = false
+  }
+}
+
+/** 鎾ら攢"妫�鏌ュ畬鎴�"锛氭妸鏈�杩戜竴浣嶅凡瀹屾垚鎮h�呴��鍥炲�欒瘖鍖� */
+const undoFinish = async () => {
+  const last = await DoctorApi.lastFinishedPatient(roomBedVO)
+  if (!last || !last.patId) {
+    ElMessage.warning('鏈伐浣嶄粖鏃ユ殏鏃犲凡瀹屾垚鐨勬鏌ヨ褰�')
+    return
+  }
+  try {
+    await ElMessageBox.confirm(
+      `纭畾鎾ら攢銆�${last.patName || last.patId}銆嶇殑銆屽畬鎴愩�嶇姸鎬佸悧锛熻鎮h�呭皢鍥炲埌鍊欒瘖鍖恒�俙,
+      '鎾ら攢',
+      { type: 'warning', confirmButtonText: '纭畾鎾ら攢', cancelButtonText: '鍙栨秷' }
+    )
+  } catch {
+    return // 鐢ㄦ埛鍙栨秷
+  }
+  undoFlag.value = true
+  try {
+    const msg = await DoctorApi.undoFinishPatient({
+      ...roomBedVO,
+      patId: last.patId,
+      checkType: last.bookCheckType
+    } as any)
+    ElMessage.success(msg || '宸叉挙閿�')
+    await initLoad()
+  } finally {
+    undoFlag.value = false
+  }
+}
+
 const finishNextPatient = async () => {
   finishFlag.value = true
   try {
@@ -80,6 +171,35 @@
   try {
     patientList.value = await DoctorApi.passNextPatient(roomBedVO)
     patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO)
+
+    // ========================================================================
+    // 銆愪慨澶嶃�戣繃鍙峰悗鍚屾牱瑕�**娓呯┖宸︿笂鏂规偅鑰呬俊鎭�**锛岃〃绀哄彲浠ュ彨涓嬩竴浣嶄簡銆�
+    //
+    // 鍘熷厛鍙皟 getOnstagePatient()锛岃�岃鏂规硶鍦ㄦ壘涓嶅埌 status===30 鐨勬偅鑰呮椂
+    // **浠�涔堥兘涓嶅仛**锛堝畠鍐呴儴閭h setOnStagePatient(undefined) 鏄娉ㄩ噴鎺夌殑锛夛紝
+    // 浜庢槸杩囧彿鍚庡乏涓婅浠嶇暀鐫�涓婁竴浣嶆偅鑰呯殑淇℃伅锛屽尰鐢熶細浠ヤ负杩樺湪澶勭悊浠栥��
+    // 杩欓噷涓庛�屾鏌ュ畬鎴愩��(onEventRoutine) 淇濇寔涓�鑷寸殑鏀跺熬鍔ㄤ綔銆�
+    // ========================================================================
+    onStagePatient = {
+      id: 0,
+      patId: '',
+      patName: '',
+      patGender: 0,
+      bookTimeslot: 0,
+      bookCheckType: 0,
+      isVip: 0,
+      seqNum: 0,
+      bookSeqNum: 0,
+      passed: 0,
+      expired: 0,
+      jumpFlag: 0,
+      roomId: 0,
+      roomName: '',
+      bedNo: '',
+      status: 0
+    }
+    routimePanelRef.value?.setPatient(undefined)
+
     getOnstagePatient()
   } finally {
     passFlag.value = false
@@ -116,6 +236,8 @@
   const queueVO2 = await DoctorApi.bedDoctorGet(roomBedVO)
   if (queueVO2.status === 20) state.value = true
   else if (queueVO2.status === 30) state.value = false
+  // 闇�姹�3锛氬悓姝�"鍋滄鍊欒瘖"寮�鍏崇姸鎬侊紙鍏朵粬鍖荤敓/鍏朵粬缁堢鏀瑰姩鍚庢湰绔篃鑳界湅鍒帮級
+  await loadStopReady()
 }
 
 const bedControl = async () => {
@@ -221,23 +343,37 @@
 </script>
 
 <template>
-  <el-container>
-    <el-header style="background-color: var(--el-color-primary-light-7); font-size: 24px">
+  <!--
+    甯冨眬浼樺寲锛氬姛鑳芥寜閽浐瀹氬湪椤甸潰搴曢儴锛屼笉鍐嶇敤 position:absolute 娴湪鍐呭涓娿��
+    路 鏍囬鏍忓浐瀹氬湪椤堕儴
+    路 涓棿鍖猴紙鎮h�呬俊鎭� + 宸插畬鎴愯褰曞垪琛級涓烘粴鍔ㄥ尯锛屾偅鑰呬俊鎭敱 RoutinePanel 鍐呴儴璁句负
+      sticky 閽夊湪椤堕儴锛屽彧鏈夎褰曞垪琛ㄦ粴鍔�
+    路 鍙充晶鎮h�呴槦鍒楃嫭绔嬫粴鍔�
+    路 銆屽彨鍙�/杩囧彿/閲嶅彨/鏆傚仠/鎾ら攢鍙彿銆嶇瓑鎸夐挳杩� #footer锛屽浐瀹氬湪搴曢儴锛屾案涓嶈璁板綍鍒楄〃閬尅
+    璇﹁ components/DoctorPageLayout銆�
+  -->
+  <DoctorPageLayout>
+    <template #header>
       <TitlePanel :titleType="0" :room="roomBedVO" :patientStatistic="patientStat" />
-    </el-header>
-    <el-container style="height: 100%">
-      <el-main style="border: solid var(--el-color-primary-light-7)">
-        <RoutinePanel :room="roomBedVO" :setappointmentId="setappointmentId" ref="routimePanelRef" @event_routine="onEventRoutine" />
-      </el-main>
-      <el-aside width="400px" style="border: solid var(--el-color-primary-light-7)">
-        <QueuePanel
-          :room="roomBedVO"
-          :queue="patientList"
-          @event_RecallFinish="onEventRecallFinish"
-        />
-      </el-aside>
-    </el-container>
-    <el-container class="right-bottom">
+    </template>
+
+    <RoutinePanel
+      :room="roomBedVO"
+      :setappointmentId="setappointmentId"
+      ref="routimePanelRef"
+      :undo-disabled="undoFlag"
+      :undo-loading="undoFlag"
+      @event_routine="onEventRoutine"
+      @event_undo_finish="undoFinish"
+    />
+
+    <template #aside>
+      <QueuePanel :room="roomBedVO" :queue="patientList" @event_RecallFinish="onEventRecallFinish" />
+    </template>
+
+    <!-- 搴曢儴鎺т欢锛氳嚜鍔� + 鍔熻兘鎸夐挳 + 鍋滄鍊欒瘖锛屾暣缁勯潬鍙� -->
+    <template #footer>
+      <!-- 鑷姩 澶嶉�夋 -->
       <el-checkbox label="鑷姩&nbsp;" v-model="autoCall" />
       <el-button :disabled="finishFlag" type="primary" @click="finishNextPatient">鍙彿</el-button>
       <el-button :disabled="passFlag" type="primary" @click="passNextPatient">杩囧彿</el-button>
@@ -245,17 +381,25 @@
       <el-button :disabled="bedControlFlag" type="primary" @click="bedControl">{{
         state ? '鏆傚仠' : '鎭㈠'
       }}</el-button>
-    </el-container>
-  </el-container>
+      <!-- 闇�姹�3锛氬仠姝㈠�欒瘖寮�鍏筹紙宸叉湁鍊欒瘖鐥呬汉缁х画鍙彿锛屼絾涓嶅啀鏂板鍊欒瘖鐥呬汉锛� -->
+      <el-switch
+        v-model="stopReady"
+        :disabled="stopReadyFlag"
+        active-text="鍋滄鍊欒瘖"
+        inactive-text="姝e父鎺ヨ瘖"
+        inline-prompt
+        style="--el-switch-on-color: #e6a23c"
+        @change="onStopReadyChange"
+      />
+      <!-- 闇�姹�2锛氭挙閿�璇偣鍙彿锛堝洖鍒板�欒瘖鍖猴級銆�
+           闇�姹�11锛氥�屾挙閿�瀹屾垚銆嶅凡鏀瑰悕涓恒�屾挙閿�銆嶏紝骞剁Щ鍒般�屽凡瀹屾垚妫�鏌ヨ褰曞垪琛ㄣ�嶇殑鏈�鍓嶉潰銆� -->
+      <el-button :disabled="undoFlag" type="warning" plain @click="undoCall">鎾ら攢鍙彿</el-button>
+    </template>
+  </DoctorPageLayout>
 </template>
 
-<style scoped lang="scss">
-.right-bottom {
-  position: absolute;
-  bottom: 50px;
-  right: 80px;
-  //background-color: #f00;
-  //color: #fff;
-  //padding: 10px;
-}
-</style>
+<!--
+  鍘熷厛杩欓噷鏈� .right-bottom { position:absolute; bottom:50px; right:80px }锛�
+  姝f槸"璁板綍鍒楄〃鍙橀暱鍚庣洊浣忓姛鑳芥寜閽�"鐨勬牴鍥狅紙鎸夐挳鑴辩鏂囨。娴併�佷笉鍗犲竷灞�绌洪棿锛夈��
+  鐜版敼鐢� DoctorPageLayout 鐨� #footer 鎵胯浇锛氭甯告枃妗f祦涓殑鍥哄畾搴曟爮锛屾棤闇�鍋忕Щ銆�
+-->

--
Gitblit v1.9.3