From c1e10385c164520dceec34576ed506b28bad1e71 Mon Sep 17 00:00:00 2001
From: jazz <jazzxhunter@163.com>
Date: 星期二, 09 一月 2024 12:03:12 +0800
Subject: [PATCH] update_202401091203_单个治疗室多个客人的逻辑编写v4
---
src/components/xio_room_off_narcosis_notice/index.vue | 2 +-
src/components/xio_room_guest_info_box/index.vue | 2 +-
src/components/xio_room_guest_box/index.vue | 4 ++--
src/components/xio_room_info_block/index.vue | 22 +++++++++++++++++++---
src/components/xio_room_list_shop_chg/index.vue | 2 +-
src/pages/room/detail.vue | 5 ++++-
6 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/src/components/xio_room_guest_box/index.vue b/src/components/xio_room_guest_box/index.vue
index 86cf0d9..1622d41 100644
--- a/src/components/xio_room_guest_box/index.vue
+++ b/src/components/xio_room_guest_box/index.vue
@@ -17,7 +17,7 @@
<span class="tx flex-1 flex-1-w1 ell">{{ item.aDoctorName?item.aDoctorName+'(鍖荤敓)銆�':'' }}{{ item.aNurseName?item.aNurseName+'(鎶ゅ＋)':'' }}</span>
</div>
<div class="guest_list__td flex flex-center">
- <div v-if="!item.act" class="tx" style="text-decoration: underline;color: #227beb;">閫夋嫨</div>
+ <div v-if="!item.act" class="tx" style="text-decoration: underline;color: #227beb;">鍔犲叆</div>
<!-- <div class="icon">
<img class="img" src="static/imgs/choose.png">
</div> -->
@@ -33,7 +33,7 @@
<script>
export default {
- name: 'XioRoomStatusChg',
+ name: 'XioRoomGuestBox',
props: {
assignTreatListViewCom: {
type: Array,
diff --git a/src/components/xio_room_guest_info_box/index.vue b/src/components/xio_room_guest_info_box/index.vue
index 69c01bc..2d9ce6c 100644
--- a/src/components/xio_room_guest_info_box/index.vue
+++ b/src/components/xio_room_guest_info_box/index.vue
@@ -52,7 +52,7 @@
// 閫氱煡鍗搁夯
import XioRoomOffNarcosisNotice from '@/components/xio_room_off_narcosis_notice'
export default {
- name: 'XioRoomStatusChg',
+ name: 'XioRoomGuestInfoBox',
components: {
XioRoomOffNarcosisNotice
},
diff --git a/src/components/xio_room_info_block/index.vue b/src/components/xio_room_info_block/index.vue
index a4486a5..a4a265d 100644
--- a/src/components/xio_room_info_block/index.vue
+++ b/src/components/xio_room_info_block/index.vue
@@ -1,6 +1,12 @@
<template>
<div class="room_info">
<div class="staff_box flex flex-ver flex-sb">
+ <div v-if="occupyInfoViewArr.length > 1" class="staff_box_item flex-1 flex flex-center">
+ <div>
+ <div class="staff_box_item__title">瀹㈡埛鍚嶇О</div>
+ <div class="staff_box_item__name">{{ occupyInfoView.appellationName || occupyInfoView.userName || '' }}</div>
+ </div>
+ </div>
<div class="staff_box_item flex-1 flex flex-center">
<div>
<div class="staff_box_item__title">鍒嗚瘖椤鹃棶</div>
@@ -30,12 +36,18 @@
<script>
export default {
- name: 'XioRoomStatusChg',
+ name: 'XioRoomInfoBlock',
props: {
occupyInfoView: {
type: [Object, Array],
default: () => {
return {}
+ }
+ },
+ occupyInfoViewArr: {
+ type: Array,
+ default: () => {
+ return []
}
}
},
@@ -81,14 +93,18 @@
height: 180px;
}
.room_info .staff_box_item:nth-child(1) {
- background-color: rgba(255,255,255,0.1);
+ background-color: rgba(255,255,255,0.3);
}
.room_info .staff_box_item:nth-child(2) {
- background-color: rgba(255,255,255,0.3);
+ background-color: rgba(255,255,255,0.1);
margin: 0 10px;
}
.room_info .staff_box_item:nth-child(3) {
+ background-color: rgba(255,255,255,0.3);
+}
+.room_info .staff_box_item:nth-child(4) {
background-color: rgba(255,255,255,0.1);
+ margin-left: 10px;
}
.room_info .staff_box_item__title {
line-height: 28px;
diff --git a/src/components/xio_room_list_shop_chg/index.vue b/src/components/xio_room_list_shop_chg/index.vue
index d86457e..7b4faec 100644
--- a/src/components/xio_room_list_shop_chg/index.vue
+++ b/src/components/xio_room_list_shop_chg/index.vue
@@ -12,7 +12,7 @@
<script>
import Req from '../../utils/jun_httpInstall' // http 璇锋眰
export default {
- name: 'XioRoomStatusChg',
+ name: 'XioRoomListShopChg',
props: {
isActive: {
type: Boolean,
diff --git a/src/components/xio_room_off_narcosis_notice/index.vue b/src/components/xio_room_off_narcosis_notice/index.vue
index cc70c4d..3fdce8e 100644
--- a/src/components/xio_room_off_narcosis_notice/index.vue
+++ b/src/components/xio_room_off_narcosis_notice/index.vue
@@ -15,7 +15,7 @@
<script>
export default {
- name: 'XioRoomStatusChg',
+ name: 'XioRoomOffNarcosisNotice',
props: {
isActive: {
type: Boolean,
diff --git a/src/pages/room/detail.vue b/src/pages/room/detail.vue
index feca948..f76c17b 100644
--- a/src/pages/room/detail.vue
+++ b/src/pages/room/detail.vue
@@ -95,7 +95,7 @@
</div>
<div class="right flex flex-col">
<div v-for="(item,index) in occupyInfoViewArr" :key="index" class="flex-1 right_room_info">
- <XioRoomInfoBlock ref="XioRoomInfoBlock" :occupy-info-view="item" />
+ <XioRoomInfoBlock ref="XioRoomInfoBlock" :occupy-info-view="item" :occupy-info-view-arr="occupyInfoViewArr" />
</div>
<div v-if="occupyInfoViewArr.length<=1" class="flex flex-col" style="border-radius: 10px;">
<XioRoomGuestBox ref="XioRoomGuestBox" :assign-treat-list-view-com="assignTreatListView" @selectCustomer="selectCustomer" />
@@ -389,6 +389,7 @@
userName: '榛勫槈鑽�',
gender: 1,
hempStatus: 2,
+ treatRoomStatus: 0,
ciq: '123',
adviserName: 'a鍚�',
aDoctorName: 'b鍚�',
@@ -402,6 +403,7 @@
userName: '鏉庡痉鍗�',
gender: 1,
hempStatus: 2,
+ treatRoomStatus: 0,
ciq: '456',
adviserName: 'd鍚�',
aDoctorName: 'e鍚�',
@@ -415,6 +417,7 @@
userName: '鐚涘鍙�',
gender: 2,
hempStatus: 2,
+ treatRoomStatus: 0,
ciq: '789',
adviserName: 'g鍚�',
aDoctorName: 'h鍚�',
--
Gitblit v1.8.0