src/api/manage.js

@@ -14,17 +14,17 @@ export default api
 
 //post
 export function postAction(url,parameter) {
-  let sign = signMd5Utils.getSign(url, parameter);
+  // let sign = signMd5Utils.getSign(url, parameter);
   //将签名和时间戳，添加在请求接口 Header
   // update-begin--author:taoyan---date:20220421--for: VUEN-410【签名改造】 X-TIMESTAMP牵扯
-  let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getTimestamp()};
+  // let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getTimestamp()};
   // update-end--author:taoyan---date:20220421--for: VUEN-410【签名改造】 X-TIMESTAMP牵扯
 
   return axios({
     url: url,
     method:'post' ,
     data: parameter,
-    headers: signHeader
+    // headers: signHeader
   })
 }
 

src/views/room/fangtailive.vue

@@ -170,7 +170,11 @@
                         style="font-size: 40px"
                       />
                     </div>
-                    <a-popover placement="rightTop" :mouseLeaveDelay="0">
+                    <a-popover
+                      placement="rightTop"
+                      :mouseLeaveDelay="0"
+                      overlayClassName="popoverWidth"
+                    >
                       <template
                         slot="content"
                         v-if="
@@ -2086,4 +2090,9 @@ export default {
   font-size: 13px;
   padding: 8px 16px;
 }
+</style>
+<style>
+.popoverWidth {
+  width: 220px !important;
+}
 </style>

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

@@ -103,11 +103,11 @@
                   style="color: rgba(255, 141, 26, 1); font-size: 18px"
               /></a-descriptions-item>
               <a-descriptions-item label="入住时间">
-                {{ model.orderInfo.arrivalTime }}
+                {{ item.livingOrder.arrivalTime }}
               </a-descriptions-item>
               <a-descriptions-item label="房价方案"> -- </a-descriptions-item>
               <a-descriptions-item label="预离时间">
-                {{ model.orderInfo.dueOutTime }}
+                {{ item.livingOrder.dueOutTime }}
               </a-descriptions-item>
               <a-descriptions-item label="订单来源">
                 {{ customerSourceName(item.livingOrder.customerSource) }}
@@ -118,13 +118,25 @@
                   style="color: rgba(255, 141, 26, 1); font-size: 18px"
               /></a-descriptions-item>
               <a-descriptions-item label="入住类型">
-                {{ model.orderInfo.bookingType == 1 ? "全天" : "钟点" }}
+                {{ item.livingOrder.livingType == 1 ? "全天" : "钟点" }}
+                <a-icon
+                  v-if="livingIndex > 0"
+                  @click="editBookingType(item)"
+                  type="edit"
+                  style="color: rgba(255, 141, 26, 1); font-size: 18px"
+                />
               </a-descriptions-item>
               <a-descriptions-item label="入住天数">
-                {{ model.orderInfo.dayCount }}
+                {{ item.livingOrder.dayCount }}
               </a-descriptions-item>
               <a-descriptions-item label="早餐券">
-                {{ model.orderInfo.breakfastNum }}
+                {{ item.livingOrder.breakfastNum }}
+                <a-icon
+                  v-if="livingIndex > 0"
+                  @click="editBreakfastNum(item)"
+                  type="edit"
+                  style="color: rgba(255, 141, 26, 1); font-size: 18px"
+                />
               </a-descriptions-item>
               <a-descriptions-item label="外部单号">
                 {{ model.orderInfo.outerOrdersNo }}
@@ -473,6 +485,14 @@
       ref="modalEditRemarkModal"
       @ok="modalFormOk"
     ></edit-remark-modal>
+    <edit-breakfast-num-modal
+      ref="modalEditBreakfastNumModal"
+      @ok="modalFormOk"
+    ></edit-breakfast-num-modal>
+    <edit-booking-type-modal
+      ref="modalEditBookingTypeModal"
+      @ok="modalFormOk"
+    ></edit-booking-type-modal>
   </div>
 </template>
 
@@ -492,6 +512,8 @@ import EditCustomerTypeModal from "./EditCustomerTypeModal.vue";
 import EditCustomerSourceModal from "./EditCustomerSourceModal.vue";
 import EditWarranterModal from "./EditWarranterModal.vue";
 import EditRemarkModal from "./EditRemarkModal.vue";
+import EditBreakfastNumModal from "./EditBreakfastNumModal.vue";
+import EditBookingTypeModal from "./EditBookingTypeModal.vue";
 import { match } from "assert";
 const columns = [
   // {
@@ -606,6 +628,8 @@ export default {
     EditCustomerSourceModal,
     EditWarranterModal,
     EditRemarkModal,
+    EditBreakfastNumModal,
+    EditBookingTypeModal,
   },
   props: {
     //表单禁用
@@ -742,6 +766,27 @@ export default {
     });
   },
   methods: {
+    editBookingType(item) {
+      var obj = {
+        orderId: item.livingOrder.id,
+        liveType: item.livingOrder.livingType,
+        fangAnId: item.livingOrder.hourRoomId,
+        livingDayPrices: item.livingDayPrices,
+        roomId: item.roomId,
+      };
+      this.$refs.modalEditBookingTypeModal.edit(obj);
+      this.$refs.modalEditBookingTypeModal.title = "修改";
+      this.$refs.modalEditBookingTypeModal.disableSubmit = false;
+    },
+    editBreakfastNum(item) {
+      var obj = {
+        orderId: item.livingOrder.id,
+        brkfstNum: item.livingOrder.breakfastNum,
+      };
+      this.$refs.modalEditBreakfastNumModal.edit(obj);
+      this.$refs.modalEditBreakfastNumModal.title = "修改";
+      this.$refs.modalEditBreakfastNumModal.disableSubmit = false;
+    },
     editRemark(item) {
       var obj = {
         orderId: item.livingOrder.id,