添加右键信息

src/views/room/fangtailive.vue

@@ -517,7 +517,35 @@
                             解锁
                           </a-menu-item>
                           <a-menu-item key="5" v-else> 锁房 </a-menu-item>
-                          <!-- <a-menu-item key="3"> 日志 </a-menu-item> -->
+
+                          <template v-if="roomLive.roomInfo.roomStatus === 3 || roomLive.roomInfo.roomStatus === 4">
+                            <a-menu-item key="6"> 详单 </a-menu-item>
+
+                            <a-menu-item key="7"> 账单 </a-menu-item>
+
+                            <a-menu-item key="8"> 查房 </a-menu-item>
+
+                            <a-menu-item key="9"> 入账 </a-menu-item>
+
+                            <a-menu-item key="10"> 续租/提前 </a-menu-item>
+
+                            <a-menu-item key="11"> 制房卡 </a-menu-item>
+
+                            <a-menu-item key="12"> 注销房卡 </a-menu-item>
+
+                            <a-menu-item key="13"> 换房 </a-menu-item>
+
+                            <a-menu-item key="14"> 合并联房 </a-menu-item>
+
+                            <a-menu-item key="15"> 添加同住 </a-menu-item>
+
+                            <a-menu-item key="16"> 结账退房 </a-menu-item>
+
+                            <a-menu-item key="17"> 撤销入住 </a-menu-item>
+                          </template>
+                          
+
+                          <a-menu-item key="18"> 日志 </a-menu-item>
                         </a-menu>
                       </a-dropdown>
                     </a-popover>
@@ -1407,6 +1435,13 @@ export default {
             }
           }
         );
+      }else if(e.key == 6 || e.key == 7){
+          this.handleBillInfo(row)
+          return
+      }else if(e.key == 15){
+        this.handleBillInfo(row)
+        // this.$refs.ModalBillRoomInfo.addlivingCustomer(row.livingData.livingOrder.id, 1);
+        return
       }
     },
     modalBillRoomFormOk(e) {

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

@@ -872,7 +872,7 @@ export default {
       );
     },
     addlivingCustomer(id, roomId) {
-      console.log(id);
+      console.log(id, roomId);
       this.$refs.modalCustomerForm.add(id, roomId);
       this.$refs.modalCustomerForm.title = "添加同住人";
       this.$refs.modalCustomerForm.disableSubmit = false;

src/views/settings/components/pos/tabletOrdering.vue

@@ -96,7 +96,7 @@ export default {
         },
         reload() {
             this.confirmLoading = true
-            this.loadLayouts()
+            // this.loadLayouts()
             setTimeout(_ => {
                 this.$message.success('刷新成功')
                 this.confirmLoading = false