Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-tenant-frontend

src/views/room/fangtailive.vue

@@ -181,7 +181,11 @@
                           预离:{{ roomLive.livingData.livingOrder.dueOutTime }}
                         </p>
                         <p>
-                          已住:{{ roomLive.livingData.livingOrder.liveDayCount }}晚 已付：{{ roomLive.livingData.livingOrder.shouKuan }}元
+                          已住:{{
+                            roomLive.livingData.livingOrder.liveDayCount
+                          }}晚 已付：{{
+                            roomLive.livingData.livingOrder.shouKuan
+                          }}元
                         </p>
                         <!-- <p>来源:{{ roomLive.detail.mobile }} 消费：300元</p> -->
                         <p>
@@ -190,7 +194,10 @@
                             roomLive.livingData.price.length > 0
                               ? roomLive.livingData.price[0].price
                               : 0
-                          }}/晚 余额：{{ (roomLive.livingData.livingOrder.shouKuan - roomLive.livingData.livingOrder.xiaoFei) }}
+                          }}/晚 余额：{{
+                            roomLive.livingData.livingOrder.shouKuan -
+                            roomLive.livingData.livingOrder.xiaoFei
+                          }}
                           <!-- {{ roomLive.detail.balance }} -->
                         </p>
                         <p>
@@ -371,18 +378,30 @@
                                     ? roomLive.livingData.price[0].price
                                     : 0
                                 }}/付{{
-                                  roomLive.livingData && roomLive.livingData.livingOrder ?
-                                  roomLive.livingData.livingOrder.shouKuan:0
-                                }}/余{{ 
-                                  roomLive.livingData && roomLive.livingData.livingOrder ?
-                                  (roomLive.livingData.livingOrder.shouKuan - roomLive.livingData.livingOrder.xiaoFei):0
+                                  roomLive.livingData &&
+                                  roomLive.livingData.livingOrder
+                                    ? roomLive.livingData.livingOrder.shouKuan
+                                    : 0
+                                }}/余{{
+                                  roomLive.livingData &&
+                                  roomLive.livingData.livingOrder
+                                    ? roomLive.livingData.livingOrder.shouKuan -
+                                      roomLive.livingData.livingOrder.xiaoFei
+                                    : 0
                                 }}</span
                               >
                             </div>
-                            <a-tag color="blue" v-if="
-                              roomLive.livingData && roomLive.livingData.livingOrder 
-                              && ((roomLive.livingData.livingOrder.shouKuan - roomLive.livingData.livingOrder.xiaoFei) < 0)
-                            ">欠</a-tag>
+                            <a-tag
+                              color="blue"
+                              v-if="
+                                roomLive.livingData &&
+                                roomLive.livingData.livingOrder &&
+                                roomLive.livingData.livingOrder.shouKuan -
+                                  roomLive.livingData.livingOrder.xiaoFei <
+                                  0
+                              "
+                              >欠</a-tag
+                            >
                             <a-tag
                               color="blue"
                               v-if="
@@ -476,8 +495,19 @@
                         </div>
                         <a-menu
                           slot="overlay"
+                          style="width: 126px"
                           @click="(e) => onMenuClick(e, roomLive)"
                         >
+                          <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>
+                          </template>
                           <a-menu-item
                             key="1"
                             v-if="
@@ -503,26 +533,33 @@
                             置干净
                           </a-menu-item>
                           <a-menu-item key="3" v-else> 置脏 </a-menu-item>
-                          <a-menu-item
-                            key="41"
-                            v-if="roomLive.roomInfo.roomStatus === 5"
+                          <template
+                            v-if="
+                              roomLive.roomInfo.roomStatus !== 3 &&
+                              roomLive.roomInfo.roomStatus !== 4
+                            "
                           >
-                            完成维修
-                          </a-menu-item>
-                          <a-menu-item key="4" v-else> 置维修 </a-menu-item>
-                          <a-menu-item
-                            key="51"
-                            v-if="roomLive.roomInfo.roomStatus === 6"
+                            <a-menu-item
+                              key="41"
+                              v-if="roomLive.roomInfo.roomStatus === 5"
+                            >
+                              完成维修
+                            </a-menu-item>
+                            <a-menu-item key="4" v-else> 置维修 </a-menu-item>
+                            <a-menu-item
+                              key="51"
+                              v-if="roomLive.roomInfo.roomStatus === 6"
+                            >
+                              解锁
+                            </a-menu-item>
+                            <a-menu-item key="5" v-else> 锁房 </a-menu-item>
+                          </template>
+                          <template
+                            v-if="
+                              roomLive.roomInfo.roomStatus === 3 ||
+                              roomLive.roomInfo.roomStatus === 4
+                            "
                           >
-                            解锁
-                          </a-menu-item>
-                          <a-menu-item key="5" v-else> 锁房 </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>
@@ -543,7 +580,6 @@
 
                             <a-menu-item key="17"> 撤销入住 </a-menu-item>
                           </template>
-                          
 
                           <a-menu-item key="18"> 日志 </a-menu-item>
                         </a-menu>
@@ -1435,13 +1471,18 @@ 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
+      } else if (e.key == 6 || e.key == 7) {
+        this.handleBillInfo(row);
+        return;
+      } else if (e.key == 11 || e.key == 12) {
+        this.$message.error("接口程序未打开，请打开接口程序");
+        return;
+      } else if (e.key == 15) {
+        this.handleBillInfo(row);
+        return;
+      } else if (e.key == 18) {
+        this.$message.error("暂未实现");
+        return;
       }
     },
     modalBillRoomFormOk(e) {