From 589bcdb26f8e9d3e0d5ef46d27acc901c96d50ea Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 15 四月 2025 15:44:49 +0800
Subject: [PATCH] update

---
 src/views/ecg/doctor/components/DevInstallPanel.vue |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/views/ecg/doctor/components/DevInstallPanel.vue b/src/views/ecg/doctor/components/DevInstallPanel.vue
index 42ffc05..e7cbef3 100644
--- a/src/views/ecg/doctor/components/DevInstallPanel.vue
+++ b/src/views/ecg/doctor/components/DevInstallPanel.vue
@@ -7,7 +7,7 @@
       v-loading="formLoading"
     >
       <el-form-item label="妫�鏌ラ」鐩�" prop="">
-        {{formData?.checkType && getCheckTypeName(formData?.checkType)}}
+        {{getCheckTypeName(formData.checkType)}}
       </el-form-item>
       <el-row :gutter="20">
         <el-col :span="12">
@@ -142,8 +142,6 @@
 const { t } = useI18n() // 鍥介檯鍖�
 const message = useMessage() // 娑堟伅寮圭獥
 
-const dialogVisible = ref(false) // 寮圭獥鐨勬槸鍚﹀睍绀�
-
 const formRef = ref() // 琛ㄥ崟 Ref
 
 const displayBarCode = ref<string> ()
@@ -180,14 +178,15 @@
 
 const checkTypeStore = useCheckTypeStore()
 
-const setPatient = (queueVO: QueueVO | undefined) => {
+const setPatient = (queueVO: QueueVO | undefined | null) => {
+  console.log("setPatient...", queueVO)
   resetForm()
   formData.value.applyNo = queueVO?.applyNo
   formData.value.episodeId = queueVO?.episodeId
   formData.value.patId = queueVO?.patId
   formData.value.patName = queueVO?.patName
   formData.value.checkType = queueVO?.bookCheckType
-  getReadyRentInfo(formData.value)
+  getReadyRentInfo(formData.value)    // 鑾峰彇棰嗙敤淇℃伅
   copyBarcode()
 }
 defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
@@ -207,12 +206,13 @@
     formData.value.bedNo = props.room.bedNo
     const data = formData.value as unknown as DevRentVO
     await DevRentApi.devInstall(data)
-    message.success(t('鎿嶄綔鎴愬姛'))
-    dialogVisible.value = false
-    // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
-    emit('event_dev_install')
+
     resetForm()
     getList()
+
+    // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
+    emit('event_dev_install')
+    message.success(t('鎿嶄綔鎴愬姛'))
   } finally {
     formLoading.value = false
   }
@@ -231,6 +231,7 @@
     baseline: undefined,
     detachment: undefined,
     remark: undefined,
+    checkType: undefined,
   }
   formRef.value?.resetFields()
   devInfo.value = {
@@ -270,6 +271,9 @@
 
 // 鑾峰彇鎮h�呯殑棰嗙敤淇℃伅
 const getReadyRentInfo = async (devRentVO) => {
+  if ((devRentVO.devId == null || devRentVO.devId === '') && (devRentVO.patId == null || devRentVO.patId === '') )
+    return
+
   const data = await DevRentApi.getReadyRent(devRentVO)
   if ( data == null)
     return

--
Gitblit v1.9.3