From 90de3fa97572d645e9da576f751257c913736e82 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 24 十月 2024 11:10:10 +0800
Subject: [PATCH] bug fix
---
src/api/ecg/devrent/index.ts | 2 +-
src/views/ecg/doctor/components/DevReadyPanel.vue | 16 ++++++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/api/ecg/devrent/index.ts b/src/api/ecg/devrent/index.ts
index 252d433..fbe4019 100644
--- a/src/api/ecg/devrent/index.ts
+++ b/src/api/ecg/devrent/index.ts
@@ -50,7 +50,7 @@
return await request.download({ url: `/ecg/dev-rent/export-excel`, params })
},
- // 鑾峰彇 Free鐨勭璧�
+ // 鏍规嵁鎮ｈ�呮垨璁惧, 鑾峰彇 Free鐨勭璧�
getFreeRent: async (params: any) => {
return await request.get({ url: `/ecg/dev-rent/get-free-rent`, params })
},
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 40818e5..d7771ed 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -1,3 +1,4 @@
+<!--璁惧棰嗙敤鐣岄潰-->
<template>
<!-- 褰撳墠鎮ｈ��: {{patient?.patId}} {{isStringEmpty(patient?.patName)?'鏃�':patient.patName}}-->
@@ -151,7 +152,6 @@
const dialogVisible = ref(false) // 寮圭獥鐨勬槸鍚﹀睍绀�
const formLoading = ref(false) // 琛ㄥ崟鐨勫姞杞戒腑锛�1锛変慨鏀规椂鐨勬暟鎹姞杞斤紱2锛夋彁浜ょ殑鎸夐挳绂佺敤
-const formType = ref('create') // 琛ㄥ崟鐨勭被鍨嬶細create - 鏂板锛泆pdate - 淇敼
const formData = ref({
id: undefined,
@@ -199,16 +199,18 @@
return
formData.value.patId = tempPatId;
- getFreeRentInfo()
+ getFreeRentInfo(formData.value)
}
-const getFreeRentInfo = async () => {
- const data = await DevRentApi.getFreeRent(formData.value)
+// 鏍规嵁鎮ｈ�呮垨璁惧, 鑾峰彇 Free鐨勭璧�
+const getFreeRentInfo = async (devRentVO) => {
+ const data = await DevRentApi.getFreeRent(devRentVO)
if (null === data)
return
// formDate 瀵瑰簲 DevRent
- formData.value = data
+ // formData.value = data //涓嶈兘鏁翠釜璧嬪�硷紝1.浼氬鑷� rent_id 鍑虹幇浠庤�屽奖鍝嶅悗绔�昏緫澶勭悊锛�2. 榛樿瑁呮満鏃堕棿琚竻绌�
+ formData.value.patDetails = data.patDetails
}
/** 鎻愪氦琛ㄥ崟 */
@@ -287,8 +289,10 @@
// formData.value.patName = queueVO?.patName
// }
const setPatient = (queueVO: QueueVO | undefined) => {
+ resetForm()
formData.value.patId = queueVO?.patId
- getRentInfoByPatId()
+ formData.value.patName = queueVO?.patName
+ getFreeRentInfo(formData.value)
}
defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
--
Gitblit v1.9.3