From b3a5df43f282f5c9cd23131788a234f098c8cbbf Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 十二月 2024 10:37:58 +0800
Subject: [PATCH] BugFix: 预约确认有时不弹检查项目，但是患者信息显示正确的现象
---
src/views/ecg/doctor/DevDismantle.vue | 178 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 136 insertions(+), 42 deletions(-)
diff --git a/src/views/ecg/doctor/DevDismantle.vue b/src/views/ecg/doctor/DevDismantle.vue
index 42d52c2..9263826 100644
--- a/src/views/ecg/doctor/DevDismantle.vue
+++ b/src/views/ecg/doctor/DevDismantle.vue
@@ -1,3 +1,4 @@
+<!--鎷嗘満鐣岄潰-->
<template>
<el-form
ref="formRef"
@@ -8,30 +9,31 @@
>
<el-row :gutter="20">
<el-col :span="12">
- <el-form-item label="璁惧缂栧彿" prop="devId">
- <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="searchRentInfo" />
- </el-form-item>
<el-form-item label="鎮ｈ�呯紪鍙�" prop="patId">
- <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="searchRentInfo" />
+ <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" />
</el-form-item>
<el-form-item label="鎮ｈ�呭悕绉�" prop="patName">
<el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
</el-form-item>
- <el-form-item label="骞叉壈鏁�" prop="interference">
- <el-input v-model="formData.interference" placeholder="璇疯緭鍏ュ共鎵版暟" />
+ <el-form-item label="鎮ｈ�呮弿杩�" prop="patDeptDesc">
+ 绉戝: {{formData.patDetails?.deptDesc}} 鐥呭尯: {{formData.patDetails?.wardDesc}} 搴婁綅: {{formData.patDetails?.bedNo}}
</el-form-item>
- <el-form-item label="鑴辩" prop="detachment">
- <el-input v-model="formData.detachment" placeholder="璇疯緭鍏ヨ劚绂�" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
<el-form-item label="瑁呮満鏃堕棿" prop="rentTime">
<el-date-picker
v-model="formData.rentTime"
type="date"
value-format="x"
placeholder="閫夋嫨瑁呮満鏃堕棿"
+ :readonly="true"
/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="璁惧缂栧彿" prop="devId">
+ <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getRentInfoByDevId" />
+ </el-form-item>
+ <el-form-item label="璁惧鎻忚堪" prop="">
+ {{formData.brand + " " + formData.model}}
</el-form-item>
<el-form-item label="鎷嗘満鏃堕棿" prop="returnTime">
<el-date-picker
@@ -41,11 +43,33 @@
placeholder="閫夋嫨鎷嗘満鏃堕棿"
/>
</el-form-item>
- <el-form-item label="鍩虹嚎绮�" prop="baseline">
- <el-input v-model="formData.baseline" placeholder="璇疯緭鍏ュ熀绾跨矖" />
- </el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <el-form-item label="骞叉壈鏁�" prop="interference">
+ <el-input v-model="formData.interference" placeholder="璇疯緭鍏ュ共鎵版暟" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鑴辫惤" prop="detachment">
+ <el-switch
+ v-model="formData.detachment"
+ :active-value="1"
+ :inactive-value="0"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍩虹嚎绮�" prop="baseline">
+ <el-switch
+ v-model="formData.baseline"
+ :active-value="1"
+ :inactive-value="0"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -53,6 +77,7 @@
<el-button @click="submitForm" type="primary" :disabled="formLoading">鎷嗘満瀹屾垚</el-button>
<el-button @click="resetForm()">閲� 缃�</el-button>
<el-button @click="loseDismantle" :disabled="formLoading">閬� 澶�</el-button>
+ <el-button @click="damageDismantle" :disabled="formLoading">鎹� 姣�</el-button>
<!-- 鍖荤敓鎷嗘満鍒楄〃 -->
<ContentWrap>
@@ -60,7 +85,9 @@
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="鎷嗘満鎯呭喌" align="center" prop="lost" >
<template #default="scope">
- {{scope.row.lost == 1 ? "閬楀け" : "瀹屾垚"}}
+ <span v-if="scope.row.jobType === 20">"宸叉媶鏈�"</span>
+ <span v-if="scope.row.jobType === 40">"宸查仐澶�"</span>
+ <span v-if="scope.row.jobType === 42">"宸叉崯姣�"</span>
</template>
</el-table-column>
<!-- <el-table-column label="浣滀笟绫诲瀷" align="center" prop="jobType" />-->
@@ -118,17 +145,17 @@
</template>
<script setup lang="ts">
-import {defineComponent, PropType} from "vue";
import { DevRentApi, DevRentVO } from '@/api/ecg/devrent'
-import {QueueVO} from "@/api/ecg/queue";
-import {isStringEmpty} from "@/utils/stringUtil";
import {dateFormatter} from "@/utils/formatTime";
import {JobRecordApi, JobRecordVO} from "@/api/ecg/jobrecord";
+import {isStringEmpty} from "@/utils/stringUtil";
+import {calculateHours, curDayEnd, curDayStart} from "@/utils/dateUtil";
+import {AppointmentApi} from "@/api/ecg/appointment";
/** 瑁呮満鎷嗘満 琛ㄥ崟 */
defineOptions({ name: 'DevrDismantle' })
-const emit = defineEmits(['success']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋�
+const emit = defineEmits(['event_dismantle_success']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋�
const { t } = useI18n() // 鍥介檯鍖�
const message = useMessage() // 娑堟伅寮圭獥
@@ -136,20 +163,9 @@
const dialogVisible = ref(false) // 寮圭獥鐨勬槸鍚﹀睍绀�
const formLoading = ref(false) // 琛ㄥ崟鐨勫姞杞戒腑锛�1锛変慨鏀规椂鐨勬暟鎹姞杞斤紱2锛夋彁浜ょ殑鎸夐挳绂佺敤
-const formType = ref('create') // 琛ㄥ崟鐨勭被鍨嬶細create - 鏂板锛泆pdate - 淇敼
-const formData = ref({
- id: undefined,
- devId: undefined,
- patId: undefined,
- patName: undefined,
- rentTime: undefined,
- returnTime: new Date().getTime(),
- interference: undefined,
- baseline: undefined,
- detachment: undefined,
- remark: undefined
-})
+const formData = ref({})
+
const formRules = reactive({
// devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
returnTime: [{ required: true, message: '璇烽�夋嫨鎷嗘満鏃ユ湡', trigger: 'blur' }],
@@ -158,6 +174,37 @@
/** 鎻愪氦琛ㄥ崟 */
const submitForm = async () => {
+ const data = formData.value as unknown as DevRentVO
+ const durationHours = calculateHours(data.rentTime!, data.returnTime!)
+ if (durationHours > 20) {
+ _submitForm()
+ return;
+ }
+
+ ElMessageBox.confirm(
+ '绂昏鏈轰笉鍒�20灏忔椂锛岀‘瀹氳鎷嗘満鍚楋紵',
+ 'Warning',
+ {
+ confirmButtonText: '濂界殑',
+ cancelButtonText: '涓嶇敤',
+ type: 'warning',
+ }
+ )
+ .then(async () => {
+ _submitForm()
+ })
+ .catch(() => {
+/*
+ ElNotification({
+ title: '娓╅Θ鎻愮ず',
+ message: '纭澶辫触',
+ type: 'warning'
+ })
+*/
+ })
+}
+
+const _submitForm = async () => {
// 鏍￠獙琛ㄥ崟
await formRef.value.validate()
// 鎻愪氦璇锋眰
@@ -169,7 +216,7 @@
message.success(t('鎿嶄綔鎴愬姛'))
dialogVisible.value = false
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
- emit('success')
+ emit('event_dismantle_success')
resetForm()
getList()
} finally {
@@ -177,7 +224,7 @@
}
}
-// 閬楀け鎿嶄綔
+// 閬楀け.鎷嗘満鎿嶄綔
const loseDismantle = async () => {
// 鏍￠獙琛ㄥ崟
await formRef.value.validate()
@@ -189,7 +236,27 @@
message.success(t('鎿嶄綔鎴愬姛'))
dialogVisible.value = false
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
- emit('success')
+ emit('event_dismantle_success')
+ resetForm()
+ getList()
+ } finally {
+ formLoading.value = false
+ }
+}
+
+// 鎹熸瘉.鎷嗘満鎿嶄綔
+const damageDismantle = async () => {
+ // 鏍￠獙琛ㄥ崟
+ await formRef.value.validate()
+ // 鎻愪氦璇锋眰
+ formLoading.value = true
+ try {
+ const data = formData.value as unknown as DevRentVO
+ await DevRentApi.devDamage(data)
+ message.success(t('鎿嶄綔鎴愬姛'))
+ dialogVisible.value = false
+ // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
+ emit('event_dismantle_success')
resetForm()
getList()
} finally {
@@ -204,19 +271,46 @@
devId: undefined,
patId: undefined,
patName: undefined,
+ patDeptCode: undefined,
+ patDeptDesc: undefined,
+ patWardCode: undefined,
+ patWardDesc: undefined,
+ patBedNo: undefined,
rentTime: undefined,
returnTime: new Date().getTime(),
interference: undefined,
baseline: undefined,
detachment: undefined,
- remark: undefined
+ remark: undefined,
+ category: '',
+ brand: '',
+ model: '',
}
formRef.value?.resetFields()
}
-const searchRentInfo = async () => {
- const data = await DevRentApi.getLatestRent(formData.value)
- console.info( data )
+const getRentInfoByDevId = () => {
+ const tempDevId = formData.value.devId;
+ resetForm()
+ if (isStringEmpty(tempDevId))
+ return
+
+ formData.value.devId = tempDevId;
+ getRentInfo()
+}
+
+const getRentInfoByPatId = () => {
+ const tempPatId = formData.value.patId;
+ resetForm()
+ if (isStringEmpty(tempPatId))
+ return
+
+ formData.value.patId = tempPatId;
+ getRentInfo()
+}
+
+const getRentInfo = async () => {
+ const data = await DevRentApi.getInstalledRent(formData.value)
if (null === data)
return
@@ -232,13 +326,13 @@
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
- jobType: 1,
+ jobType: [20, 40, 42], // 妫�鏌ョ姸鎬�
docId: undefined,
docName: undefined,
devId: undefined,
patId: undefined,
patName: undefined,
- jobTime: [],
+ jobTime: [curDayStart(), curDayEnd()],
summary: undefined,
remark: undefined,
createTime: []
@@ -266,8 +360,8 @@
/** 鍒濆鍖� **/
onMounted(() => {
+ resetForm()
getList()
})
</script>
-
--
Gitblit v1.9.3