From 7dd1cf55eda4666b75f559b526837d0b4a6f2522 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期二, 08 十月 2024 15:14:57 +0800 Subject: [PATCH] update --- src/views/ecg/doctor/DevInstall.vue | 69 ++++++++++++++++++++-------------- 1 files changed, 40 insertions(+), 29 deletions(-) diff --git a/src/views/ecg/doctor/DevInstall.vue b/src/views/ecg/doctor/DevInstall.vue index d7b88ba..bfa5146 100644 --- a/src/views/ecg/doctor/DevInstall.vue +++ b/src/views/ecg/doctor/DevInstall.vue @@ -8,11 +8,14 @@ > <el-row :gutter="20"> <el-col :span="12"> - <el-form-item label="璁惧缂栧彿" prop="devId"> - <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getRentInfoByDevId" /> + <el-form-item label="鎮h�呯紪鍙�" prop="patId"> + <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" /> </el-form-item> - <el-form-item label="璁惧鎻忚堪" prop=""> - {{formData.brand + " " + formData.model}} + <el-form-item label="鎮h�呭悕绉�" prop="patName"> + <el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" /> + </el-form-item> + <el-form-item label="鎮h�呮弿杩�" prop="patDeptDesc"> + 绉戝: {{formData.patDeptDesc}} 鐥呭尯: {{formData.patWardDesc}} 搴婁綅: {{formData.patBedNo}} </el-form-item> <el-form-item label="瑁呮満鏃堕棿" prop="rentTime"> <el-date-picker @@ -22,30 +25,15 @@ placeholder="閫夋嫨瑁呮満鏃堕棿" /> </el-form-item> - <el-form-item label="骞叉壈鏁�" prop="interference"> - <el-input v-model="formData.interference" placeholder="璇疯緭鍏ュ共鎵版暟" /> - </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="鎮h�呯紪鍙�" prop="patId"> - <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" /> + <el-form-item label="璁惧缂栧彿" prop="devId"> + <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getDevInfo"/> </el-form-item> - <el-form-item label="鎮h�呭悕绉�" prop="patName"> - <el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" /> - </el-form-item> - <el-form-item label="鎷嗘満鏃堕棿" prop="returnTime"> - <el-date-picker - v-model="formData.returnTime" - type="date" - value-format="x" - placeholder="閫夋嫨鎷嗘満鏃堕棿" - /> - </el-form-item> - <el-form-item label="鍩虹嚎绮�" prop="baseline"> - <el-input v-model="formData.baseline" placeholder="璇疯緭鍏ュ熀绾跨矖" /> + <el-form-item label="璁惧鎻忚堪" prop=""> + <span v-if="formData.brand !== null"> {{formData.brand}} </span> + {{" "}} + <span v-if="formData.model !== null"> {{formData.model}} </span> </el-form-item> <el-form-item label="澶囨敞" prop="remark"> <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" /> @@ -64,7 +52,7 @@ <el-table-column label="瑁呮満鎯呭喌" align="center" prop="lost" > <template #default="scope"> <span v-if="scope.row.jobType === 10">"宸茶鏈�"</span> - <span v-if="scope.row.jobType === 30">"宸叉斁寮�"</span> + <span v-if="scope.row.jobType === 35">"宸叉斁寮�"</span> </template> </el-table-column> <!-- <el-table-column label="浣滀笟绫诲瀷" align="center" prop="jobType" />--> @@ -127,6 +115,7 @@ import {JobRecordApi, JobRecordVO} from "@/api/ecg/jobrecord"; import {isStringEmpty} from "@/utils/stringUtil"; import {curDayEnd, curDayStart} from "@/utils/dateUtil"; +import {DeviceApi} from "@/api/ecg/devmanage"; /** 瑁呮満 琛ㄥ崟 */ defineOptions({ name: 'DevrInstall' }) @@ -176,6 +165,11 @@ devId: undefined, patId: undefined, patName: undefined, + patDeptCode: undefined, + patDeptDesc: undefined, + patWardCode: undefined, + patWardDesc: undefined, + patBedNo: undefined, rentTime: new Date().getTime(), returnTime: undefined, interference: undefined, @@ -189,6 +183,22 @@ formRef.value?.resetFields() } +const getDevInfo = async () => { + if (isStringEmpty(formData.value.devId)) { + formData.value.category = "" + formData.value.brand = "" + formData.value.model = "" + return + } + + const data = await DeviceApi.getDeviceByDevId(formData.value.devId!) + console.info( data ) + formData.value.category = data === null ? "" : data.category + formData.value.brand = data === null ? "" : data.brand + formData.value.model = data === null ? "" : data.model +} + +/* const getRentInfoByDevId = () => { const tempDevId = formData.value.devId; resetForm() @@ -198,6 +208,7 @@ formData.value.devId = tempDevId; getRentInfo() } +*/ const getRentInfoByPatId = () => { const tempPatId = formData.value.patId; @@ -226,7 +237,7 @@ const queryParams = reactive({ pageNo: 1, pageSize: 10, - jobType: [10, 30], + jobType: [10, 35], docId: undefined, docName: undefined, devId: undefined, @@ -261,11 +272,11 @@ const cancelInstall = async () => { const data = formData.value as unknown as DevRentVO if (formData.value.id === null || formData.value.id === undefined) { - const result = await DevRentApi.devCancel(data) + const result = await DevRentApi.devInstallCancel(data) formData.value.id = result message.success(t('鎿嶄綔鎴愬姛')) } else { - await DevRentApi.devCancel(data) + await DevRentApi.devInstallCancel(data) message.success(t('鎿嶄綔鎴愬姛')) } // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢 -- Gitblit v1.9.3