fix

src/components/tools/UserMenu.vue

@@ -54,6 +54,10 @@
            <a-icon type="tool"/>
            <span>系统设置</span>
         </a-menu-item> -->
+        <a-menu-item key="10" @click="changeHotel" >
+          <a-icon type="swap" />
+          <span>切换酒店</span>
+        </a-menu-item>
         <a-menu-item key="4" @click="updatePassword">
           <a-icon type="setting"/>
           <span>密码修改</span>
@@ -238,6 +242,7 @@
       /*update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
       /*update_begin author:liushaoqian date:20200507 for: 刷新缓存*/
       clearCache(){
+        
         getAction("sys/dict/refleshCache").then((res) => {
           if (res.success) {
             //重新加载缓存
@@ -253,6 +258,9 @@
           this.$message.warn("刷新缓存失败！");
           console.log("刷新失败",e)
         })
+      },
+      changeHotel() {
+        this.$router.push("/hotel/entry")
       }
       /*update_end author:liushaoqian date:20200507 for: 刷新缓存*/
     }

src/views/room/calendarfangtai.vue

@@ -102,7 +102,7 @@
             </div>
           </div>
         </div>
-        <div class="wrapper-header" style="flex: 1; overflow-x: auto;height: 100%;overflow-y: auto;"
+        <div class="wrapper-header" style="flex: 1; overflow-x: auto;height: 100%;overflow-y: auto; cursor: pointer;"
           @scroll="exterHandleScroll" ref="systemForm">
           <div v-for="(sItem, sIndex) in data" :key="sIndex">
             <div v-for="(rItem, rIndex) in sItem.rooms" :key="rIndex" style="height:100px;">
@@ -252,8 +252,8 @@
     <lock-room-modal ref="ModalLockRoom" @ok="modalLockRoomFormOk"></lock-room-modal>
     <upkeep-room-modal ref="modalForm" @ok="modalLockRoomFormOk"></upkeep-room-modal>
     <schedule-room-modal ref="ModalScheduleRoom" @ok="modalFormOk"></schedule-room-modal>
-    <bill-room-form-modal ref="ModalBillRoomForm" @ok="modalBillRoomFormOk"></bill-room-form-modal>
-    <BillRoomInfoModal ref="ModalBillRoomInfo" />
+    <bill-room-form-modal ref="ModalBillRoomForm" @ok="modalBillRoomFormOk" @close="onPanelChange"></bill-room-form-modal>
+    <BillRoomInfoModal ref="ModalBillRoomInfo" @close="onPanelChange"/>
   </a-card>
 </template>
 

src/views/room/modules/checkIn/BillRoomFormModal.vue

@@ -60,6 +60,7 @@ export default {
       this.visible = false;
     },
     handleCancel() {
+      this.$emit("close")
       this.close();
     },
   },

src/views/room/modules/checkIn/BillRoomInfoModal.vue

@@ -122,6 +122,7 @@ export default {
       // this.visible = false;
     },
     handleCancel() {
+      this.$emit("close")
       this.close();
     },
   },