From ef8b45aea99e31d95773d82f7508449489b6e278 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期四, 12 九月 2024 17:49:26 +0800 Subject: [PATCH] 放弃装机功能 --- src/views/ecg/doctor/components/DevInstallPanel.vue | 155 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 133 insertions(+), 22 deletions(-) diff --git a/src/views/ecg/doctor/components/DevInstallPanel.vue b/src/views/ecg/doctor/components/DevInstallPanel.vue index e9b7477..7fc88e3 100644 --- a/src/views/ecg/doctor/components/DevInstallPanel.vue +++ b/src/views/ecg/doctor/components/DevInstallPanel.vue @@ -18,29 +18,78 @@ 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-form> <el-button @click="submitForm" type="primary" :disabled="formLoading">瑁呮満瀹屾垚</el-button> - <el-button @click="dialogVisible = false">鍙� 娑�</el-button> + <el-button @click="cancelInstall" type="primary" :disabled="formLoading">鏀惧純瑁呮満</el-button> + <el-button @click="resetForm()">閲� 缃�</el-button> + + + <!-- 鍖荤敓鎷嗘満鍒楄〃 --> + <ContentWrap> + <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @current-change="onCurChange" > + <el-table-column label="id" align="center" prop="id" /> + <el-table-column label="--" align="center" prop="cancelled" > + <template #default="scope"> + {{scope.row.cancelled == 1 ? "鏀惧純" : ""}} + </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" width="auto" 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="timeFormatter" + /> +<!-- <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" + /> +--> +<!-- + <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"> @@ -48,6 +97,8 @@ import { DevRentApi, DevRentVO } from '@/api/ecg/devrent' import {QueueVO} from "@/api/ecg/queue"; import {isStringEmpty} from "@/utils/stringUtil"; +import {dateFormatter, timeFormatter} from "@/utils/formatTime"; +import {JobRecordApi, JobRecordVO} from "@/api/ecg/jobrecord"; /** 瑁呮満鎷嗘満 琛ㄥ崟 */ defineComponent({ name: 'DevInstallPanel' }) @@ -70,8 +121,8 @@ const formData = ref({ id: undefined, devId: undefined, - patId: patient.value.patId, - patName: patient.value.patName, + patId: patient.value?.patId, + patName: patient.value?.patName, rentTime: new Date().getTime(), returnTime: undefined, interference: undefined, @@ -95,8 +146,6 @@ formLoading.value = true try { const data = formData.value as unknown as DevRentVO - data.patId = patient.value.patId - data.patName = patient.value.patName if (formData.value.id === null || formData.value.id === undefined) { const result = await DevRentApi.devInstall(data) formData.value.id = result @@ -108,9 +157,27 @@ dialogVisible.value = false // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢 emit('success') + resetForm() + getList() } finally { formLoading.value = false } +} + +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') + resetForm() + getList() } /** 閲嶇疆琛ㄥ崟 */ @@ -136,5 +203,49 @@ } defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰� + +const loading = ref(true) // 鍒楄〃鐨勫姞杞戒腑 +const list = ref<JobRecordVO[]>([]) // 鍒楄〃鐨勬暟鎹� +const total = ref(0) // 鍒楄〃鐨勬�婚〉鏁� +const queryParams = reactive({ + pageNo: 1, + pageSize: 10, + jobType: 0, + docId: undefined, + docName: undefined, + devId: undefined, + patId: undefined, + patName: undefined, + jobTime: [], + 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 onCurChange = (cur) => { + if (cur !== null) + getSelectedRent( cur.rentId ) +} + +const getSelectedRent = async (rentId) => { + formData.value = await DevRentApi.getDevRent(rentId) +} + +/** 鍒濆鍖� **/ +onMounted(() => { + getList() +}) + </script> -- Gitblit v1.9.3