From e25465c223a2e63422acfb58414597ca8fc4df09 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期四, 13 十一月 2025 18:01:55 +0800
Subject: [PATCH] 排队异常、小屏适配问题
---
src/views/ecg/devmanage/index.vue | 137 ++++++++++++++++++++++++++++++++-------------
1 files changed, 97 insertions(+), 40 deletions(-)
diff --git a/src/views/ecg/devmanage/index.vue b/src/views/ecg/devmanage/index.vue
index d6a483c..09006f2 100644
--- a/src/views/ecg/devmanage/index.vue
+++ b/src/views/ecg/devmanage/index.vue
@@ -6,37 +6,46 @@
:model="queryParams"
ref="queryFormRef"
:inline="true"
- label-width="68px"
+ label-width="100px"
>
- <el-form-item label="閲囪喘鏃ユ湡" prop="purchaseDate">
- <el-date-picker
- v-model="queryParams.purchaseDate"
- value-format="YYYY-MM-DD HH:mm:ss"
- type="daterange"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
- class="!w-220px"
- />
- </el-form-item>
- <el-form-item label="璁惧缂栧彿" prop="devId">
+ <el-form-item label="璁惧閮ㄩ棬缂栧彿" prop="devId">
<el-input
- v-model="queryParams.devId"
- placeholder="璇疯緭鍏ヨ澶囩紪鍙�"
+ v-model="queryParams.devCodeDept"
+ placeholder="璇疯緭鍏ヨ澶囬儴闂ㄧ紪鍙�"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
+ <el-form-item label="璁惧鍖婚櫌缂栧彿" prop="devId">
+ <el-input
+ v-model="queryParams.devCodeHosp"
+ placeholder="璇疯緭鍏ヨ澶囧尰闄㈢紪鍙�"
+ clearable
+ @keyup.enter="handleQuery"
+ class="!w-240px"
+ />
+ </el-form-item>
+ <el-form-item label="璁惧鍥烘湁缂栧彿" prop="devId">
+ <el-input
+ v-model="queryParams.devCodeIntrinsic"
+ placeholder="璇疯緭鍏ヨ澶囧浐鏈夌紪鍙�"
+ clearable
+ @keyup.enter="handleQuery"
+ class="!w-240px"
+ />
+ </el-form-item>
+
<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"
@@ -90,6 +99,19 @@
/>
</el-select>
</el-form-item>
+
+ <el-form-item label="閲囪喘鏃ユ湡" prop="purchaseDate">
+ <el-date-picker
+ v-model="queryParams.purchaseDate"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ type="daterange"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+ class="!w-220px"
+ />
+ </el-form-item>
+
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 鎼滅储</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 閲嶇疆</el-button>
@@ -119,7 +141,7 @@
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<!-- <el-table-column label="id" align="center" prop="id" />-->
<el-table-column label="璁惧缂栧彿" align="center" prop="devId" width="100px" />
- <el-table-column label="鍒嗙被鍚�" align="center" prop="category">
+ <el-table-column label="鍒嗙被" align="center" prop="category" width="60px">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ECG_DEV_CATEGORY" :value="scope.row.category" />
</template>
@@ -129,25 +151,46 @@
<dict-tag :type="DICT_TYPE.ECG_DEV_BRAND" :value="scope.row.brand" />
</template>
</el-table-column>
- <el-table-column label="鍨嬪彿" align="center" prop="model" />
- <el-table-column label="鐘舵��" align="center" prop="lost" >
+ <el-table-column label="鍨嬪彿" align="center" prop="model" width="100px"/>
+ <el-table-column label="鐘舵��" align="center" prop="lost" width="80px">
<template #default="scope">
<span>{{tranlateDevState(scope.row.state)}}</span>
</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"
- prop="createTime"
- :formatter="dateFormatter2"
- width="180px"
- />
--->
- <el-table-column label="鎿嶄綔" align="center" min-width="120px">
+
+ <el-table-column label="鎮ｈ��" align="center" prop="patDetails" width="400px">
<template #default="scope">
+ <span>{{scope.row.patDetails?.name}} {{scope.row.patDetails?.mobile}} {{scope.row.patDetails?.wardDesc}} {{scope.row.patDetails?.bedNo}}</span>
+ </template>
+ </el-table-column>
+
+ <el-table-column label="鐘舵�佹棩鏈�" align="center" prop="stateDate" :formatter="dateFormatter2" width="120px"/>
+ <el-table-column label="閲囪喘鏃ユ湡" align="center" prop="purchaseDate" :formatter="dateFormatter2" width="120px"/>
+
+ <el-table-column label="澶囨敞" align="center" prop="comment" width="100px" />
+
+ <!--
+ <el-table-column
+ label="鍒涘缓鏃堕棿"
+ align="center"
+ prop="createTime"
+ :formatter="dateFormatter2"
+ width="180px"
+ />
+ -->
+ <el-table-column label="鎿嶄綔" align="center" min-width="170px">
+ <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"
@@ -162,7 +205,7 @@
@click="openForm('devState', scope.row.id)"
v-hasPermi="['ecg:device:update']"
>
- 璁惧鐘舵��
+ 鏀圭姸鎬�
</el-button>
<el-button
link
@@ -189,12 +232,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 {tranlateDevState} from "@/utils/statusFormatter";
+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' })
@@ -211,10 +256,13 @@
purchaseDate: [],
createTime: [],
devId: undefined,
- state: undefined,
- category: undefined,
- brand: undefined,
- model: undefined
+ devCodeIntrinsic: undefined,
+ devCodeHosp: undefined,
+ devCodeDept: undefined,
+ state: [],
+ category: '',
+ brand: '',
+ model: '',
})
const queryFormRef = ref() // 鎼滅储鐨勮〃鍗�
const exportLoading = ref(false) // 瀵煎嚭鐨勫姞杞戒腑
@@ -245,6 +293,13 @@
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
+}
+
+const showPatient = async (rentId: number) => {
+ if (!rentId) return
+
+ const devRent = await DevRentApi.getDevRent(rentId)
+ ElMessageBox.alert(devRent.patName + " " + devRent.patDetails, '鎮ｈ�呬俊鎭�');
}
/** 娣诲姞/淇敼鎿嶄綔 */
@@ -282,7 +337,7 @@
}
const categoryChanged = async () => {
- const data = await DevModelApi.getBrandOption(queryParams.category!)
+ const data = await DevModelApi.getBrandOption(queryParams.category??'')
brandOptions.value = data
queryParams.brand = ''
@@ -293,7 +348,7 @@
}
const brandChanged = async () => {
- const data = await DevModelApi.getModelOption(queryParams.category!, queryParams.brand!)
+ const data = await DevModelApi.getModelOption(queryParams.category??'', queryParams.brand??'')
modelOptions.value = data
queryParams.model = ''
@@ -306,6 +361,8 @@
const data = await getStrDictOptions(DICT_TYPE.ECG_DEV_CATEGORY)
categoryOptions.value = data
+ categoryChanged()
+
getList()
})
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3