From 5311b8ec19221a560aeca28262f14433b7781801 Mon Sep 17 00:00:00 2001
From: jxmanxk <312142485@qq.com>
Date: 星期二, 23 一月 2024 17:43:53 +0800
Subject: [PATCH] update_202401231742_强制重置房间状态，不传治疗记录数组

---
 src/pages/room/detail.vue |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/pages/room/detail.vue b/src/pages/room/detail.vue
index 643f04f..032c3b9 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鍚�',
@@ -561,18 +571,18 @@
 
         // 褰撳墠閫夋嫨瀹㈡埛鐨勬暟缁勫垹闄ゅ鎴�
         this.occupyInfoViewArrDataHandle('cancel', item)
+        params.treatRoomList = []
+        if (arr && arr.length) {
+          arr.forEach((o) => {
+            params.treatRoomList.push({
+              treatRecordId: o.id,
+              status: o.treatRoomStatus
+            })
+          })
+        }
       } else {
         // 鏇存敼鐨勭姸鎬�
         params.status = status * 1
-      }
-      params.treatRoomList = []
-      if (arr && arr.length) {
-        arr.forEach((o) => {
-          params.treatRoomList.push({
-            treatRecordId: o.id,
-            status: o.treatRoomStatus
-          })
-        })
       }
 
       Req.http.post({
@@ -591,7 +601,7 @@
           isUseDefaultChg = 1
         }
         // 鍙鏇存敼涓虹┖闂插氨閲嶇疆鍙傛暟
-        if (status === 0) {
+        if (params.status === 0) {
           console.log('鎴块棿鏇存敼涓虹┖闂�')
           // 閲嶇疆榛樿宸蹭娇鐢ㄥ浜虹殑鍙傛暟
           isUseDefault = false

--
Gitblit v1.8.0