制卡调整

src/views/room/fangtailive.vue

@@ -1610,21 +1610,14 @@ export default {
       this.loadData();
       console.log("e", e);
       this.YDorder = e.order
-      getAction(`/business/busOtherRoomCard/queryByHotelId`).then(res=>{
-        console.log(res);
-        if (res.success && res.result) {
-          if (res.result.status==1) {
-            this.$refs.batchCheckInModal.visible = true;
+      if (this.kzfLiving) {
+        this.$refs.batchCheckInModal.visible = true;
             this.$refs.batchCheckInModal.edit(e.model)
-          }else{
-            this.$refs.ModalBillRoomInfo.add(e.order);
+      }else{
+        this.$refs.ModalBillRoomInfo.add(e.order);
             this.$refs.ModalBillRoomInfo.title = "账单";
             this.$refs.ModalBillRoomInfo.disableSubmit = true;
-          }
-        }
-      })
-      
-      
+      }
     },
     modalBatchhFormOk(){
       this.$refs.ModalBillRoomInfo.add(this.YDorder);

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

@@ -5,7 +5,7 @@
     :visible="visible"
     @ok="handleOk"
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
+    @cancel="handleOk"
     cancelText="关闭">
     <pos-type-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></pos-type-form>
   </j-modal>