From b863e12d8bc8a32c10a16131e0ab066420fc4a75 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期六, 12 十月 2024 16:33:02 +0800
Subject: [PATCH] 装机 页面功能 待续
---
src/views/ecg/doctor/DevInstall.vue | 24 ++++++++++++------------
src/views/ecg/doctor/components/DevInstallPanel.vue | 24 +++++++++++++++++++++---
src/views/ecg/doctor/components/DevReadyPanel.vue | 2 +-
3 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/src/views/ecg/doctor/DevInstall.vue b/src/views/ecg/doctor/DevInstall.vue
index 970f8af..c2d66dc 100644
--- a/src/views/ecg/doctor/DevInstall.vue
+++ b/src/views/ecg/doctor/DevInstall.vue
@@ -15,7 +15,7 @@
bedNo: null
})
-const onStagePatient = ref<QueueVO>({
+const installingPatient = ref<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
})
@@ -41,7 +41,7 @@
try {
patientList.value = await DoctorApi.finishInstallNextPatient(roomBedVO.value)
patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO.value)
- getOnstagePatient()
+ getInstallingPatient()
} finally {
finishFlag.value = false
}
@@ -52,7 +52,7 @@
try {
patientList.value = await DoctorApi.passNextPatient(roomBedVO.value)
patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO.value)
- getOnstagePatient()
+ getInstallingPatient()
} finally {
passFlag.value = false
}
@@ -62,13 +62,13 @@
await DoctorApi.callAgainPatient(roomBedVO.value)
}
-const getOnstagePatient = () => {
- const tempPatient : QueueVO | undefined = patientList.value.find(item => item.status === 30)
+const getInstallingPatient = () => {
+ const tempPatient : QueueVO | undefined = patientList.value.find(item => item.status === 36)
if (undefined === tempPatient) {
- setOnStagePatient(undefined)
- } else if (tempPatient.patId !== onStagePatient.value.patId) {
- onStagePatient.value= tempPatient
- setOnStagePatient(tempPatient)
+ setInstallingPatient(undefined)
+ } else if (tempPatient.patId !== installingPatient.value.patId) {
+ installingPatient.value= tempPatient
+ setInstallingPatient(tempPatient)
}
}
@@ -83,7 +83,7 @@
}
patientList.value = await DoctorApi.getReceivedPatientList(roomBedVO.value)
- getOnstagePatient()
+ getInstallingPatient()
patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO.value)
const queueVO2 = await DoctorApi.bedDoctorGet(roomBedVO.value)
if (queueVO2.status === 20)
@@ -154,7 +154,7 @@
/** 鎮ｈ�呭彉鏇存搷浣� */
const devInstallPanelRef = ref()
-const setOnStagePatient = (tempPatient: QueueVO | undefined) => {
+const setInstallingPatient = (tempPatient: QueueVO | undefined) => {
devInstallPanelRef.value.setPatient(tempPatient)
}
@@ -167,7 +167,7 @@
</el-header>
<el-container style="height: 100%;">
<el-main style="border: solid var(--el-color-primary-light-7)">
- <DevInstallPanel ref="devInstallPanelRef" @event_dev_install="onEventDevInstall"/>
+ <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"/>
diff --git a/src/views/ecg/doctor/components/DevInstallPanel.vue b/src/views/ecg/doctor/components/DevInstallPanel.vue
index 442d30e..9aafa5f 100644
--- a/src/views/ecg/doctor/components/DevInstallPanel.vue
+++ b/src/views/ecg/doctor/components/DevInstallPanel.vue
@@ -116,11 +116,26 @@
import {isStringEmpty} from "@/utils/stringUtil";
import {curDayEnd, curDayStart} from "@/utils/dateUtil";
import {DeviceApi} from "@/api/ecg/devmanage";
+import {QueueVO} from "@/api/ecg/queue";
+import {RoomBedVO} from "@/api/ecg/doctor";
-/** 瑁呮満 琛ㄥ崟 */
-defineOptions({ name: 'DevrInstall' })
+/** 璁惧瑁呮満 琛ㄥ崟 */
+defineComponent({ name: 'DevInstallPanel' })
+
+const props = defineProps({
+ room: {
+ type: Object as PropType<RoomBedVO>,
+ required: true
+ }
+})
const emit = defineEmits(['event_dev_install']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋�
+
+const setPatient = (queueVO: QueueVO | undefined) => {
+ formData.value.patId = queueVO?.patId
+ getRentInfoByPatId()
+}
+defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
const { t } = useI18n() // 鍥介檯鍖�
const message = useMessage() // 娑堟伅寮圭獥
@@ -144,8 +159,9 @@
// 鎻愪氦璇锋眰
formLoading.value = true
try {
+ formData.value.roomId = props.room.roomId
+ formData.value.bedNo = props.room.bedNo
const data = formData.value as unknown as DevRentVO
- //await DevRentApi.updateDevRent(data)
await DevRentApi.devInstall(data)
message.success(t('鎿嶄綔鎴愬姛'))
dialogVisible.value = false
@@ -270,6 +286,8 @@
}
const cancelInstall = async () => {
+ formData.value.roomId = props.room.roomId
+ formData.value.bedNo = props.room.bedNo
const data = formData.value as unknown as DevRentVO
if (formData.value.id === null || formData.value.id === undefined) {
const result = await DevRentApi.devInstallCancel(data)
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 425efbd..8f53084 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -123,7 +123,7 @@
import {curDayEnd, curDayStart} from "@/utils/dateUtil";
import {PatientStatisticVO, RoomBedVO} from "@/api/ecg/doctor";
-/** 瑁呮満鎷嗘満 琛ㄥ崟 */
+/** 璁惧棰嗙敤 琛ㄥ崟 */
defineComponent({ name: 'DevReadyPanel' })
const props = defineProps({
--
Gitblit v1.9.3