From 67787dab34d5c1d0acd6e6436cc8ba1e97ae94ea Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 27 Nov 2024 11:45:23 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20filter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../position-employee/01_PositionMain.vue     | 126 +++++++++---------
 .../components/position/01_Position.vue       | 119 ++++++++---------
 .../02_users/views/04_roleOrganization.vue    |  29 ++--
 3 files changed, 134 insertions(+), 140 deletions(-)

diff --git a/src/modules/01_metadata/components/position-employee/01_PositionMain.vue b/src/modules/01_metadata/components/position-employee/01_PositionMain.vue
index dc580b99..97095dd4 100644
--- a/src/modules/01_metadata/components/position-employee/01_PositionMain.vue
+++ b/src/modules/01_metadata/components/position-employee/01_PositionMain.vue
@@ -307,55 +307,6 @@ onMounted(async () => {
 </script>
 <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">
-        <div class="col-md-2">
-          <q-select
-            label="ค้นหาจาก"
-            v-model="formQuery.type"
-            :options="optionFilter"
-            emit-value
-            dense
-            map-options
-            outlined
-            option-label="name"
-            option-value="id"
-          />
-        </div>
-
-        <div class="col-md-4">
-          <q-input
-            ref="searchRef"
-            v-model="formQuery.keyword"
-            outlined
-            dense
-            lazy-rules
-            label="คำค้น"
-            hide-bottom-space
-            @keydown.enter="fetchData()"
-          >
-            <template v-slot:append>
-              <q-icon
-                v-if="formQuery.keyword"
-                name="cancel"
-                @click="formQuery.keyword = ''"
-                class="cursor-pointer"
-              ></q-icon>
-            </template>
-          </q-input>
-        </div>
-
-        <div class="row">
-          <q-btn
-            color="primary"
-            icon="search"
-            label="ค้นหา"
-            class="full-width"
-            @click="fetchData()"
-          />
-        </div>
-      </div>
-    </div>
     <div class="row col-12">
       <q-btn
         id="addComplaints"
@@ -368,21 +319,70 @@ onMounted(async () => {
         @click="onClickOpenDialog()"
         ><q-tooltip>เพิ่มตำเเหน่ง </q-tooltip></q-btn
       >
-      <q-space />
+    </div>
 
-      <q-select
-        v-model="visibleColumns"
-        multiple
-        outlined
-        dense
-        options-dense
-        :display-value="$q.lang.table.columns"
-        emit-value
-        map-options
-        :options="columns"
-        option-value="name"
-        style="min-width: 140px"
-      />
+    <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"
+          :options="optionFilter"
+          emit-value
+          dense
+          map-options
+          outlined
+          option-label="name"
+          option-value="id"
+        />
+      </div>
+
+      <div class="col-xs-12 col-md-3">
+        <q-input
+          ref="searchRef"
+          v-model="formQuery.keyword"
+          outlined
+          dense
+          lazy-rules
+          label="คำค้น"
+          hide-bottom-space
+          @keydown.enter="fetchData()"
+        >
+          <template v-slot:append>
+            <q-icon
+              v-if="formQuery.keyword"
+              name="cancel"
+              @click="formQuery.keyword = ''"
+              class="cursor-pointer"
+            ></q-icon>
+          </template>
+        </q-input>
+      </div>
+
+      <div class="col-xs-12 col-md-1">
+        <q-btn
+          color="primary"
+          icon="search"
+          label="ค้นหา"
+          class="full-width"
+          @click="fetchData()"
+        />
+      </div>
+
+      <q-space />
+      <div class="col-xs-12 col-md-1">
+        <q-select
+          v-model="visibleColumns"
+          multiple
+          outlined
+          dense
+          options-dense
+          :display-value="$q.lang.table.columns"
+          emit-value
+          map-options
+          :options="columns"
+          option-value="name"
+        />
+      </div>
     </div>
   </div>
 
diff --git a/src/modules/01_metadata/components/position/01_Position.vue b/src/modules/01_metadata/components/position/01_Position.vue
index abec02a4..9bc91143 100644
--- a/src/modules/01_metadata/components/position/01_Position.vue
+++ b/src/modules/01_metadata/components/position/01_Position.vue
@@ -296,54 +296,6 @@ onMounted(async () => {
 <template>
   <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">
-          <div class="col-md-2">
-            <q-select
-              label="ค้นหาจาก"
-              v-model="type"
-              :options="optionFilter"
-              emit-value
-              dense
-              map-options
-              outlined
-              option-label="name"
-              option-value="id"
-            />
-          </div>
-
-          <div class="col-md-5">
-            <q-input
-              v-model="search"
-              outlined
-              dense
-              lazy-rules
-              label="คำค้น"
-              hide-bottom-space
-            >
-              <template v-slot:append>
-                <q-icon
-                  v-if="search"
-                  name="cancel"
-                  @click="search = ''"
-                  class="cursor-pointer"
-                ></q-icon>
-              </template>
-            </q-input>
-          </div>
-
-          <div class="row">
-            <q-btn
-              color="primary"
-              icon="search"
-              label="ค้นหา"
-              class="full-width"
-              type="submit"
-            />
-          </div>
-        </div>
-      </div>
-
       <div class="row col-12">
         <q-btn
           id="addComplaints"
@@ -356,21 +308,64 @@ onMounted(async () => {
           @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"
+            :options="optionFilter"
+            emit-value
+            dense
+            map-options
+            outlined
+            option-label="name"
+            option-value="id"
+          />
+        </div>
+        <div class="col-xs-12 col-md-3">
+          <q-input
+            v-model="search"
+            outlined
+            dense
+            lazy-rules
+            label="คำค้น"
+            hide-bottom-space
+          >
+            <template v-slot:append>
+              <q-icon
+                v-if="search"
+                name="cancel"
+                @click="search = ''"
+                class="cursor-pointer"
+              ></q-icon>
+            </template>
+          </q-input>
+        </div>
+        <div class="col-xs-12 col-md-2">
+          <q-btn
+            class="full-width"
+            color="primary"
+            icon="search"
+            label="ค้นหา"
+            type="submit"
+          />
+        </div>
         <q-space />
-
-        <q-select
-          v-model="visibleColumns"
-          multiple
-          outlined
-          dense
-          options-dense
-          :display-value="$q.lang.table.columns"
-          emit-value
-          map-options
-          :options="columns"
-          option-value="name"
-          style="min-width: 140px"
-        />
+        <div class="col-xs-12 col-md-1">
+          <q-select
+            v-model="visibleColumns"
+            multiple
+            outlined
+            dense
+            options-dense
+            :display-value="$q.lang.table.columns"
+            emit-value
+            map-options
+            :options="columns"
+            option-value="name"
+          />
+        </div>
       </div>
     </div>
   </q-form>
diff --git a/src/modules/02_users/views/04_roleOrganization.vue b/src/modules/02_users/views/04_roleOrganization.vue
index a1e7e1b3..806c810e 100644
--- a/src/modules/02_users/views/04_roleOrganization.vue
+++ b/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"