From a7d0cd5b5c09bd3f4a92076a5bd59b38358b4b6d Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期一, 28 十月 2024 09:47:03 +0800 Subject: [PATCH] icon update --- src/views/ecg/doctor/components/DevReadyPanel.vue | 39 +++++++++++++++++++++++++-------------- 1 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue index d7771ed..d892742 100644 --- a/src/views/ecg/doctor/components/DevReadyPanel.vue +++ b/src/views/ecg/doctor/components/DevReadyPanel.vue @@ -27,12 +27,12 @@ <el-form-item label="璁惧鎻忚堪" prop=""> {{deviceInfo.brand + " " + deviceInfo.model + " " + deviceInfo.state}} </el-form-item> - <el-form-item label="瑁呮満鏃堕棿" prop="rentTime"> + <el-form-item label="棰嗙敤鏃堕棿" prop="rentTime"> <el-date-picker v-model="formData.rentTime" type="date" value-format="x" - placeholder="閫夋嫨瑁呮満鏃堕棿" + placeholder="閫夋嫨棰嗙敤鏃堕棿" /> </el-form-item> <el-form-item label="澶囨敞" prop="remark"> @@ -47,7 +47,7 @@ </el-form> <el-button @click="submitForm" type="primary" :disabled="formLoading">棰嗙敤瀹屾垚</el-button> <el-button @click="resetForm()">閲� 缃�</el-button> - <el-button @click="printBill()">鎵撳嵃灏忕エ</el-button> + <el-button @click="printBill(formData.patName)">鎵撳嵃灏忕エ</el-button> <el-button @click="cancelInstall" :disabled="formLoading">鏀惧純瑁呮満</el-button> <!-- 鍖荤敓瑁呮満鍒楄〃 --> @@ -132,7 +132,7 @@ import {DeviceApi, DeviceVO} from "@/api/ecg/devmanage"; import {curDayEnd, curDayStart} from "@/utils/dateUtil"; import {RoomBedVO} from "@/api/ecg/doctor"; -import {hiprint, defaultElementTypeProvider} from "vue-plugin-hiprint" +import {hiprint} from "vue-plugin-hiprint"; /** 璁惧棰嗙敤 琛ㄥ崟 */ defineComponent({ name: 'DevReadyPanel' }) @@ -209,7 +209,8 @@ return // formDate 瀵瑰簲 DevRent - // formData.value = data //涓嶈兘鏁翠釜璧嬪�硷紝1.浼氬鑷� rent_id 鍑虹幇浠庤�屽奖鍝嶅悗绔�昏緫澶勭悊锛�2. 榛樿瑁呮満鏃堕棿琚竻绌� + // formData.value = data //涓嶈兘鏁翠釜璧嬪�硷紝 榛樿棰嗙敤鏃堕棿琚竻绌� + formData.value.id = data.id; formData.value.patDetails = data.patDetails } @@ -336,16 +337,26 @@ formData.value = await DevRentApi.getDevRent(rentId) } -const printBill = async () => { - // ElNotification({ - // title: '娓╅Θ鎻愮ず', - // message: '寰呭疄鐜帮紒', - // type: 'warning' - // }) +const printBill = async (myContent: string) => { // 寮曞叆鍚庝娇鐢ㄧず渚� hiprint.init({ -// host: 'http://192.168.2.100:17521', + // host: 'http://192.168.2.100:17521', + token: '111111' + }); +// 涓嬪垪鏂规硶閮芥槸娌℃湁鎷栨嫿璁捐椤甸潰鐨�, 鐩稿綋浜庝唬鐮佹ā寮�, 浣跨敤浠g爜璁捐椤甸潰 +// 鎯宠瀹炵幇鎷栨嫿璁捐椤甸潰,璇峰線涓嬬湅 '鑷畾涔夎璁�' + var hiprintTemplate = new hiprint.PrintTemplate(); // 鍙紶鍙傛暟 + var panel = hiprintTemplate.addPrintPanel({ width: 100, height: 130, paperFooter: 340, paperHeader: 10 }); +//鏂囨湰 + panel.addPrintText({ options: { width: 140, height: 15, top: 20, left: 20, title: myContent, textAlign: 'center' } }); +//鎵撳嵃 + 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 +} +/* hiprint 绀轰緥 +// 寮曞叆鍚庝娇鐢ㄧず渚� + hiprint.init({ + // host: 'http://192.168.2.100:17521', token: '111111' }); // 涓嬪垪鏂规硶閮芥槸娌℃湁鎷栨嫿璁捐椤甸潰鐨�, 鐩稿綋浜庝唬鐮佹ā寮�, 浣跨敤浠g爜璁捐椤甸潰 @@ -360,9 +371,9 @@ panel.addPrintText({ options: { width: 35, height: 35, top: 40, left: 165, title: '123456', textType: 'qrcode' } }); //闀挎枃鏈� panel.addPrintLongText({ options: { width: 180, height: 35, top: 90, left: 20, title: '闀挎枃鏈細hiprint鏄竴涓緢濂界殑webjs鎵撳嵃,娴忚鍣ㄥ湪鐨勫湴鏂逛粬閮藉彲浠ヨ繍琛�' } }); -//鎵撳嵃 +//鎵撳嵃 鐩存帴鎵撳嵃 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 -} +*/ /* 鍒嗛〉鎵撳嵃 HiPrint.print({ pages: [ -- Gitblit v1.9.3