From f98ab75bf0f7fb54e7e3955a5f6e5a4935a86cbe Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期四, 31 十月 2024 11:21:14 +0800 Subject: [PATCH] fix warning --- src/views/ecg/doctor/DevDismantle.vue | 69 ++++++++++++++++++++++++---------- 1 files changed, 48 insertions(+), 21 deletions(-) diff --git a/src/views/ecg/doctor/DevDismantle.vue b/src/views/ecg/doctor/DevDismantle.vue index db8c5f4..d479724 100644 --- a/src/views/ecg/doctor/DevDismantle.vue +++ b/src/views/ecg/doctor/DevDismantle.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 @@ -20,21 +23,16 @@ type="date" value-format="x" placeholder="閫夋嫨瑁呮満鏃堕棿" + :readonly="true" /> - </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="getRentInfoByDevId" /> </el-form-item> - <el-form-item label="鎮h�呭悕绉�" prop="patName"> - <el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" /> + <el-form-item label="璁惧鎻忚堪" prop=""> + {{formData.brand + " " + formData.model}} </el-form-item> <el-form-item label="鎷嗘満鏃堕棿" prop="returnTime"> <el-date-picker @@ -44,11 +42,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> @@ -63,7 +83,8 @@ <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> </template> </el-table-column> <!-- <el-table-column label="浣滀笟绫诲瀷" align="center" prop="jobType" />--> @@ -125,6 +146,7 @@ import {dateFormatter} from "@/utils/formatTime"; import {JobRecordApi, JobRecordVO} from "@/api/ecg/jobrecord"; import {isStringEmpty} from "@/utils/stringUtil"; +import {curDayEnd, curDayStart} from "@/utils/dateUtil"; /** 瑁呮満鎷嗘満 琛ㄥ崟 */ defineOptions({ name: 'DevrDismantle' }) @@ -194,6 +216,11 @@ devId: undefined, patId: undefined, patName: undefined, + patDeptCode: undefined, + patDeptDesc: undefined, + patWardCode: undefined, + patWardDesc: undefined, + patBedNo: undefined, rentTime: undefined, returnTime: new Date().getTime(), interference: undefined, @@ -228,7 +255,7 @@ } const getRentInfo = async () => { - const data = await DevRentApi.getDismantleRent(formData.value) + const data = await DevRentApi.getInstalledRent(formData.value) if (null === data) return @@ -244,13 +271,13 @@ const queryParams = reactive({ pageNo: 1, pageSize: 10, - jobType: 1, + jobType: [20, 40], docId: undefined, docName: undefined, devId: undefined, patId: undefined, patName: undefined, - jobTime: [], + jobTime: [curDayStart(), curDayEnd()], summary: undefined, remark: undefined, createTime: [] -- Gitblit v1.9.3