From b10adc8a3fd000901836e2219fa83462694e9866 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 13 八月 2024 10:48:42 +0800
Subject: [PATCH] update
---
src/views/ecg/room/index.vue | 2
src/utils/dict.ts | 1
src/views/ecg/queue/index.vue | 85 +++++++++++++++++++++---------------------
src/api/ecg/queue/index.ts | 4 +-
4 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/src/api/ecg/queue/index.ts b/src/api/ecg/queue/index.ts
index e702590..2a37f08 100644
--- a/src/api/ecg/queue/index.ts
+++ b/src/api/ecg/queue/index.ts
@@ -9,7 +9,7 @@
bookTimeslot: number // 棰勭害鏃堕棿娈�
bookCheckType: boolean // 棰勭害妫�鏌ョ被鍨�
seqNum: number // 鎺掗槦搴忓彿
- status: boolean // 10:鎺掗槦涓� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿 60:杩囨湡
+ status: number // 10:鎺掗槦涓� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿 60:杩囨湡
passed: boolean // 杩囧彿鏍囪
expired: boolean // 棰勭害杩囨湡鏍囪
roomNum: string // 璇婂缂栧彿
@@ -47,4 +47,4 @@
exportqueue: async (params) => {
return await request.download({ url: `/ecg/queue/export-excel`, params })
}
-}
\ No newline at end of file
+}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 43e15e8..71b943c 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -146,6 +146,7 @@
ECG_BOOK_TIMESLOT = 'ecg_book_timeslot',
ECG_CHECK_TYPE = 'ecg_check_type',
ECG_BOOK_SRC = 'ecg_book_src',
+ ECG_QUEUE_STATUS = 'ecg_queue_status',
// ========== BPM 妯″潡 ==========
BPM_MODEL_FORM_TYPE = 'bpm_model_form_type',
diff --git a/src/views/ecg/queue/index.vue b/src/views/ecg/queue/index.vue
index 07d3827..1108742 100644
--- a/src/views/ecg/queue/index.vue
+++ b/src/views/ecg/queue/index.vue
@@ -26,24 +26,20 @@
class="!w-240px"
/>
</el-form-item>
- <el-form-item label="鎮ｈ�呮�у埆" prop="patGender">
- <el-select
- v-model="queryParams.patGender"
- placeholder="璇烽�夋嫨鎮ｈ�呮�у埆"
- clearable
- class="!w-240px"
- >
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
<el-form-item label="棰勭害鏃舵" prop="bookTimeslot">
- <el-input
+ <el-select
v-model="queryParams.bookTimeslot"
placeholder="璇疯緭鍏ラ绾︽椂娈�"
clearable
- @keyup.enter="handleQuery"
class="!w-240px"
- />
+ >
+ <el-option
+ v-for="dict in getIntDictOptions(DICT_TYPE.ECG_BOOK_TIMESLOT)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="妫�鏌ョ被鍨�" prop="bookCheckType">
<el-select
@@ -52,7 +48,12 @@
clearable
class="!w-240px"
>
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
+ <el-option
+ v-for="dict in getIntDictOptions(DICT_TYPE.ECG_CHECK_TYPE)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
</el-select>
</el-form-item>
<el-form-item label="鎺掗槦搴忓彿" prop="seqNum">
@@ -64,34 +65,19 @@
class="!w-240px"
/>
</el-form-item>
- <el-form-item label="鐘舵��" prop="status">
+ <el-form-item label="鎺掗槦鐘舵��" prop="status">
<el-select
v-model="queryParams.status"
- placeholder="璇烽�夋嫨鐘舵��"
+ placeholder="璇烽�夋嫨鎺掗槦鐘舵��"
clearable
class="!w-240px"
>
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
- <el-form-item label="杩囧彿鏍囪" prop="passed">
- <el-select
- v-model="queryParams.passed"
- placeholder="璇烽�夋嫨杩囧彿鏍囪"
- clearable
- class="!w-240px"
- >
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
- <el-form-item label="棰勭害杩囨湡鏍囪" prop="expired">
- <el-select
- v-model="queryParams.expired"
- placeholder="璇烽�夋嫨棰勭害杩囨湡鏍囪"
- clearable
- class="!w-240px"
- >
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
+ <el-option
+ v-for="dict in getIntDictOptions(DICT_TYPE.ECG_QUEUE_STATUS)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
</el-select>
</el-form-item>
<el-form-item label="璇婂缂栧彿" prop="roomNum">
@@ -103,10 +89,10 @@
class="!w-240px"
/>
</el-form-item>
- <el-form-item label="璇婄枟搴婄紪鍙�" prop="bedNum">
+ <el-form-item label="璇婄枟搴婂彿" prop="bedNum">
<el-input
v-model="queryParams.bedNum"
- placeholder="璇疯緭鍏ヨ瘖鐤楀簥缂栧彿"
+ placeholder="璇疯緭鍏ヨ瘖鐤楀簥鍙�"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
@@ -154,10 +140,22 @@
<el-table-column label="鎮ｈ�呯紪鍙�" align="center" prop="patId" />
<el-table-column label="鎮ｈ�呭鍚�" align="center" prop="patName" />
<el-table-column label="鎮ｈ�呮�у埆" align="center" prop="patGender" />
- <el-table-column label="棰勭害鏃舵" align="center" prop="bookTimeslot" />
- <el-table-column label="妫�鏌ョ被鍨�" align="center" prop="bookCheckType" />
- <el-table-column label="鎺掗槦搴忓彿" align="center" prop="seqNum" />
- <el-table-column label="鐘舵��" align="center" prop="status" />
+ <el-table-column label="棰勭害鏃舵" align="center" prop="bookTimeslot" >
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.ECG_BOOK_TIMESLOT" :value="scope.row.bookTimeslot" />
+ </template>
+ </el-table-column>
+ <el-table-column label="妫�鏌ョ被鍨�" align="center" prop="bookCheckType" >
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.ECG_CHECK_TYPE" :value="scope.row.bookCheckType" />
+ </template>
+ </el-table-column>
+ <el-table-column label="鎺掗槦搴忓彿" align="center" prop="seqNum" />
+ <el-table-column label="鐘舵��" align="center" prop="status" >
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.ECG_QUEUE_STATUS" :value="scope.row.status" />
+ </template>
+ </el-table-column>
<el-table-column label="杩囧彿鏍囪" align="center" prop="passed" />
<el-table-column label="杩囨湡鏍囪" align="center" prop="expired" />
<el-table-column label="璇婂缂栧彿" align="center" prop="roomNum" />
@@ -208,6 +206,7 @@
import download from '@/utils/download'
import { queueApi, queueVO } from '@/api/ecg/queue'
import queueForm from './queueForm.vue'
+import {DICT_TYPE, getIntDictOptions} from '@/utils/dict'
/** 鎺掗槦 鍒楄〃 */
defineOptions({ name: 'queue' })
diff --git a/src/views/ecg/room/index.vue b/src/views/ecg/room/index.vue
index 3a8ab8e..cf58b81 100644
--- a/src/views/ecg/room/index.vue
+++ b/src/views/ecg/room/index.vue
@@ -17,7 +17,7 @@
class="!w-240px"
/>
</el-form-item>
- <el-form-item label="璇婄枟搴婄紪鍙�" prop="bedNo">
+ <el-form-item label="璇婄枟搴婂彿" prop="bedNo">
<el-input
v-model="queryParams.bedNo"
placeholder="璇疯緭鍏ヨ瘖鐤楀簥缂栧彿"
--
Gitblit v1.9.3