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

---
 src/api/ecg/devrent/index.ts                      |    9 +++++----
 src/views/ecg/doctor/components/DevReadyPanel.vue |   51 ++++++++++++++++++++++++++-------------------------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/api/ecg/devrent/index.ts b/src/api/ecg/devrent/index.ts
index 3980e1d..6965373 100644
--- a/src/api/ecg/devrent/index.ts
+++ b/src/api/ecg/devrent/index.ts
@@ -11,15 +11,16 @@
   patName: string | undefined // 鎮ｈ�呭悕绉�
   patDetails: PatDetailsVO | undefined
   checkType: number | undefined
-  rentTime: Date | undefined // 瑁呮満鏃堕棿
-  returnTime: Date | undefined // 鎷嗘満鏃堕棿
+  rentTime: number | undefined // 瑁呮満鏃堕棿
+  returnTime: number | undefined // 鎷嗘満鏃堕棿
   interference: number | undefined // 骞叉壈鏁�
   baseline: string | undefined // 鍩虹嚎绮�
   detachment: string | undefined // 鑴辫惤
   remark: string | undefined // 澶囨敞
   paid: number | undefined
-  roomId: number | undefined
-  bedNo: string | undefined
+  patSrc: number | undefined // 鎮ｈ�呮潵婧�
+  roomId: number | undefined | null
+  bedNo: string | undefined | null
 }
 
 // 瑁呮満鎷嗘満 API
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 97b9a02..de70cc7 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -11,7 +11,7 @@
       v-loading="formLoading"
     >
       <el-form-item label="妫�鏌ラ」鐩�" prop="">
-        {{formData.checkType && checkTypeStore.getCheckTypeName(formData.checkType)}}
+        {{formData?.checkType && checkTypeStore.getCheckTypeName(formData?.checkType)}}
       </el-form-item>
       <el-form-item label="鎮ｈ�呯紪鍙�" prop="patId">
         <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" />
@@ -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" />
-        {{formData.patDetails?.deptDesc}} {{formData.patDetails?.wardDesc}} {{formData.patDetails?.bedNo}}
+        <dict-tag v-if="formData?.patSrc" :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData?.patSrc" />
+        {{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;&nbsp;" + deviceInfo.model + " " + tranlateDevState(deviceInfo.state)}}
+        {{(deviceInfo?.brand||'-') + "&nbsp;" + (deviceInfo?.model||'-') + "&nbsp;" + tranlateDevState(deviceInfo?.state)}}
       </el-form-item>
       <el-form-item label="棰嗙敤鏃堕棿" prop="rentTime">
         <el-date-picker
@@ -148,7 +148,6 @@
 import {AppointmentApi, AppointmentVO} from "@/api/ecg/appointment";
 import {useCheckTypeStore} from '@/store/modules/checkType'
 import {calGender, getBookBeginTime} from "@/utils";
-import form from "@/components/Form/src/Form.vue";
 import {DICT_TYPE} from "@/utils/dict";
 import {tranlateDevState} from "@/utils/statusFormatter";
 
@@ -177,6 +176,8 @@
 
 const formData = ref<DevRentVO>({
   id: undefined,
+  applyNo: undefined,
+  episodeId: undefined,
   devId: undefined,
   patId: undefined,
   patName: undefined,
@@ -189,6 +190,7 @@
   detachment: undefined,
   remark: undefined,
   paid: undefined,
+  patSrc: undefined,
   roomId: props.room.roomId,
   bedNo: props.room.bedNo
 })
@@ -201,15 +203,7 @@
 })
 const formRef = ref() // 琛ㄥ崟 Ref
 
-const deviceInfo = ref<DeviceVO> ({
-  id: 0,
-  devId: '',
-  category: '',
-  brand: '',
-  model: '',
-  purchaseDate: 0,
-  state: 0,
-})
+const deviceInfo = ref<DeviceVO> ()
 
 const displayBarCode = ref<string> ()
 
@@ -252,7 +246,7 @@
 
     await DevRentApi.devReady(data)
 
-    if (autoPrint.value)
+    if (autoPrint.value && data.patId && data.checkType)
       printBill( data.patId, data.checkType)
 
     dialogVisible.value = false
@@ -286,6 +280,8 @@
 const resetForm = () => {
   formData.value = {
     id: undefined,
+    applyNo: undefined,
+    episodeId: undefined,
     devId: undefined,
     patId: undefined,
     patName: undefined,
@@ -298,15 +294,13 @@
     remark: undefined,
     patDetails: undefined,
     paid: undefined,
+    patSrc: undefined,
     roomId: props.room.roomId,
     bedNo: props.room.bedNo
   }
   formRef.value?.resetFields()
 
-  deviceInfo.value.category = ''
-  deviceInfo.value.brand = ''
-  deviceInfo.value.model = ''
-  deviceInfo.value.state = 0
+  deviceInfo.value = undefined
 }
 
 const setPatient = (queueVO: QueueVO | undefined) => {
@@ -436,10 +430,7 @@
 */
 
 const getDevInfo = async () => {
-  deviceInfo.value.category = ''
-  deviceInfo.value.brand = ''
-  deviceInfo.value.model = ''
-  deviceInfo.value.state = 0
+  deviceInfo.value = undefined
   if (isStringEmpty(formData.value.devId))
     return
 
@@ -450,12 +441,22 @@
 }
 
 const feeConfirm = async () => {
+  if (formData.value?.id === undefined) {
+    message.error(t('璇峰厛棰嗙敤'))
+    return
+  }
+
   const result = await DevRentApi.feeConfirm(formData.value.id)
   if (0 == result)
-    message.success(t('鎿嶄綔鎴愬姛'))
+    message.success(t('纭垂鎿嶄綔鎴愬姛'))
 }
 
 const feeCancel = async () => {
+  if (formData.value?.id === undefined) {
+    message.error(t('璇峰厛棰嗙敤'))
+    return
+  }
+
   const result = await DevRentApi.feeCancel(formData.value.id)
   if (0 == result)
     message.success(t('鎿嶄綔鎴愬姛'))
@@ -466,7 +467,7 @@
     return ""
 
   const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
-  if (!displayBarcode.includes( formData.value.patSrc ))
+  if (formData.value.patSrc == null || !displayBarcode.includes( formData.value.patSrc ))
     return ""
 
   return getBarcode()

--
Gitblit v1.9.3