From b21bac11fffd44e28eee3a518b1dc69fe705306c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 19 十一月 2024 15:30:59 +0800
Subject: [PATCH] 患者详情
---
src/api/ecg/common/index.ts | 8 ++++
src/api/ecg/devrent/index.ts | 30 ++++++++-------
src/views/ecg/devmanage/index.vue | 34 ++++++++++------
src/api/ecg/queue/index.ts | 2 +
src/views/ecg/doctor/components/DevReadyPanel.vue | 14 +++----
5 files changed, 53 insertions(+), 35 deletions(-)
diff --git a/src/api/ecg/common/index.ts b/src/api/ecg/common/index.ts
new file mode 100644
index 0000000..eb3552e
--- /dev/null
+++ b/src/api/ecg/common/index.ts
@@ -0,0 +1,8 @@
+export interface PatDetailsVO {
+ bedNo: string
+ mobile: string
+ deptDesc: string
+ wardCode: string
+ deptCode: string
+ wardDesc: string
+}
diff --git a/src/api/ecg/devrent/index.ts b/src/api/ecg/devrent/index.ts
index 1a6ea16..7c5bb55 100644
--- a/src/api/ecg/devrent/index.ts
+++ b/src/api/ecg/devrent/index.ts
@@ -1,21 +1,23 @@
import request from '@/config/axios'
+import {PatDetailsVO} from "@/api/ecg/common";
// 瑁呮満鎷嗘満 VO
export interface DevRentVO {
- id: number | null // id
- devId: string // 璁惧缂栧彿
- patId: string // 鎮ｈ�呯紪鍙�
- patName: string // 鎮ｈ�呭悕绉�
- checkType: number
- rentTime: Date // 瑁呮満鏃堕棿
- returnTime: Date // 鎷嗘満鏃堕棿
- interference: number // 骞叉壈鏁�
- baseline: string // 鍩虹嚎绮�
- detachment: string // 鑴辫惤
- remark: string // 澶囨敞
-
- roomId: number
- bedNo: string
+ id: number | undefined // id
+ devId: string | undefined // 璁惧缂栧彿
+ patId: string | undefined// 鎮ｈ�呯紪鍙�
+ patName: string | undefined // 鎮ｈ�呭悕绉�
+ patDetails: PatDetailsVO | undefined
+ checkType: number | undefined
+ rentTime: Date | undefined // 瑁呮満鏃堕棿
+ returnTime: Date | undefined // 鎷嗘満鏃堕棿
+ interference: number | undefined // 骞叉壈鏁�
+ baseline: string | undefined // 鍩虹嚎绮�
+ detachment: string | undefined // 鑴辫惤
+ remark: string | undefined // 澶囨敞
+ paid: number | undefined
+ roomId: number | undefined
+ bedNo: string | undefined
}
// 瑁呮満鎷嗘満 API
diff --git a/src/api/ecg/queue/index.ts b/src/api/ecg/queue/index.ts
index abc54b4..c36b84e 100644
--- a/src/api/ecg/queue/index.ts
+++ b/src/api/ecg/queue/index.ts
@@ -1,4 +1,5 @@
import request from '@/config/axios'
+import {PatDetailsVO} from "@/api/ecg/common";
// 鎺掗槦 VO
export interface QueueVO {
@@ -18,6 +19,7 @@
roomId: number // 璇婂缂栧彿
roomName: string // 璇婂鍚嶇О
bedNo: string // 璇婄枟搴婄紪鍙�
+ patDetails: PatDetailsVO
}
// 鎺掗槦 API
diff --git a/src/views/ecg/devmanage/index.vue b/src/views/ecg/devmanage/index.vue
index 67ce8cd..9a18959 100644
--- a/src/views/ecg/devmanage/index.vue
+++ b/src/views/ecg/devmanage/index.vue
@@ -120,7 +120,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 +130,31 @@
<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" :formatter="dateFormatter2" 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="createTime"
+ :formatter="dateFormatter2"
+ width="180px"
+ />
+ -->
<el-table-column label="鎿嶄綔" align="center" min-width="120px">
<template #default="scope">
<el-button
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 13795d6..9563265 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -19,7 +19,7 @@
</el-form-item>
<el-form-item label="鎮ｈ�呮弿杩�" prop="patDeptDesc">
- {{formData.patDetails}}
+ {{formData.patDetails?.deptDesc}} {{formData.patDetails?.wardDesc}} {{formData.patDetails?.bedNo}}
</el-form-item>
<el-form-item label="璁惧缂栧彿" prop="devId">
<el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getDevInfo"/>
@@ -159,16 +159,11 @@
const checkTypeStore = useCheckTypeStoreWithOut()
-const formData = ref({
+const formData = ref<DevRentVO>({
id: undefined,
devId: undefined,
patId: undefined,
patName: undefined,
- patDeptCode: undefined,
- patDeptDesc: undefined,
- patWardCode: undefined,
- patWardDesc: undefined,
- patBedNo: undefined,
patDetails: undefined,
checkType: undefined,
rentTime: new Date().getTime(),
@@ -181,6 +176,7 @@
roomId: props.room.roomId,
bedNo: props.room.bedNo
})
+
const formRules = reactive({
devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
rentTime: [{ required: true, message: '璇烽�夋嫨瑁呮満鏃ユ湡', trigger: 'blur' }],
@@ -215,6 +211,8 @@
if (null === data)
return
+ console.info("dev rent : " + data)
+
// formDate 瀵瑰簲 DevRent
// formData.value = data //涓嶈兘鏁翠釜璧嬪�硷紝 榛樿棰嗙敤鏃堕棿琚竻绌�
formData.value.id = data.id; //rent id
@@ -230,7 +228,7 @@
try {
formData.value.roomId = props.room.roomId
formData.value.bedNo = props.room.bedNo
- const data = formData.value as unknown as DevRentVO
+ const data = formData.value
console.info( data )
if (formData.value.id === null || formData.value.id === undefined) {
--
Gitblit v1.9.3