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/DevInstall.vue |  217 +++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 174 insertions(+), 43 deletions(-)

diff --git a/src/views/ecg/doctor/DevInstall.vue b/src/views/ecg/doctor/DevInstall.vue
index 03da696..95f6ed4 100644
--- a/src/views/ecg/doctor/DevInstall.vue
+++ b/src/views/ecg/doctor/DevInstall.vue
@@ -1,24 +1,32 @@
 <script setup lang="ts">
+// 瑁呮満椤点��
+// 鍘熸湰缂哄皯缁勪欢 name锛岄渶涓庤彍鍗� system_menu(2841).component_name 淇濇寔涓�鑷达紝
+// 鍚﹀垯 keep-alive 鐨� :include 鍖归厤澶辫触锛屽垏鍥炴爣绛鹃〉浼氶噸鏂板姞杞藉苟鍒锋柊鏁版嵁銆�
+defineOptions({ name: 'doctor-dev-install' })
+
 import TitlePanel from "@/views/ecg/doctor/components/TitlePanel.vue";
 import DevInstallPanel from "@/views/ecg/doctor/components/DevInstallPanel.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 {useUserStore} from "@/store/modules/user";
 import {QueueVO} from "@/api/ecg/queue";
-import {ElNotification} from "element-plus";
+import {ElMessage, ElMessageBox, ElNotification} from "element-plus";
+import {useRoomStore} from "@/store/modules/room";
 
-const userStore = useUserStore();
+const roomStore = useRoomStore();
 
 const roomBedVO = ref<RoomBedVO>({
     roomId: null,
     roomName: null,
-    bedNo: null
+    bedNo: null,
+    checkTypes: null,
+    opType: null
 })
 
-const installingPatient = ref<QueueVO>({
+let installingPatient: QueueVO = {
   bedNo: "", bookCheckType: 0, bookTimeslot: 0, expired: 0, id: 0, jumpFlag: 0, passed: 0,
   patGender: 0, patId: "", patName: "", roomId: 0, roomName: "", seqNum: 0, status: 0
-})
+}
 
 const patientStat = ref<PatientStatisticVO>({
     finishedNum: 0,
@@ -28,6 +36,7 @@
     queuingNum: 0
 })
 
+const autoCall = ref<boolean>(false);
 const state = ref<boolean>()
 
 const patientList = ref<QueueVO[]>([])
@@ -45,7 +54,7 @@
     getInstallingPatient()
 
     // 鐢ㄤ簬瑙e喅 宸︿晶閲嶇疆鍚� 鑾峰彇褰撳墠 銆愬畨瑁呬腑銆戞偅鑰�
-    setInstallingPatient(installingPatient.value)
+    setInstallingPatient(installingPatient)
   } finally {
     finishFlag.value = false
   }
@@ -67,11 +76,11 @@
 }
 
 const getInstallingPatient = () => {
-  const tempPatient : QueueVO | undefined = patientList.value.find(item => item.status === 36)
-  if (undefined === tempPatient) {
+  const tempPatient : QueueVO | undefined | null = patientList.value.find(item => item.status === 36)
+  if (tempPatient == null) {
     //setInstallingPatient(undefined)
-  } else if (tempPatient.patId !== installingPatient.value.patId) {
-    installingPatient.value= tempPatient
+  } else if (tempPatient.patId !== installingPatient.patId) {
+    installingPatient = tempPatient
     setInstallingPatient(tempPatient)
   }
 }
@@ -94,6 +103,95 @@
     state.value = true
   else if (queueVO2.status === 30)
     state.value = false
+  // 闇�姹�3锛氬悓姝�"鍋滄鍊欒瘖"寮�鍏崇姸鎬�
+  await loadStopReady()
+}
+
+// ==================== 闇�姹�3锛氬仠姝㈠�欒瘖寮�鍏� ====================
+// 寮�鍚悗銆愬凡鏈夊�欒瘖鐥呬汉缁х画鍙彿锛屼絾涓嶅啀鏂板鍊欒瘖鐥呬汉銆戯紱鍏抽棴鍚庢仮澶嶃��
+// 娉細瑁呮満宸ヤ綅(opType=2)鏈韩涓嶈繘"鍒嗘祦闃熷垪"锛岃寮�鍏冲瑁呮満宸ヤ綅
+//     涓昏鐢ㄤ簬"鍋滄鎺ユ敹鏂扮殑寰呰鏈烘偅鑰�"鐨勮涔夌粺涓�涓庣姸鎬佸彲瑙併��
+const stopReady = ref<boolean>(false)
+const stopReadyFlag = ref<boolean>(true)
+
+const loadStopReady = async () => {
+  try {
+    stopReady.value = await DoctorApi.getStopReady(roomBedVO.value)
+  } catch (e) {
+    // 鏌ヨ澶辫触涓嶆墦鏂疆璇�
+  } finally {
+    stopReadyFlag.value = false
+  }
+}
+
+const onStopReadyChange = async (val: boolean) => {
+  stopReadyFlag.value = true
+  try {
+    if (val) {
+      await DoctorApi.stopReady(roomBedVO.value)
+      ElMessage.success('宸插仠姝㈠�欒瘖锛氫笉鍐嶆帴鏀舵柊鐨勫�欒瘖鎮h�咃紝宸叉湁鎮h�呬粛鍙甯稿彨鍙�')
+    } else {
+      await DoctorApi.resumeReady(roomBedVO.value)
+      ElMessage.success('宸叉仮澶嶅�欒瘖锛氬紑濮嬫帴鏀舵柊鐨勫�欒瘖鎮h��')
+    }
+    await initLoad()
+  } catch (e) {
+    stopReady.value = !val
+  } finally {
+    stopReadyFlag.value = false
+  }
+}
+
+// ==================== 闇�姹�2锛氭挙閿�鍙彿 / 鎾ら攢瑁呮満瀹屾垚 ====================
+const undoFlag = ref<boolean>(false)
+
+const undoCall = async () => {
+  try {
+    await ElMessageBox.confirm(
+      '纭畾瑕佹挙閿�鏈鍙彿鍚楋紵璇ユ偅鑰呭皢鍥炲埌鍊欒瘖鍖猴紝鍙噸鏂板彨鍙枫��',
+      '鎾ら攢鍙彿',
+      { type: 'warning', confirmButtonText: '纭畾鎾ら攢', cancelButtonText: '鍙栨秷' }
+    )
+  } catch {
+    return
+  }
+  undoFlag.value = true
+  try {
+    const msg = await DoctorApi.undoCallPatient(roomBedVO.value)
+    ElMessage.success(msg || '宸叉挙閿�鍙彿')
+    await initLoad()
+  } finally {
+    undoFlag.value = false
+  }
+}
+
+const undoFinish = async () => {
+  const last = await DoctorApi.lastFinishedPatient(roomBedVO.value)
+  if (!last || !last.patId) {
+    ElMessage.warning('鏈伐浣嶄粖鏃ユ殏鏃犲凡瀹屾垚鐨勬鏌ヨ褰�')
+    return
+  }
+  try {
+    await ElMessageBox.confirm(
+      `纭畾鎾ら攢銆�${last.patName || last.patId}銆嶇殑瀹屾垚鎿嶄綔鍚楋紵璇ユ偅鑰呭皢鍥炲埌鍊欒瘖鍖恒�俙,
+      '鎾ら攢',
+      { type: 'warning', confirmButtonText: '纭畾鎾ら攢', cancelButtonText: '鍙栨秷' }
+    )
+  } catch {
+    return
+  }
+  undoFlag.value = true
+  try {
+    const msg = await DoctorApi.undoFinishPatient({
+      ...roomBedVO.value,
+      patId: last.patId,
+      checkType: last.bookCheckType
+    } as any)
+    ElMessage.success(msg || '宸叉挙閿�')
+    await initLoad()
+  } finally {
+    undoFlag.value = false
+  }
 }
 
 const bedControl = async () => {
@@ -125,10 +223,12 @@
   finishFlag.value = true
   passFlag.value = true
 
-  if (userStore.isSetRoom) {
-    roomBedVO.value.roomId = userStore.room!.roomId
-    roomBedVO.value.roomName = userStore.room!.roomName
-    roomBedVO.value.bedNo = userStore.room!.bedNo
+  if (roomStore.isSetRoom) {
+    roomBedVO.value.roomId = roomStore.room!.roomId
+    roomBedVO.value.roomName = roomStore.room!.roomName
+    roomBedVO.value.bedNo = roomStore.room!.bedNo
+    roomBedVO.value.checkTypes = roomStore.room!.checkTypes
+    roomBedVO.value.opType = roomStore.room!.opType
 
     timerRunFlag = true
     doctorTimer()
@@ -149,8 +249,16 @@
 })
 
 const onEventDevInstall = () => {
-   //console.info("onDevInstallPanelEvent...")
-  // onStagePatient.value.patId = ""
+  installingPatient = {
+    bedNo: "", bookCheckType: 0, bookTimeslot: 0, expired: 0, id: 0, jumpFlag: 0, passed: 0,
+    patGender: 0, patId: "", patName: "", roomId: 0, roomName: "", seqNum: 0, status: 0
+  }
+
+  if (autoCall.value) {
+    finishNextPatient()
+  } else {
+    initLoad()
+  }
 }
 
 const onEventRecallFinish = () => {
@@ -166,34 +274,57 @@
 </script>
 
 <template>
-  <el-container>
-    <el-header style="background-color: var(--el-color-primary-light-7); font-size: 24px">
-      <TitlePanel :titleType=1 :room="roomBedVO" :patientStatistic="patientStat" />
-    </el-header>
-    <el-container style="height: 100%;">
-      <el-main style="border: solid var(--el-color-primary-light-7)">
-        <DevInstallPanel :room="roomBedVO" ref="devInstallPanelRef" @event_dev_install="onEventDevInstall"/>
-      </el-main>
-      <el-aside width="400px" style="border: solid var(--el-color-primary-light-7)">
-          <QueuePanel :queue="patientList" @event_RecallFinish="onEventRecallFinish"/>
-      </el-aside>
-    </el-container>
-    <el-container class="right-bottom">
+  <!--
+    甯冨眬浼樺寲锛氬姛鑳芥寜閽浐瀹氬湪椤甸潰搴曢儴锛屼笉鍐嶇敤 position:absolute 娴湪鍐呭涓娿��
+    璇﹁ components/DoctorPageLayout锛堜笌鍙彿妫�鏌�/璁惧棰嗙敤椤靛叡鐢ㄥ悓涓�甯冨眬锛夈��
+  -->
+  <DoctorPageLayout>
+    <template #header>
+      <TitlePanel :titleType=2 :room="roomBedVO" :patientStatistic="patientStat" />
+    </template>
+
+    <DevInstallPanel
+      :room="roomBedVO"
+      ref="devInstallPanelRef"
+      :undo-disabled="undoFlag"
+      :undo-loading="undoFlag"
+      @event_dev_install="onEventDevInstall"
+      @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>
-      <el-button  type="primary" @click="callAgain">閲嶅彨</el-button>
+      <el-button type="primary" @click="callAgain">閲嶅彨</el-button>
       <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: 100px;
-  //background-color: #f00;
-  //color: #fff;
-  //padding: 10px;
-}
-</style>
+<!--
+  鍘熷厛杩欓噷鏈� .right-bottom { position:absolute; bottom:50px; right:80px }锛�
+  姝f槸"璁板綍鍒楄〃鍙橀暱鍚庣洊浣忓姛鑳芥寜閽�"鐨勬牴鍥狅紙鎸夐挳鑴辩鏂囨。娴併�佷笉鍗犲竷灞�绌洪棿锛夈��
+  鐜版敼鐢� DoctorPageLayout 鐨� #footer 鎵胯浇锛氭甯告枃妗f祦涓殑鍥哄畾搴曟爮锛屾棤闇�鍋忕Щ銆�
+-->

--
Gitblit v1.9.3