From 8d11e11a86bbfe84ea4156bd68e865bb2986e9bd Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 18 十一月 2024 11:18:21 +0800
Subject: [PATCH] 领用界面 自动叫号控制
---
src/views/ecg/doctor/components/RoutinePanel.vue | 2 +-
src/views/ecg/appointment/AppointmentForm.vue | 2 +-
src/views/ecg/doctor/index.vue | 13 +++++++++++--
src/views/ecg/queue/QueueForm.vue | 10 +++++-----
src/views/ecg/devmanage/DeviceForm.vue | 14 +++++++-------
5 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/src/views/ecg/appointment/AppointmentForm.vue b/src/views/ecg/appointment/AppointmentForm.vue
index f79ec29..432e460 100644
--- a/src/views/ecg/appointment/AppointmentForm.vue
+++ b/src/views/ecg/appointment/AppointmentForm.vue
@@ -26,7 +26,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
:key="dict.value"
- :label="dict.value"
+ :value="dict.value"
>
{{ dict.label }}
</el-radio>
diff --git a/src/views/ecg/devmanage/DeviceForm.vue b/src/views/ecg/devmanage/DeviceForm.vue
index a537770..9c338fc 100644
--- a/src/views/ecg/devmanage/DeviceForm.vue
+++ b/src/views/ecg/devmanage/DeviceForm.vue
@@ -57,13 +57,13 @@
<el-form-item v-if="formType !== 'create'" label="鐘舵��" prop="state">
<el-radio-group v-if="formType === 'devState'" v-model="formData.state">
- <el-radio key="0" :label="0"> 绌洪棽涓� </el-radio>
- <el-radio key="5" :label="5"> 宸查鍙� </el-radio>
- <el-radio key="10" :label="10"> 宸茶鏈� </el-radio>
- <el-radio key="20" :label="20"> 宸查仐澶� </el-radio>
- <el-radio key="30" :label="30"> 寰呯淮淇� </el-radio>
- <el-radio key="30" :label="40"> 缁翠慨涓� </el-radio>
- <el-radio key="40" :label="50"> 宸叉姤搴� </el-radio>
+ <el-radio key="0" :value="0"> 绌洪棽涓� </el-radio>
+ <el-radio key="5" :value="5"> 宸查鍙� </el-radio>
+ <el-radio key="10" :value="10"> 宸茶鏈� </el-radio>
+ <el-radio key="20" :value="20"> 宸查仐澶� </el-radio>
+ <el-radio key="30" :value="30"> 寰呯淮淇� </el-radio>
+ <el-radio key="30" :value="40"> 缁翠慨涓� </el-radio>
+ <el-radio key="40" :value="50"> 宸叉姤搴� </el-radio>
</el-radio-group>
<span v-else>{{tranlateDevState(formData.state)}}</span>
</el-form-item>
diff --git a/src/views/ecg/doctor/components/RoutinePanel.vue b/src/views/ecg/doctor/components/RoutinePanel.vue
index 7ca95be..ee6e454 100644
--- a/src/views/ecg/doctor/components/RoutinePanel.vue
+++ b/src/views/ecg/doctor/components/RoutinePanel.vue
@@ -166,7 +166,7 @@
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
emit('event_routine')
resetForm()
- getList()
+ getList() // 鍖荤敓浣滀笟鍘嗗彶
} finally {
formLoading.value = false
}
diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue
index 1a894ad..e8fd253 100644
--- a/src/views/ecg/doctor/index.vue
+++ b/src/views/ecg/doctor/index.vue
@@ -1,3 +1,4 @@
+<!--璁惧棰嗙敤鎿嶄綔鐣岄潰-->
<script setup lang="ts">
import TitlePanel from "@/views/ecg/doctor/components/TitlePanel.vue";
import QueuePanel from "@/views/ecg/doctor/components/QueuePanel.vue";
@@ -29,6 +30,7 @@
queuingNum: 0
})
+const autoCall = ref<boolean>(false);
const state = ref<boolean>()
const patientList = ref<QueueVO[]>([])
@@ -152,7 +154,13 @@
const onEventDevReady = () => {
//console.info("onDevRentPanelEvent...")
onStagePatient.value.patId = ""
- initLoad()
+
+ console.info("autoCall " + autoCall.value)
+ if (autoCall.value) {
+ finishNextPatient()
+ } else {
+ initLoad()
+ }
}
const onEventRecallFinish = () => {
@@ -181,6 +189,7 @@
</el-aside>
</el-container>
<el-container class="right-bottom">
+ <el-checkbox label="鑷姩 " v-model="autoCall" />
<el-button :disabled="finishFlag" type="primary" @click="finishNextPatient">鍙彿</el-button>
<el-button :disabled="passFlag" type="primary" @click="passNextPatient">杩囧彿</el-button>
<el-button type="primary" @click="callAgain">閲嶅彨</el-button>
@@ -193,7 +202,7 @@
.right-bottom {
position: absolute;
bottom: 50px;
- right: 100px;
+ right: 80px;
//background-color: #f00;
//color: #fff;
//padding: 10px;
diff --git a/src/views/ecg/queue/QueueForm.vue b/src/views/ecg/queue/QueueForm.vue
index e243c07..0112c65 100644
--- a/src/views/ecg/queue/QueueForm.vue
+++ b/src/views/ecg/queue/QueueForm.vue
@@ -15,7 +15,7 @@
</el-form-item>
<el-form-item label="鎮ｈ�呮�у埆" prop="patGender">
<el-radio-group v-model="formData.patGender">
- <el-radio label="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
+ <el-radio :value="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="棰勭害鏃堕棿娈�" prop="bookTimeslot">
@@ -23,7 +23,7 @@
</el-form-item>
<el-form-item label="棰勭害妫�鏌ョ被鍨�" prop="bookCheckType">
<el-radio-group v-model="formData.bookCheckType">
- <el-radio label="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
+ <el-radio :value="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="鎺掗槦搴忓彿" prop="seqNum">
@@ -31,17 +31,17 @@
</el-form-item>
<el-form-item label="5:杩囧彿 10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚" prop="status">
<el-radio-group v-model="formData.status">
- <el-radio label="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
+ <el-radio :value="10">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="杩囧彿鏍囪" prop="passed">
<el-radio-group v-model="formData.passed">
- <el-radio label="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
+ <el-radio :value="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="棰勭害杩囨湡鏍囪" prop="expired">
<el-radio-group v-model="formData.expired">
- <el-radio label="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
+ <el-radio :value="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="璇婂缂栧彿" prop="roomId">
--
Gitblit v1.9.3