From 659bff41eef235e4adb7fce892a768c52c5f1ea5 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期四, 12 九月 2024 11:25:47 +0800 Subject: [PATCH] 装机 作业列表 --- src/views/ecg/doctor/DevDismantle.vue | 9 +- src/views/ecg/doctor/index.vue | 20 +++--- src/views/ecg/doctor/components/DevInstallPanel.vue | 104 ++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 14 deletions(-) diff --git a/src/views/ecg/doctor/DevDismantle.vue b/src/views/ecg/doctor/DevDismantle.vue index 090a5a6..c34352f 100644 --- a/src/views/ecg/doctor/DevDismantle.vue +++ b/src/views/ecg/doctor/DevDismantle.vue @@ -193,9 +193,6 @@ } } -const getSelectedRent = async (rentId) => { - formData.value = await DevRentApi.getDevRent(rentId) -} const loading = ref(true) // 鍒楄〃鐨勫姞杞戒腑 const list = ref<JobRecordVO[]>([]) // 鍒楄〃鐨勬暟鎹� @@ -227,11 +224,13 @@ } const onCurChange = (cur) => { - console.log( cur ) - console.log( cur.rentId) getSelectedRent( cur.rentId ) } +const getSelectedRent = async (rentId) => { + formData.value = await DevRentApi.getDevRent(rentId) +} + /** 鍒濆鍖� **/ onMounted(() => { getList() diff --git a/src/views/ecg/doctor/components/DevInstallPanel.vue b/src/views/ecg/doctor/components/DevInstallPanel.vue index e9b7477..3b5a071 100644 --- a/src/views/ecg/doctor/components/DevInstallPanel.vue +++ b/src/views/ecg/doctor/components/DevInstallPanel.vue @@ -41,6 +41,64 @@ </el-form> <el-button @click="submitForm" type="primary" :disabled="formLoading">瑁呮満瀹屾垚</el-button> <el-button @click="dialogVisible = false">鍙� 娑�</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="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"> @@ -48,6 +106,8 @@ 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"; /** 瑁呮満鎷嗘満 琛ㄥ崟 */ defineComponent({ name: 'DevInstallPanel' }) @@ -108,6 +168,7 @@ dialogVisible.value = false // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢 emit('success') + getList() } finally { formLoading.value = false } @@ -136,5 +197,48 @@ } 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) => { + getSelectedRent( cur.rentId ) +} + +const getSelectedRent = async (rentId) => { + formData.value = await DevRentApi.getDevRent(rentId) +} + +/** 鍒濆鍖� **/ +onMounted(() => { + getList() +}) + </script> diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue index 1a9e5c8..98ad122 100644 --- a/src/views/ecg/doctor/index.vue +++ b/src/views/ecg/doctor/index.vue @@ -156,17 +156,19 @@ <TitlePanel :room="roomBedVO" :patientStatistic="patientStat" /> </el-header> <el-container> - <el-main> + <el-aside width="500px"> <DevInstallPanel ref="devInstallPanelRef" @success="onEvent"/> - </el-main> - <el-aside width="300px" style="background-color: var(--el-color-primary-light-7);"> - <QueuePanel :queue="patientList"/> </el-aside> - </el-container> - <el-container style="justify-content: center; margin-top: 30px"> - <el-button :disabled="finishFlag" type="primary" @click="finishNextPatient">鍙彿</el-button> - <el-button :disabled="passFlag" type="primary" @click="passNextPatient">杩囧彿</el-button> - <el-button :disabled="bedControlFlag" type="primary" @click="bedControl">{{state?'鏆傚仠':'鎭㈠'}}</el-button> + <el-container style="background-color: var(--el-color-primary-light-7);"> + <el-main > + <QueuePanel :queue="patientList"/> + </el-main> + <el-footer> + <el-button :disabled="finishFlag" type="primary" @click="finishNextPatient">鍙彿</el-button> + <el-button :disabled="passFlag" type="primary" @click="passNextPatient">杩囧彿</el-button> + <el-button :disabled="bedControlFlag" type="primary" @click="bedControl">{{state?'鏆傚仠':'鎭㈠'}}</el-button> + </el-footer> + </el-container> </el-container> </el-container> </template> -- Gitblit v1.9.3