From b3a5df43f282f5c9cd23131788a234f098c8cbbf Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 十二月 2024 10:37:58 +0800
Subject: [PATCH] BugFix: 预约确认有时不弹检查项目，但是患者信息显示正确的现象
---
src/views/ecg/appointment/CheckItemPanel.vue | 147 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 133 insertions(+), 14 deletions(-)
diff --git a/src/views/ecg/appointment/CheckItemPanel.vue b/src/views/ecg/appointment/CheckItemPanel.vue
index 8fe2bd4..d841bda 100644
--- a/src/views/ecg/appointment/CheckItemPanel.vue
+++ b/src/views/ecg/appointment/CheckItemPanel.vue
@@ -2,22 +2,33 @@
import {defineComponent, PropType} from "vue";
import {useCheckTypeStore} from "@/store/modules/checkType";
import {AppointmentApi, AppointmentVO} from "@/api/ecg/appointment";
-import {dateFormatter2, formatDate} from "@/utils/formatTime";
import {formatTimeslot} from "@/utils/formatter";
-import {isCurrentDay} from "@/utils/dateUtil";
+import {calculateAge, formatTimestamp, isCurrentDay} from "@/utils/dateUtil";
+import {QueueSequenceApi, QueueSequenceVO} from "@/api/ecg/queuesequence";
+import {formatDate} from "../../../utils/formatTime";
+import { cloneDeep } from 'lodash-es'
+import {hiprint} from "vue-plugin-hiprint";
+import {calGender, getBookBeginTime} from "@/utils";
defineComponent({
name: 'CheckItemPanel'
})
-const props = defineProps({
+const props = defineProps({
appointment: {
type: Object as PropType<AppointmentVO>,
required: true
}
})
+const emit = defineEmits(['event_appoint_confirm']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋�
+
const checkTypeStore = useCheckTypeStore();
+
+const checkTypeTimeslotList = ref<QueueSequenceVO>()
+const bookTimeSlotVip = ref<number>()
+
+const bookSeqNum = ref<number>()
const _confirmAppointment = async () => {
if (!isCurrentDay(props.appointment.bookDate)) {
@@ -31,32 +42,127 @@
}
)
.then(async () => {
- ElMessage({
- type: 'success',
- message: 'Delete completed',
- })
- const data = await AppointmentApi.confirmAppointmentVip(props.appointment)
+ 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: 'warning'
+ type: 'info'
})
})
.catch(() => {
- ElMessage({
- type: 'info',
- message: 'Delete canceled',
+/*
+ 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)
+ bookSeqNum.value = data
+ // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
+ emit('event_appoint_confirm')
+ _printNote()
ElNotification({
title: '娓╅Θ鎻愮ず',
message: data,
- type: 'warning'
+ type: 'info'
})
}
}
+
+const _printNote = async (printMode?: number) => {
+ console.info( props.appointment )
+
+// 寮曞叆鍚庝娇鐢ㄧず渚�
+ hiprint.init({
+ // host: 'http://192.168.2.100:17521',
+ token: '111111'
+ });
+// 涓嬪垪鏂规硶閮芥槸娌℃湁鎷栨嫿璁捐椤甸潰鐨�, 鐩稿綋浜庝唬鐮佹ā寮�, 浣跨敤浠ｇ爜璁捐椤甸潰
+// 鎯宠瀹炵幇鎷栨嫿璁捐椤甸潰,璇峰線涓嬬湅 '鑷畾涔夎璁�'
+ var hiprintTemplate = new hiprint.PrintTemplate(); // 鍙紶鍙傛暟
+ //var panel = hiprintTemplate.addPrintPanel({ width: 100, height: 130, paperFooter: 340, paperHeader: 10 }); 瀵艰嚧璧颁笁椤�
+ var panel = hiprintTemplate.addPrintPanel({ width: 140, height: 130, paperNumberDisabled:true});
+//鏂囨湰
+ const checkTypeName = checkTypeStore.getCheckTypeName(props.appointment.bookCheckType)
+ 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: 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: 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: 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: 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: 130, height: 20, top: 7, left: 170, title: ''+_bookSeqNum, textAlign: 'center', fontSize: 30, fontFamily: '寰蒋闆呴粦', fontWeight: '1200' } });
+
+ // 娉ㄦ剰浜嬮」
+ const notes = checkTypeStore.getCheckTypeNotes(props.appointment.bookCheckType)
+ 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)
+ hiprintTemplate.print2([{}]); // 鍙互浼� [瀹氫綅鍙傛暟] http://https://ccsimple.github.io/sv-print-docs/config/template.html#%E8%87%AA%E5%AE%9A%E4%B9%89%E8%AE%BE%E8%AE%A1%E4%BD%BF%E7%94%A8%E7%A4%BA%E4%BE%8B
+ else
+ hiprintTemplate.print([{}]);
+}
+
+onMounted( async () => {
+ const data = await QueueSequenceApi.getTimeslotByCheckType(props.appointment.bookCheckType)
+ console.info( data )
+ checkTypeTimeslotList.value = data
+})
</script>
@@ -65,8 +171,21 @@
<template #header>{{checkTypeStore.getCheckTypeName(appointment.bookCheckType)}}</template>
<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-model="bookTimeSlotVip" clearable placeholder="璇烽�夋嫨棰勭害鏃堕棿娈�">
+ <el-option
+ v-for="item in checkTypeTimeslotList"
+ :key="item.id"
+ :label="formatTimeslot(item.timeSlot)"
+ :value="item.timeSlot"
+ :disabled="item.queueVipNo === item.queueVipFull"
+ />
+ </el-select>
+ {{bookSeqNum??appointment.bookSeqNum}}
<el-divider/>
- <el-button :type="isCurrentDay(appointment.bookDate)?'primary':'warning'" @click="_confirmAppointment"><Icon icon="ep:refresh" class="mr-5px" /> 鎺掗槦 </el-button>
+ <el-button @click="_confirmAppointment" :type="isCurrentDay(appointment.bookDate)?'primary':'warning'"><Icon icon="ep:list" class="mr-5px" /> 鎺掗槦 </el-button>
+ <el-button @click="_printNote(8)"><Icon icon="ep:printer" class="mr-5px" /> 鎵撳嵃鍙� </el-button>
</el-card>
</template>
--
Gitblit v1.9.3