From 0b13963800eadb0a87a68809e8cbfecb6592fde7 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期三, 25 九月 2024 18:30:36 +0800 Subject: [PATCH] 新装机界面 --- src/views/ecg/doctor/DevDismantle.vue | 2 src/views/ecg/doctor/DevInstall.vue | 283 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/api/ecg/devrent/index.ts | 9 + 3 files changed, 291 insertions(+), 3 deletions(-) diff --git a/src/api/ecg/devrent/index.ts b/src/api/ecg/devrent/index.ts index 0411c01..a3447ed 100644 --- a/src/api/ecg/devrent/index.ts +++ b/src/api/ecg/devrent/index.ts @@ -47,8 +47,13 @@ }, // 鑾峰彇鎮h�呰澶囨渶杩戠殑绉熻祦 - getDismantleRent: async (params: any) => { - return await request.get({ url: `/ecg/dev-rent/get-dismantle-rent`, params }) + getReadyRent: async (params: any) => { + return await request.get({ url: `/ecg/dev-rent/get-ready-rent`, params }) + }, + + // 鑾峰彇鎮h�呰澶囨渶杩戠殑绉熻祦 + getInstalledRent: async (params: any) => { + return await request.get({ url: `/ecg/dev-rent/get-installed-rent`, params }) }, // 璁惧鍑嗗 diff --git a/src/views/ecg/doctor/DevDismantle.vue b/src/views/ecg/doctor/DevDismantle.vue index bfc89c7..1636cd9 100644 --- a/src/views/ecg/doctor/DevDismantle.vue +++ b/src/views/ecg/doctor/DevDismantle.vue @@ -230,7 +230,7 @@ } const getRentInfo = async () => { - const data = await DevRentApi.getDismantleRent(formData.value) + const data = await DevRentApi.getInstalledRent(formData.value) if (null === data) return diff --git a/src/views/ecg/doctor/DevInstall.vue b/src/views/ecg/doctor/DevInstall.vue new file mode 100644 index 0000000..d7b88ba --- /dev/null +++ b/src/views/ecg/doctor/DevInstall.vue @@ -0,0 +1,283 @@ +<template> + <el-form + ref="formRef" + :model="formData" + :rules="formRules" + label-width="100px" + v-loading="formLoading" + > + <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> + <el-form-item label="璁惧鎻忚堪" prop=""> + {{formData.brand + " " + formData.model}} + </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="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> + <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> + <el-form-item label="澶囨敞" prop="remark"> + <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" /> + </el-form-item> + </el-col> + </el-row> + </el-form> + <el-button @click="submitForm" type="primary" :disabled="formLoading">瑁呮満瀹屾垚</el-button> + <el-button @click="resetForm()">閲� 缃�</el-button> + <el-button @click="cancelInstall" :disabled="formLoading">鏀惧純瑁呮満</el-button> + + <!-- 鍖荤敓瑁呮満鍒楄〃 --> + <ContentWrap> + <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="lost" > + <template #default="scope"> + <span v-if="scope.row.jobType === 10">"宸茶鏈�"</span> + <span v-if="scope.row.jobType === 30">"宸叉斁寮�"</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" /> + <el-table-column label="鎮h�呭悕绉�" align="center" prop="patName" /> + <el-table-column + label="浣滀笟鏃堕棿" + align="center" + prop="jobTime" + :formatter="dateFormatter" + width="180px" + /> + <el-table-column label="浣滀笟姒傝" align="center" prop="summary" /> + <el-table-column label="澶囨敞" align="center" prop="remark" /> + <el-table-column + label="鍒涘缓鏃堕棿" + align="center" + prop="createTime" + :formatter="dateFormatter" + width="180px" + /> + <el-table-column label="鎿嶄綔" align="center" min-width="120px"> + <template #default="scope"> + <el-button + link + type="primary" + @click="openForm('update', scope.row.id)" + v-hasPermi="['ecg:job-record:update']" + > + 缂栬緫 + </el-button> + <el-button + link + type="danger" + @click="handleDelete(scope.row.id)" + v-hasPermi="['ecg:job-record:delete']" + > + 鍒犻櫎 + </el-button> + </template> + </el-table-column> + </el-table> + <!-- 鍒嗛〉 --> + <Pagination + :total="total" + v-model:page="queryParams.pageNo" + v-model:limit="queryParams.pageSize" + @pagination="getList" + /> + </ContentWrap> + +</template> + +<script setup lang="ts"> +import { DevRentApi, DevRentVO } from '@/api/ecg/devrent' +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: 'DevrInstall' }) + +const emit = defineEmits(['success-install']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋� + +const { t } = useI18n() // 鍥介檯鍖� +const message = useMessage() // 娑堟伅寮圭獥 + +const dialogVisible = ref(false) // 寮圭獥鐨勬槸鍚﹀睍绀� + +const formLoading = ref(false) // 琛ㄥ崟鐨勫姞杞戒腑锛�1锛変慨鏀规椂鐨勬暟鎹姞杞斤紱2锛夋彁浜ょ殑鎸夐挳绂佺敤 + +const formData = ref({}) + +const formRules = reactive({ + // devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }], + rentTime: [{ required: true, message: '璇烽�夋嫨瑁呮満鏃ユ湡', trigger: 'blur' }], +}) +const formRef = ref() // 琛ㄥ崟 Ref + +/** 鎻愪氦琛ㄥ崟 */ +const submitForm = async () => { + // 鏍¢獙琛ㄥ崟 + await formRef.value.validate() + // 鎻愪氦璇锋眰 + formLoading.value = true + try { + const data = formData.value as unknown as DevRentVO + //await DevRentApi.updateDevRent(data) + await DevRentApi.devInstall(data) + message.success(t('鎿嶄綔鎴愬姛')) + dialogVisible.value = false + // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢 + emit('success-install') + resetForm() + getList() + } finally { + formLoading.value = false + } +} + +/** 閲嶇疆琛ㄥ崟 */ +const resetForm = () => { + formData.value = { + id: undefined, + devId: undefined, + patId: undefined, + patName: undefined, + rentTime: new Date().getTime(), + returnTime: undefined, + interference: undefined, + baseline: undefined, + detachment: undefined, + remark: undefined, + category: '', + brand: '', + model: '', + } + formRef.value?.resetFields() +} + +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.getReadyRent(formData.value) + if (null === data) + return + + formData.value = data + if (data.returnTime === null) + data.returnTime = new Date().getTime() +} + + +const loading = ref(true) // 鍒楄〃鐨勫姞杞戒腑 +const list = ref<JobRecordVO[]>([]) // 鍒楄〃鐨勬暟鎹� +const total = ref(0) // 鍒楄〃鐨勬�婚〉鏁� +const queryParams = reactive({ + pageNo: 1, + pageSize: 10, + jobType: [10, 30], + docId: undefined, + docName: undefined, + devId: undefined, + patId: undefined, + patName: undefined, + jobTime: [curDayStart(), curDayEnd()], + summary: undefined, + remark: undefined, + createTime: [] +}) +/** 鏌ヨ鍒楄〃 */ +const getList = async () => { + loading.value = true + try { + const data = await JobRecordApi.getJobRecordDoctorPage(queryParams) + list.value = data.list + total.value = data.total + } finally { + loading.value = false + } +} + +const onRowClick = (cur) => { + if (cur !== null) + getSelectedRent( cur.rentId ) +} + +const getSelectedRent = async (rentId) => { + formData.value = await DevRentApi.getDevRent(rentId) +} + +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) + formData.value.id = result + message.success(t('鎿嶄綔鎴愬姛')) + } else { + await DevRentApi.devCancel(data) + message.success(t('鎿嶄綔鎴愬姛')) + } + // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢 + emit('success-install') + resetForm() + getList() +} + +/** 鍒濆鍖� **/ +onMounted(() => { + resetForm() + getList() +}) + +</script> -- Gitblit v1.9.3