From a7d0cd5b5c09bd3f4a92076a5bd59b38358b4b6d Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期一, 28 十月 2024 09:47:03 +0800 Subject: [PATCH] icon update --- src/views/ecg/doctor/DevDismantle.vue | 221 +++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 151 insertions(+), 70 deletions(-) diff --git a/src/views/ecg/doctor/DevDismantle.vue b/src/views/ecg/doctor/DevDismantle.vue index b4ec0e3..d479724 100644 --- a/src/views/ecg/doctor/DevDismantle.vue +++ b/src/views/ecg/doctor/DevDismantle.vue @@ -6,53 +6,89 @@ label-width="100px" v-loading="formLoading" > - <el-form-item label="璁惧缂栧彿" prop="devId"> - <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="searchRentInfo"/> - </el-form-item> - <el-form-item label="鎮h�呯紪鍙�" prop="patId"> - <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" /> - </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="rentTime"> - <el-date-picker - v-model="formData.rentTime" - type="date" - value-format="x" - 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="interference"> - <el-input v-model="formData.interference" 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="detachment"> - <el-input v-model="formData.detachment" placeholder="璇疯緭鍏ヨ劚绂�" /> - </el-form-item> - <el-form-item label="澶囨敞" prop="remark"> - <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" /> - </el-form-item> + <el-row :gutter="20"> + <el-col :span="12"> + <el-form-item label="鎮h�呯紪鍙�" prop="patId"> + <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" /> + </el-form-item> + <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 + 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 + v-model="formData.returnTime" + type="date" + value-format="x" + 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> </el-form> <el-button @click="submitForm" type="primary" :disabled="formLoading">鎷嗘満瀹屾垚</el-button> - <el-button @click="dialogVisible = false">鍙� 娑�</el-button> + <el-button @click="resetForm()">閲� 缃�</el-button> + <el-button @click="loseDismantle" :disabled="formLoading">閬� 澶�</el-button> <!-- 鍖荤敓鎷嗘満鍒楄〃 --> <ContentWrap> - <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> + <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="jobType" /> - <el-table-column label="鍖荤敓缂栧彿" align="center" prop="docId" /> + <el-table-column label="鎷嗘満鎯呭喌" align="center" prop="lost" > + <template #default="scope"> + <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" />--> +<!-- <el-table-column label="鍖荤敓缂栧彿" align="center" prop="docId" />--> <el-table-column label="鍖荤敓鍚嶇О" align="center" prop="docName" /> <el-table-column label="璁惧缂栧彿" align="center" prop="devId" /> <el-table-column label="鎮h�呯紪鍙�" align="center" prop="patId" /> @@ -106,12 +142,11 @@ </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 {curDayEnd, curDayStart} from "@/utils/dateUtil"; /** 瑁呮満鎷嗘満 琛ㄥ崟 */ defineOptions({ name: 'DevrDismantle' }) @@ -124,23 +159,12 @@ 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' }], + // devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }], + returnTime: [{ required: true, message: '璇烽�夋嫨鎷嗘満鏃ユ湡', trigger: 'blur' }], }) const formRef = ref() // 琛ㄥ崟 Ref @@ -165,6 +189,26 @@ } } +// 閬楀け鎿嶄綔 +const loseDismantle = async () => { + // 鏍¢獙琛ㄥ崟 + await formRef.value.validate() + // 鎻愪氦璇锋眰 + formLoading.value = true + try { + const data = formData.value as unknown as DevRentVO + await DevRentApi.devLose(data) + message.success(t('鎿嶄綔鎴愬姛')) + dialogVisible.value = false + // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢 + emit('success') + resetForm() + getList() + } finally { + formLoading.value = false + } +} + /** 閲嶇疆琛ㄥ崟 */ const resetForm = () => { formData.value = { @@ -172,26 +216,54 @@ 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.devId) - 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 + + formData.value = data if (data.returnTime === null) data.returnTime = new Date().getTime() - - if (null != data) { - formData.value = data - } } + const loading = ref(true) // 鍒楄〃鐨勫姞杞戒腑 const list = ref<JobRecordVO[]>([]) // 鍒楄〃鐨勬暟鎹� @@ -199,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: [] @@ -222,10 +294,19 @@ } } +const onRowClick = (cur) => { + if (cur !== null) + getSelectedRent( cur.rentId ) +} + +const getSelectedRent = async (rentId) => { + formData.value = await DevRentApi.getDevRent(rentId) +} + /** 鍒濆鍖� **/ onMounted(() => { + resetForm() getList() }) </script> - -- Gitblit v1.9.3