From b3a5df43f282f5c9cd23131788a234f098c8cbbf Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 十二月 2024 10:37:58 +0800
Subject: [PATCH] BugFix: 预约确认有时不弹检查项目，但是患者信息显示正确的现象
---
src/views/ecg/devmanage/index.vue | 73 ++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 29 deletions(-)
diff --git a/src/views/ecg/devmanage/index.vue b/src/views/ecg/devmanage/index.vue
index 4e20cc8..8229feb 100644
--- a/src/views/ecg/devmanage/index.vue
+++ b/src/views/ecg/devmanage/index.vue
@@ -31,12 +31,13 @@
<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"
@@ -119,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>
@@ -129,22 +130,42 @@
<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="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="createTime"
- :formatter="dateFormatter2"
- width="180px"
- />
+
+ <!--
+ <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
+ 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"
@@ -159,7 +180,7 @@
@click="openForm('devState', scope.row.id)"
v-hasPermi="['ecg:device:update']"
>
- 璁惧鐘舵��
+ 鏀圭姸鎬�
</el-button>
<el-button
link
@@ -186,11 +207,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 {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' })
@@ -207,7 +231,7 @@
purchaseDate: [],
createTime: [],
devId: undefined,
- state: undefined,
+ state: [],
category: undefined,
brand: undefined,
model: undefined
@@ -243,6 +267,13 @@
handleQuery()
}
+const showPatient = async (rentId: number) => {
+ if (!rentId) return
+
+ const devRent = await DevRentApi.getDevRent(rentId)
+ ElMessageBox.alert(devRent.patName + " " + devRent.patDetails, '鎮ｈ�呬俊鎭�');
+}
+
/** 娣诲姞/淇敼鎿嶄綔 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
@@ -275,22 +306,6 @@
} finally {
exportLoading.value = false
}
-}
-
-const stateOptions = [
- {label: "绌洪棽", value: 0},
- {label: "宸查鐢�", value: 5},
- {label: "宸茶鏈�", value: 10},
- {label: "宸查仐澶�", value: 20},
- {label: "寰呯淮淇�", value: 30},
- {label: "缁翠慨涓�", value: 40},
- {label: "宸叉姤搴�", value: 50}
- ]
-
-const tranlateDevState = (state) => {
- const stateOption = stateOptions.find(obj => obj.value === state)
- console.info( stateOption )
- return undefined !== stateOption ? stateOption.label : ''
}
const categoryChanged = async () => {
--
Gitblit v1.9.3