From 348e6bcdc7fa566a48b96dea53d24ec6dda49e1d Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期五, 11 四月 2025 18:06:40 +0800 Subject: [PATCH] update --- src/views/ecg/doctor/DevDismantle.vue | 42 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/views/ecg/doctor/DevDismantle.vue b/src/views/ecg/doctor/DevDismantle.vue index 0b313d7..724af68 100644 --- a/src/views/ecg/doctor/DevDismantle.vue +++ b/src/views/ecg/doctor/DevDismantle.vue @@ -16,7 +16,7 @@ <el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" /> </el-form-item> <el-form-item label="鎮h�呮弿杩�" prop="patDeptDesc"> - 绉戝: {{formData.patDeptDesc}} 鐥呭尯: {{formData.patWardDesc}} 搴婁綅: {{formData.patBedNo}} + 绉戝: {{formData?.patDetails?.deptDesc}} 鐥呭尯: {{formData?.patDetails?.wardDesc}} 搴婁綅: {{formData?.patDetails?.bedNo}} </el-form-item> <el-form-item label="瑁呮満鏃堕棿" prop="rentTime"> <el-date-picker @@ -33,7 +33,7 @@ <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getRentInfoByDevId" /> </el-form-item> <el-form-item label="璁惧鎻忚堪" prop=""> - {{formData.brand + " " + formData.model}} + {{formData?.brand + " " + formData?.model + " " + tranlateDevState(formData?.devState)}} </el-form-item> <el-form-item label="鎷嗘満鏃堕棿" prop="returnTime"> <el-date-picker @@ -149,7 +149,9 @@ import {dateFormatter} from "@/utils/formatTime"; import {JobRecordApi, JobRecordVO} from "@/api/ecg/jobrecord"; import {isStringEmpty} from "@/utils/stringUtil"; -import {curDayEnd, curDayStart} from "@/utils/dateUtil"; +import {calculateHours, curDayEnd, curDayStart} from "@/utils/dateUtil"; +import {AppointmentApi} from "@/api/ecg/appointment"; +import {tranlateDevState} from "../../../utils/statusFormatter"; /** 瑁呮満鎷嗘満 琛ㄥ崟 */ defineOptions({ name: 'DevrDismantle' }) @@ -173,6 +175,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() // 鎻愪氦璇锋眰 @@ -253,6 +286,7 @@ category: '', brand: '', model: '', + devState: undefined, } formRef.value?.resetFields() } @@ -278,7 +312,7 @@ } const getRentInfo = async () => { - const data = await DevRentApi.getInstalledRent(formData.value) + const data = await DevRentApi.getExistingRent(formData.value) if (null === data) return -- Gitblit v1.9.3