From 23e46fc6b6f6f70dab360ded43fe3078fe4ce224 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 12 十一月 2024 14:08:45 +0800
Subject: [PATCH] update
---
src/api/ecg/devrent/index.ts | 1 +
src/views/ecg/queue/index.vue | 4 ++--
src/views/ecg/doctor/components/DevReadyPanel.vue | 18 +++++++++++++++---
3 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/api/ecg/devrent/index.ts b/src/api/ecg/devrent/index.ts
index 58d4813..1a6ea16 100644
--- a/src/api/ecg/devrent/index.ts
+++ b/src/api/ecg/devrent/index.ts
@@ -6,6 +6,7 @@
devId: string // 璁惧缂栧彿
patId: string // 鎮ｈ�呯紪鍙�
patName: string // 鎮ｈ�呭悕绉�
+ checkType: number
rentTime: Date // 瑁呮満鏃堕棿
returnTime: Date // 鎷嗘満鏃堕棿
interference: number // 骞叉壈鏁�
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 8179fd1..13795d6 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -12,7 +12,7 @@
>
<el-form-item label="鎮ｈ�呯紪鍙�" prop="patId">
<el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" />
- <Qrcode v-if="formData.patId !== undefined && formData.patId !== ''" :text="formData.patId" logo="/logo.gif" width=100 />
+ <Qrcode v-if="formData.patId !== undefined && formData.patId !== ''" :text="formData.patId" logo="/logo.gif" :width=100 />
</el-form-item>
<el-form-item label="鎮ｈ�呭悕绉�" prop="patName">
<el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
@@ -170,6 +170,7 @@
patWardDesc: undefined,
patBedNo: undefined,
patDetails: undefined,
+ checkType: undefined,
rentTime: new Date().getTime(),
returnTime: undefined,
interference: undefined,
@@ -216,7 +217,7 @@
// formDate 瀵瑰簲 DevRent
// formData.value = data //涓嶈兘鏁翠釜璧嬪�硷紝 榛樿棰嗙敤鏃堕棿琚竻绌�
- formData.value.id = data.id;
+ formData.value.id = data.id; //rent id
formData.value.patDetails = data.patDetails
}
@@ -275,12 +276,22 @@
devId: undefined,
patId: undefined,
patName: undefined,
+ checkType: undefined,
rentTime: new Date().getTime(),
returnTime: undefined,
interference: undefined,
baseline: undefined,
detachment: undefined,
- remark: undefined
+ remark: undefined,
+ patDeptCode: undefined,
+ patDeptDesc: undefined,
+ patWardCode: undefined,
+ patWardDesc: undefined,
+ patBedNo: undefined,
+ patDetails: undefined,
+ paid: undefined,
+ roomId: props.room.roomId,
+ bedNo: props.room.bedNo
}
formRef.value?.resetFields()
@@ -299,6 +310,7 @@
resetForm()
formData.value.patId = queueVO?.patId
formData.value.patName = queueVO?.patName
+ formData.value.checkType = queueVO?.bookCheckType
getFreeRentInfo(formData.value)
}
defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
diff --git a/src/views/ecg/queue/index.vue b/src/views/ecg/queue/index.vue
index 55a5728..254e0bd 100644
--- a/src/views/ecg/queue/index.vue
+++ b/src/views/ecg/queue/index.vue
@@ -147,8 +147,8 @@
<dict-tag :type="DICT_TYPE.ECG_BOOK_TIMESLOT" :value="scope.row.bookTimeslot" />
</template>
</el-table-column>
- <el-table-column label="鎺掗槦搴忓彿" align="center" prop="bookSeqNum" />
- <el-table-column label="鎺掗槦搴忓彿" align="center" prop="seqNum" />
+ <el-table-column label="棰勭害鍙�" align="center" prop="bookSeqNum" />
+ <el-table-column label="鎺掗槦鍙�" align="center" prop="seqNum" />
<el-table-column label="VIP" align="center" prop="isVip" />
<el-table-column label="鐘舵��" align="center" prop="status" >
<template #default="scope">
--
Gitblit v1.9.3