From 8db5a459b5902ed780699dcfc3c2d6b6720a3d57 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 18 十二月 2024 14:16:17 +0800
Subject: [PATCH] 设备备注 & 查询条件
---
src/views/ecg/devmanage/index.vue | 69 +++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 18 deletions(-)
diff --git a/src/views/ecg/devmanage/index.vue b/src/views/ecg/devmanage/index.vue
index a16379f..2b4e247 100644
--- a/src/views/ecg/devmanage/index.vue
+++ b/src/views/ecg/devmanage/index.vue
@@ -6,7 +6,7 @@
:model="queryParams"
ref="queryFormRef"
:inline="true"
- label-width="68px"
+ label-width="100px"
>
<el-form-item label="閲囪喘鏃ユ湡" prop="purchaseDate">
<el-date-picker
@@ -19,15 +19,35 @@
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"
@@ -120,7 +140,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>
@@ -130,23 +150,33 @@
<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="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="createTime"
- :formatter="dateFormatter2"
- width="180px"
- />
--->
+ <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="120px">
<template #default="scope">
<el-button
@@ -223,6 +253,9 @@
purchaseDate: [],
createTime: [],
devId: undefined,
+ devCodeIntrinsic: undefined,
+ devCodeHosp: undefined,
+ devCodeDept: undefined,
state: [],
category: undefined,
brand: undefined,
@@ -263,7 +296,7 @@
if (!rentId) return
const devRent = await DevRentApi.getDevRent(rentId)
- ElMessageBox.alert(devRent.patDetails, '鎮ｈ�呬俊鎭�');
+ ElMessageBox.alert(devRent.patName + " " + devRent.patDetails, '鎮ｈ�呬俊鎭�');
}
/** 娣诲姞/淇敼鎿嶄綔 */
--
Gitblit v1.9.3