From d85bd456d094842dbc47c19438df882f3d7c6c66 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 24 十月 2024 11:09:09 +0800
Subject: [PATCH] bug fix
---
src/views/ecg/doctor/components/DevReadyPanel.vue | 159 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 132 insertions(+), 27 deletions(-)
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 3cfa0d1..40818e5 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -1,5 +1,7 @@
<template>
- 褰撳墠鎮ｈ��: {{patient?.patId}} {{isStringEmpty(patient?.patName)?'鏃�':patient.patName}}
+
+<!-- 褰撳墠鎮ｈ��: {{patient?.patId}} {{isStringEmpty(patient?.patName)?'鏃�':patient.patName}}-->
+
<el-form
ref="formRef"
:model="formData"
@@ -7,11 +9,22 @@
label-width="100px"
v-loading="formLoading"
>
+ <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 />
+ </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}}
+ </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.brand + " " + deviceInfo.model + " " + deviceInfo.state}}
</el-form-item>
<el-form-item label="瑁呮満鏃堕棿" prop="rentTime">
<el-date-picker
@@ -24,6 +37,12 @@
<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>
@@ -34,6 +53,11 @@
<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">
+ <template #default="scope">
+ {{scope.row.paid == 1 ? "宸茬即" : ""}}
+ </template>
+ </el-table-column>
<el-table-column label="棰嗙敤鎯呭喌" align="center" prop="cancelled" >
<template #default="scope">
<span v-if="scope.row.jobType === 5">"宸查鐢�"</span>
@@ -102,15 +126,24 @@
import { DevRentApi, DevRentVO } from '@/api/ecg/devrent'
import {QueueVO} from "@/api/ecg/queue";
import {isStringEmpty} from "@/utils/stringUtil";
-import {dateFormatter, timeFormatter} from "@/utils/formatTime";
+import {dateFormatter} from "@/utils/formatTime";
import {JobRecordApi, JobRecordVO} from "@/api/ecg/jobrecord";
import {DeviceApi, DeviceVO} from "@/api/ecg/devmanage";
import {curDayEnd, curDayStart} from "@/utils/dateUtil";
+import {RoomBedVO} from "@/api/ecg/doctor";
+import {hiprint, defaultElementTypeProvider} from "vue-plugin-hiprint"
-/** 瑁呮満鎷嗘満 琛ㄥ崟 */
+/** 璁惧棰嗙敤 琛ㄥ崟 */
defineComponent({ name: 'DevReadyPanel' })
-const emit = defineEmits(['success-ready']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋�
+const props = defineProps({
+ room: {
+ type: Object as PropType<RoomBedVO>,
+ required: true
+ }
+})
+
+const emit = defineEmits(['event_dev_ready']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋�
const { t } = useI18n() // 鍥介檯鍖�
const message = useMessage() // 娑堟伅寮圭獥
@@ -120,22 +153,26 @@
const formLoading = ref(false) // 琛ㄥ崟鐨勫姞杞戒腑锛�1锛変慨鏀规椂鐨勬暟鎹姞杞斤紱2锛夋彁浜ょ殑鎸夐挳绂佺敤
const formType = ref('create') // 琛ㄥ崟鐨勭被鍨嬶細create - 鏂板锛泆pdate - 淇敼
-const patient = ref<QueueVO>({
- patId: '',
- patName: ''
-})
-
const formData = ref({
id: undefined,
devId: undefined,
- patId: patient.value?.patId,
- patName: patient.value?.patName,
+ patId: undefined,
+ patName: undefined,
+ patDeptCode: undefined,
+ patDeptDesc: undefined,
+ patWardCode: undefined,
+ patWardDesc: undefined,
+ patBedNo: undefined,
+ patDetails: undefined,
rentTime: new Date().getTime(),
returnTime: undefined,
interference: undefined,
baseline: undefined,
detachment: undefined,
- remark: undefined
+ remark: undefined,
+ paid: undefined,
+ roomId: props.room.roomId,
+ bedNo: props.room.bedNo
})
const formRules = reactive({
devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
@@ -152,8 +189,27 @@
brand: '',
model: '',
purchaseDate: 0,
- lost: 0,
+ state: 0,
})
+
+const getRentInfoByPatId = () => {
+ const tempPatId = formData.value.patId;
+ resetForm()
+ if (isStringEmpty(tempPatId))
+ return
+
+ formData.value.patId = tempPatId;
+ getFreeRentInfo()
+}
+
+const getFreeRentInfo = async () => {
+ const data = await DevRentApi.getFreeRent(formData.value)
+ if (null === data)
+ return
+
+ // formDate 瀵瑰簲 DevRent
+ formData.value = data
+}
/** 鎻愪氦琛ㄥ崟 */
const submitForm = async () => {
@@ -162,7 +218,11 @@
// 鎻愪氦璇锋眰
formLoading.value = true
try {
+ formData.value.roomId = props.room.roomId
+ formData.value.bedNo = props.room.bedNo
const data = formData.value as unknown as DevRentVO
+ console.info( data )
+
if (formData.value.id === null || formData.value.id === undefined) {
const result = await DevRentApi.devReady(data)
formData.value.id = result
@@ -173,7 +233,7 @@
}
dialogVisible.value = false
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
- emit('success-ready')
+ emit('event_dev_ready')
resetForm()
getList()
} finally {
@@ -182,17 +242,19 @@
}
const cancelInstall = 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.devCancel(data)
+ const result = await DevRentApi.devReadyCancel(data)
formData.value.id = result
message.success(t('鎿嶄綔鎴愬姛'))
} else {
- await DevRentApi.devCancel(data)
+ await DevRentApi.devReadyCancel(data)
message.success(t('鎿嶄綔鎴愬姛'))
}
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
- emit('success-ready')
+ emit('event_dev_ready')
resetForm()
getList()
}
@@ -202,8 +264,8 @@
formData.value = {
id: undefined,
devId: undefined,
- patId: patient.value?.patId,
- patName: patient.value?.patName,
+ patId: undefined,
+ patName: undefined,
rentTime: new Date().getTime(),
returnTime: undefined,
interference: undefined,
@@ -216,11 +278,17 @@
deviceInfo.value.category = ''
deviceInfo.value.brand = ''
deviceInfo.value.model = ''
+ 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) => {
- patient.value = queueVO
- resetForm()
+ formData.value.patId = queueVO?.patId
+ getRentInfoByPatId()
}
defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
@@ -265,17 +333,54 @@
}
const printBill = async () => {
- ElNotification({
- title: '娓╅Θ鎻愮ず',
- message: '寰呭疄鐜帮紒',
- type: 'warning'
- })
+ // ElNotification({
+ // title: '娓╅Θ鎻愮ず',
+ // message: '寰呭疄鐜帮紒',
+ // type: 'warning'
+ // })
+
+// 寮曞叆鍚庝娇鐢ㄧず渚�
+ hiprint.init({
+// host: 'http://192.168.2.100:17521',
+ token: '111111'
+ });
+// 涓嬪垪鏂规硶閮芥槸娌℃湁鎷栨嫿璁捐椤甸潰鐨�, 鐩稿綋浜庝唬鐮佹ā寮�, 浣跨敤浠ｇ爜璁捐椤甸潰
+// 鎯宠瀹炵幇鎷栨嫿璁捐椤甸潰,璇峰線涓嬬湅 '鑷畾涔夎璁�'
+ var hiprintTemplate = new hiprint.PrintTemplate(); // 鍙紶鍙傛暟
+ var panel = hiprintTemplate.addPrintPanel({ width: 100, height: 130, paperFooter: 340, paperHeader: 10 });
+//鏂囨湰
+ panel.addPrintText({ options: { width: 140, height: 15, top: 20, left: 20, title: 'hiprint鎻掍欢鎵嬪姩娣诲姞text', textAlign: 'center' } });
+//鏉″舰鐮�
+ panel.addPrintText({ options: { width: 140, height: 35, top: 40, left: 20, title: '123456', textType: 'barcode' } });
+//浜岀淮鐮�
+ panel.addPrintText({ options: { width: 35, height: 35, top: 40, left: 165, title: '123456', textType: 'qrcode' } });
+//闀挎枃鏈�
+ panel.addPrintLongText({ options: { width: 180, height: 35, top: 90, left: 20, title: '闀挎枃鏈細hiprint鏄竴涓緢濂界殑webjs鎵撳嵃,娴忚鍣ㄥ湪鐨勫湴鏂逛粬閮藉彲浠ヨ繍琛�' } });
+//鎵撳嵃
+ 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
}
+/* 鍒嗛〉鎵撳嵃
+HiPrint.print({
+ pages: [
+ {
+ text: 'Hello World!'
+ },
+ {
+ html: '<div><h1>Hello World!</h1></div>',
+ pageBreak: true
+ },
+ {
+ image: 'image.png'
+ }
+ ]
+});
+*/
const getDevInfo = async () => {
deviceInfo.value.category = ''
deviceInfo.value.brand = ''
deviceInfo.value.model = ''
+ deviceInfo.value.state = 0
if (isStringEmpty(formData.value.devId))
return
--
Gitblit v1.9.3