Merge branch 'develop-zhouyi' into 'develop'

fix(@gms/gms-plugin-billexpand): vxetable中弹出modal点击会消失

See merge request GFP/RBC/rbc-frontend!71

develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/edit-modal.vue

@@ -25,9 +25,11 @@
 <template>
   <div class="dept-person-div">
     <Modal
+      ref="modal"
       v-model="visible"
       :title="title"
       :width="modalWidth"
+      :mask-closable="false"
       @on-ok="onOk"
       @on-cancel="onCancel"
     >
@@ -134,8 +136,15 @@ export default {
     window.onresize = () => {
       this.getModalHeight()
     }
+    this.$refs.modal.$el.addEventListener('click', this.stopPropagation)
+  },
+  beforeUnmount() {
+    this.$refs.modal.$el.removeeventlistener('click', this.stopPropagation)
   },
   methods: {
+    stopPropagation(event) {
+      event.stopPropagation()
+    },
     getModalHeight() {
       let viewport = window.innerHeight
       if (viewport <= 600 && viewport >= 400) {