From d2d830d163c57975ee04746a392cc8147ccadc48 Mon Sep 17 00:00:00 2001
From: jazz <jazzxhunter@163.com>
Date: 星期一, 11 十二月 2023 18:03:15 +0800
Subject: [PATCH] update_202312111803_打包更新线上
---
src/pages/room/detail.vue | 167 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 126 insertions(+), 41 deletions(-)
diff --git a/src/pages/room/detail.vue b/src/pages/room/detail.vue
index 244a76c..97605ec 100644
--- a/src/pages/room/detail.vue
+++ b/src/pages/room/detail.vue
@@ -11,6 +11,7 @@
</div>
</div>
<div class="right flex-1 flex flex-jcfe flex-ver">
+ <el-button type="primary" icon="el-icon-refresh" class="reset_btn flex flex-center" size="small" style="width: 100px;" @click="getData">鍒锋柊</el-button>
<div class="reset_btn flex flex-center" @click="resetStatus">閲嶇疆鎴块棿鐘舵��</div>
<div class="page_date">
<div class="page_week">{{ timeObj.week }}</div>
@@ -21,7 +22,7 @@
</div>
</div>
<!-- 鏈湁瀹夋帓 -->
- <div v-if="!occupyInfoView && (!assignTreatList || !assignTreatList.length)" class="page_container flex flex-1">
+ <div v-if="!occupyInfoView && (!assignTreatListView || !assignTreatListView.length)" class="page_container flex flex-1">
<div class="main flex-1">
<div v-if="roomInfo && roomInfo.roomNo" class="room_title">{{ roomInfo.roomNo }}</div>
<div v-if="roomInfo" class="room_main_tip" style="margin-top: 93px;line-height: 186px;font-size: 140px;">-{{ statusTx[roomInfo.status] }}-</div>
@@ -64,23 +65,23 @@
</div>
</div>
<!-- 娌℃湁瀹汉鍜屾湁瀹夋帓 -->
- <div v-if="!occupyInfoView && (assignTreatList && assignTreatList.length)" class="page_container flex flex-1">
+ <div v-if="!occupyInfoView && (assignTreatListView && assignTreatListView.length)" class="page_container flex flex-1">
<div class="main flex-1">
<div v-if="roomInfo && roomInfo.roomNo" class="room_title">{{ roomInfo.roomNo }}</div>
<div v-if="roomInfo" class="room_main_tip">-{{ statusTx[roomInfo.status] }}-</div>
<div v-if="roomInfo && roomInfo.status >= 1" class="room_left_btn_box flex flex-ver">
- <div v-if="roomInfo.status == 1" class="room_left_btn_box__item flex-1 flex flex-center yellow" @click="setStatus('瀹汉浼戞伅', 2)">瀹汉浼戞伅</div>
- <div v-if="roomInfo.status == 1" class="room_left_btn_box__item flex-1 flex flex-center gray" @click="setStatus('鎵撴壂涓�', 3)">閫氱煡鎵撴壂</div>
- <div v-if="roomInfo.status == 2" class="room_left_btn_box__item flex flex-center green" @click="setStatus('鎵撴壂涓�', 3)">閫氱煡鎵撴壂</div>
- <div v-if="roomInfo.status == 3" class="room_left_btn_box__item flex flex-center green" @click="setStatus('绌洪棽', 0)">缁撴潫鎵撴壂</div>
+ <div v-if="roomInfo.status == 1" class="room_left_btn_box__item flex-1 flex flex-center yellow btn_ani" @click="setStatus('瀹汉浼戞伅', 2)">瀹汉浼戞伅</div>
+ <div v-if="roomInfo.status == 1" class="room_left_btn_box__item flex-1 flex flex-center gray btn_ani" @click="setStatus('鎵撴壂涓�', 3)">閫氱煡鎵撴壂</div>
+ <div v-if="roomInfo.status == 2" class="room_left_btn_box__item flex flex-center green btn_ani" @click="setStatus('鎵撴壂涓�', 3)">閫氱煡鎵撴壂</div>
+ <div v-if="roomInfo.status == 3" class="room_left_btn_box__item flex flex-center green btn_ani" @click="setStatus('绌洪棽', 0)">缁撴潫鎵撴壂</div>
</div>
</div>
<div class="right">
<div class="right_block flex flex-col">
<div class="guest_title flex flex-center">绛夊緟璇婄枟</div>
- <div class="guest_block flex-1">
- <div class="guest_list">
- <div v-for="(item, index) in assignTreatList" :key="index" class="guest_list__row flex flex-ver" @click="selectCustomer(item)">
+ <div class="guest_block flex-1" style="border-radius: 0 0 10px 10px;">
+ <div v-if="assignTreatListView && assignTreatListView.length" class="guest_list">
+ <div v-for="(item, index) in assignTreatListView" :key="index" class="guest_list__row flex flex-ver" @click="selectCustomer(item)">
<div class="guest_list__td">
<div class="tx flex flex-ver">
<div class="flex-1 flex-1-w1 ell">{{ item.userName }}</div>
@@ -94,18 +95,22 @@
<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 class="icon">
+ <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>
+ </div> -->
</div>
</div>
+ </div>
+ <div v-if="!assignTreatListView || !assignTreatListView.length" class="guest_list">
+ <div class="guest_list__row flex flex-center rowtip">鏆傛棤鏁版嵁</div>
</div>
</div>
</div>
</div>
</div>
<!-- 瀹汉鍜屾湁瀹夋帓 -->
- <div v-if="occupyInfoView && (assignTreatList && assignTreatList.length)" class="page_container flex flex-1">
+ <div v-if="occupyInfoView" class="page_container flex flex-1">
<div class="main flex-1">
<div v-if="roomInfo && roomInfo.roomNo" class="room_title">{{ roomInfo.roomNo }}</div>
<div class="room_content">
@@ -128,10 +133,10 @@
</div>
<div v-if="roomInfo" class="room_left_btn_box flex flex-ver" style="margin-top: 105px;">
<div v-if="roomInfo.status == 0" class="room_left_btn_box__item flex flex-center green btn_ani" @click="setStatus('浣跨敤涓�', 1)">寮�濮嬫不鐤�</div>
- <div v-if="roomInfo.status == 1" class="room_left_btn_box__item flex-1 flex flex-center yellow" @click="setStatus('瀹汉浼戞伅', 2)">瀹汉浼戞伅</div>
- <div v-if="roomInfo.status == 1" class="room_left_btn_box__item flex-1 flex flex-center gray" @click="setStatus('鎵撴壂涓�', 3)">閫氱煡鎵撴壂</div>
- <div v-if="roomInfo.status == 2" class="room_left_btn_box__item flex flex-center green" @click="setStatus('鎵撴壂涓�', 3)">閫氱煡鎵撴壂</div>
- <div v-if="roomInfo.status == 3" class="room_left_btn_box__item flex flex-center green" @click="setStatus('绌洪棽', 0)">缁撴潫鎵撴壂</div>
+ <div v-if="roomInfo.status == 1" class="room_left_btn_box__item flex-1 flex flex-center yellow btn_ani" @click="setStatus('瀹汉浼戞伅', 2)">瀹汉浼戞伅</div>
+ <div v-if="roomInfo.status == 1" class="room_left_btn_box__item flex-1 flex flex-center gray btn_ani" @click="setStatus('鎵撴壂涓�', 3)">閫氱煡鎵撴壂</div>
+ <div v-if="roomInfo.status == 2" class="room_left_btn_box__item flex flex-center green btn_ani" @click="setStatus('鎵撴壂涓�', 3)">閫氱煡鎵撴壂</div>
+ <div v-if="roomInfo.status == 3" class="room_left_btn_box__item flex flex-center green btn_ani" @click="setStatus('绌洪棽', 0)">缁撴潫鎵撴壂</div>
</div>
</div>
<div class="right flex flex-col">
@@ -162,11 +167,11 @@
</div>
</div>
</div>
- <div class="guest_box flex flex-col">
+ <div class="guest_box flex flex-col" style="border-radius: 10px;">
<div class="guest_title flex flex-center">绛夊緟璇婄枟</div>
<div class="guest_block flex-1">
- <div class="guest_list">
- <div v-for="(item, index) in assignTreatList" :key="index" class="guest_list__row flex flex-ver" @click="selectCustomer(item)">
+ <div v-if="assignTreatListView && assignTreatListView.length" class="guest_list">
+ <div v-for="(item, index) in assignTreatListView" :key="index" class="guest_list__row flex flex-ver" @click="selectCustomer(item)">
<div class="guest_list__td">
<div class="tx flex flex-ver">
<div class="flex-1 flex-1-w1 ell">{{ item.userName }}</div>
@@ -180,11 +185,15 @@
<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 class="icon">
+ <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>
+ </div> -->
</div>
</div>
+ </div>
+ <div v-if="!assignTreatListView || !assignTreatListView.length" class="guest_list">
+ <div class="guest_list__row flex flex-center rowtip">鏆傛棤鏁版嵁</div>
</div>
</div>
</div>
@@ -224,41 +233,75 @@
occupyInfo: '', // 褰撳墠鍗犵敤浜虹殑淇℃伅
assignTreatList: [],
statusTx: ['绌洪棽', '浣跨敤涓�', '瀹汉浼戞伅', '鎵撴壂涓�'],
- timeObj: {} // week锛氭槦鏈燂紝date锛氬勾鏈堟棩锛宼imeMin锛氭椂鍒嗭紝time锛氭椂鍒嗙锛宼imeStamp锛氭椂闂存埑
+ timeObj: {}, // week锛氭槦鏈燂紝date锛氬勾鏈堟棩锛宼imeMin锛氭椂鍒嗭紝time锛氭椂鍒嗙锛宼imeStamp锛氭椂闂存埑
+ curTreatId: ''
}
},
computed: {
occupyInfoView() {
- // 鏈夊崰鐢�
- if (this.occupyInfo) {
- return this.occupyInfo
- // 娌℃湁鍗犵敤
+ console.log('00000000000000000000000', this.occupyInfo, isUseDefault, isUseDefaultChg)
+ // 鏈夊綋鍓嶉�変腑鐨勶紝鏍规嵁闇�姹備慨鏀瑰鍔犻�変腑涓嶆洿鏀圭姸鎬侊紝鐢辩┖闂插紑濮�
+ if (this.curTreatId) {
+ return this.gatCurTreatInfo()
} else {
- // 杩樻病浣跨敤榛樿瀹汉鍊兼垨鑰呭凡浣跨敤榛樿瀹汉鍊艰繕娌℃敼鍙樼姸鎬侊紙閫傞厤杞锛�
- if ((!isUseDefault || (isUseDefault && isUseDefaultChg === 0)) && this.assignTreatList && this.assignTreatList.length) {
- isUseDefault = true
- return this.assignTreatList[0]
- // 宸蹭娇鐢ㄨ繃榛樿瀹汉鍊�
+ // 鏈夊崰鐢�
+ if (this.occupyInfo) {
+ return this.occupyInfo
+ // 娌℃湁鍗犵敤
} else {
- return ''
+ // 杩樻病浣跨敤榛樿瀹汉鍊兼垨鑰呭凡浣跨敤榛樿瀹汉鍊艰繕娌℃敼鍙樼姸鎬侊紙閫傞厤杞锛�
+ if ((!isUseDefault || (isUseDefault && isUseDefaultChg === 0)) && this.assignTreatList && this.assignTreatList.length) {
+ isUseDefault = true
+ return this.assignTreatList[0]
+ // 宸蹭娇鐢ㄨ繃榛樿瀹汉鍊�
+ } else {
+ return ''
+ }
}
+ }
+ },
+ assignTreatListView() {
+ if (this.assignTreatList && this.assignTreatList.length) {
+ this.assignTreatList.forEach((o) => {
+ o.act = false
+ if (this.occupyInfoView && this.occupyInfoView.id === o.id) {
+ o.act = true
+ }
+ })
+ return this.assignTreatList
+ } else {
+ return []
}
}
},
- mounted() {
+ activated() {
console.log('roomDetail mounted')
+ // 璁板綍褰撳墠鐨勬不鐤桰D
+ var curTreatId = localStorage.getItem('curTreatId')
+ this.curTreatId = curTreatId || ''
+ this.id = this.$route.query.id || ''
this.init()
},
+ mounted() {},
destroyed() {
},
methods: {
init() {
+ // 杩涘叆椤甸潰鍏堝垵濮嬪寲甯搁噺鏍囪瘑
+ isUseDefault = false
+ isUseDefaultChg = 0
// 璁℃椂
this.countGetTime(this, 'timeObj', 'detail')
// 杞getData锛�8绉掍竴娆�
this.pollingAjaxFn(this, 'getData', 'detail', 8000)
// this.getData()
+ },
+ // 鑾峰彇褰撳墠娌荤枟淇℃伅
+ gatCurTreatInfo() {
+ if (this.assignTreatList && this.assignTreatList.length) {
+ return this.assignTreatList.find((o) => {return o.id === this.curTreatId})
+ }
},
// 鑾峰彇鎴块棿璇︽儏
getData() {
@@ -312,6 +355,7 @@
},
// 杩斿洖
back() {
+ // 閲嶇疆榛樿宸蹭娇鐢ㄥ浜虹殑鍙傛暟
isUseDefault = false
isUseDefaultChg = 0
// 鍏抽棴璁℃椂
@@ -319,7 +363,14 @@
// 鍏抽棴杞
this.stopPollingAjaxFn('detail')
// 杩斿洖
- this.$router.go(-1)
+ // console.log('111111111', this.$route.meta.isPush)
+ if (this.$route && this.$route.meta && this.$route.meta.isPush) {
+ this.$router.go(-1)
+ } else {
+ this.$router.push({
+ path: `/`
+ })
+ }
},
// 鏈湁瀹夋帓鐩存帴鐘舵�佸彉鏇�
statusChg(e) {
@@ -367,7 +418,21 @@
}).then((res) => {
// 鍦ㄥ凡鏈夐粯璁ゅ浜虹殑鎯呭喌涓嬶紝鏀瑰彉鐘舵�佹洿鏀规爣璇嗭紙閫傞厤杞锛�
if (isUseDefault) {
+ console.log('鍦ㄥ凡鏈夐粯璁ゅ浜虹殑鎯呭喌涓嬶紝鏀瑰彉鐘舵�佹洿鏀规爣璇�')
isUseDefaultChg = 1
+ }
+ // 褰撳墠閫変腑鐨勭敤鎴锋埧闂存洿鏀逛簡鐘舵�侊紝宸茬粡鎴愪负鍗犵敤鏃讹紝娓呴櫎閫変腑鍖荤枟璁板綍id
+ if (item && item.id && item.id === this.curTreatId) {
+ console.log('褰撳墠閫変腑鐨勭敤鎴锋埧闂存洿鏀逛簡鐘舵�侊紝宸茬粡鎴愪负鍗犵敤鏃讹紝娓呴櫎閫変腑鍖荤枟璁板綍id')
+ localStorage.removeItem('curTreatId')
+ this.curTreatId = ''
+ }
+ // 鍙鏇存敼涓虹┖闂插氨閲嶇疆鍙傛暟
+ if (status === 0) {
+ console.log('鏇存敼涓虹┖闂�')
+ // 閲嶇疆榛樿宸蹭娇鐢ㄥ浜虹殑鍙傛暟
+ isUseDefault = false
+ isUseDefaultChg = 0
}
// console.log('8888888888888888888888888888888888', res)
cb && cb()
@@ -385,7 +450,10 @@
// if (roomInfo && opt.status * 1 == roomInfo.status) {
// return
// }
- this.changeStatusFn(occupyInfoView, opt.status, () => {
+ // 娓呴櫎閫変腑鍖荤枟璁板綍id
+ localStorage.removeItem('curTreatId')
+ this.curTreatId = ''
+ this.changeStatusFn({}, opt.status, () => {
// 鍒锋柊璇︽儏
this.getData()
// 鍏抽棴寮圭獥
@@ -394,6 +462,9 @@
},
// 閫夋嫨瀹㈡埛
selectCustomer(item = {}) {
+ if (item.act) {
+ return
+ }
// 鎵撳紑寮圭獥
this.$refs['XioCustomerSelect'].showDialog()
// 缁勪欢瀹㈡埛鏁版嵁澶勭悊
@@ -407,12 +478,18 @@
// 閫夋嫨瀹㈡埛纭畾
selectCustomerSubmit(opt) {
console.log('submit', opt)
- this.changeStatusFn(opt, 1, () => {
- // 鍒锋柊璇︽儏
- this.getData()
- // 鍏抽棴寮圭獥
- this.$refs['XioCustomerSelect'].hideDialog()
- })
+ // 纭畾閫夋嫨鐨勭敤鎴凤紝璁板綍id
+ localStorage.setItem('curTreatId', opt.id)
+ this.curTreatId = opt.id
+ // 閲嶇疆鎴块棿鐘舵��
+ if (this.roomInfo && this.roomInfo.status) {
+ this.changeStatusFn({}, 0, () => {
+ // 鍒锋柊璇︽儏
+ this.getData()
+ })
+ }
+ // 鍏抽棴寮圭獥
+ this.$refs['XioCustomerSelect'].hideDialog()
}
}
}
@@ -440,6 +517,8 @@
text-align: center;
font-family: Microsoft Yahei;
cursor: pointer;
+ border: 0;
+ margin-left: 20px;
}
.page_container .main {
/* height: 100%; */
@@ -629,6 +708,12 @@
.page_container .right .guest_list__row:nth-child(2n) {
background-color: #fff;
}
+.page_container .right .guest_list__row.rowtip {
+ background-color: #fff;
+ line-height: 30px;
+ color: rgba(0,0,0,.5);
+ font-size: 22px;
+}
.page_container .right .guest_list__td {}
.page_container .right .guest_list__td .tx {
line-height: 30px;
--
Gitblit v1.8.0