From df2c4a7a693323a43dc74168a780a52c69e41c1b Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 10 四月 2025 16:11:10 +0800
Subject: [PATCH] update

---
 src/views/ecg/doctor/components/DevReadyPanel.vue |   60 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index de70cc7..8b3411f 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -23,14 +23,14 @@
       </el-form-item>
 
       <el-form-item label="鎮ｈ�呮弿杩�" prop="patDeptDesc">
-        <dict-tag v-if="formData?.patSrc" :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData?.patSrc" />
+        <dict-tag v-if="formData.patDetails?.source" :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData.patDetails?.source" />
         {{formData?.patDetails?.deptDesc}} {{formData?.patDetails?.wardDesc}} {{formData?.patDetails?.bedNo}}
       </el-form-item>
       <el-form-item label="璁惧缂栧彿" prop="devId">
         <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getDevInfo"/>
       </el-form-item>
       <el-form-item label="璁惧鎻忚堪" prop="">
-        {{(deviceInfo?.brand||'-') + "&nbsp;" + (deviceInfo?.model||'-') + "&nbsp;" + tranlateDevState(deviceInfo?.state)}}
+        {{ devInfo?.brand||'-' }} {{ devInfo?.model||'-' }} {{ tranlateDevState(devInfo?.state) }}
       </el-form-item>
       <el-form-item label="棰嗙敤鏃堕棿" prop="rentTime">
         <el-date-picker
@@ -190,7 +190,6 @@
   detachment: undefined,
   remark: undefined,
   paid: undefined,
-  patSrc: undefined,
   roomId: props.room.roomId,
   bedNo: props.room.bedNo
 })
@@ -203,7 +202,12 @@
 })
 const formRef = ref() // 琛ㄥ崟 Ref
 
-const deviceInfo = ref<DeviceVO> ()
+const devInfo = ref<Partial<DeviceVO>>({
+  category: undefined,
+  brand: undefined,
+  model: undefined,
+  state: undefined,
+})
 
 const displayBarCode = ref<string> ()
 
@@ -225,11 +229,10 @@
     return
 
   // formDate 瀵瑰簲  DevRent
-  // formData.value = data  //涓嶈兘鏁翠釜璧嬪�硷紝 榛樿棰嗙敤鏃堕棿琚竻绌�
-  formData.value.id = data.id;   //rent id
-  formData.value.applyNo = data.applyNo;
-  formData.value.episodeId = data.episodeId;
-  formData.value.patDetails = data.patDetails
+  formData.value = data
+
+  // 棰嗙敤鏃堕棿  閲囩敤褰撳墠鏃堕棿
+  formData.value.rentTime = new Date().getTime()
 }
 
 /** 鎻愪氦琛ㄥ崟 */
@@ -294,13 +297,17 @@
     remark: undefined,
     patDetails: undefined,
     paid: undefined,
-    patSrc: undefined,
     roomId: props.room.roomId,
     bedNo: props.room.bedNo
   }
   formRef.value?.resetFields()
 
-  deviceInfo.value = undefined
+  devInfo.value = {
+    category: undefined,
+    brand: undefined,
+    model: undefined,
+    state: undefined,
+  }
 }
 
 const setPatient = (queueVO: QueueVO | undefined) => {
@@ -310,7 +317,6 @@
   formData.value.patId = queueVO?.patId
   formData.value.patName = queueVO?.patName
   formData.value.checkType = queueVO?.bookCheckType
-  formData.value.patSrc = queueVO?.patDetails.source
   getFreeRentInfo(formData.value)
   copyBarcode()
 }
@@ -353,7 +359,14 @@
 }
 
 const getSelectedRent = async (rentId) => {
-  formData.value = await DevRentApi.getDevRent(rentId)
+  const data = await DevRentApi.getDevRent(rentId)
+
+  formData.value = data
+
+  devInfo.value.category = data.category
+  devInfo.value.brand = data.brand
+  devInfo.value.model = data.model
+  devInfo.value.state = data.devState
 }
 
 const printBill = async (patId: string, checkType: number, printMode?: number) => {
@@ -430,14 +443,16 @@
 */
 
 const getDevInfo = async () => {
-  deviceInfo.value = undefined
-  if (isStringEmpty(formData.value.devId))
+  if (formData.value?.devId == null) {
+    devInfo.value.brand = undefined
+    devInfo.value.model = undefined
+    devInfo.value.state = undefined
     return
+  }
 
   const data = await DeviceApi.getDeviceByDevId(formData.value.devId!)
-  console.info( data )
   if ( null !== data)
-    deviceInfo.value = data
+    devInfo.value = data
 }
 
 const feeConfirm = async () => {
@@ -467,7 +482,8 @@
     return ""
 
   const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
-  if (formData.value.patSrc == null || !displayBarcode.includes( formData.value.patSrc ))
+  if (formData.value.patDetails == null || formData.value.patDetails.source == null ||
+      !displayBarcode.includes( formData.value.patDetails.source ))
     return ""
 
   return getBarcode()
@@ -477,9 +493,13 @@
   if (!formData.value.checkType)
     return ""
 
-  if (1 === formData.value.patSrc || 2 === formData.value.patSrc)
+  const patSource = formData.value.patDetails?.source
+  if (patSource == null)
+    return ""
+
+  if (1 === patSource || 2 === patSource)
     return formData.value.applyNo??""
-  else if (3 === formData.value.patSrc || 4 === formData.value.patSrc)
+  else if (3 === patSource || 4 === patSource)
     return formData.value.episodeId??""
 
   return ""

--
Gitblit v1.9.3