Merge branch 'master' of https://git.willaspace.com/External-Projects/Champya-Vue

src/components/Global/Modal/BasicModal.vue

@@ -5,10 +5,9 @@
     :width="width"
     :transition="transition"
     dark
-    :tag="tag"
   >
     <main-back height="100%" :is-modal="true">
-      <component :is="tag === 'form' ? 'v-form' : 'div'">
+      <component :is="tag" @submit.prevent="$emit('submit')">
         <v-card class="wa__modal">
           <div class="wa__modal-header">
             <slot name="header" :modal="modal" :data="data" v-if="modal"></slot>

src/components/Programs/Modals/FiltersModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <basic-modal width="458" transition="slide-x-transition">
+  <basic-modal width="458" transition="slide-x-transition" tag="form" @submit="filterPrograms">
     <template #header>
       <div class="close__modal">
         <v-icon class="WMi-cancel-1" large @click="$_closeModal()"></v-icon>
@@ -88,7 +88,6 @@
           text="execute"
           icon="WMi-filter"
           type="submit"
-          @click.native="filterPrograms"
         />
       </div>
     </template>