From c6421e15ecc9df14dbb2f29ab76a73ce7aa7f603 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期一, 25 十一月 2024 21:32:09 +0800 Subject: [PATCH] 预约小票 打印 --- src/views/ecg/doctor/DevInstall.vue | 45 +++++++++++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 14 deletions(-) diff --git a/src/views/ecg/doctor/DevInstall.vue b/src/views/ecg/doctor/DevInstall.vue index cdab691..06bbebc 100644 --- a/src/views/ecg/doctor/DevInstall.vue +++ b/src/views/ecg/doctor/DevInstall.vue @@ -1,18 +1,21 @@ <script setup lang="ts"> -import TitleInstallPanel from "@/views/ecg/doctor/components/TitleInstallPanel.vue"; +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 {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 {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>({ @@ -28,6 +31,7 @@ queuingNum: 0 }) +const autoCall = ref<boolean>(false); const state = ref<boolean>() const patientList = ref<QueueVO[]>([]) @@ -43,6 +47,9 @@ patientList.value = await DoctorApi.finishInstallNextPatient(roomBedVO.value) patientStat.value = await DoctorApi.getDevInstallStatistic(roomBedVO.value) getInstallingPatient() + + // 鐢ㄤ簬瑙e喅 宸︿晶閲嶇疆鍚� 鑾峰彇褰撳墠 銆愬畨瑁呬腑銆戞偅鑰� + setInstallingPatient(installingPatient.value) } finally { finishFlag.value = false } @@ -51,7 +58,7 @@ const passNextPatient = async () => { passFlag.value = true try { - patientList.value = await DoctorApi.passNextPatient(roomBedVO.value) + patientList.value = await DoctorApi.passInstallNextPatient(roomBedVO.value) patientStat.value = await DoctorApi.getDevInstallStatistic(roomBedVO.value) getInstallingPatient() } finally { @@ -60,13 +67,13 @@ } const callAgain = async () => { - await DoctorApi.callAgainPatient(roomBedVO.value) + await DoctorApi.callInstallingPatientAgain(roomBedVO.value) } const getInstallingPatient = () => { const tempPatient : QueueVO | undefined = patientList.value.find(item => item.status === 36) if (undefined === tempPatient) { - setInstallingPatient(undefined) + //setInstallingPatient(undefined) } else if (tempPatient.patId !== installingPatient.value.patId) { installingPatient.value= tempPatient setInstallingPatient(tempPatient) @@ -83,7 +90,7 @@ return } - patientList.value = await DoctorApi.getReceivedPatientList(roomBedVO.value) + patientList.value = await DoctorApi.getToBeInstalledPatientList(roomBedVO.value) getInstallingPatient() patientStat.value = await DoctorApi.getDevInstallStatistic(roomBedVO.value) const queueVO2 = await DoctorApi.bedDoctorGet(roomBedVO.value) @@ -122,10 +129,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() @@ -147,6 +156,13 @@ const onEventDevInstall = () => { //console.info("onDevInstallPanelEvent...") + installingPatient.value.patId = "" + + if (autoCall.value) { + finishNextPatient() + } else { + initLoad() + } } const onEventRecallFinish = () => { @@ -164,17 +180,18 @@ <template> <el-container> <el-header style="background-color: var(--el-color-primary-light-7); font-size: 24px"> - <TitlePanel :titleType=1 :room="roomBedVO" :patientStatistic="patientStat" /> + <TitlePanel :titleType=2 :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"/> + <QueuePanel :room="roomBedVO" :queue="patientList" @event_RecallFinish="onEventRecallFinish"/> </el-aside> </el-container> <el-container class="right-bottom"> + <el-checkbox label="鑷姩 " 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> @@ -187,7 +204,7 @@ .right-bottom { position: absolute; bottom: 50px; - right: 100px; + right: 80px; //background-color: #f00; //color: #fff; //padding: 10px; -- Gitblit v1.9.3