From e2f9c60f3964d37241c8ddcb0d939bcfc4f92fa4 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 20 九月 2024 13:33:59 +0800
Subject: [PATCH] 开诊界面 患者顺序
---
src/api/ecg/screen/index.ts | 8 +-------
src/views/ecg/callingscreen/bigscreen.vue | 5 +++--
src/views/ecg/callingscreen/roomscreen.vue | 5 +++--
src/views/ecg/queue/QueueForm.vue | 4 ++--
src/views/ecg/doctor/components/QueuePanel.vue | 2 +-
src/views/ecg/queue/index.vue | 2 +-
src/api/ecg/queue/index.ts | 2 +-
7 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/api/ecg/queue/index.ts b/src/api/ecg/queue/index.ts
index 410e86e..9e47821 100644
--- a/src/api/ecg/queue/index.ts
+++ b/src/api/ecg/queue/index.ts
@@ -9,7 +9,7 @@
bookTimeslot: number // 棰勭害鏃堕棿娈�
bookCheckType: number // 棰勭害妫�鏌ョ被鍨�
seqNum: number // 鎺掗槦搴忓彿
- status: number // 10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿
+ status: number // 5:杩囧彿 10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚
passed: number // 杩囧彿鏍囪
expired: number // 棰勭害杩囨湡鏍囪
jumpFlag: number //鎻掗槦鏍囪
diff --git a/src/api/ecg/screen/index.ts b/src/api/ecg/screen/index.ts
index 2087008..b3793a9 100644
--- a/src/api/ecg/screen/index.ts
+++ b/src/api/ecg/screen/index.ts
@@ -1,11 +1,5 @@
import request from '@/config/axios'
-export const statusMap = new Map([
- [20, "鍑嗗涓�"],
- [30, "灏辫瘖涓�"],
- [50, "杩囧彿"]
-]);
-
// 鍙彿 VO
export interface CallingVO {
patId: string // 鎮ｈ�呯紪鍙�
@@ -14,7 +8,7 @@
bookDate: Date // 棰勭害鏃ユ湡
bookCheckType: number // 棰勭害妫�鏌ョ被鍨�
seqNum: number // 鎺掗槦搴忓彿
- status: number // 10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿
+ status: number // 5:杩囧彿 10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚
passed: number // 杩囧彿鏍囪
expired: number // 棰勭害杩囨湡鏍囪
called: number
diff --git a/src/views/ecg/callingscreen/bigscreen.vue b/src/views/ecg/callingscreen/bigscreen.vue
index a59b1b8..823cec8 100644
--- a/src/views/ecg/callingscreen/bigscreen.vue
+++ b/src/views/ecg/callingscreen/bigscreen.vue
@@ -1,7 +1,8 @@
<script setup lang="ts">
-import {ScreenApi, statusMap, CallingVO} from "@/api/ecg/screen";
+import {ScreenApi, CallingVO} from "@/api/ecg/screen";
import {CallApi, CallVO} from "@/api/ecg/call";
+import {DICT_TYPE} from "@/utils/dict";
defineOptions({ name: 'bigscreen' })
@@ -102,7 +103,7 @@
</el-table-column>
<el-table-column label="鐘舵��" align="center" prop="status" width="80">
<template #default="scope">
- {{ statusMap.get(scope.row.status) }}
+ <dict-tag :type="DICT_TYPE.ECG_QUEUE_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/ecg/callingscreen/roomscreen.vue b/src/views/ecg/callingscreen/roomscreen.vue
index a51aedb..c0ea7f8 100644
--- a/src/views/ecg/callingscreen/roomscreen.vue
+++ b/src/views/ecg/callingscreen/roomscreen.vue
@@ -2,7 +2,8 @@
import {RoomBedVO} from "@/api/ecg/doctor";
import {RoomApi} from "@/api/ecg/room";
-import {CallingVO, statusMap, ScreenApi} from "@/api/ecg/screen";
+import {CallingVO, ScreenApi} from "@/api/ecg/screen";
+import {DICT_TYPE} from "@/utils/dict";
defineOptions({ name: 'roomscreen' })
@@ -74,7 +75,7 @@
</el-table-column>
<el-table-column label="鐘舵��" align="center" :prop="status" width="80">
<template #default="scope">
- {{ statusMap.get(scope.row.status) }}
+ <dict-tag :type="DICT_TYPE.ECG_QUEUE_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
</el-table>
diff --git a/src/views/ecg/doctor/components/QueuePanel.vue b/src/views/ecg/doctor/components/QueuePanel.vue
index 7feeb57..6f82075 100644
--- a/src/views/ecg/doctor/components/QueuePanel.vue
+++ b/src/views/ecg/doctor/components/QueuePanel.vue
@@ -45,7 +45,7 @@
{{item.bedNo}}
<dict-tag :type="DICT_TYPE.ECG_CHECK_TYPE" :value="item.bookCheckType" />
<dict-tag :type="DICT_TYPE.ECG_QUEUE_STATUS" :value="item.status" />
- <el-button v-if="item.status === 50" @click="recall(item)"> 鍙洖 </el-button>
+ <el-button v-if="item.status === 5" @click="recall(item)"> 鍙洖 </el-button>
</div>
</template>
diff --git a/src/views/ecg/queue/QueueForm.vue b/src/views/ecg/queue/QueueForm.vue
index e4aebb6..e243c07 100644
--- a/src/views/ecg/queue/QueueForm.vue
+++ b/src/views/ecg/queue/QueueForm.vue
@@ -29,7 +29,7 @@
<el-form-item label="鎺掗槦搴忓彿" prop="seqNum">
<el-input v-model="formData.seqNum" placeholder="璇疯緭鍏ユ帓闃熷簭鍙�" />
</el-form-item>
- <el-form-item label="10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿" prop="status">
+ <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-group>
@@ -89,7 +89,7 @@
patName: [{ required: true, message: '鎮ｈ�呭鍚嶄笉鑳戒负绌�', trigger: 'blur' }],
bookTimeslot: [{ required: true, message: '棰勭害鏃堕棿娈典笉鑳戒负绌�', trigger: 'blur' }],
seqNum: [{ required: true, message: '鎺掗槦搴忓彿涓嶈兘涓虹┖', trigger: 'blur' }],
- status: [{ required: true, message: '10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿', trigger: 'blur' }],
+ status: [{ required: true, message: '5:杩囧彿 10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 ', trigger: 'blur' }],
passed: [{ required: true, message: '杩囧彿鏍囪涓嶈兘涓虹┖', trigger: 'blur' }],
expired: [{ required: true, message: '棰勭害杩囨湡鏍囪涓嶈兘涓虹┖', trigger: 'blur' }]
})
diff --git a/src/views/ecg/queue/index.vue b/src/views/ecg/queue/index.vue
index 577befb..7841c12 100644
--- a/src/views/ecg/queue/index.vue
+++ b/src/views/ecg/queue/index.vue
@@ -188,7 +188,7 @@
link
type="danger"
@click="recall(scope.row)"
- v-if="scope.row.status === 50"
+ v-if="scope.row.status === 5"
v-hasPermi="['ecg:queue:recall']"
>
鍙洖
--
Gitblit v1.9.3