ปรับ filter

src/modules/01_metadata/components/position-employee/01_PositionMain.vue

@@ -308,8 +308,21 @@ onMounted(async () => {
 <template>
   <div class="row col-12 q-mb-sm q-col-gutter-sm">
     <div class="row col-12">
-      <div class="row col-md-12 q-col-gutter-sm">
+      <q-btn
-        <div class="col-md-2">
+        id="addComplaints"
+        for="addComplaints"
+        size="12px"
+        flat
+        round
+        color="primary"
+        icon="mdi-plus"
+        @click="onClickOpenDialog()"
+        ><q-tooltip>เพิ่มตำเเหน่ง </q-tooltip></q-btn
+      >
+    </div>
+
+    <div class="row col-12 q-col-gutter-sm q-mb-sm">
+      <div class="col-xs-12 col-md-2">
         <q-select
           label="ค้นหาจาก"
           v-model="formQuery.type"
@@ -323,7 +336,7 @@ onMounted(async () => {
         />
       </div>
 
-        <div class="col-md-4">
+      <div class="col-xs-12 col-md-3">
         <q-input
           ref="searchRef"
           v-model="formQuery.keyword"
@@ -345,7 +358,7 @@ onMounted(async () => {
         </q-input>
       </div>
 
-        <div class="row">
+      <div class="col-xs-12 col-md-1">
         <q-btn
           color="primary"
           icon="search"
@@ -354,22 +367,9 @@ onMounted(async () => {
           @click="fetchData()"
         />
       </div>
-      </div>
-    </div>
-    <div class="row col-12">
-      <q-btn
-        id="addComplaints"
-        for="addComplaints"
-        size="12px"
-        flat
-        round
-        color="primary"
-        icon="mdi-plus"
-        @click="onClickOpenDialog()"
-        ><q-tooltip>เพิ่มตำเเหน่ง </q-tooltip></q-btn
-      >
-      <q-space />
 
+      <q-space />
+      <div class="col-xs-12 col-md-1">
         <q-select
           v-model="visibleColumns"
           multiple
@@ -381,10 +381,10 @@ onMounted(async () => {
           map-options
           :options="columns"
           option-value="name"
-        style="min-width: 140px"
         />
       </div>
     </div>
+  </div>
 
   <div class="full-width q-mt-sm">
     <d-table

src/modules/01_metadata/components/position/01_Position.vue

@@ -297,8 +297,20 @@ onMounted(async () => {
   <q-form @submit.prevent="fetchData()">
     <div class="row col-12 q-mb-sm q-col-gutter-sm">
       <div class="row col-12">
-        <div class="row col-md-12 q-col-gutter-sm">
+        <q-btn
-          <div class="col-md-2">
+          id="addComplaints"
+          for="addComplaints"
+          size="12px"
+          flat
+          round
+          color="primary"
+          icon="mdi-plus"
+          @click="popupAdd()"
+          ><q-tooltip>เพิ่มตำเเหน่ง </q-tooltip></q-btn
+        >
+      </div>
+      <div class="row col-12 q-col-gutter-sm q-mb-sm">
+        <div class="col-xs-12 col-md-2">
           <q-select
             label="ค้นหาจาก"
             v-model="type"
@@ -311,8 +323,7 @@ onMounted(async () => {
             option-value="id"
           />
         </div>
-
+        <div class="col-xs-12 col-md-3">
-          <div class="col-md-5">
           <q-input
             v-model="search"
             outlined
@@ -331,33 +342,17 @@ onMounted(async () => {
             </template>
           </q-input>
         </div>
-
+        <div class="col-xs-12 col-md-2">
-          <div class="row">
           <q-btn
+            class="full-width"
             color="primary"
             icon="search"
             label="ค้นหา"
-              class="full-width"
             type="submit"
           />
         </div>
-        </div>
-      </div>
-
-      <div class="row col-12">
-        <q-btn
-          id="addComplaints"
-          for="addComplaints"
-          size="12px"
-          flat
-          round
-          color="primary"
-          icon="mdi-plus"
-          @click="popupAdd()"
-          ><q-tooltip>เพิ่มตำเเหน่ง </q-tooltip></q-btn
-        >
         <q-space />
-
+        <div class="col-xs-12 col-md-1">
           <q-select
             v-model="visibleColumns"
             multiple
@@ -369,10 +364,10 @@ onMounted(async () => {
             map-options
             :options="columns"
             option-value="name"
-          style="min-width: 140px"
           />
         </div>
       </div>
+    </div>
   </q-form>
 
   <div class="full-width q-mt-sm">

src/modules/02_users/views/04_roleOrganization.vue

@@ -311,6 +311,20 @@ onMounted(async () => {
           <div class="col-12"><q-separator /></div>
           <q-card-section>
             <div class="row col-12 q-col-md">
+              <q-btn
+                v-if="orgId"
+                flat
+                dense
+                color="primary"
+                icon="add"
+                round
+                @click="modalAdd = true"
+              >
+                <q-tooltip>เพิ่มข้อมูล</q-tooltip>
+              </q-btn>
+            </div>
+
+            <div class="row col-12 q-mt-sm">
               <div class="col-md-10">
                 <div class="row col-12 q-col-gutter-sm">
                   <div class="col-md-3">
@@ -356,21 +370,6 @@ onMounted(async () => {
                   </div>
                 </div>
               </div>
-            </div>
-
-            <div class="row col-12 q-mt-sm">
-              <q-btn
-                v-if="orgId"
-                flat
-                dense
-                color="primary"
-                icon="add"
-                round
-                @click="modalAdd = true"
-              >
-                <q-tooltip>เพิ่มข้อมูล</q-tooltip>
-              </q-btn>
-
               <q-space />
               <q-select
                 v-model="visibleColumns"