From 1fa81f8c3c68b14e08554637eda80679f90b46ee Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 23 七月 2026 14:40:43 +0800
Subject: [PATCH] 新增停止
---
src/views/ecg/doctor/components/DevReadyPanel.vue | 117 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 79 insertions(+), 38 deletions(-)
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 8c190ff..c0930da 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -9,29 +9,44 @@
:rules="formRules"
label-width="100px"
v-loading="formLoading"
+
>
+ <el-row>
+ <el-col :span="12">
<el-form-item label="妫�鏌ラ」鐩�" prop="">
- {{formData?.checkType && getCheckTypeName(formData?.checkType)}}
+ {{getCheckTypeName(formData.checkType)}}
</el-form-item>
- <el-form-item label="鎮ｈ�呯紪鍙�" prop="patId">
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎮ｈ�呯紪鍙�" prop="patId" >
<el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" />
<Barcode v-if="displayBarCode" :value="displayBarCode" :width=100 />
<el-button @click="copyBarcode()">澶嶅埗</el-button>
</el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="鎮ｈ�呭悕绉�" prop="patName">
<el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
</el-form-item>
-
+ </el-col>
+ <el-col :span="12">
+
<el-form-item label="鎮ｈ�呮弿杩�" prop="patDeptDesc">
<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-col>
+ <el-col :span="12">
<el-form-item label="璁惧缂栧彿" prop="devId">
<el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getDevInfo"/>
</el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="璁惧鎻忚堪" prop="">
{{ devInfo?.brand||'-' }} {{ devInfo?.model||'-' }} {{ tranlateDevState(devInfo?.state) }}
</el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="棰嗙敤鏃堕棿" prop="rentTime">
<el-date-picker
v-model="formData.rentTime"
@@ -40,6 +55,14 @@
placeholder="閫夋嫨棰嗙敤鏃堕棿"
/>
</el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏄惁澶氳��" prop="tolerance">
+ <el-tag type="info" v-if="formData.tolerance == 0">鍚�</el-tag>
+ <el-tag type="danger" v-else>鏄�</el-tag>
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
@@ -51,10 +74,11 @@
</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="printBill(formData.patDetails?.appointmentId)">鎵撳嵃灏忕エ</el-button>
<el-button @click="cancelReady" :disabled="formLoading">鏀惧純棰嗙敤</el-button>
<el-button @click="resetForm()">閲� 缃�</el-button>
<el-button v-if="needAutoFeeConfirm(formData.checkType)" @click="feeConfirm" :disabled="formLoading">纭垂</el-button>
@@ -147,9 +171,9 @@
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 { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import {tranlateDevState} from "@/utils/statusFormatter";
-import {getCheckTypeName} from "../../../../utils/checkTypeFormatter";
+import {getCheckTypeName, needAutoFeeConfirm} from "../../../../utils/checkTypeFormatter";
/** 璁惧棰嗙敤 琛ㄥ崟 */
defineComponent({ name: 'DevReadyPanel' })
@@ -166,15 +190,13 @@
const { t } = useI18n() // 鍥介檯鍖�
const message = useMessage() // 娑堟伅寮圭獥
-const dialogVisible = ref(false) // 寮圭獥鐨勬槸鍚﹀睍绀�
-
const formLoading = ref(false) // 琛ㄥ崟鐨勫姞杞戒腑锛�1锛変慨鏀规椂鐨勬暟鎹姞杞斤紱2锛夋彁浜ょ殑鎸夐挳绂佺敤
const autoPrint = ref<boolean>(true);
const checkTypeStore = useCheckTypeStore()
-const formData = ref<Partial<DevRentVO>>({
+const formData = ref<DevRentVO>({
id: undefined,
devId: undefined,
patId: undefined,
@@ -204,13 +226,6 @@
const displayBarCode = ref<string> ()
-const needAutoFeeConfirm = (checkType: number | null | undefined) => {
- if (checkType == null)
- return false
-
- return checkTypeStore.getExpenseRecognition(checkType)
-}
-
const getRentInfoByPatId = () => {
const tempPatId = formData.value.patId;
resetForm()
@@ -224,6 +239,9 @@
// 鏍规嵁鎮ｈ�呮垨璁惧, 鑾峰彇 Free鐨勭璧�
const getFreeRentInfo = async (devRentVO) => {
+ if ((devRentVO.devId == null || devRentVO.devId === '') && (devRentVO.patId == null || devRentVO.patId === '') )
+ return
+
const data = await DevRentApi.getFreeRent(devRentVO)
if (null === data)
return
@@ -247,7 +265,7 @@
await DevRentApi.devReady(formData.value)
if (autoPrint.value && formData.value.patId && formData.value.checkType) {
- printBill(formData.value.patId, formData.value.checkType)
+ printBill(formData.value.patDetails?.appointmentId)
}
// 鑷姩纭垂
@@ -255,12 +273,11 @@
feeConfirm()
}
- dialogVisible.value = false
- // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
- emit('event_dev_ready')
resetForm()
getList()
+ // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
+ emit('event_dev_ready')
message.success(t('鎿嶄綔瀹屾垚'))
} finally {
formLoading.value = false
@@ -312,7 +329,7 @@
formData.value.patId = queueVO?.patId
formData.value.patName = queueVO?.patName
formData.value.checkType = queueVO?.bookCheckType
- getFreeRentInfo(formData.value)
+ getFreeRentInfo(formData.value) // 寰呮鏌ョ殑淇℃伅 @ dev_rent 琛�
copyBarcode()
}
defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
@@ -364,10 +381,11 @@
devInfo.value.state = data.devState
}
-const printBill = async (patId: string, checkType: number, printMode?: number) => {
+const printBill = async (appointmentId: number | null | undefined, printMode?: number) => {
+ if ( appointmentId == null )
+ return
- const curAppointment: AppointmentVO = await AppointmentApi.getCurAppointmentByPatIdAndCheckType( patId, checkType )
- console.info( curAppointment )
+ const curAppointment: AppointmentVO = await AppointmentApi.getAppointment( appointmentId )
// 寮曞叆鍚庝娇鐢ㄧず渚�
hiprint.init({
@@ -452,40 +470,58 @@
const feeConfirm = async () => {
if (formData.value.id == null) {
- message.error(t('璇峰厛棰嗙敤'))
+ message.error('璇峰厛棰嗙敤')
return
}
- const result = await DevRentApi.feeConfirm(formData.value.id)
- if (0 === result)
- message.success(t('纭垂鎿嶄綔鎴愬姛'))
+ try {
+ const result = await DevRentApi.feeConfirm(formData.value.id)
+ if (0 === result) {
+ //message.success('纭垂鎿嶄綔鎴愬姛')
+ }
+ } catch (err) {
+ // 妗嗘灦 浼氱粰鍑� 鍚庡彴鐨� 閿欒淇℃伅
+ }
}
const feeCancel = async () => {
if (formData.value.id == null) {
- message.error(t('璇峰厛棰嗙敤'))
+ message.error('璇峰厛棰嗙敤')
return
}
- const result = await DevRentApi.feeCancel(formData.value.id)
- if (0 === result)
- message.success(t('鎿嶄綔鎴愬姛'))
+ try {
+ const result = await DevRentApi.feeCancel(formData.value.id)
+ if (0 === result) {
+ //message.success('纭垂鍙栨秷鎴愬姛')
+ }
+ } catch (err) {
+ // 妗嗘灦 浼氱粰鍑� 鍚庡彴鐨� 閿欒淇℃伅
+ }
}
+/**
+ * 鑾峰彇鏉″舰鐮侊紝鏄剧ず涓庡惁 鍚屼竴涓��
+ */
const getDisplayBarcode = (): string => {
- if (!formData.value.checkType)
+ 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 ))
+ if (formData.value.patDetails?.source == null)
+ return ""
+
+ const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType)
+ if (displayBarcode == null || displayBarcode.length === 0)
+ return ""
+
+ if (!displayBarcode.includes( formData.value.patDetails.source ))
return ""
return getBarcode()
}
const getBarcode = (): string => {
- if (!formData.value.checkType)
+ if (formData.value.checkType == null)
return ""
const patSource = formData.value.patDetails?.source
@@ -502,7 +538,12 @@
const copyBarcode = async () => {
displayBarCode.value = getDisplayBarcode()
- await navigator.clipboard.writeText( getBarcode() );
+
+ const barCode = getBarcode()
+ if (isStringEmpty(barCode))
+ return
+
+ await navigator.clipboard.writeText( barCode );
}
/** 鍒濆鍖� **/
--
Gitblit v1.9.3