From 936c01060eea0924b88ca5c35d221a972a6aba7d Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 05 十月 2026 10:47:22 +0800
Subject: [PATCH] 检查单列表调整
---
src/views/ecg/devmanage/index.vue | 232 +++++++++++++++++++++------------------------------------
1 files changed, 87 insertions(+), 145 deletions(-)
diff --git a/src/views/ecg/devmanage/index.vue b/src/views/ecg/devmanage/index.vue
index a16379f..78949fa 100644
--- a/src/views/ecg/devmanage/index.vue
+++ b/src/views/ecg/devmanage/index.vue
@@ -1,114 +1,60 @@
<template>
<ContentWrap>
<!-- 鎼滅储宸ヤ綔鏍� -->
- <el-form
- class="-mb-15px"
- :model="queryParams"
- ref="queryFormRef"
- :inline="true"
- label-width="68px"
- >
- <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 class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="100px">
+ <el-form-item label="璁惧閮ㄩ棬缂栧彿" prop="devId">
+ <el-input 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.devId"
- placeholder="璇疯緭鍏ヨ澶囩紪鍙�"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
+ <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 DevStateOptions"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="queryParams.state" multiple placeholder="璇烽�夋嫨鐘舵��" clearable class="!w-240px">
+ <el-option v-for="dict in DevStateOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="鍒嗙被鍚�" prop="category">
- <el-select
- v-model="queryParams.category"
- placeholder="璇烽�夋嫨鍒嗙被鍚�"
- clearable
- class="!w-240px"
- @change="categoryChanged"
- >
- <el-option
- v-for="dict in categoryOptions"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="queryParams.category" placeholder="璇烽�夋嫨鍒嗙被鍚�" clearable class="!w-240px"
+ @change="categoryChanged">
+ <el-option v-for="dict in categoryOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="鍝佺墝" prop="brand">
- <el-select
- v-model="queryParams.brand"
- placeholder="璇烽�夋嫨鍝佺墝"
- clearable
- class="!w-240px"
- @change="brandChanged"
- >
- <el-option
- v-for="dict in brandOptions"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="queryParams.brand" placeholder="璇烽�夋嫨鍝佺墝" clearable class="!w-240px" @change="brandChanged">
+ <el-option v-for="dict in brandOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="鍨嬪彿" prop="model">
- <el-select
- v-model="queryParams.model"
- placeholder="璇烽�夋嫨鍨嬪彿"
- clearable
- class="!w-240px"
- >
- <el-option
- v-for="dict in modelOptions"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="queryParams.model" placeholder="璇烽�夋嫨鍨嬪彿" clearable class="!w-240px">
+ <el-option v-for="dict in modelOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
</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>
- <el-button
- type="primary"
- plain
- @click="openForm('create')"
- v-hasPermi="['ecg:device:create']"
- >
+ <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>
+ <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['ecg:device:create']">
<Icon icon="ep:plus" class="mr-5px" /> 鏂板
</el-button>
- <el-button
- type="success"
- plain
- @click="handleExport"
- :loading="exportLoading"
- v-hasPermi="['ecg:device:export']"
- >
+ <el-button type="success" plain @click="handleExport" :loading="exportLoading"
+ v-hasPermi="['ecg:device:export']">
<Icon icon="ep:download" class="mr-5px" /> 瀵煎嚭
</el-button>
</el-form-item>
@@ -120,7 +66,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,25 +76,34 @@
<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>
+ <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="stateDate" :formatter="dateFormatter2" width="120px" />
+
+ <el-table-column label="浣跨敤鎮h��" 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="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"
@@ -158,40 +113,22 @@
>
鏌ユ偅鑰�
</el-button>
- <el-button
- link
- type="primary"
- @click="openForm('update', scope.row.id)"
- v-hasPermi="['ecg:device:update']"
- >
+-->
+ <el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['ecg:device:update']">
缂栬緫
</el-button>
- <el-button
- link
- type="primary"
- @click="openForm('devState', scope.row.id)"
- v-hasPermi="['ecg:device:update']"
- >
+ <el-button link type="primary" @click="openForm('devState', scope.row.id)" v-hasPermi="['ecg:device:update']">
鏀圭姸鎬�
</el-button>
- <el-button
- link
- type="danger"
- @click="handleDelete(scope.row.id)"
- v-hasPermi="['ecg:device:delete']"
- >
+ <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['ecg:device:delete']">
鍒犻櫎
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 鍒嗛〉 -->
- <Pagination
- :total="total"
- v-model:page="queryParams.pageNo"
- v-model:limit="queryParams.pageSize"
- @pagination="getList"
- />
+ <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+ @pagination="getList" />
</ContentWrap>
<!-- 琛ㄥ崟寮圭獥锛氭坊鍔�/淇敼 -->
@@ -200,13 +137,13 @@
<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 { 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 { DeviceApi, DeviceVO, DevModelApi, OptionsVO } from '@/api/ecg/devmanage'
import DeviceForm from './DeviceForm.vue'
-import {DevRentApi} from "@/api/ecg/devrent";
+import { DevRentApi } from "@/api/ecg/devrent";
/** 璁惧 鍒楄〃 */
defineOptions({ name: 'Device' })
@@ -223,10 +160,13 @@
purchaseDate: [],
createTime: [],
devId: undefined,
+ devCodeIntrinsic: undefined,
+ devCodeHosp: undefined,
+ devCodeDept: undefined,
state: [],
- category: undefined,
- brand: undefined,
- model: undefined
+ category: '',
+ brand: '',
+ model: '',
})
const queryFormRef = ref() // 鎼滅储鐨勮〃鍗�
const exportLoading = ref(false) // 瀵煎嚭鐨勫姞杞戒腑
@@ -263,7 +203,7 @@
if (!rentId) return
const devRent = await DevRentApi.getDevRent(rentId)
- ElMessageBox.alert(devRent.patDetails, '鎮h�呬俊鎭�');
+ ElMessageBox.alert(devRent.patName + " " + devRent.patDetails, '鎮h�呬俊鎭�');
}
/** 娣诲姞/淇敼鎿嶄綔 */
@@ -282,7 +222,7 @@
message.success(t('common.delSuccess'))
// 鍒锋柊鍒楄〃
await getList()
- } catch {}
+ } catch { }
}
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
@@ -301,7 +241,7 @@
}
const categoryChanged = async () => {
- const data = await DevModelApi.getBrandOption(queryParams.category!)
+ const data = await DevModelApi.getBrandOption(queryParams.category ?? '')
brandOptions.value = data
queryParams.brand = ''
@@ -312,7 +252,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 = ''
@@ -321,10 +261,12 @@
}
/** 鍒濆鍖� **/
-onMounted( async () => {
+onMounted(async () => {
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