From 943a2c431b178e37913544b1c6c9beafb4b74b74 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期六, 28 十二月 2024 00:55:27 +0800
Subject: [PATCH] update
---
src/views/ecg/doctor/components/RoutinePanel.vue | 39 ++++++++++++++++++++++++++-------------
src/views/ecg/doctor/components/DevReadyPanel.vue | 5 -----
2 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 66c0701..8bffad7 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -295,11 +295,6 @@
baseline: undefined,
detachment: undefined,
remark: undefined,
- patDeptCode: undefined,
- patDeptDesc: undefined,
- patWardCode: undefined,
- patWardDesc: undefined,
- patBedNo: undefined,
patDetails: undefined,
paid: undefined,
roomId: props.room.roomId,
diff --git a/src/views/ecg/doctor/components/RoutinePanel.vue b/src/views/ecg/doctor/components/RoutinePanel.vue
index 5c93abe..32601e8 100644
--- a/src/views/ecg/doctor/components/RoutinePanel.vue
+++ b/src/views/ecg/doctor/components/RoutinePanel.vue
@@ -18,9 +18,9 @@
<el-form-item label="鎮ｈ�呭悕绉�" prop="patName">
<el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
</el-form-item>
- <el-form-item label="鎮ｈ�呮弿杩�" prop="patDeptDesc">
- <dict-tag :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData.patSrc" />
- 绉戝: {{formData.patDeptDesc}} 鐥呭尯: {{formData.patWardDesc}} 搴婁綅: {{formData.patBedNo}}
+ <el-form-item label="鎮ｈ�呮弿杩�" prop="patDetails">
+ <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="rentTime">
<el-date-picker
@@ -157,7 +157,23 @@
const formLoading = ref(false) // 琛ㄥ崟鐨勫姞杞戒腑锛�1锛変慨鏀规椂鐨勬暟鎹姞杞斤紱2锛夋彁浜ょ殑鎸夐挳绂佺敤
-const formData = ref({})
+const formData = ref({
+ id: undefined,
+ devId: undefined,
+ patId: undefined,
+ patName: undefined,
+ patDetails: undefined,
+ checkType: undefined,
+ rentTime: new Date().getTime(),
+ returnTime: undefined,
+ interference: undefined,
+ baseline: undefined,
+ detachment: undefined,
+ remark: undefined,
+ paid: undefined,
+ roomId: props.room.roomId,
+ bedNo: props.room.bedNo
+})
const formRules = reactive({
// devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
@@ -196,20 +212,17 @@
devId: undefined,
patId: undefined,
patName: undefined,
- patDeptCode: undefined,
- patDeptDesc: undefined,
- patWardCode: undefined,
- patWardDesc: undefined,
- patBedNo: undefined,
+ checkType: undefined,
rentTime: new Date().getTime(),
returnTime: undefined,
interference: undefined,
baseline: undefined,
detachment: undefined,
remark: undefined,
- category: '',
- brand: '',
- model: '',
+ patDetails: undefined,
+ paid: undefined,
+ roomId: props.room.roomId,
+ bedNo: props.room.bedNo
}
formRef.value?.resetFields()
}
@@ -232,7 +245,7 @@
// formDate 瀵瑰簲 DevRent
// formData.value = data //涓嶈兘鏁翠釜璧嬪�硷紝 榛樿棰嗙敤鏃堕棿琚竻绌�
- formData.value.id = data.id;
+ formData.value.id = data.id; //rent id
formData.value.applyNo = data.applyNo;
formData.value.episodeId = data.episodeId;
formData.value.patDetails = data.patDetails
--
Gitblit v1.9.3