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 | 66 ++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 13 deletions(-)
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index c977620..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" />
- <Barcode v-if="!isStringEmpty(formData.patId) && 1 === checkTypeStore.getCheckTypeDispBarCode(formData.checkType)" :value="formData.patId" :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">
@@ -49,8 +54,8 @@
</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)">鎵撳嵃灏忕エ</el-button>
- <el-button @click="printBill(formData.patId, 8)">鎵撳嵃灏忕エ2</el-button>
+ <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="feeConfirm" :disabled="formLoading">纭垂</el-button>
@@ -143,6 +148,8 @@
import {AppointmentApi, AppointmentVO} from "@/api/ecg/appointment";
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' })
@@ -203,6 +210,8 @@
state: 0,
})
+const displayBarCode = ref<string> ()
+
const getRentInfoByPatId = () => {
const tempPatId = formData.value.patId;
resetForm()
@@ -211,6 +220,7 @@
formData.value.patId = tempPatId;
getFreeRentInfo(formData.value)
+ copyBarcode()
}
// 鏍规嵁鎮ｈ�呮垨璁惧, 鑾峰彇 Free鐨勭璧�
@@ -222,6 +232,8 @@
// 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
}
@@ -240,7 +252,7 @@
await DevRentApi.devReady(data)
if (autoPrint.value)
- printBill( data.patId)
+ printBill( data.patId, data.checkType)
dialogVisible.value = false
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
@@ -301,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 鏂规硶锛岀敤浜庤缃偅鑰�
@@ -355,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 )
// 寮曞叆鍚庝娇鐢ㄧず渚�
@@ -381,8 +392,8 @@
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.patId, textType: 'barcode' } });
+ //鏉″舰鐮�
+ panel.addPrintText({ options: { width: 140, height: 22, top: 86, left: 20, title: curAppointment.episodeId, textType: 'barcode' } });
//鎵撳嵃
if (undefined === printMode)
@@ -454,6 +465,35 @@
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