From c6421e15ecc9df14dbb2f29ab76a73ce7aa7f603 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 25 十一月 2024 21:32:09 +0800
Subject: [PATCH] 预约小票 打印
---
src/views/ecg/appointment/CheckItemPanel.vue | 16 +++++++++++-----
src/api/ecg/checktype/index.ts | 1 +
src/store/modules/checkType.ts | 7 +++++++
3 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/api/ecg/checktype/index.ts b/src/api/ecg/checktype/index.ts
index 4066486..c18cf57 100644
--- a/src/api/ecg/checktype/index.ts
+++ b/src/api/ecg/checktype/index.ts
@@ -13,6 +13,7 @@
timeslotBookNum: number // 鏃舵棰勭害瑙勫畾浜烘暟
timeslotReservedNum: number // 姣忔椂娈甸鐣欎汉鏁�
affinityCheckTypes: number[] | null// 浜插拰鐨勬鏌ョ被鍨�
+ notes: string // 棰勭害娉ㄦ剰浜嬮」
}
// 妫�鏌ョ被鍨� API
diff --git a/src/store/modules/checkType.ts b/src/store/modules/checkType.ts
index 54b50fd..c282975 100644
--- a/src/store/modules/checkType.ts
+++ b/src/store/modules/checkType.ts
@@ -9,6 +9,7 @@
value: number
name: string
displayBarcode: number
+ notes: string
}
export interface CheckTypeState {
checkTypeMap: Map<number, CheckTypeSimpleVO>
@@ -77,6 +78,12 @@
}
return this.checkTypeMap[type].displayBarcode
},
+ getCheckTypeNotes(type: number) {
+ if (!this.isSetCheckType) {
+ this.setCheckTypeMap()
+ }
+ return this.checkTypeMap[type].notes
+ },
async resetCheckTypeInfo() {
wsCache.delete(CACHE_KEY.CHECKTYPE_CACHE)
const res = await CheckTypeApi.getSimpleCheckTypeList()
diff --git a/src/views/ecg/appointment/CheckItemPanel.vue b/src/views/ecg/appointment/CheckItemPanel.vue
index fcbc5f8..366cf57 100644
--- a/src/views/ecg/appointment/CheckItemPanel.vue
+++ b/src/views/ecg/appointment/CheckItemPanel.vue
@@ -87,17 +87,23 @@
var panel = hiprintTemplate.addPrintPanel({ width: 140, height: 130, paperNumberDisabled:true});
//鏂囨湰
const checkTypeName = checkTypeStore.getCheckTypeName(props.appointment.bookCheckType)
- panel.addPrintText({ options: { width: 140, height: 12, top: -18, left: 20, title: checkTypeName, textAlign: 'center', fontSize: 13, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
+ panel.addPrintText({ options: { width: 140, height: 12, top: 0, left: 20, title: checkTypeName, textAlign: 'center', fontSize: 13, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
const patientBaisc = props.appointment.patName + " " + calGender(props.appointment.patGender) + " " + calculateAge(props.appointment.patBirthday) + "宀�"
- panel.addPrintText({ options: { width: 140, height: 12, top: 0, left: 20, title: patientBaisc, textAlign: 'center' , fontSize: 13, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
+ panel.addPrintText({ options: { width: 140, height: 12, top: 18, left: 20, title: patientBaisc, textAlign: 'center' , fontSize: 13, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
const ward_bed = props.appointment.patWardDesc + "-" + props.appointment.patBedNo
- panel.addPrintText({ options: { width: 140, height: 12, top: 18, left: 20, title: ward_bed, textAlign: 'center', fontSize: 13, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
+ panel.addPrintText({ options: { width: 140, height: 12, top: 36, left: 20, title: ward_bed, textAlign: 'center', fontSize: 13, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
const bookTime = formatTimestamp(props.appointment.bookDate) + " " + getBookBeginTime(props.appointment.bookTimeslot)
- panel.addPrintText({ options: { width: 140, height: 12, top: 36, left: 20, title: bookTime, textAlign: 'center', fontSize: 13, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
+ panel.addPrintText({ options: { width: 140, height: 12, top: 54, left: 20, title: bookTime, textAlign: 'center', fontSize: 13, 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', } });
const _bookSeqNum = bookSeqNum.value??props.appointment?.bookSeqNum
- panel.addPrintText({ options: { width: 140, height: 12, top: 60, left: 20, title: ''+_bookSeqNum, textAlign: 'center', fontSize: 20, fontFamily: '寰蒋闆呴粦', fontWeight: '1000' } });
+ panel.addPrintText({ options: { width: 140, height: 12, top: 78, left: 20, title: ''+_bookSeqNum, textAlign: 'center', fontSize: 20, fontFamily: '寰蒋闆呴粦', fontWeight: '1000' } });
+
+ // 鏉＄爜 灏辫瘖娴佹按鍙�
+ panel.addPrintText({ options: { width: 140, height: 22, top: 104, left: 20, title: props.appointment.episodeId, textType: 'barcode' } });
+ // 娉ㄦ剰浜嬮」
+ const notes = checkTypeStore.getCheckTypeNotes(props.appointment.bookCheckType)
+ panel.addPrintText({ options: { width: 140, height: 12, top: 128, left: 20, title: notes, textAlign: 'center', fontSize: 13, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
//鎵撳嵃
if (undefined === printMode)
--
Gitblit v1.9.3