From a58eaf896a8c584494b6238c5362544e0df56f57 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 29 十一月 2024 19:00:58 +0800
Subject: [PATCH] update
---
src/views/ecg/doctor/components/RoutinePanel.vue | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/src/views/ecg/doctor/components/RoutinePanel.vue b/src/views/ecg/doctor/components/RoutinePanel.vue
index 9b363ac..2c9a405 100644
--- a/src/views/ecg/doctor/components/RoutinePanel.vue
+++ b/src/views/ecg/doctor/components/RoutinePanel.vue
@@ -12,12 +12,13 @@
<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="!isStringEmpty(formData.patId) && 1 === checkTypeStore.getCheckTypeDispBarCode(formData.checkType)" :value="formData.patId" :width=100 />
+ <Barcode v-if="getDisplayBarcode()" :value="getDisplayBarcode()" :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">
+ <dict-tag :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData.patSrc" />
绉戝: {{formData.patDeptDesc}} 鐥呭尯: {{formData.patWardDesc}} 搴婁綅: {{formData.patBedNo}}
</el-form-item>
<el-form-item label="妫�鏌ユ椂闂�" prop="rentTime">
@@ -30,6 +31,9 @@
</el-form-item>
</el-col>
<el-col :span="12">
+ <el-form-item label="妫�鏌ラ」鐩�" prop="">
+ {{formData.checkType && checkTypeStore.getCheckTypeName(formData.checkType)}}
+ </el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
@@ -37,14 +41,16 @@
</el-row>
</el-form>
<el-button @click="submitForm" type="primary" :disabled="formLoading">妫�鏌ュ畬鎴�</el-button>
- <el-button @click="resetForm()">閲� 缃�</el-button>
<el-button @click="cancelInstall" :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="lost" >
+<!-- <el-table-column label="id" align="center" prop="id" />-->
+ <el-table-column label="妫�鏌ョ姸鎬�" align="center" prop="lost" >
<template #default="scope">
<span v-if="scope.row.jobType === 60">宸叉鏌�</span>
<span v-if="scope.row.jobType === 50">宸叉斁寮�</span>
@@ -114,6 +120,7 @@
import {RoomBedVO} from "@/api/ecg/doctor";
import {Barcode} from "@/components/Barcode";
import {useCheckTypeStore} from "@/store/modules/checkType";
+import {DICT_TYPE} from "@/utils/dict";
/** 璁惧瑁呮満 琛ㄥ崟 */
defineComponent({ name: 'RoutinePanel' })
@@ -131,9 +138,12 @@
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
+ formData.value.patSrc = queueVO?.patDetails.source
getFreeRentInfo(formData.value)
}
defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
@@ -218,6 +228,8 @@
// formDate 瀵瑰簲 DevRent
// formData.value = data //涓嶈兘鏁翠釜璧嬪�硷紝 榛樿棰嗙敤鏃堕棿琚竻绌�
formData.value.id = data.id;
+ formData.value.applyNo = data.applyNo;
+ formData.value.episodeId = data.episodeId;
formData.value.patDetails = data.patDetails
}
@@ -264,18 +276,42 @@
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.routineCheckCancel(data)
- formData.value.id = result
- message.success(t('鎿嶄綔鎴愬姛'))
- } else {
- await DevRentApi.routineCheckCancel(data)
- message.success(t('鎿嶄綔鎴愬姛'))
- }
+ await DevRentApi.routineCheckCancel(data)
+
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
emit('event_routine')
resetForm()
getList()
+
+ message.success(t('鎿嶄綔鎴愬姛'))
+}
+
+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('鎿嶄綔鎴愬姛'))
+}
+
+const getDisplayBarcode = () => {
+ if (!formData.value.checkType)
+ return ""
+
+ const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
+ if (!displayBarcode.includes( formData.value.patSrc ))
+ return ""
+
+ if (1 === formData.value.patSrc || 2 === formData.value.patSrc)
+ return formData.value.applyNo
+ else if (3 === formData.value.patSrc || 4 === formData.value.patSrc)
+ return formData.value.episodeId
+
+ return ""
}
/** 鍒濆鍖� **/
--
Gitblit v1.9.3