From 4e80712bf8eae6094baf1fae25d6e2979b423d9d Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期五, 01 十一月 2024 18:22:56 +0800 Subject: [PATCH] 小票打印 --- src/views/ecg/doctor/DevInstall.vue | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/views/ecg/doctor/DevInstall.vue b/src/views/ecg/doctor/DevInstall.vue index d9e1158..0edafda 100644 --- a/src/views/ecg/doctor/DevInstall.vue +++ b/src/views/ecg/doctor/DevInstall.vue @@ -1,5 +1,5 @@ <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'; @@ -12,7 +12,9 @@ const roomBedVO = ref<RoomBedVO>({ roomId: null, roomName: null, - bedNo: null + bedNo: null, + checkTypes: null, + opType: null }) const installingPatient = ref<QueueVO>({ @@ -43,6 +45,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 +56,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 +65,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 +88,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) @@ -126,6 +131,8 @@ roomBedVO.value.roomId = userStore.room!.roomId roomBedVO.value.roomName = userStore.room!.roomName roomBedVO.value.bedNo = userStore.room!.bedNo + roomBedVO.value.checkTypes = userStore.room!.checkTypes + roomBedVO.value.opType = userStore.room!.opType timerRunFlag = true doctorTimer() @@ -147,6 +154,8 @@ const onEventDevInstall = () => { //console.info("onDevInstallPanelEvent...") + installingPatient.value.patId = "" + initLoad() } const onEventRecallFinish = () => { @@ -164,7 +173,7 @@ <template> <el-container> <el-header style="background-color: var(--el-color-primary-light-7); font-size: 24px"> - <TitleInstallPanel :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)"> -- Gitblit v1.9.3