冲突

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

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <bus-member-card-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></bus-member-card-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import BusMemberCardForm from './AgreementUnitInfo'
+  export default {
+    name: 'BusMemberCardModal',
+    components: {
+      BusMemberCardForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add (livingOrderId,roomId) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add(livingOrderId,roomId);
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

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

@@ -5,84 +5,67 @@
     :visible="visible"
     switchFullscreen
     @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }"
     @cancel="handleCancel"
-    cancelText="关闭">
-<<<<<<< HEAD
-    <bus-member-card-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></bus-member-card-form>
-=======
-    <refund :agreementId="agreementId" ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></refund>
->>>>>>> cefd92a69aeaf6e6bb384d753b109db267c49e3b
+    cancelText="关闭"
+  >
+    <refund
+      :agreementId="agreementId"
+      ref="realForm"
+      @ok="submitCallback"
+      :disabled="disableSubmit"
+    ></refund>
   </j-modal>
 </template>
 
 <script>
+import Refund from "./AgreementUnitTable.vue";
 
-<<<<<<< HEAD
-  import BusMemberCardForm from './AgreementUnitInfo'
-  export default {
-    name: 'BusMemberCardModal',
-    components: {
-      BusMemberCardForm
+export default {
+  name: "RefundModal",
+  components: {
+    Refund,
+  },
+  props: {
+    agreementId: {
+      default: "",
     },
-    data () {
-      return {
-        title:'',
-=======
-  import Refund from './AgreementUnitTable.vue'
-  export default {
-    name: 'RefundModal',
-    components: {
-      Refund
+  },
+  data() {
+    return {
+      title: "协议",
+      width: 800,
+      visible: false,
+      disableSubmit: false,
+    };
+  },
+  methods: {
+    add(record) {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs.realForm.add(record);
+      });
     },
-    props:{
-        agreementId:{
-            default:''
-        }
+    edit(record) {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs.realForm.edit(record);
+      });
     },
-    data () {
-      return {
-        title:'协议',
->>>>>>> cefd92a69aeaf6e6bb384d753b109db267c49e3b
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
+    close() {
+      this.$emit("close");
+      this.visible = false;
     },
-    methods: {
-<<<<<<< HEAD
-      add (livingOrderId,roomId) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add(livingOrderId,roomId);
-=======
-      add (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add(record);
->>>>>>> cefd92a69aeaf6e6bb384d753b109db267c49e3b
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
+    handleOk() {
+      this.$refs.realForm.submitForm();
+    },
+    submitCallback() {
+      this.$emit("ok");
+      this.visible = false;
+    },
+    handleCancel() {
+      this.close();
+    },
+  },
+};
 </script>