From 5aac6d6a9b1d3e4a1d026c00ee0678767ee00eb1 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 25 十一月 2024 21:00:48 +0800
Subject: [PATCH] 拆机20小时提醒
---
src/views/ecg/doctor/components/DevReadyPanel.vue | 80 ++++++++++++++++++++++-----------------
1 files changed, 45 insertions(+), 35 deletions(-)
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 7188a76..fa72d4b 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -38,27 +38,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)">鎵撳嵃灏忕エ</el-button>
- <el-button @click="printBill(formData.patId, 8)">鎵撳嵃灏忕エ2</el-button>
- <el-button @click="cancelInstall" :disabled="formLoading">鏀惧純瑁呮満</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>
<!-- 鍖荤敓瑁呮満鍒楄〃 -->
<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" >
@@ -233,38 +237,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('鎿嶄綔瀹屾垚'))
- if (autoPrint.value)
- printBill( data.patId)
- } 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()
@@ -357,9 +355,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 )
// 寮曞叆鍚庝娇鐢ㄧず渚�
@@ -374,17 +372,17 @@
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, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
+ 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, fontWeight: '700', } });
+ 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, fontFamily: '榛戜綋', } });
+ 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, 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: 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)
@@ -444,6 +442,18 @@
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('鎿嶄綔鎴愬姛'))
+}
+
/** 鍒濆鍖� **/
onMounted(() => {
getList()
--
Gitblit v1.9.3