Merge branch 'develop' into devTee

# Conflicts:
#	src/modules/12_evaluatePersonal/views/MainPage.vue

src/modules/12_evaluatePersonal/views/MainPage.vue

@@ -56,6 +56,10 @@ watch(
   }
 );
 
+function filterFn() {
+  getList();
+  console.log("enter", filter.value);
+}
 function getList() {
   showLoader();
   http
@@ -92,6 +96,41 @@ onMounted(async () => {
     รายการคำขอประเมิน
   </div>
   <q-card flat bordered class="col-12 q-mt-sm q-pt-sm q-pa-md">
+    <div class="row col-12 q-col-gutter-sm q-mb-sm">
+      <q-space />
+      <q-input
+        class="col-xs-12 col-sm-3 col-md-2"
+        id="filterTable"
+        for="filterTable"
+        dense
+        outlined
+        v-model="filter"
+        label="ค้นหา"
+        debounce="300"
+        @keydown.enter.prevent="filterFn"
+      >
+        <template v-slot:append>
+          <q-icon name="search" />
+        </template>
+      </q-input>
+
+      <q-select
+        id="visibleColumns"
+        for="visibleColumns"
+        v-model="store.visibleColumns"
+        multiple
+        outlined
+        dense
+        options-dense
+        :display-value="$q.lang.table.columns"
+        emit-value
+        map-options
+        :options="store.columns"
+        option-value="name"
+        options-cover
+        class="col-xs-12 col-sm-3 col-md-2"
+      />
+    </div>
     <div>
       <d-table
         ref="table"