From 70afd5a087e16f2fd5a1ba0541e3fd408bd91f5f Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 11 十月 2024 18:57:31 +0800
Subject: [PATCH] update
---
src/api/ecg/devrent/index.ts | 4 ++++
src/views/ecg/doctor/index.vue | 6 +++---
src/views/ecg/doctor/components/DevReadyPanel.vue | 33 +++++++++++++++++++++++++--------
3 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/src/api/ecg/devrent/index.ts b/src/api/ecg/devrent/index.ts
index 48d2ccb..7ee9f68 100644
--- a/src/api/ecg/devrent/index.ts
+++ b/src/api/ecg/devrent/index.ts
@@ -1,4 +1,5 @@
import request from '@/config/axios'
+import {RoomBedVO} from "@/api/ecg/doctor";
// 瑁呮満鎷嗘満 VO
export interface DevRentVO {
@@ -12,6 +13,9 @@
baseline: string // 鍩虹嚎绮�
detachment: string // 鑴辫惤
remark: string // 澶囨敞
+
+ roomId: number
+ bedNo: string
}
// 瑁呮満鎷嗘満 API
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index e3329bb..425efbd 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -121,11 +121,19 @@
import {JobRecordApi, JobRecordVO} from "@/api/ecg/jobrecord";
import {DeviceApi, DeviceVO} from "@/api/ecg/devmanage";
import {curDayEnd, curDayStart} from "@/utils/dateUtil";
+import {PatientStatisticVO, RoomBedVO} from "@/api/ecg/doctor";
/** 瑁呮満鎷嗘満 琛ㄥ崟 */
defineComponent({ name: 'DevReadyPanel' })
-const emit = defineEmits(['success-ready']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋�
+const props = defineProps({
+ room: {
+ type: Object as PropType<RoomBedVO>,
+ required: true
+ }
+})
+
+const emit = defineEmits(['event_dev_ready']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋�
const { t } = useI18n() // 鍥介檯鍖�
const message = useMessage() // 娑堟伅寮圭獥
@@ -135,10 +143,11 @@
const formLoading = ref(false) // 琛ㄥ崟鐨勫姞杞戒腑锛�1锛変慨鏀规椂鐨勬暟鎹姞杞斤紱2锛夋彁浜ょ殑鎸夐挳绂佺敤
const formType = ref('create') // 琛ㄥ崟鐨勭被鍨嬶細create - 鏂板锛泆pdate - 淇敼
-const patient = ref<QueueVO>({
- patId: '',
- patName: ''
-})
+// const patient = ref<QueueVO>({
+// patId: '',
+// patName: ''
+// })
+const patient = ref<QueueVO>()
const formData = ref({
id: undefined,
@@ -156,7 +165,9 @@
baseline: undefined,
detachment: undefined,
remark: undefined,
- paid: undefined
+ paid: undefined,
+ roomId: props.room.roomId,
+ bedNo: props.room.bedNo
})
const formRules = reactive({
devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
@@ -183,7 +194,11 @@
// 鎻愪氦璇锋眰
formLoading.value = true
try {
+ formData.value.roomId = props.room.roomId
+ formData.value.bedNo = props.room.bedNo
const data = formData.value as unknown as DevRentVO
+ console.info( data )
+
if (formData.value.id === null || formData.value.id === undefined) {
const result = await DevRentApi.devReady(data)
formData.value.id = result
@@ -194,7 +209,7 @@
}
dialogVisible.value = false
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
- emit('success-ready')
+ emit('event_dev_ready')
resetForm()
getList()
} finally {
@@ -203,6 +218,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.devReadyCancel(data)
@@ -213,7 +230,7 @@
message.success(t('鎿嶄綔鎴愬姛'))
}
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
- emit('success-ready')
+ emit('event_dev_ready')
resetForm()
getList()
}
diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue
index 23c549f..0cd40ae 100644
--- a/src/views/ecg/doctor/index.vue
+++ b/src/views/ecg/doctor/index.vue
@@ -142,8 +142,8 @@
timerRunFlag = false
})
-const onEvent = () => {
- // console.info("onDevRentPanelEvent...")
+const onEventDevReady = () => {
+ //console.info("onDevRentPanelEvent...")
}
const onEventRecallFinish = () => {
@@ -165,7 +165,7 @@
</el-header>
<el-container style="height: 100%;">
<el-main style="border: solid var(--el-color-primary-light-7)">
- <DevReadyPanel ref="devInstallPanelRef" @success="onEvent"/>
+ <DevReadyPanel :room="roomBedVO" ref="devInstallPanelRef" @event_dev_ready="onEventDevReady"/>
</el-main>
<el-aside width="400px" style="border: solid var(--el-color-primary-light-7)">
<QueuePanel :queue="patientList" @event_RecallFinish="onEventRecallFinish"/>
--
Gitblit v1.9.3