From 90de3fa97572d645e9da576f751257c913736e82 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 24 十月 2024 11:10:10 +0800
Subject: [PATCH] bug fix
---
src/components/RoomBedSelect/src/RoomBedSelect.vue | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/components/RoomBedSelect/src/RoomBedSelect.vue b/src/components/RoomBedSelect/src/RoomBedSelect.vue
index a804b87..79092cc 100644
--- a/src/components/RoomBedSelect/src/RoomBedSelect.vue
+++ b/src/components/RoomBedSelect/src/RoomBedSelect.vue
@@ -1,14 +1,17 @@
<script lang="ts" setup>
-import { RoomApi, RoomVO } from '@/api/ecg/room'
+import { RoomVO } from '@/api/ecg/room'
import {PropType} from "vue";
import {useUserStore} from "@/store/modules/user";
-const emit = defineEmits(['haveSeat', 'leaveSeat'])
+import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
+import {useCheckTypeStore} from "@/store/modules/checkType";
+const emit = defineEmits(['event-haveseat', 'event-leaveseat'])
defineComponent({
name: 'RoomBedSelect'
})
-const props = defineProps({
+//const props = defineProps({
+defineProps({
title: {
type: String,
required: true
@@ -23,19 +26,21 @@
}
})
+const checkTypeStore = useCheckTypeStore();
const userStore = useUserStore()
const curUser = userStore.getUser
-const onHaveSeatclick = (newItem) => {
- emit('haveSeat', newItem)
+const onHaveSeatclick = (newItem: RoomVO) => {
+ emit('event-haveseat', newItem)
}
-const onLeaveSeatclick = (curItem) => {
- emit('leaveSeat', curItem)
+const onLeaveSeatclick = (curItem: RoomVO) => {
+ emit('event-leaveseat', curItem)
}
+
/** 鍒濆鍖� **/
onMounted(() => {
- console.info(props.bedList)
+ //console.info(props.bedList)
})
</script>
@@ -45,23 +50,35 @@
<template #header>{{title}}</template>
<div v-for="(bedItem, index) in bedList" :key="index">
<div class="deskwarp">
+
+ <div v-for="(checkType, subIndex) in bedItem.checkTypes" :key="subIndex">
+ {{checkTypeStore.getCheckTypeName(checkType)}}
+ </div>
+ <div>
+ {{bedItem.opType === 1?"棰嗙敤":""}}
+ {{bedItem.opType === 2?"瀹夎":""}}
+ </div>
+
<img
- v-if="curBed.roomId !== bedItem.roomId || curBed.bedNo !== bedItem.bedNo"
- src="@/assets/room/desk.png"
+ v-if="bedItem.docId === null"
+ src="@/assets/room/open.jpg"
style="width: 100%"
+ alt="鏃犲尰鐢�"
/>
<img
v-else
src="@/assets/room/desk-doctor.jpeg"
style="width: 100%"
+ alt="鏈夊尰鐢�"
/>
- <div>{{bedItem.bedNo}} {{bedItem.docName}}</div>
+ <div>{{bedItem.bedNo}} {{bedItem.docName}} {{bedItem.status === 30?"-鏆傚仠":""}}</div>
<el-button v-if="bedItem.docId === null" @click = onHaveSeatclick(bedItem)>
鍏ュ骇
</el-button>
<el-button v-if="bedItem.docId === curUser.id" @click = onLeaveSeatclick(bedItem)>
绂诲骇
</el-button>
+ <el-divider/>
</div>
</div>
</el-card>
@@ -91,6 +108,7 @@
display: flex;
flex-direction: column;
align-items: center;
+ /*height: 260px;*/
}
</style>
--
Gitblit v1.9.3