From b921b343fd70d32e766dc9206bee9b977ff046e3 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 25 十一月 2024 13:58:39 +0800
Subject: [PATCH] 打印调整
---
src/views/ecg/doctor/components/DevReadyPanel.vue | 126 +++++++++++++++++++++++-------------------
1 files changed, 69 insertions(+), 57 deletions(-)
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 55fd706..c977620 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -12,14 +12,14 @@
>
<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 />
+ <Barcode v-if="!isStringEmpty(formData.patId) && 1 === checkTypeStore.getCheckTypeDispBarCode(formData.checkType)" :value="formData.patId" :width=100 />
</el-form-item>
<el-form-item label="鎮ｈ�呭悕绉�" prop="patName">
<el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
</el-form-item>
<el-form-item label="鎮ｈ�呮弿杩�" prop="patDeptDesc">
- {{formData.patDetails}}
+ {{formData.patDetails?.deptDesc}} {{formData.patDetails?.wardDesc}} {{formData.patDetails?.bedNo}}
</el-form-item>
<el-form-item label="璁惧缂栧彿" prop="devId">
<el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getDevInfo"/>
@@ -38,26 +38,31 @@
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
+<!--
<el-form-item label="缂磋垂纭" prop="paid">
<el-radio-group v-model="formData.paid">
<el-radio key="1" :label="1"> 宸茬即璐� </el-radio>
<el-radio key="0" :label="0"> 鏈即璐� </el-radio>
</el-radio-group>
</el-form-item>
+-->
</el-form>
<el-button @click="submitForm" type="primary" :disabled="formLoading">棰嗙敤瀹屾垚</el-button>
- <el-button @click="resetForm()">閲� 缃�</el-button>
+ <el-checkbox style="margin-left:10px" label="鑷姩 " v-model="autoPrint" />
<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>
+ <el-button @click="cancelReady" :disabled="formLoading">鏀惧純棰嗙敤</el-button>
+ <el-button @click="resetForm()">閲� 缃�</el-button>
+ <el-button @click="feeConfirm" :disabled="formLoading">纭垂</el-button>
+ <el-button @click="feeCancel" :disabled="formLoading">鍙栨秷纭垂</el-button>
<!-- 鍖荤敓瑁呮満鍒楄〃 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @row-click="onRowClick" >
- <el-table-column label="id" align="center" prop="id" />
- <el-table-column label="缂磋垂" align="center" prop="paid">
+<!-- <el-table-column label="id" align="center" prop="id" />-->
+ <el-table-column label="纭垂" align="center" prop="paid">
<template #default="scope">
- {{scope.row.paid == 1 ? "宸茬即" : ""}}
+ {{scope.row.paid == 1 ? "宸茬‘璐�" : ""}}
</template>
</el-table-column>
<el-table-column label="棰嗙敤鎯呭喌" align="center" prop="cancelled" >
@@ -125,6 +130,7 @@
<script setup lang="ts">
import {defineComponent, PropType} from "vue";
+import {Barcode} from "@/components/Barcode";
import { DevRentApi, DevRentVO } from '@/api/ecg/devrent'
import {QueueVO} from "@/api/ecg/queue";
import {isStringEmpty} from "@/utils/stringUtil";
@@ -135,8 +141,8 @@
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";
+import {useCheckTypeStore} from '@/store/modules/checkType'
+import {calGender, getBookBeginTime} from "@/utils";
/** 璁惧棰嗙敤 琛ㄥ崟 */
defineComponent({ name: 'DevReadyPanel' })
@@ -157,19 +163,17 @@
const formLoading = ref(false) // 琛ㄥ崟鐨勫姞杞戒腑锛�1锛変慨鏀规椂鐨勬暟鎹姞杞斤紱2锛夋彁浜ょ殑鎸夐挳绂佺敤
-const checkTypeStore = useCheckTypeStoreWithOut()
+const autoPrint = ref<boolean>(true);
-const formData = ref({
+const checkTypeStore = useCheckTypeStore()
+
+const formData = ref<DevRentVO>({
id: undefined,
devId: undefined,
patId: undefined,
patName: undefined,
- patDeptCode: undefined,
- patDeptDesc: undefined,
- patWardCode: undefined,
- patWardDesc: undefined,
- patBedNo: undefined,
patDetails: undefined,
+ checkType: undefined,
rentTime: new Date().getTime(),
returnTime: undefined,
interference: undefined,
@@ -180,6 +184,7 @@
roomId: props.room.roomId,
bedNo: props.room.bedNo
})
+
const formRules = reactive({
devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
rentTime: [{ required: true, message: '璇烽�夋嫨瑁呮満鏃ユ湡', trigger: 'blur' }],
@@ -216,7 +221,7 @@
// formDate 瀵瑰簲 DevRent
// formData.value = data //涓嶈兘鏁翠釜璧嬪�硷紝 榛樿棰嗙敤鏃堕棿琚竻绌�
- formData.value.id = data.id;
+ formData.value.id = data.id; //rent id
formData.value.patDetails = data.patDetails
}
@@ -229,39 +234,35 @@
try {
formData.value.roomId = props.room.roomId
formData.value.bedNo = props.room.bedNo
- const data = formData.value as unknown as DevRentVO
+ const data = formData.value
console.info( data )
- if (formData.value.id === null || formData.value.id === undefined) {
- const result = await DevRentApi.devReady(data)
- formData.value.id = result
- message.success(t('鎿嶄綔瀹屾垚'))
- } else {
- await DevRentApi.devReady(data)
- message.success(t('鏇存柊瀹屾垚'))
- }
+ await DevRentApi.devReady(data)
+
+ if (autoPrint.value)
+ printBill( data.patId)
+
dialogVisible.value = false
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
emit('event_dev_ready')
resetForm()
getList()
+
+ message.success(t('鎿嶄綔瀹屾垚'))
} finally {
formLoading.value = false
}
}
-const cancelInstall = async () => {
+// 鏀惧純棰嗙敤
+const cancelReady = async () => {
formData.value.roomId = props.room.roomId
formData.value.bedNo = props.room.bedNo
const data = formData.value as unknown as DevRentVO
- if (formData.value.id === null || formData.value.id === undefined) {
- const result = await DevRentApi.devReadyCancel(data)
- formData.value.id = result
- message.success(t('鎿嶄綔鎴愬姛'))
- } else {
- await DevRentApi.devReadyCancel(data)
- message.success(t('鎿嶄綔鎴愬姛'))
- }
+
+ await DevRentApi.devReadyCancel(data)
+ message.success(t('鎿嶄綔鎴愬姛'))
+
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
emit('event_dev_ready')
resetForm()
@@ -275,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()
@@ -299,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 鏂规硶锛岀敤浜庤缃偅鑰�
@@ -356,20 +368,21 @@
// 涓嬪垪鏂规硶閮芥槸娌℃湁鎷栨嫿璁捐椤甸潰鐨�, 鐩稿綋浜庝唬鐮佹ā寮�, 浣跨敤浠ｇ爜璁捐椤甸潰
// 鎯宠瀹炵幇鎷栨嫿璁捐椤甸潰,璇峰線涓嬬湅 '鑷畾涔夎璁�'
var hiprintTemplate = new hiprint.PrintTemplate(); // 鍙紶鍙傛暟
- var panel = hiprintTemplate.addPrintPanel({ width: 100, height: 130, paperFooter: 340, paperHeader: 10 });
+ //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(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: 10, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
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: 10, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
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: 10, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
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: 10, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
+ panel.addPrintText({ options: { width: 140, height: 12, top: 58, left: 20, title: curAppointment.patId, textAlign: 'center', fontSize: 10, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
+ panel.addPrintText({ options: { width: 140, height: 12, top: 72, left: 20, title: curAppointment.patMobile, textAlign: 'center', fontSize: 10, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
//鏉″舰鐮�
- 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' } });
//鎵撳嵃
if (undefined === printMode)
@@ -415,19 +428,6 @@
});
*/
-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 () => {
deviceInfo.value.category = ''
deviceInfo.value.brand = ''
@@ -442,6 +442,18 @@
deviceInfo.value = data
}
+const feeConfirm = async () => {
+ const result = await DevRentApi.feeConfirm(formData.value.id)
+ if (0 == result)
+ message.success(t('鎿嶄綔鎴愬姛'))
+}
+
+const feeCancel = async () => {
+ const result = await DevRentApi.feeCancel(formData.value.id)
+ if (0 == result)
+ message.success(t('鎿嶄綔鎴愬姛'))
+}
+
/** 鍒濆鍖� **/
onMounted(() => {
getList()
--
Gitblit v1.9.3