From a90276a242ddca6f45e234c5cc4832a7a01a7e03 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 02 十二月 2024 11:06:53 +0800
Subject: [PATCH] Fix Bug: 条码更新问题
---
src/views/ecg/devmanage/index.vue | 91 +++++++++++++++++++++++++++++----------------
1 files changed, 59 insertions(+), 32 deletions(-)
diff --git a/src/views/ecg/devmanage/index.vue b/src/views/ecg/devmanage/index.vue
index d2eb6c7..8229feb 100644
--- a/src/views/ecg/devmanage/index.vue
+++ b/src/views/ecg/devmanage/index.vue
@@ -19,17 +19,6 @@
class="!w-220px"
/>
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
- <el-date-picker
- v-model="queryParams.createTime"
- 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 label="璁惧缂栧彿" prop="devId">
<el-input
v-model="queryParams.devId"
@@ -38,6 +27,22 @@
@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>
</el-form-item>
<el-form-item label="鍒嗙被鍚�" prop="category">
<el-select
@@ -115,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>
@@ -125,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"
@@ -155,7 +180,7 @@
@click="openForm('devState', scope.row.id)"
v-hasPermi="['ecg:device:update']"
>
- 璁惧鐘舵��
+ 鏀圭姸鎬�
</el-button>
<el-button
link
@@ -182,11 +207,14 @@
</template>
<script setup lang="ts">
+import { ElMessageBox } from 'element-plus'
import {getStrDictOptions, DICT_TYPE, DictDataType} from '@/utils/dict'
-import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
+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' })
@@ -203,6 +231,7 @@
purchaseDate: [],
createTime: [],
devId: undefined,
+ state: [],
category: undefined,
brand: undefined,
model: undefined
@@ -238,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) => {
@@ -270,15 +306,6 @@
} finally {
exportLoading.value = false
}
-}
-
-const tranlateDevState = (state) => {
- if (state === 0) return "绌洪棽";
- else if (state=== 5) return "宸查鐢�";
- else if (state=== 10) return "宸茶鏈�";
- else if (state=== 20) return "宸查仐澶�";
- else if (state=== 30) return "缁翠慨涓�";
- else if (state=== 40) return "宸叉姤搴�";
}
const categoryChanged = async () => {
--
Gitblit v1.9.3