From a90276a242ddca6f45e234c5cc4832a7a01a7e03 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 02 十二月 2024 11:06:53 +0800
Subject: [PATCH] Fix Bug: 条码更新问题
---
src/views/ecg/doctor/components/DevReadyPanel.vue | 158 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 100 insertions(+), 58 deletions(-)
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 9563265..6ee02c8 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -10,15 +10,20 @@
label-width="100px"
v-loading="formLoading"
>
+ <el-form-item label="妫�鏌ラ」鐩�" prop="">
+ {{formData.checkType && checkTypeStore.getCheckTypeName(formData.checkType)}}
+ </el-form-item>
<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="displayBarCode" :value="displayBarCode" :width=100 />
+ <el-button @click="copyBarcode()">澶嶅埗</el-button>
</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">
+ <dict-tag v-if="formData.patSrc" :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData.patSrc" />
{{formData.patDetails?.deptDesc}} {{formData.patDetails?.wardDesc}} {{formData.patDetails?.bedNo}}
</el-form-item>
<el-form-item label="璁惧缂栧彿" prop="devId">
@@ -38,26 +43,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-checkbox style="margin-left:10px" label="鑷姩 " v-model="autoPrint" />
+ <el-button @click="printBill(formData.patId, formData.checkType)">鎵撳嵃灏忕エ</el-button>
+ <el-button @click="printBill(formData.patId, formData.checkType, 8)">鎵撳嵃灏忕エ2</el-button>
+ <el-button @click="cancelReady" :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>
+ <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 +135,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 +146,10 @@
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";
+import form from "@/components/Form/src/Form.vue";
+import {DICT_TYPE} from "@/utils/dict";
/** 璁惧棰嗙敤 琛ㄥ崟 */
defineComponent({ name: 'DevReadyPanel' })
@@ -157,7 +170,9 @@
const formLoading = ref(false) // 琛ㄥ崟鐨勫姞杞戒腑锛�1锛変慨鏀规椂鐨勬暟鎹姞杞斤紱2锛夋彁浜ょ殑鎸夐挳绂佺敤
-const checkTypeStore = useCheckTypeStoreWithOut()
+const autoPrint = ref<boolean>(true);
+
+const checkTypeStore = useCheckTypeStore()
const formData = ref<DevRentVO>({
id: undefined,
@@ -195,6 +210,8 @@
state: 0,
})
+const displayBarCode = ref<string> ()
+
const getRentInfoByPatId = () => {
const tempPatId = formData.value.patId;
resetForm()
@@ -203,6 +220,7 @@
formData.value.patId = tempPatId;
getFreeRentInfo(formData.value)
+ copyBarcode()
}
// 鏍规嵁鎮ｈ�呮垨璁惧, 鑾峰彇 Free鐨勭璧�
@@ -211,11 +229,11 @@
if (null === data)
return
- console.info("dev rent : " + data)
-
// formDate 瀵瑰簲 DevRent
// formData.value = data //涓嶈兘鏁翠釜璧嬪�硷紝 榛樿棰嗙敤鏃堕棿琚竻绌�
formData.value.id = data.id; //rent id
+ formData.value.applyNo = data.applyNo;
+ formData.value.episodeId = data.episodeId;
formData.value.patDetails = data.patDetails
}
@@ -231,36 +249,32 @@
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, data.checkType)
+
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()
@@ -299,17 +313,16 @@
deviceInfo.value.state = 0
}
-// const setPatient = (queueVO: QueueVO | undefined) => {
-// resetForm()
-// formData.value.patId = queueVO?.patId
-// formData.value.patName = queueVO?.patName
-// }
const setPatient = (queueVO: QueueVO | undefined) => {
resetForm()
+ formData.value.applyNo = queueVO?.applyNo
+ formData.value.episodeId = queueVO?.episodeId
formData.value.patId = queueVO?.patId
formData.value.patName = queueVO?.patName
formData.value.checkType = queueVO?.bookCheckType
+ formData.value.patSrc = queueVO?.patDetails.source
getFreeRentInfo(formData.value)
+ copyBarcode()
}
defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
@@ -353,9 +366,9 @@
formData.value = await DevRentApi.getDevRent(rentId)
}
-const printBill = async (patId: string, printMode?: number) => {
+const printBill = async (patId: string, checkType: number, printMode?: number) => {
- const curAppointment: AppointmentVO = await AppointmentApi.getCurAppointmentByPatId( patId )
+ const curAppointment: AppointmentVO = await AppointmentApi.getCurAppointmentByPatIdAndCheckType( patId, checkType )
console.info( curAppointment )
// 寮曞叆鍚庝娇鐢ㄧず渚�
@@ -366,20 +379,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: 12, top: 2, left: 20, title: checkTypeName, textAlign: 'center', fontSize: 8 } });
+ 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: 12, top: 16, left: 20, title: patientBaisc, textAlign: 'center' , fontSize: 8 } });
+ 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: 12, top: 30, left: 20, title: ward_bed, textAlign: 'center', fontSize: 8 } });
+ 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: 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: 22, top: 86, left: 20, title: curAppointment.patId, textType: 'barcode' } });
+ 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: 22, top: 86, left: 20, title: curAppointment.episodeId, textType: 'barcode' } });
//鎵撳嵃
if (undefined === printMode)
@@ -425,19 +439,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 = ''
@@ -452,6 +453,47 @@
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('鎿嶄綔鎴愬姛'))
+}
+
+const getDisplayBarcode = (): string => {
+ if (!formData.value.checkType)
+ return ""
+
+ const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
+ if (!displayBarcode.includes( formData.value.patSrc ))
+ return ""
+
+ return getBarcode()
+}
+
+const getBarcode = (): string => {
+ if (!formData.value.checkType)
+ return ""
+
+ if (1 === formData.value.patSrc || 2 === formData.value.patSrc)
+ return formData.value.applyNo??""
+ else if (3 === formData.value.patSrc || 4 === formData.value.patSrc)
+ return formData.value.episodeId??""
+
+ return ""
+}
+
+const copyBarcode = async () => {
+ displayBarCode.value = getDisplayBarcode()
+ await navigator.clipboard.writeText( getBarcode() );
+ console.info(displayBarCode.value)
+}
+
/** 鍒濆鍖� **/
onMounted(() => {
getList()
--
Gitblit v1.9.3