From 16d88d3f3b6bfb362fcb58d4aeef9275c72e1ea3 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 26 十一月 2024 15:09:37 +0800
Subject: [PATCH] 预约确认单项时，确认完清除
---
src/views/ecg/queue/index.vue | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/src/views/ecg/queue/index.vue b/src/views/ecg/queue/index.vue
index d682321..5fcf837 100644
--- a/src/views/ecg/queue/index.vue
+++ b/src/views/ecg/queue/index.vue
@@ -129,22 +129,31 @@
<!-- 鍒楄〃 -->
<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" min-width="120px">
+ <template #default="scope">
+ {{scope.row.patName}} ({{genderFormat(scope.row.patGender)}})
+ </template>
+ </el-table-column>
+ <el-table-column label="妫�鏌ョ被鍨�" align="center" prop="bookCheckType" min-width="100px">
+ <template #default="scope">
+ {{checkTypeStore.getCheckTypeName(scope.row.bookCheckType)}}
+ </template>
+ </el-table-column>
+ <el-table-column label="鎮ｈ�呰鎯�" align="center" prop="patDetails" min-width="300px">
+ <template #default="scope">
+ <span>{{scope.row.patDetails?.mobile}} {{scope.row.patDetails?.wardDesc}} {{scope.row.patDetails?.bedNo}}</span>
+ </template>
+ </el-table-column>
<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">
- {{checkTypeStore.getCheckTypeName(scope.row.bookCheckType)}}
- </template>
- </el-table-column>
- <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">
<dict-tag :type="DICT_TYPE.ECG_QUEUE_STATUS" :value="scope.row.status" />
@@ -167,7 +176,7 @@
<el-button
link
type="primary"
- @click="openAppointmentForm('preview', scope.row.patId)"
+ @click="openAppointmentForm('preview', scope.row.patId, scope.row.bookCheckType)"
v-hasPermi="['ecg:appointment:preview']"
>
鏌ョ湅
@@ -223,11 +232,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' })
@@ -288,8 +297,8 @@
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
-const openAppointmentForm = (type: string, patId: string, status: number) => {
- formRef.value.openByQueue(type, patId, status)
+const openAppointmentForm = (type: string, patId: string, checkType: number) => {
+ formRef.value.openByQueue(type, patId, checkType)
}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.3