1

src/views/room/fangtailive.vue

@@ -335,8 +335,9 @@
                               <span>
                                 {{
                                   roomLive.livingData.livingCustomers
-                              ? roomLive.livingData.livingCustomers.customerName
-                              : ""
+                                    ? roomLive.livingData.livingCustomers
+                                        .customerName
+                                    : ""
                                 }}
                                 <a-tag
                                   color="pink"
@@ -733,10 +734,14 @@
       ref="modalSelectCheckInRoomOrder"
       @ok="modalLockRoomFormOk"
     ></select-check-in-room-order-modal>
-    <customer-modal ref="modalCustomerForm" @ok="modalLockRoomFormOk"></customer-modal>
-    <exchange-houses-modalVue ref="exchangeHousesModalVue" @ok="modalLockRoomFormOk" />
-
-
+    <customer-modal
+      ref="modalCustomerForm"
+      @ok="modalLockRoomFormOk"
+    ></customer-modal>
+    <exchange-houses-modalVue
+      ref="exchangeHousesModalVue"
+      @ok="modalLockRoomFormOk"
+    />
   </a-card>
 </template>
 
@@ -759,14 +764,13 @@ import guestorders from "./guestorders";
 import leasegoods from "./leasegoods";
 import membermessage from "./membermessage";
 import membergoodsmanage from "./membergoodsmanage";
-import fangwuLookRoom from './fangwuLookRoom.vue'
+import fangwuLookRoom from "./fangwuLookRoom.vue";
 
-import lookRoomModalVue from './modules/fangtaiModal/lookRoomModal/lookRoomModal.vue';
-import continuedModalVue from './modules/fangtaiModal/continuedModal/continuedModal.vue';
+import lookRoomModalVue from "./modules/fangtaiModal/lookRoomModal/lookRoomModal.vue";
+import continuedModalVue from "./modules/fangtaiModal/continuedModal/continuedModal.vue";
 import SelectCheckInRoomOrderModal from "./modules/checkIn/SelectCheckInRoomOrderModal.vue";
 import CustomerModal from "./modules/checkIn/CustomerModal.vue";
-import exchangeHousesModalVue from './modules/fangtaiModal/exchangeHouses/exchangeHousesModal.vue';
-
+import exchangeHousesModalVue from "./modules/fangtaiModal/exchangeHouses/exchangeHousesModal.vue";
 
 import { TreeSelect } from "ant-design-vue";
 import moment from "moment";
@@ -795,7 +799,7 @@ export default {
     continuedModalVue,
     SelectCheckInRoomOrderModal,
     CustomerModal,
-    exchangeHousesModalVue
+    exchangeHousesModalVue,
   },
   data() {
     return {
@@ -1141,7 +1145,8 @@ export default {
       } else {
         this.$refs.ModalBillRoomInfo.add(
           roomLive.livingData.livingOrder.bookingOrderId,
-          1
+          1,
+          roomLive.roomInfo.id
         );
         this.$refs.ModalBillRoomInfo.title = "账单";
         this.$refs.ModalBillRoomInfo.disableSubmit = true;
@@ -1512,42 +1517,45 @@ export default {
         this.$message.error("接口程序未打开，请打开接口程序");
         return;
       } else if (e.key == 15) {
-        this.$refs.modalCustomerForm.add(row.livingData.livingOrder.id, row.roomInfo.id);
+        this.$refs.modalCustomerForm.add(
+          row.livingData.livingOrder.id,
+          row.roomInfo.id
+        );
         this.$refs.modalCustomerForm.title = "添加同住人";
         this.$refs.modalCustomerForm.disableSubmit = false;
         return;
       } else if (e.key == 18) {
         this.$message.error("暂未实现");
         return;
-      }else if(e.key == 8){
-        this.$refs.lookRoomModalVue.edit(row)
+      } else if (e.key == 8) {
+        this.$refs.lookRoomModalVue.edit(row);
         console.log(this.$refs.lookRoomModalVue);
-        this.$refs.lookRoomModalVue.title = '查房'
+        this.$refs.lookRoomModalVue.title = "查房";
         this.$refs.lookRoomModalVue.disableSubmit = true;
-        return
-      }else if(e.key == 9){
+        return;
+      } else if (e.key == 9) {
         this.handleBillInfo(row);
-        return
-      }else if(e.key == 10){
-        this.$refs.continuedModalVue.edit(row)
-        this.$refs.continuedModalVue.title = '续住'
+        return;
+      } else if (e.key == 10) {
+        this.$refs.continuedModalVue.edit(row);
+        this.$refs.continuedModalVue.title = "续住";
         this.$refs.continuedModalVue.disableSubmit = false;
-        return
-      }else if( e.key == 14 ){
+        return;
+      } else if (e.key == 14) {
         this.$refs.modalSelectCheckInRoomOrder.add();
         this.$refs.modalSelectCheckInRoomOrder.title = "请选择需要关联的订单";
         this.$refs.modalSelectCheckInRoomOrder.disableSubmit = false;
         this.$refs.modalSelectCheckInRoomOrder.livingOrderId =
           row.livingData.livingOrder.id;
         this.$refs.modalSelectCheckInRoomOrder.livingRoomId = row.roomInfo.id;
-        return
-      }else if( e.key==13 ){
-        this.$refs.exchangeHousesModalVue.edit(row)
-        this.$refs.exchangeHousesModalVue.title = '换房'
+        return;
+      } else if (e.key == 13) {
+        this.$refs.exchangeHousesModalVue.edit(row);
+        this.$refs.exchangeHousesModalVue.title = "换房";
         this.$refs.exchangeHousesModalVue.disableSubmit = false;
-      }else if( e.key == 16){
+      } else if (e.key == 16) {
         this.handleBillInfo(row);
-        return
+        return;
       }
     },
     modalBillRoomFormOk(e) {

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

@@ -1419,6 +1419,7 @@ export default {
       this.model.orderInfo.vipCustomerId = value;
       console.log(result);
       this.vipCustomerData = result;
+      this.vipCustomerIdChange(result.id)
     },
 
     loadOrderFees() {

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

@@ -34,7 +34,7 @@
           </div>
         </div>
         <a-divider />
-        <a-tabs @change="tabChange">
+        <a-tabs @change="tabChange" v-model="tabSelectRoomId">
           <a-tab-pane
             :key="item.roomId"
             v-for="(item, livingIndex) in model.livingRoomIds"
@@ -69,7 +69,7 @@
               /></a-descriptions-item>
               <a-descriptions-item label="性别">
                 {{
-                  item.livingCustomers  && item.livingCustomers[0]
+                  item.livingCustomers && item.livingCustomers[0]
                     ? item.livingCustomers[0].gender === 1
                       ? "男"
                       : "女"
@@ -77,11 +77,13 @@
                 }}</a-descriptions-item
               >
               <a-descriptions-item label="房间数量">
-                {{ livingIndex == 0 ? model.livingRoomIds.length : 1 }}间
+                {{ livingIndex == 0 ? model.livingRoomIds.length - 1 : 1 }}间
               </a-descriptions-item>
               <a-descriptions-item label="手机号">
                 {{
-                  item.livingCustomers  && item.livingCustomers[0] ? item.livingCustomers[0].phone : "--"
+                  item.livingCustomers && item.livingCustomers[0]
+                    ? item.livingCustomers[0].phone
+                    : "--"
                 }}
                 <a-icon
                   type="edit"
@@ -607,6 +609,8 @@ export default {
           "/business/busRoomBookingOrders/getBookingOrderInfo",
       },
       id: "",
+      roomId: "",
+      tabSelectRoomId: "",
       customerSourceList: [],
       warranterList: [],
       key: 0,
@@ -941,6 +945,9 @@ export default {
           });
           livingRoomId.livingCustomers = list;
           res.result.livingRoomIds.unshift(livingRoomId);
+          this.tabSelectRoomId = this.roomId
+            ? this.roomId
+            : res.result.livingRoomIds[1].roomId;
           this.model = res.result;
           getAction("/business/busRoomBookingOrders/living-fees", {
             bookingOrderId: this.model.orderInfo.id,
@@ -1032,9 +1039,10 @@ export default {
     onChange(e) {
       console.log(e);
     },
-    add(id, key) {
+    add(id, key, roomId) {
       this.key = key;
       this.id = id;
+      this.roomId = roomId;
       this.edit(this.modelDefault);
       this.getBookingOrderInfo();
     },

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

@@ -85,11 +85,11 @@ export default {
     };
   },
   methods: {
-    add(id, key) {
+    add(id, key, roomId) {
       console.log("id", id);
       this.visible = true;
       this.$nextTick(() => {
-        this.$refs.realForm.add(id, key);
+        this.$refs.realForm.add(id, key, roomId);
       });
     },
     edit(record) {
@@ -122,7 +122,7 @@ export default {
       // this.visible = false;
     },
     handleCancel() {
-      this.$emit("close")
+      this.$emit("close");
       this.close();
     },
   },