From 9e188fa816e204f8a02d032e55e2bd63168a77ec Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 07 十一月 2024 17:29:12 +0800
Subject: [PATCH] update
---
src/utils/stringUtil.ts | 7 +++++++
src/views/ecg/queue/index.vue | 21 +++++++++++++--------
src/api/ecg/queue/index.ts | 2 ++
3 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/api/ecg/queue/index.ts b/src/api/ecg/queue/index.ts
index 9e47821..abc54b4 100644
--- a/src/api/ecg/queue/index.ts
+++ b/src/api/ecg/queue/index.ts
@@ -8,6 +8,8 @@
patGender: number // 鎮ｈ�呮�у埆
bookTimeslot: number // 棰勭害鏃堕棿娈�
bookCheckType: number // 棰勭害妫�鏌ョ被鍨�
+ bookSeqNum: number //棰勭害搴忓彿
+ isVip: number // 鏄惁VIP鎮ｈ��
seqNum: number // 鎺掗槦搴忓彿
status: number // 5:杩囧彿 10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚
passed: number // 杩囧彿鏍囪
diff --git a/src/utils/stringUtil.ts b/src/utils/stringUtil.ts
index 4f3514c..3e57ef1 100644
--- a/src/utils/stringUtil.ts
+++ b/src/utils/stringUtil.ts
@@ -3,3 +3,10 @@
return !value || value.trim() === '';
}
+export function genderFormat(value: number): string {
+ if ( 1===value ) {
+ return "鐢�";
+ } else {
+ return "濂�";
+ }
+}
diff --git a/src/views/ecg/queue/index.vue b/src/views/ecg/queue/index.vue
index d682321..55a5728 100644
--- a/src/views/ecg/queue/index.vue
+++ b/src/views/ecg/queue/index.vue
@@ -129,14 +129,11 @@
<!-- 鍒楄〃 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
- <el-table-column label="id" align="center" prop="id" />
+<!-- <el-table-column label="id" align="center" prop="id" />-->
<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="patDetails" />
- <el-table-column label="棰勭害鏃舵" align="center" prop="bookTimeslot" >
+ <el-table-column label="鎮ｈ�呭鍚�" align="center" min-width="120px">
<template #default="scope">
- <dict-tag :type="DICT_TYPE.ECG_BOOK_TIMESLOT" :value="scope.row.bookTimeslot" />
+ {{scope.row.patName}} ({{genderFormat(scope.row.patGender)}})
</template>
</el-table-column>
<el-table-column label="妫�鏌ョ被鍨�" align="center" prop="bookCheckType" >
@@ -144,7 +141,15 @@
{{checkTypeStore.getCheckTypeName(scope.row.bookCheckType)}}
</template>
</el-table-column>
- <el-table-column label="鎺掗槦搴忓彿" align="center" prop="seqNum" />
+ <el-table-column label="鎮ｈ�呰鎯�" align="center" prop="patDetails" />
+ <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="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">
<dict-tag :type="DICT_TYPE.ECG_QUEUE_STATUS" :value="scope.row.status" />
@@ -223,11 +228,11 @@
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { QueueApi, QueueVO } from '@/api/ecg/queue'
-import queueForm from './QueueForm.vue'
import {DICT_TYPE, getIntDictOptions} from '@/utils/dict'
import {DoctorApi, PatientVO} from "@/api/ecg/doctor";
import {useCheckTypeStore} from "@/store/modules/checkType";
import AppointmentForm from "@/views/ecg/appointment/AppointmentForm.vue";
+import {genderFormat} from "@/utils/stringUtil";
/** 鎺掗槦 鍒楄〃 */
defineOptions({ name: 'queue' })
--
Gitblit v1.9.3