From 23e46fc6b6f6f70dab360ded43fe3078fe4ce224 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 12 十一月 2024 14:08:45 +0800
Subject: [PATCH] update
---
src/views/ecg/doctor/components/DevReadyPanel.vue | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index c058733..13795d6 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -12,7 +12,7 @@
>
<el-form-item label="鎮ｈ�呯紪鍙�" prop="patId">
<el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" />
- <Qrcode v-if="formData.patId !== undefined && formData.patId !== ''" :text="formData.patId" logo="/logo.gif" width=100 />
+ <Qrcode v-if="formData.patId !== undefined && formData.patId !== ''" :text="formData.patId" logo="/logo.gif" :width=100 />
</el-form-item>
<el-form-item label="鎮ｈ�呭悕绉�" prop="patName">
<el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
@@ -48,6 +48,7 @@
<el-button @click="submitForm" type="primary" :disabled="formLoading">棰嗙敤瀹屾垚</el-button>
<el-button @click="resetForm()">閲� 缃�</el-button>
<el-button @click="printBill(formData.patId)">鎵撳嵃灏忕エ</el-button>
+ <el-button @click="printBill(formData.patId, 8)">鎵撳嵃灏忕エ2</el-button>
<el-button @click="cancelInstall" :disabled="formLoading">鏀惧純瑁呮満</el-button>
<!-- 鍖荤敓瑁呮満鍒楄〃 -->
@@ -169,6 +170,7 @@
patWardDesc: undefined,
patBedNo: undefined,
patDetails: undefined,
+ checkType: undefined,
rentTime: new Date().getTime(),
returnTime: undefined,
interference: undefined,
@@ -215,7 +217,7 @@
// formDate 瀵瑰簲 DevRent
// formData.value = data //涓嶈兘鏁翠釜璧嬪�硷紝 榛樿棰嗙敤鏃堕棿琚竻绌�
- formData.value.id = data.id;
+ formData.value.id = data.id; //rent id
formData.value.patDetails = data.patDetails
}
@@ -274,12 +276,22 @@
devId: undefined,
patId: undefined,
patName: undefined,
+ checkType: undefined,
rentTime: new Date().getTime(),
returnTime: undefined,
interference: undefined,
baseline: undefined,
detachment: undefined,
- remark: undefined
+ remark: undefined,
+ patDeptCode: undefined,
+ patDeptDesc: undefined,
+ patWardCode: undefined,
+ patWardDesc: undefined,
+ patBedNo: undefined,
+ patDetails: undefined,
+ paid: undefined,
+ roomId: props.room.roomId,
+ bedNo: props.room.bedNo
}
formRef.value?.resetFields()
@@ -298,6 +310,7 @@
resetForm()
formData.value.patId = queueVO?.patId
formData.value.patName = queueVO?.patName
+ formData.value.checkType = queueVO?.bookCheckType
getFreeRentInfo(formData.value)
}
defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
@@ -342,7 +355,7 @@
formData.value = await DevRentApi.getDevRent(rentId)
}
-const printBill = async (patId: string) => {
+const printBill = async (patId: string, printMode?: number) => {
const curAppointment: AppointmentVO = await AppointmentApi.getCurAppointmentByPatId( patId )
console.info( curAppointment )
@@ -358,20 +371,23 @@
var panel = hiprintTemplate.addPrintPanel({ width: 100, height: 130, paperFooter: 340, paperHeader: 10 });
//鏂囨湰
const checkTypeName = checkTypeStore.getCheckTypeName(curAppointment.bookCheckType)
- panel.addPrintText({ options: { width: 140, height: 15, top: 20, left: 20, title: checkTypeName, textAlign: 'center', fontSize: 11 } });
+ panel.addPrintText({ options: { width: 140, height: 12, top: 2, left: 20, title: checkTypeName, textAlign: 'center', fontSize: 8 } });
const patientBaisc = curAppointment.patName + " " + calGender(curAppointment.patGender) + " " + calculateAge(curAppointment.patBirthday) + "宀�"
- panel.addPrintText({ options: { width: 140, height: 15, top: 40, left: 20, title: patientBaisc, textAlign: 'center' , fontSize: 11} });
+ panel.addPrintText({ options: { width: 140, height: 12, top: 16, left: 20, title: patientBaisc, textAlign: 'center' , fontSize: 8 } });
const ward_bed = curAppointment.patWardDesc + "-" + curAppointment.patBedNo
- panel.addPrintText({ options: { width: 140, height: 15, top: 60, left: 20, title: ward_bed, textAlign: 'center', fontSize: 11 } });
+ panel.addPrintText({ options: { width: 140, height: 12, top: 30, left: 20, title: ward_bed, textAlign: 'center', fontSize: 8 } });
const bookTime = formatTimestamp(curAppointment.bookDate) + " " + getBookBeginTime(curAppointment.bookTimeslot)
- panel.addPrintText({ options: { width: 140, height: 15, top: 80, left: 20, title: bookTime, textAlign: 'center', fontSize: 10 } });
- panel.addPrintText({ options: { width: 140, height: 15, top: 100, left: 20, title: curAppointment.patId, textAlign: 'center', fontSize: 10} });
- panel.addPrintText({ options: { width: 140, height: 15, top: 120, left: 20, title: curAppointment.patMobile, textAlign: 'center', fontSize: 10 } });
+ panel.addPrintText({ options: { width: 140, height: 12, top: 44, left: 20, title: bookTime, textAlign: 'center', fontSize: 8 } });
+ panel.addPrintText({ options: { width: 140, height: 12, top: 58, left: 20, title: curAppointment.patId, textAlign: 'center', fontSize: 8 } });
+ panel.addPrintText({ options: { width: 140, height: 12, top: 72, left: 20, title: curAppointment.patMobile, textAlign: 'center', fontSize: 8 } });
//鏉″舰鐮�
- panel.addPrintText({ options: { width: 140, height: 35, top: 140, left: 20, title: curAppointment.patId, textType: 'barcode' } });
+ panel.addPrintText({ options: { width: 140, height: 22, top: 86, left: 20, title: curAppointment.patId, textType: 'barcode' } });
//鎵撳嵃
- hiprintTemplate.print([{},{},{}]); // 鍙互浼� [瀹氫綅鍙傛暟] 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
+ 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([{},{},{}]);
}
/* hiprint 绀轰緥
// 寮曞叆鍚庝娇鐢ㄧず渚�
--
Gitblit v1.9.3