From cfd2621f98e34e348a0e7ca7466464f9886d4eb2 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 十二月 2024 19:46:48 +0800
Subject: [PATCH] 工位选择界面 诊室安装room id排序
---
src/views/ecg/appointment/CheckItemPanel.vue | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/src/views/ecg/appointment/CheckItemPanel.vue b/src/views/ecg/appointment/CheckItemPanel.vue
index 70f48f6..d841bda 100644
--- a/src/views/ecg/appointment/CheckItemPanel.vue
+++ b/src/views/ecg/appointment/CheckItemPanel.vue
@@ -43,7 +43,7 @@
)
.then(async () => {
const tempAppointment = cloneDeep(props.appointment)
- if( undefined !== bookTimeSlotVip.value && null !== bookTimeSlotVip.value ) {
+ if (undefined !== bookTimeSlotVip.value && null !== bookTimeSlotVip.value) {
tempAppointment.bookTimeslot = bookTimeSlotVip.value
}
const data = await AppointmentApi.confirmAppointmentVip(tempAppointment)
@@ -58,11 +58,48 @@
})
})
.catch(() => {
+/*
ElNotification({
title: '娓╅Θ鎻愮ず',
message: '纭澶辫触',
type: 'warning'
})
+*/
+ })
+ } else if (undefined !== bookTimeSlotVip.value && null !== bookTimeSlotVip.value && props.appointment.bookTimeslot !== bookTimeSlotVip.value) {
+ ElMessageBox.confirm(
+ '褰撳ぉ棰勭害椤癸紝纭畾瑕佽蛋VIP鍚楋紵',
+ 'Warning',
+ {
+ confirmButtonText: '濂界殑',
+ cancelButtonText: '涓嶇敤',
+ type: 'warning',
+ }
+ )
+ .then(async () => {
+ const tempAppointment = cloneDeep(props.appointment)
+ if (undefined !== bookTimeSlotVip.value && null !== bookTimeSlotVip.value) {
+ tempAppointment.bookTimeslot = bookTimeSlotVip.value
+ }
+ const data = await AppointmentApi.confirmAppointmentVip(tempAppointment)
+ bookSeqNum.value = data
+ // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
+ emit('event_appoint_confirm')
+ _printNote()
+ ElNotification({
+ title: '娓╅Θ鎻愮ず',
+ message: data,
+ type: 'info'
+ })
+ })
+ .catch(() => {
+ /*
+ ElNotification({
+ title: '娓╅Θ鎻愮ず',
+ message: '纭澶辫触',
+ type: 'warning'
+ })
+ */
})
} else {
const data = await AppointmentApi.confirmAppointment(props.appointment)
@@ -93,26 +130,26 @@
var panel = hiprintTemplate.addPrintPanel({ width: 140, height: 130, paperNumberDisabled:true});
//鏂囨湰
const checkTypeName = checkTypeStore.getCheckTypeName(props.appointment.bookCheckType)
- panel.addPrintText({ options: { width: 140, height: 15, top: 0, left: 20, title: checkTypeName, textAlign: 'center', fontSize: 15, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
+ panel.addPrintText({ options: { width: 150, height: 15, top: 2, left: 10, title: checkTypeName, textAlign: 'center', fontSize: 15, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
const patientBaisc = props.appointment.patName + " " + calGender(props.appointment.patGender) + " " + calculateAge(props.appointment.patBirthday) + "宀�"
- panel.addPrintText({ options: { width: 140, height: 15, top: 25, left: 20, title: patientBaisc, textAlign: 'center' , fontSize: 15, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
+ panel.addPrintText({ options: { width: 150, height: 15, top: 27, left: 10, title: patientBaisc, textAlign: 'center' , fontSize: 15, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
const ward_bed = props.appointment.patWardDesc + "-" + props.appointment.patBedNo
- panel.addPrintText({ options: { width: 140, height: 15, top: 50, left: 20, title: ward_bed, textAlign: 'center', fontSize: 15, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
+ panel.addPrintText({ options: { width: 150, height: 15, top: 52, left: 10, title: ward_bed, textAlign: 'center', fontSize: 15, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
const bookTime = formatTimestamp(props.appointment.bookDate) + " " + getBookBeginTime(props.appointment.bookTimeslot)
- panel.addPrintText({ options: { width: 140, height: 15, top: 75, left: 20, title: bookTime, textAlign: 'center', fontSize: 15, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
- //panel.addPrintText({ options: { width: 140, height: 12, top: 58, left: 20, title: props.appointment.patId, textAlign: 'center', fontSize: 8 } });
- //panel.addPrintText({ options: { width: 140, height: 12, top: 72, left: 20, title: props.appointment.patMobile, textAlign: 'center', fontSize: 8, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
+ panel.addPrintText({ options: { width: 150, height: 15, top: 77, left: 10, title: bookTime, textAlign: 'center', fontSize: 15, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
+ //panel.addPrintText({ options: { width: 150, height: 12, top: 58, left: 10, title: props.appointment.patId, textAlign: 'center', fontSize: 8 } });
+ //panel.addPrintText({ options: { width: 150, height: 12, top: 72, left: 10, title: props.appointment.patMobile, textAlign: 'center', fontSize: 8, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
// 鏉＄爜 灏辫瘖娴佹按鍙�
- panel.addPrintText({ options: { width: 140, height: 22, top: 104, left: 20, title: props.appointment.episodeId, textType: 'barcode' } });
+ panel.addPrintText({ options: { width: 150, height: 22, top: 107, left: 10, title: props.appointment.episodeId, textType: 'barcode' } });
// 鍙充晶 Pane 杈撳嚭
const _bookSeqNum = bookSeqNum.value??props.appointment?.bookSeqNum
- panel.addPrintText({ options: { width: 140, height: 20, top: 0, left: 160, title: ''+_bookSeqNum, textAlign: 'center', fontSize: 30, fontFamily: '寰蒋闆呴粦', fontWeight: '1200' } });
+ panel.addPrintText({ options: { width: 130, height: 20, top: 7, left: 170, title: ''+_bookSeqNum, textAlign: 'center', fontSize: 30, fontFamily: '寰蒋闆呴粦', fontWeight: '1200' } });
// 娉ㄦ剰浜嬮」
const notes = checkTypeStore.getCheckTypeNotes(props.appointment.bookCheckType)
- panel.addPrintText({ options: { width: 140, height: 40, top: 30, left: 160, title: notes, textAlign: 'center', fontSize: 13, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
+ panel.addPrintLongText({ options: { width: 130, height: 80, top: 35, left: 170, lineHeight: 15, title: notes, textAlign: 'center', fontSize: 13, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
//鎵撳嵃
if (undefined === printMode)
@@ -135,7 +172,8 @@
<div>{{formatDate(appointment.bookDate, 'YYYY-MM-DD')}}</div>
<div>{{formatTimeslot(appointment.bookTimeslot)}}</div>
- <el-select v-if="!isCurrentDay(appointment.bookDate)" v-model="bookTimeSlotVip" placeholder="璇烽�夋嫨棰勭害鏃堕棿娈�">
+<!-- <el-select v-if="!isCurrentDay(appointment.bookDate)" v-model="bookTimeSlotVip" placeholder="璇烽�夋嫨棰勭害鏃堕棿娈�">-->
+ <el-select v-model="bookTimeSlotVip" clearable placeholder="璇烽�夋嫨棰勭害鏃堕棿娈�">
<el-option
v-for="item in checkTypeTimeslotList"
:key="item.id"
--
Gitblit v1.9.3