From 107bb47a563a7b551ea2bb616fa2ba3d8a52ee7a Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 08 十一月 2024 16:17:12 +0800
Subject: [PATCH] update

---
 src/views/ecg/doctor/components/DevReadyPanel.vue |   47 ++++++++++++++++++++++++++++-------------------
 1 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 7b8131f..8179fd1 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -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>
 
   <!-- 鍖荤敓瑁呮満鍒楄〃 -->
@@ -130,11 +131,12 @@
 import {dateFormatter} from "@/utils/formatTime";
 import {JobRecordApi, JobRecordVO} from "@/api/ecg/jobrecord";
 import {DeviceApi, DeviceVO} from "@/api/ecg/devmanage";
-import {curDayEnd, curDayStart} from "@/utils/dateUtil";
+import {calculateAge, curDayEnd, curDayStart, formatTimestamp} from "@/utils/dateUtil";
 import {RoomBedVO} from "@/api/ecg/doctor";
 import {hiprint} from "vue-plugin-hiprint";
 import {AppointmentApi, AppointmentVO} from "@/api/ecg/appointment";
 import { useCheckTypeStoreWithOut } from '@/store/modules/checkType'
+import {PrefixInteger} from "@/utils/formatter";
 
 /** 璁惧棰嗙敤 琛ㄥ崟 */
 defineComponent({ name: 'DevReadyPanel' })
@@ -341,7 +343,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 )
@@ -357,20 +359,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' } });
-  const patientBaisc = curAppointment.patName + "  " + curAppointment.patGender + "  " + curAppointment.patAge
-  panel.addPrintText({ options: { width: 140, height: 15, top: 40, left: 20, title: patientBaisc, textAlign: 'center' } });
+  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: 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' } });
-  const bookTime = curAppointment.bookDate + "-" + getBookBeginTime(curAppointment.bookTimeslot)
-  panel.addPrintText({ options: { width: 140, height: 15, top: 80, left: 20, title: bookTime, textAlign: 'center' } });
-  panel.addPrintText({ options: { width: 140, height: 15, top: 100, left: 20, title: curAppointment.patId, textAlign: 'center' } });
-  panel.addPrintText({ options: { width: 140, height: 15, top: 120, left: 20, title: curAppointment.patMobile, textAlign: 'center' } });
+  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: 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 绀轰緥
 // 寮曞叆鍚庝娇鐢ㄧず渚�
@@ -410,13 +415,17 @@
 });
 */
 
-const getBookBeginTime = (bookTimeslot: string): string => {
-  if (7 == bookTimeslot.length) {
-    return bookTimeslot.slice(0, 0) + ":" + bookTimeslot.slice(1, 2)
-  } else if (8 == bookTimeslot.length) {
-    return bookTimeslot.slice(0, 1) + ":" + bookTimeslot.slice(2, 3)
-  }
-  return "-"
+const getBookBeginTime = (bookTimeslot: number): string => {
+  const hour = parseInt( bookTimeslot/1000000 );
+  const minute = parseInt( bookTimeslot/10000 ) % 100;
+  return PrefixInteger(hour,2) + ":" + PrefixInteger(minute, 2);
+}
+
+const calGender = (_gender: number): string => {
+  if (1 === _gender)
+    return "鐢�"
+  else
+    return "濂�"
 }
 
 const getDevInfo = async () => {

--
Gitblit v1.9.3