From 8db5a459b5902ed780699dcfc3c2d6b6720a3d57 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 18 十二月 2024 14:16:17 +0800
Subject: [PATCH] 设备备注 & 查询条件
---
src/api/ecg/devmanage/index.ts | 4 ++++
src/views/ecg/devmanage/index.vue | 33 +++++++++++++++++++++++++++++----
src/views/ecg/devmanage/DeviceForm.vue | 19 ++++++++++++++++---
3 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/src/api/ecg/devmanage/index.ts b/src/api/ecg/devmanage/index.ts
index 26241f9..ed7380d 100644
--- a/src/api/ecg/devmanage/index.ts
+++ b/src/api/ecg/devmanage/index.ts
@@ -10,12 +10,16 @@
// 璁惧 VO
export interface DeviceVO {
id: number // id
+ devCodeIntrinsic: string
+ devCodeHosp: string
+ devCodeDept: string
devId: string // 璁惧缂栧彿
category: string // 鍒嗙被鍚�
brand: string // 鍝佺墝
model: string // 鍨嬪彿
purchaseDate: number // 閲囪喘鏃ユ湡
state: number //鐘舵��
+ comment: string // 澶囨敞
}
// 璁惧缁熻 VO
diff --git a/src/views/ecg/devmanage/DeviceForm.vue b/src/views/ecg/devmanage/DeviceForm.vue
index 9c338fc..6f6cb55 100644
--- a/src/views/ecg/devmanage/DeviceForm.vue
+++ b/src/views/ecg/devmanage/DeviceForm.vue
@@ -67,6 +67,11 @@
</el-radio-group>
<span v-else>{{tranlateDevState(formData.state)}}</span>
</el-form-item>
+
+ <el-form-item label="澶囨敞" prop="devId">
+ <el-input v-model="formData.comment" placeholder="璇疯緭鍏ヨ澶囧娉�" />
+ </el-form-item>
+
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">纭� 瀹�</el-button>
@@ -90,6 +95,7 @@
const formType = ref('') // 琛ㄥ崟鐨勭被鍨嬶細create - 鏂板锛泆pdate - 淇敼
const formData = ref<DeviceVO>({
id: 0,
+ devId: '',
purchaseDate: new Date().getTime(),
devCodeIntrinsic: '',
devCodeHosp: '',
@@ -97,8 +103,10 @@
category: '',
brand: '',
model: '',
- lost: 0,
+ comment: '',
+ state: 0,
})
+
const formRules = reactive({
})
const formRef = ref() // 琛ㄥ崟 Ref
@@ -162,11 +170,16 @@
const resetForm = () => {
formData.value = {
id: 0,
- purchaseDate: new Date().getTime(),
devId: '',
+ purchaseDate: new Date().getTime(),
+ devCodeIntrinsic: '',
+ devCodeHosp: '',
+ devCodeDept: '',
category: '',
brand: '',
- model: ''
+ model: '',
+ comment: '',
+ state: 0,
}
formRef.value?.resetFields()
}
diff --git a/src/views/ecg/devmanage/index.vue b/src/views/ecg/devmanage/index.vue
index 8229feb..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"
@@ -146,6 +166,8 @@
<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="鍒涘缓鏃堕棿"
@@ -231,6 +253,9 @@
purchaseDate: [],
createTime: [],
devId: undefined,
+ devCodeIntrinsic: undefined,
+ devCodeHosp: undefined,
+ devCodeDept: undefined,
state: [],
category: undefined,
brand: undefined,
--
Gitblit v1.9.3