From e005f776031c7acdde4fd4545c8ee098101b1b55 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期五, 08 十一月 2024 18:45:41 +0800 Subject: [PATCH] update --- src/views/ecg/devmanage/index.vue | 44 ++++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/views/ecg/devmanage/index.vue b/src/views/ecg/devmanage/index.vue index bb1db29..67ce8cd 100644 --- a/src/views/ecg/devmanage/index.vue +++ b/src/views/ecg/devmanage/index.vue @@ -31,12 +31,13 @@ <el-form-item label="鐘舵��" prop="state"> <el-select v-model="queryParams.state" + multiple placeholder="璇烽�夋嫨鐘舵��" clearable class="!w-240px" > <el-option - v-for="dict in stateOptions" + v-for="dict in DevStateOptions" :key="dict.value" :label="dict.label" :value="dict.value" @@ -136,6 +137,8 @@ </template> </el-table-column> <el-table-column label="閲囪喘鏃ユ湡" align="center" prop="purchaseDate" :formatter="dateFormatter2" width="120px"/> + <el-table-column label="鐘舵�佹棩鏈�" align="center" prop="stateDate" :formatter="dateFormatter2" width="120px"/> +<!-- <el-table-column label="鍒涘缓鏃堕棿" align="center" @@ -143,8 +146,18 @@ :formatter="dateFormatter2" width="180px" /> +--> <el-table-column label="鎿嶄綔" align="center" min-width="120px"> <template #default="scope"> + <el-button + link + type="primary" + @click="showPatient(scope.row.rentId)" + v-hasPermi="['ecg:device:update']" + v-if= scope.row.rentId + > + 鏌ユ偅鑰� + </el-button> <el-button link type="primary" @@ -159,7 +172,7 @@ @click="openForm('devState', scope.row.id)" v-hasPermi="['ecg:device:update']" > - 璁惧鐘舵�� + 鏀圭姸鎬� </el-button> <el-button link @@ -186,11 +199,14 @@ </template> <script setup lang="ts"> +import { ElMessageBox } from 'element-plus' import {getStrDictOptions, DICT_TYPE, DictDataType} from '@/utils/dict' import {dateFormatter2} from '@/utils/formatTime' +import {DevStateOptions, tranlateDevState} from "@/utils/statusFormatter"; import download from '@/utils/download' import {DeviceApi, DeviceVO, DevModelApi, OptionsVO} from '@/api/ecg/devmanage' import DeviceForm from './DeviceForm.vue' +import {DevRentApi} from "@/api/ecg/devrent"; /** 璁惧 鍒楄〃 */ defineOptions({ name: 'Device' }) @@ -207,7 +223,7 @@ purchaseDate: [], createTime: [], devId: undefined, - state: undefined, + state: [], category: undefined, brand: undefined, model: undefined @@ -243,6 +259,13 @@ handleQuery() } +const showPatient = async (rentId: number) => { + if (!rentId) return + + const devRent = await DevRentApi.getDevRent(rentId) + ElMessageBox.alert(devRent.patName + " " + devRent.patDetails, '鎮h�呬俊鎭�'); +} + /** 娣诲姞/淇敼鎿嶄綔 */ const formRef = ref() const openForm = (type: string, id?: number) => { @@ -275,21 +298,6 @@ } finally { exportLoading.value = false } -} - -const stateOptions = [ - {label: "绌洪棽", value: 0}, - {label: "宸查鐢�", value: 5}, - {label: "宸茶鏈�", value: 10}, - {label: "宸查仐澶�", value: 20}, - {label: "缁翠慨涓�", value: 30}, - {label: "宸叉姤搴�", value: 40} - ] - -const tranlateDevState = (state) => { - const stateOption = stateOptions.find(obj => obj.value === state) - console.info( stateOption ) - return undefined !== stateOption ? stateOption.label : '' } const categoryChanged = async () => { -- Gitblit v1.9.3