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

src/views/pos/diandan.vue

@@ -9,8 +9,8 @@
     </a-tabs>
     <div style="display: flex; height: calc(100vh - 350px)">
       <a-card style="width: 25%">
-        <p v-if="selectRoomOrder && selectRoomOrder.id">
-          房间：{{ selectRoomOrder.tableNo }},姓名:{{ selectRoomOrder.id }}
+        <p v-if="selectRoomOrder && selectRoomOrder.roomName">
+          房间：{{ selectRoomOrder.roomName }},姓名:{{ selectRoomOrder.customerName }}
         </p>
         <a-table
           bordered
@@ -47,7 +47,7 @@
           <a-button v-if="!btnDisabled" @click="handleAdd">挂单</a-button>
           <a-button v-else @click="handlePickingGoodsOrder">取单</a-button>
           <a-button
-            v-if="selectRoomOrder && selectRoomOrder.id && !btnDisabled"
+            v-if="selectRoomOrder && selectRoomOrder.roomName && !btnDisabled"
             @click="handleToRoomFeePayment"
             >确定挂房帐</a-button
           >
@@ -367,7 +367,7 @@ export default {
         model.hotelId = _info.id;
       }
       model.id = this.selectOrderInfo.id;
-      model.toRoomFeeOrderId = this.selectRoomOrder.id;
+      model.toRoomFeeOrderId = this.selectRoomOrder.livingOrderId;
       model.posType = this.tabPosTypeId;
       var posOrderGoodsDetailList = [];
       this.selectGoodsList.forEach((t) => {

src/views/pos/modules/SelectCheckInRoomOrder.vue

@@ -7,24 +7,8 @@
           <a-col :span="3">
             <a-form-item label="">
               <j-input
-                placeholder="入住单号"
-                v-model="queryParam.tableNo"
-              ></j-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="3">
-            <a-form-item label="">
-              <j-input
-                placeholder="房间号"
-                v-model="queryParam.tableNo"
-              ></j-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="3">
-            <a-form-item label="">
-              <j-input
-                placeholder="姓名"
-                v-model="queryParam.tableNo"
+                placeholder="入住单号/房间号/姓名"
+                v-model="queryParam.keyw"
               ></j-input>
             </a-form-item>
           </a-col>
@@ -127,28 +111,31 @@ export default {
         {
           title: "房间",
           align: "center",
-          dataIndex: "tableNo",
+          dataIndex: "roomName",
         },
         {
           title: "名字",
           align: "center",
-          dataIndex: "id",
+          dataIndex: "customerName",
         },
         {
           title: "单号",
           align: "center",
-          dataIndex: "code",
+          dataIndex: "livingOrderNo",
         },
         {
           title: "状态",
           align: "center",
-          dataIndex: "couponMoney",
-        },
-        {
-          title: "金额",
-          align: "center",
-          dataIndex: "payMoney",
+          dataIndex: "customerId",
+          customRender(text) {
+            return "正常入住";
+          },
         },
+        // {
+        //   title: "金额",
+        //   align: "center",
+        //   dataIndex: "payMoney",
+        // },
         {
           title: "操作",
           dataIndex: "action",
@@ -159,7 +146,7 @@ export default {
         },
       ],
       url: {
-        list: "/pos/posOrderGoods/list?status=0",
+        list: "/business/busRoomBookingOrders/living-orders?status=-1",
         delete: "/business/busMemberCard/delete",
         deleteBatch: "/business/busMemberCard/deleteBatch",
         exportXlsUrl: "/business/busMemberCard/exportXls",
@@ -179,7 +166,7 @@ export default {
   },
   methods: {
     handleSelect(row) {
-      this.$emit("ok",row);
+      this.$emit("ok", row);
     },
   },
 };

src/views/pos/tablediandan.vue

@@ -13,8 +13,8 @@
             <div>开台时间：{{ tableOrderInfo.orderTime }}</div>
           </a-col>
         </a-row>
-        <p v-if="selectRoomOrder && selectRoomOrder.id">
-          房间：{{ selectRoomOrder.tableNo }},姓名:{{ selectRoomOrder.id }}
+        <p v-if="selectRoomOrder && selectRoomOrder.roomName">
+          房间：{{ selectRoomOrder.roomName }},姓名:{{ selectRoomOrder.customerName }}
         </p>
         <a-table
           bordered
@@ -62,7 +62,7 @@
             >下单</a-button
           >
           <a-button
-            v-if="selectRoomOrder && selectRoomOrder.id && !btnDisabled"
+            v-if="selectRoomOrder && selectRoomOrder.roomName && !btnDisabled"
             @click="handleToRoomFeePayment"
             >确定挂房帐</a-button
           >
@@ -415,7 +415,7 @@ export default {
         model.hotelId = _info.id;
       }
       model.id = this.selectOrderInfo.id;
-      model.toRoomFeeOrderId = this.selectRoomOrder.id;
+      model.toRoomFeeOrderId = this.selectRoomOrder.livingOrderId;
       model.posType = this.tableOrderInfo.posTypeId;
       model.posTableId = this.tableOrderInfo.id;
       model.tableNo = this.tableOrderInfo.name;

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

@@ -755,6 +755,12 @@ export default {
       } else if (text == 5) {
         msg = "结账收款";
       }
+      else if (text == 6) {
+        msg = "商品";
+      }
+      else if (text == 7) {
+        msg = "点餐";
+      }
       return msg;
     },
     async getbusRoomPayType() {