GFJ

src/views/room/fangtailive.vue

@@ -1803,9 +1803,10 @@ export default {
       }
     },
     modalBatchhFormOk() {
-      this.$refs.ModalBillRoomInfo.add(this.YDorder);
-      this.$refs.ModalBillRoomInfo.title = "账单";
-      this.$refs.ModalBillRoomInfo.disableSubmit = true;
+      // 制房卡之后不调用账单
+      // this.$refs.ModalBillRoomInfo.add(this.YDorder);
+      // this.$refs.ModalBillRoomInfo.title = "账单";
+      // this.$refs.ModalBillRoomInfo.disableSubmit = true;
     },
     modalFormOk(e) {
       console.log("e", e);

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

@@ -33,7 +33,7 @@
                           font-weight: 600;
                         "
                       >
-                        宾客信息
+                        宾客信息{{ utcTxt }}
                       </h4>
                       <div v-if="model.roomIds&&model.roomIds.length>1"><a-switch v-model="otherRoomSync" />附属房间录入信息</div>
                     </div>
@@ -956,7 +956,7 @@
             <td style="text-align:center;color:#722ed1;height:60px">
               <div>每日房价</div>
               <div>
-                <a-input-number :placeholder="item.marketPrice.toString()" @change="batchPrice($event, index)"></a-input-number>
+                <a-input-number :min="0" :defaultValue="item.marketPrice" :placeholder="item.marketPrice.toString()" @change="batchPrice($event, index)"></a-input-number>
               </div>
             </td>
           </tr>
@@ -967,7 +967,7 @@
               {{sItem.day}}
             </div>
             <div>
-              <a-input-number v-model="sItem.price" />
+              <a-input-number :min="0" v-model="sItem.price" />
             </div>
           </td>
         </th>
@@ -1085,6 +1085,7 @@ export default {
   },
   data() {
     return {
+      utcTxt: null,
       editDepositModal: false,
       //会员选中数据
       vipCustomerData: {},
@@ -1481,6 +1482,12 @@ export default {
     },
   },
   created() {
+    // postAction("/business/busRoomBookingOrders/test-utc",{
+    //   createTime: new Date()
+    // }).then(res=>{
+    //   let d = new Date(res.result)
+    //   this.utcTxt = `======服务端返回UTC:${res.result}===LocalDateTime:${d.toLocaleString()}`
+    // })
     var _info = JSON.parse(localStorage.getItem("storeInfo"));
     if (_info) {
       this.model.hotelId = _info.id;

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

@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import BillRoomForm from "./BillRoomForm";
+import BillRoomForm from "./BillRoomForm.vue";
 export default {
   name: "BillRoomFormModal",
   components: {