From f4b90cc4280809e8b69bb1a7617e3e7b7a6d5920 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 10 四月 2025 16:17:15 +0800
Subject: [PATCH] update
---
src/views/ecg/doctor/components/DevReadyPanel.vue | 162 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 103 insertions(+), 59 deletions(-)
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index c977620..96b1d7b 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -10,22 +10,27 @@
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">
- {{formData.patDetails?.deptDesc}} {{formData.patDetails?.wardDesc}} {{formData.patDetails?.bedNo}}
+ <dict-tag v-if="formData.patDetails?.source" :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData.patDetails?.source" />
+ {{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"/>
</el-form-item>
<el-form-item label="璁惧鎻忚堪" prop="">
- {{deviceInfo.brand + " " + deviceInfo.model + " " + deviceInfo.state}}
+ {{ devInfo?.brand||'-' }} {{ devInfo?.model||'-' }} {{ tranlateDevState(devInfo?.state) }}
</el-form-item>
<el-form-item label="棰嗙敤鏃堕棿" prop="rentTime">
<el-date-picker
@@ -49,12 +54,12 @@
</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>
- <el-button @click="feeCancel" :disabled="formLoading">鍙栨秷纭垂</el-button>
+ <el-button v-if="formData.checkType && checkTypeStore.getExpenseRecognition(formData.checkType)" @click="feeConfirm" :disabled="formLoading">纭垂</el-button>
+ <el-button v-if="formData.checkType && checkTypeStore.getExpenseRecognition(formData.checkType)" @click="feeCancel" :disabled="formLoading">鍙栨秷纭垂</el-button>
<!-- 鍖荤敓瑁呮満鍒楄〃 -->
<ContentWrap>
@@ -143,6 +148,8 @@
import {AppointmentApi, AppointmentVO} from "@/api/ecg/appointment";
import {useCheckTypeStore} from '@/store/modules/checkType'
import {calGender, getBookBeginTime} from "@/utils";
+import {DICT_TYPE} from "@/utils/dict";
+import {tranlateDevState} from "@/utils/statusFormatter";
/** 璁惧棰嗙敤 琛ㄥ崟 */
defineComponent({ name: 'DevReadyPanel' })
@@ -167,8 +174,7 @@
const checkTypeStore = useCheckTypeStore()
-const formData = ref<DevRentVO>({
- id: undefined,
+const formData = ref<Partial<DevRentVO>>({
devId: undefined,
patId: undefined,
patName: undefined,
@@ -176,9 +182,6 @@
checkType: undefined,
rentTime: new Date().getTime(),
returnTime: undefined,
- interference: undefined,
- baseline: undefined,
- detachment: undefined,
remark: undefined,
paid: undefined,
roomId: props.room.roomId,
@@ -193,15 +196,14 @@
})
const formRef = ref() // 琛ㄥ崟 Ref
-const deviceInfo = ref<DeviceVO> ({
- id: 0,
- devId: '',
- category: '',
- brand: '',
- model: '',
- purchaseDate: 0,
- state: 0,
+const devInfo = ref<Partial<DeviceVO>>({
+ category: undefined,
+ brand: undefined,
+ model: undefined,
+ state: undefined,
})
+
+const displayBarCode = ref<string> ()
const getRentInfoByPatId = () => {
const tempPatId = formData.value.patId;
@@ -211,6 +213,7 @@
formData.value.patId = tempPatId;
getFreeRentInfo(formData.value)
+ copyBarcode()
}
// 鏍规嵁鎮ｈ�呮垨璁惧, 鑾峰彇 Free鐨勭璧�
@@ -220,9 +223,10 @@
return
// formDate 瀵瑰簲 DevRent
- // formData.value = data //涓嶈兘鏁翠釜璧嬪�硷紝 榛樿棰嗙敤鏃堕棿琚竻绌�
- formData.value.id = data.id; //rent id
- formData.value.patDetails = data.patDetails
+ formData.value = data
+
+ // 棰嗙敤鏃堕棿 閲囩敤褰撳墠鏃堕棿
+ formData.value.rentTime = new Date().getTime()
}
/** 鎻愪氦琛ㄥ崟 */
@@ -239,8 +243,8 @@
await DevRentApi.devReady(data)
- if (autoPrint.value)
- printBill( data.patId)
+ if (autoPrint.value && data.patId && data.checkType)
+ printBill( data.patId, data.checkType)
dialogVisible.value = false
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
@@ -272,22 +276,13 @@
/** 閲嶇疆琛ㄥ崟 */
const resetForm = () => {
formData.value = {
- id: undefined,
devId: undefined,
patId: undefined,
patName: undefined,
checkType: undefined,
rentTime: new Date().getTime(),
returnTime: undefined,
- interference: undefined,
- baseline: undefined,
- detachment: undefined,
remark: undefined,
- patDeptCode: undefined,
- patDeptDesc: undefined,
- patWardCode: undefined,
- patWardDesc: undefined,
- patBedNo: undefined,
patDetails: undefined,
paid: undefined,
roomId: props.room.roomId,
@@ -295,23 +290,23 @@
}
formRef.value?.resetFields()
- deviceInfo.value.category = ''
- deviceInfo.value.brand = ''
- deviceInfo.value.model = ''
- deviceInfo.value.state = 0
+ devInfo.value = {
+ category: undefined,
+ brand: undefined,
+ model: undefined,
+ state: undefined,
+ }
}
-// 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
getFreeRentInfo(formData.value)
+ copyBarcode()
}
defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
@@ -352,12 +347,19 @@
}
const getSelectedRent = async (rentId) => {
- formData.value = await DevRentApi.getDevRent(rentId)
+ const data = await DevRentApi.getDevRent(rentId)
+
+ formData.value = data
+
+ devInfo.value.category = data.category
+ devInfo.value.brand = data.brand
+ devInfo.value.model = data.model
+ devInfo.value.state = data.devState
}
-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 +383,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)
@@ -429,29 +431,71 @@
*/
const getDevInfo = async () => {
- deviceInfo.value.category = ''
- deviceInfo.value.brand = ''
- deviceInfo.value.model = ''
- deviceInfo.value.state = 0
- if (isStringEmpty(formData.value.devId))
+ if (formData.value?.devId == null) {
+ devInfo.value.brand = undefined
+ devInfo.value.model = undefined
+ devInfo.value.state = undefined
return
+ }
const data = await DeviceApi.getDeviceByDevId(formData.value.devId!)
- console.info( data )
if ( null !== data)
- deviceInfo.value = data
+ devInfo.value = data
}
const feeConfirm = async () => {
+ if (formData.value?.id === undefined) {
+ message.error(t('璇峰厛棰嗙敤'))
+ return
+ }
+
const result = await DevRentApi.feeConfirm(formData.value.id)
+ if (0 == result)
+ message.success(t('纭垂鎿嶄綔鎴愬姛'))
+}
+
+const feeCancel = async () => {
+ if (formData.value?.id === undefined) {
+ message.error(t('璇峰厛棰嗙敤'))
+ return
+ }
+
+ const result = await DevRentApi.feeCancel(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 (formData.value.patDetails == null || formData.value.patDetails.source == null ||
+ !displayBarcode.includes( formData.value.patDetails.source ))
+ return ""
+
+ return getBarcode()
+}
+
+const getBarcode = (): string => {
+ if (!formData.value.checkType)
+ return ""
+
+ const patSource = formData.value.patDetails?.source
+ if (patSource == null)
+ return ""
+
+ if (1 === patSource || 2 === patSource)
+ return formData.value.applyNo??""
+ else if (3 === patSource || 4 === patSource)
+ return formData.value.episodeId??""
+
+ return ""
+}
+
+const copyBarcode = async () => {
+ displayBarCode.value = getDisplayBarcode()
+ await navigator.clipboard.writeText( getBarcode() );
}
/** 鍒濆鍖� **/
--
Gitblit v1.9.3