From 3fd7a12be67b3412035731aa8ff23575b92d6009 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 27 十一月 2024 14:15:04 +0800
Subject: [PATCH] 预约小票 格式调整
---
src/views/ecg/queue/index.vue | 72 ++++++++++++++++++++++++++----------
1 files changed, 52 insertions(+), 20 deletions(-)
diff --git a/src/views/ecg/queue/index.vue b/src/views/ecg/queue/index.vue
index 700fbc2..175be25 100644
--- a/src/views/ecg/queue/index.vue
+++ b/src/views/ecg/queue/index.vue
@@ -67,6 +67,7 @@
</el-form-item>
<el-form-item label="鎺掗槦鐘舵��" prop="status">
<el-select
+ multiple
v-model="queryParams.status"
placeholder="璇烽�夋嫨鎺掗槦鐘舵��"
clearable
@@ -101,6 +102,7 @@
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 鎼滅储</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 閲嶇疆</el-button>
+<!--
<el-button
type="primary"
plain
@@ -109,6 +111,8 @@
>
<Icon icon="ep:plus" class="mr-5px" /> 鏂板
</el-button>
+-->
+<!--
<el-button
type="success"
plain
@@ -118,6 +122,7 @@
>
<Icon icon="ep:download" class="mr-5px" /> 瀵煎嚭
</el-button>
+-->
</el-form-item>
</el-form>
</ContentWrap>
@@ -125,22 +130,32 @@
<!-- 鍒楄〃 -->
<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="episodeId" min-width="150px"/>
<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" />
@@ -163,11 +178,12 @@
<el-button
link
type="primary"
- @click="openForm('update', scope.row.id)"
- v-hasPermi="['ecg:queue:update']"
+ @click="openAppointmentForm('preview', scope.row.patId, scope.row.bookCheckType)"
+ v-hasPermi="['ecg:appointment:preview']"
>
- 缂栬緫
+ 鏌ョ湅
</el-button>
+<!--
<el-button
link
type="danger"
@@ -176,6 +192,7 @@
>
鍒犻櫎
</el-button>
+-->
<el-button
link
type="danger"
@@ -183,13 +200,13 @@
v-if="scope.row.status === 10"
v-hasPermi="['ecg:queue:jump']"
>
- {{scope.row.jumpFlag === 0? "鎻掗槦" : "鍙栨秷鎻掗槦"}}
+ {{scope.row.jumpFlag === 0? "鍔犳��" : "鍙栨秷鍔犳��"}}
</el-button>
<el-button
link
type="danger"
@click="recall(scope.row)"
- v-if="scope.row.status === 5"
+ v-if="scope.row.status === 5 || scope.row.status === 7"
v-hasPermi="['ecg:queue:recall']"
>
鍙洖
@@ -207,17 +224,21 @@
</ContentWrap>
<!-- 琛ㄥ崟寮圭獥锛氭坊鍔�/淇敼 -->
- <queueForm ref="formRef" @success="getList" />
+ <!-- <queueForm ref="formRef" @success="getList" />-->
+
+ <!-- 琛ㄥ崟寮圭獥锛氭坊鍔�/淇敼 -->
+ <AppointmentForm ref="formRef" @event_appointment_success="getList" />
</template>
<script setup lang="ts">
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' })
@@ -240,7 +261,7 @@
bookTimeslot: undefined,
bookCheckType: undefined,
seqNum: undefined,
- status: undefined,
+ status: [],
passed: undefined,
expired: undefined,
roomId: undefined,
@@ -278,6 +299,9 @@
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
+const openAppointmentForm = (type: string, patId: string, checkType: number) => {
+ formRef.value.openByQueue(type, patId, checkType)
+}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (id: number) => {
@@ -312,10 +336,18 @@
roomId: item.roomId,
bedNo: item.bedNo,
patId: item.patId,
- jumpFlag: 0
+ checkType: item.bookCheckType,
+ //jumpFlag: 0,
+ roomId_operator: item.roomId, // 闃熷垪鐣岄潰 鍙洖鎿嶄綔鏃� 淇濇寔鍘熸潵鐨勫伐浣�
+ bedNo_operator: item.bedNo, // 闃熷垪鐣岄潰 鍙洖鎿嶄綔鏃� 淇濇寔鍘熸潵鐨勫伐浣�
}
- const data = await DoctorApi.recallPatient(patientVO);
+ let data = ""
+ if (item.status === 5) // 甯歌銆侀鐢� 杩囧彿
+ data = await DoctorApi.recallPatient(patientVO);
+ else if (item.status === 7)
+ data = await DoctorApi.recallInstallPatient(patientVO);
+
message.info(data)
// 鍒锋柊鍒楄〃
await getList()
--
Gitblit v1.9.3