From 106d90222ad7fb031cae93876e904e9dc8e5ce7f Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 11 四月 2025 16:05:47 +0800
Subject: [PATCH] fix warnings
---
src/views/ecg/doctor/components/DevReadyPanel.vue | 258 +++++++++++++++++++++++++++++++--------------------
1 files changed, 157 insertions(+), 101 deletions(-)
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 55fd706..f846a23 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 && 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">
- {{formData.patDetails}}
+ <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
@@ -38,26 +43,30 @@
<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="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 v-if="needAutoFeeConfirm(formData.checkType)" @click="feeConfirm" :disabled="formLoading">纭垂</el-button>
+ <el-button v-if="needAutoFeeConfirm(formData.checkType)" @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 +134,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 +145,11 @@
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 {DICT_TYPE} from "@/utils/dict";
+import {tranlateDevState} from "@/utils/statusFormatter";
+import {getCheckTypeName, needAutoFeeConfirm} from "../../../../utils/checkTypeFormatter";
/** 璁惧棰嗙敤 琛ㄥ崟 */
defineComponent({ name: 'DevReadyPanel' })
@@ -157,29 +170,23 @@
const formLoading = ref(false) // 琛ㄥ崟鐨勫姞杞戒腑锛�1锛変慨鏀规椂鐨勬暟鎹姞杞斤紱2锛夋彁浜ょ殑鎸夐挳绂佺敤
-const checkTypeStore = useCheckTypeStoreWithOut()
+const autoPrint = ref<boolean>(true);
-const formData = ref({
+const checkTypeStore = useCheckTypeStore()
+
+const formData = ref<Partial<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,
- baseline: undefined,
- detachment: undefined,
remark: undefined,
paid: undefined,
- roomId: props.room.roomId,
- bedNo: props.room.bedNo
})
+
const formRules = reactive({
devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
rentTime: [{ required: true, message: '璇烽�夋嫨瑁呮満鏃ユ湡', trigger: 'blur' }],
@@ -188,15 +195,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;
@@ -206,6 +212,7 @@
formData.value.patId = tempPatId;
getFreeRentInfo(formData.value)
+ copyBarcode()
}
// 鏍规嵁鎮ｈ�呮垨璁惧, 鑾峰彇 Free鐨勭璧�
@@ -215,9 +222,10 @@
return
// formDate 瀵瑰簲 DevRent
- // formData.value = data //涓嶈兘鏁翠釜璧嬪�硷紝 榛樿棰嗙敤鏃堕棿琚竻绌�
- formData.value.id = data.id;
- formData.value.patDetails = data.patDetails
+ formData.value = data
+
+ // 棰嗙敤鏃堕棿 閲囩敤褰撳墠鏃堕棿
+ formData.value.rentTime = new Date().getTime()
}
/** 鎻愪氦琛ㄥ崟 */
@@ -229,39 +237,38 @@
try {
formData.value.roomId = props.room.roomId
formData.value.bedNo = props.room.bedNo
- const data = formData.value as unknown as DevRentVO
- console.info( data )
+ await DevRentApi.devReady(formData.value)
- 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('鏇存柊瀹屾垚'))
+ if (autoPrint.value && formData.value.patId && formData.value.checkType) {
+ printBill(formData.value.patId, formData.value.checkType)
}
+
+ // 鑷姩纭垂
+ if (needAutoFeeConfirm(formData.value.checkType)) {
+ feeConfirm()
+ }
+
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()
@@ -271,35 +278,35 @@
/** 閲嶇疆琛ㄥ崟 */
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
+ remark: undefined,
+ patDetails: undefined,
+ paid: undefined,
}
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 鏂规硶锛岀敤浜庤缃偅鑰�
@@ -340,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 )
// 寮曞叆鍚庝娇鐢ㄧず渚�
@@ -356,24 +370,25 @@
// 涓嬪垪鏂规硶閮芥槸娌℃湁鎷栨嫿璁捐椤甸潰鐨�, 鐩稿綋浜庝唬鐮佹ā寮�, 浣跨敤浠ｇ爜璁捐椤甸潰
// 鎯宠瀹炵幇鎷栨嫿璁捐椤甸潰,璇峰線涓嬬湅 '鑷畾涔夎璁�'
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 } });
+ const checkTypeName = getCheckTypeName(curAppointment.bookCheckType)
+ 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: 35, top: 140, 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)
- 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
+ if (printMode == null)
+ 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
else
hiprintTemplate.print([{},{},{}]);
}
@@ -415,31 +430,72 @@
});
*/
-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 = ''
- 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 == null) {
+ 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 == null) {
+ message.error(t('璇峰厛棰嗙敤'))
+ return
+ }
+
+ const result = await DevRentApi.feeCancel(formData.value.id)
+ if (0 === result)
+ message.success(t('鎿嶄綔鎴愬姛'))
+}
+
+const getDisplayBarcode = (): string => {
+ if (formData.value.checkType == null)
+ 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 == null)
+ 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