From f6ea728ea50706b1dfa75bc0d266fb6b5f13ef7f Mon Sep 17 00:00:00 2001
From: jazz <jazzxhunter@163.com>
Date: 星期二, 09 一月 2024 19:29:29 +0800
Subject: [PATCH] Merge branch 'xio_dev'
---
src/pages/room/detail.vue | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/pages/room/detail.vue b/src/pages/room/detail.vue
index 643f04f..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" />
@@ -191,7 +191,7 @@
} else {
// 杩樻病浣跨敤榛樿瀹汉鍊兼垨鑰呭凡浣跨敤榛樿瀹汉鍊艰繕娌℃敼鍙樼姸鎬侊紙閫傞厤杞锛�
if ((!isUseDefault || (isUseDefault && isUseDefaultChg === 0)) && this.assignTreatList && this.assignTreatList.length) {
- isUseDefault = true
+ // isUseDefault = true
return this.assignTreatList[0]
// 宸蹭娇鐢ㄨ繃榛樿瀹汉鍊�
} else {
@@ -342,6 +342,13 @@
})
}
})
+ // 鍩烘湰涓嶄細鍑虹幇杩欑鎯呭喌锛屼絾鏄互闃蹭竾涓�锛岃嫢鏈湴缂撳瓨id瀛樺湪锛屼絾瀵逛笉涓婂垪琛ㄥ垯缂撳瓨绗竴鏉℃暟鎹甶d
+ if (!arr.length) {
+ arr.push(this.assignTreatList[0])
+ this.curTreatIds = []
+ this.curTreatIds.push(this.assignTreatList[0].id)
+ this.setLocalCurTreatIds()
+ }
}
return arr
},
@@ -382,6 +389,7 @@
userName: '榛勫槈鑽�',
gender: 1,
hempStatus: 2,
+ treatRoomStatus: 0,
ciq: '123',
adviserName: 'a鍚�',
aDoctorName: 'b鍚�',
@@ -395,6 +403,7 @@
userName: '鏉庡痉鍗�',
gender: 1,
hempStatus: 2,
+ treatRoomStatus: 0,
ciq: '456',
adviserName: 'd鍚�',
aDoctorName: 'e鍚�',
@@ -408,6 +417,7 @@
userName: '鐚涘鍙�',
gender: 2,
hempStatus: 2,
+ treatRoomStatus: 0,
ciq: '789',
adviserName: 'g鍚�',
aDoctorName: 'h鍚�',
@@ -591,7 +601,7 @@
isUseDefaultChg = 1
}
// 鍙鏇存敼涓虹┖闂插氨閲嶇疆鍙傛暟
- if (status === 0) {
+ if (params.status === 0) {
console.log('鎴块棿鏇存敼涓虹┖闂�')
// 閲嶇疆榛樿宸蹭娇鐢ㄥ浜虹殑鍙傛暟
isUseDefault = false
--
Gitblit v1.8.0