|
@@ -92,14 +92,14 @@
|
|
|
¥{{item2.roomNumber|delDataStatus(item2.houseBaseId,roomData.roomDataList,'price',item2.floor)}}
|
|
|
</view>
|
|
|
<view v-else
|
|
|
- @click="check(item2.roomNumber,item2.houseBaseId,roomData,i + '-'+index2+ '-'+ ind,item2.floor)"
|
|
|
+ @click.stop="check(item2.roomNumber,item2.houseBaseId,roomData,i + '-'+index2+ '-'+ ind,item2.floor)"
|
|
|
class="cellBox">
|
|
|
¥{{item2.roomNumber|delDataStatus(item2.houseBaseId,roomData.roomDataList,'price',item2.floor)}}
|
|
|
</view>
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
<view
|
|
|
- @click="tabCli(item2.roomNumber,item2.houseBaseId,roomData.roomDataList,item2)"
|
|
|
+ @click.stop="tabCli(item2.roomNumber,item2.houseBaseId,roomData.roomDataList,item2)"
|
|
|
class="tdP">
|
|
|
<text>{{item2.roomNumber|delDataStatus(item2.houseBaseId,roomData.roomDataList,'guestName',item2.floor)}}</text>
|
|
|
<text>{{item2.roomNumber|delDataStatus(item2.houseBaseId,roomData.roomDataList,'status',item2.floor)}}</text>
|
|
@@ -249,21 +249,10 @@
|
|
|
//this.scrollLeft = e.detail.scrollLeft; // div 到左边的距离
|
|
|
},
|
|
|
//关房
|
|
|
- tabCli(roomNumber, id, roomId,row) {
|
|
|
- // console.log(row)
|
|
|
- // console.log(roomId)
|
|
|
- // console.log(id)
|
|
|
- // console.log(roomNumber)
|
|
|
+ tabCli(roomNumber, id, roomId,row) {
|
|
|
if (roomNumber) {
|
|
|
- let obj = {};
|
|
|
- // for (let i = 0; i < roomId.length; i++) {
|
|
|
- // if (id == roomId[i].houseBaseId && roomNumber == roomId[i].roomNumber) {
|
|
|
- // obj = roomId[i];
|
|
|
- // }
|
|
|
- // }
|
|
|
- obj=roomId.filter((item)=>item.houseBaseId==id&&item.roomNumber==roomNumber)
|
|
|
- console.log(11)
|
|
|
- console.log(obj)
|
|
|
+ let obj = {};
|
|
|
+ obj=roomId.filter((item)=>item.houseBaseId==id&&item.roomNumber==roomNumber)
|
|
|
//已预订,已入住 待确认 待支付
|
|
|
if (obj.status == 1 || obj.status == 2 || obj.status == -1 || obj.status == -2) {
|
|
|
let orderId = obj.orderId;
|
|
@@ -271,33 +260,30 @@
|
|
|
url: "/pages/house/orderInfo?orderId=" + orderId
|
|
|
})
|
|
|
//到详情
|
|
|
- } else {
|
|
|
- // console.log(this.checkDataRoomId)
|
|
|
- console.log('--------------')
|
|
|
- console.log(obj)
|
|
|
- console.log(this.checkDataRoomId)
|
|
|
- console.log('------------------')
|
|
|
+ } else {
|
|
|
//更改状态
|
|
|
- this.areaShow = true;
|
|
|
- this.checkDataRoomId = [obj[0].id];
|
|
|
- console.log(222)
|
|
|
- console.log(this.checkDataRoomId)
|
|
|
- this.checkStatus = obj.status;
|
|
|
+ // this.checkDataRoomId = [obj[0].id];
|
|
|
+ this.$set(this.checkDataRoomId,0,obj[0].id);
|
|
|
+ this.checkStatus = obj.status;
|
|
|
+ this.$nextTick(()=>{
|
|
|
+ this.areaShow = true;
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
//确定关房
|
|
|
passengerConfirm(e) {
|
|
|
- console.log(this.checkDataRoomId)
|
|
|
let status = this.area[e.indexs[0]].id;
|
|
|
this.$api.post('/merchant/hotel/room/state/updRoomState', {
|
|
|
roomIds: this.checkDataRoomId,
|
|
|
status: status
|
|
|
}).then(res => {
|
|
|
- if (res.data.code == 0) {
|
|
|
- this.clearData();
|
|
|
- this.areaShow = false;
|
|
|
- this.init()
|
|
|
+ if (res.data.code == 0) {
|
|
|
+ this.areaShow = false;
|
|
|
+ this.$nextTick(()=>{
|
|
|
+ this.clearData();
|
|
|
+ this.init()
|
|
|
+ })
|
|
|
} else {
|
|
|
this.$showToast(res.data.msg);
|
|
|
}
|
|
@@ -359,13 +345,11 @@
|
|
|
}
|
|
|
},
|
|
|
clearData() {
|
|
|
- setTimeout(() => {
|
|
|
- this.newPrice = '';
|
|
|
- this.checkDataDate = [];
|
|
|
- this.checkPrice = [];
|
|
|
- this.checkDataRoomId = [];
|
|
|
- this.checkPosition = [];
|
|
|
- }, 1500);
|
|
|
+ this.newPrice = '';
|
|
|
+ this.checkDataDate = [];
|
|
|
+ this.checkPrice = [];
|
|
|
+ this.checkDataRoomId = [];
|
|
|
+ this.checkPosition = [];
|
|
|
},
|
|
|
//选择房间
|
|
|
check(roomNumber, id, item, position, floor) {
|