ปรับ ข้อมูลหลัก

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

@@ -27,6 +27,7 @@ const {
   messageError,
   success,
   dialogRemove,
+  date2Thai,
 } = mixin;
 
 //table
@@ -76,6 +77,9 @@ const columns = ref<QTableProps["columns"]>([
     field: "createdAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return date2Thai(val, false, true);
+    },
   },
   {
     name: "lastUpdatedAt",
@@ -85,6 +89,9 @@ const columns = ref<QTableProps["columns"]>([
     field: "lastUpdatedAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return date2Thai(val, false, true);
+    },
   },
   {
     name: "lastUpdateFullName",

src/modules/01_metadata/components/position-employee/02_GroupMain.vue

@@ -18,12 +18,12 @@ import dialogHeader from "@/components/DialogHeader.vue";
 const $q = useQuasar();
 const router = useRouter();
 const {
-  dialogRemove,
   dialogConfirm,
   success,
   messageError,
   showLoader,
   hideLoader,
+  date2Thai,
 } = useCounterMixin();
 
 //Table
@@ -65,6 +65,9 @@ const columns = ref<QTableProps["columns"]>([
     field: "createdAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return date2Thai(val, false, true);
+    },
   },
   {
     name: "lastUpdatedAt",
@@ -74,7 +77,11 @@ const columns = ref<QTableProps["columns"]>([
     field: "lastUpdatedAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return date2Thai(val, false, true);
+    },
   },
+
   {
     name: "lastUpdateFullName",
     align: "left",
@@ -222,7 +229,18 @@ onMounted(async () => {
     </q-btn>
     <q-space />
     <div class="row q-gutter-sm">
-      <q-input outlined dense v-model="filterKeyword" label="ค้นหา"></q-input>
+      <q-input
+        dense
+        outlined
+        clearable
+        v-model="filterKeyword"
+        placeholder="ค้นหา"
+        @clear="filterKeyword = ''"
+      >
+        <template v-slot:append v-if="filterKeyword === ''">
+          <q-icon name="search" />
+        </template>
+      </q-input>
       <q-select
         v-model="visibleColumns"
         multiple

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

@@ -7,10 +7,7 @@ import config from "@/app.config";
 
 /** importType*/
 import type { QTableProps } from "quasar";
-import type {
-  ResGroup,
-  ResLevel,
-} from "@/modules/01_metadata/interface/response/positionEmployee/Main";
+import type { ResLevel } from "@/modules/01_metadata/interface/response/positionEmployee/Main";
 import type { DataGroup } from "@/modules/01_metadata/interface/index/positionEmployee";
 import type { FormDataLevel } from "@/modules/01_metadata/interface/request/positionEmployee";
 
@@ -26,8 +23,14 @@ const $q = useQuasar();
 const storeOption = useMainOptionDataStore();
 const route = useRoute();
 const router = useRouter();
-const { dialogConfirm, showLoader, hideLoader, messageError, success } =
-  useCounterMixin();
+const {
+  dialogConfirm,
+  showLoader,
+  hideLoader,
+  messageError,
+  success,
+  date2Thai,
+} = useCounterMixin();
 
 // Table
 const rows = ref<DataGroup[]>([]); // รายการกลุ่มงาน
@@ -45,7 +48,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "posLevelName",
     align: "left",
-    label: "ระดับชั้นงาน",
+    label: "กลุ่มงาน",
     sortable: true,
     field: "posLevelName",
     headerStyle: "font-size: 14px",
@@ -78,6 +81,9 @@ const columns = ref<QTableProps["columns"]>([
     field: "createdAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return date2Thai(val, false, true);
+    },
   },
   {
     name: "lastUpdatedAt",
@@ -87,6 +93,9 @@ const columns = ref<QTableProps["columns"]>([
     field: "lastUpdatedAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return date2Thai(val, false, true);
+    },
   },
   {
     name: "lastUpdateFullName",
@@ -249,7 +258,7 @@ onMounted(() => {
       class="q-mr-sm"
       @click="router.go(-1)"
     />
-    รายการระดับชั้นงาน{{ titleName }}
+    รายการระดับชั้นงานของกลุ่มงาน{{ titleName }}
   </div>
 
   <q-card flat bordered>
@@ -266,7 +275,18 @@ onMounted(() => {
         </q-btn>
         <q-space />
         <div class="row q-gutter-sm">
-          <q-input outlined dense v-model="filter" label="ค้นหา"></q-input>
+          <q-input
+            dense
+            outlined
+            clearable
+            v-model="filter"
+            placeholder="ค้นหา"
+            @clear="filter = ''"
+          >
+            <template v-slot:append v-if="filter === ''">
+              <q-icon name="search" />
+            </template>
+          </q-input>
           <q-select
             v-model="visibleColumns"
             multiple
@@ -300,7 +320,7 @@ onMounted(() => {
           <q-tr :props="props">
             <q-th auto-width />
             <q-th v-for="col in props.cols" :key="col.name" :props="props">
-              <span class="text-weight-bold">{{ col.label }}</span>
+              <span class="text-weight-medium">{{ col.label }}</span>
             </q-th>
           </q-tr>
         </template>