From 136754e91046f3fbddfd5072b0edfa13cc7e1046 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Wed, 26 Feb 2025 17:15:19 +0700
Subject: [PATCH] =?UTF-8?q?sort=20=E0=B8=AA=E0=B8=A3=E0=B8=A3=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableView.vue                              | 3 ++-
 src/modules/03_recruiting/components/Table.vue            | 8 ++++----
 src/modules/03_recruiting/interface/index/Main.ts         | 1 +
 src/modules/03_recruiting/views/01_compete/Detail.vue     | 6 ++++++
 src/modules/03_recruiting/views/01_compete/ImportData.vue | 6 ++++++
 src/modules/03_recruiting/views/01_compete/Period.vue     | 2 ++
 .../03_recruiting/views/02_qualify/DisableDetail.vue      | 7 +++++++
 .../03_recruiting/views/02_qualify/DisablePeriod.vue      | 4 +++-
 src/modules/03_recruiting/views/02_qualify/Manage.vue     | 4 ++--
 src/modules/03_recruiting/views/02_qualify/Period.vue     | 3 ++-
 10 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/components/TableView.vue b/src/components/TableView.vue
index 0487ac38c..407368c06 100644
--- a/src/components/TableView.vue
+++ b/src/components/TableView.vue
@@ -325,6 +325,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar } from "quasar";
 
 const filter = defineModel<string>("filter", { required: true });
+const sortBy = defineModel<string>("sortBy");
 
 const $q = useQuasar();
 const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
@@ -337,7 +338,7 @@ const modalPublish = ref<boolean>(false);
 const modalDelete = ref<boolean>(false);
 
 const pagination = ref({
-  sortBy: "desc",
+  sortBy: sortBy.value ? sortBy.value : "desc",
   descending: false,
   page: 1,
   rowsPerPage: 10,
diff --git a/src/modules/03_recruiting/components/Table.vue b/src/modules/03_recruiting/components/Table.vue
index da6b6afa1..440a9b053 100644
--- a/src/modules/03_recruiting/components/Table.vue
+++ b/src/modules/03_recruiting/components/Table.vue
@@ -6,10 +6,10 @@ import type { Pagination } from "@/modules/03_recruiting/interface/index/Main";
 const attrs = ref<any>(useAttrs());
 const table = ref<any>(null);
 const filterRef = ref<any>(null);
-const initialPagination = ref<Pagination>({
-  rowsPerPage: 0,
-});
+
 const filter = defineModel<string>("filter", { required: true });
+const pagination = defineModel<Pagination>('pagination',{required:true})
+
 const props = defineProps({
   onSearch: Function,
   count: Number,
@@ -175,7 +175,7 @@ function resetFilter() {
     :virtual-scroll-sticky-size-start="48"
     dense
     :pagination-label="paginationLabel"
-    :pagination="initialPagination"
+    v-model:pagination="pagination"
     :rows-per-page-options="[0]"
   >
     <template v-slot:header="props">
diff --git a/src/modules/03_recruiting/interface/index/Main.ts b/src/modules/03_recruiting/interface/index/Main.ts
index 90a1a5a03..3823f05db 100644
--- a/src/modules/03_recruiting/interface/index/Main.ts
+++ b/src/modules/03_recruiting/interface/index/Main.ts
@@ -1,6 +1,7 @@
 import { ref } from "vue";
 interface Pagination {
   rowsPerPage: number;
+  sortBy: string;
 }
 
 interface DataDateMonthObject {
diff --git a/src/modules/03_recruiting/views/01_compete/Detail.vue b/src/modules/03_recruiting/views/01_compete/Detail.vue
index 8a018f3a1..9067e995a 100644
--- a/src/modules/03_recruiting/views/01_compete/Detail.vue
+++ b/src/modules/03_recruiting/views/01_compete/Detail.vue
@@ -12,6 +12,7 @@ import { useQuasar } from "quasar";
 import type { RecruitDetailResponse } from "@/modules/03_recruiting/interface/response/Period";
 import Table from "@/modules/03_recruiting/components/Table.vue";
 import genReportXLSX from "@/plugins/genreportxlsx";
+import type { Pagination } from "@/modules/03_recruiting/interface/index/Main";
 
 const $q = useQuasar();
 const router = useRouter();
@@ -20,6 +21,10 @@ const mixin = useCounterMixin();
 const { messageError, success, showLoader, hideLoader, onSearchDataTable } =
   mixin;
 
+const initialPagination = ref<Pagination>({
+  rowsPerPage: 0,
+  sortBy: "year",
+});
 const year = ref<string>("");
 const round = ref<string>("");
 const name = ref<string>("");
@@ -475,6 +480,7 @@ onMounted(async () => {
         :visible-columns="visibleColumns"
         v-model:inputfilter="filter"
         v-model:inputvisible="visibleColumns"
+        v-model:pagination="initialPagination"
         :nornmalData="false"
         :conclude="true"
       >
diff --git a/src/modules/03_recruiting/views/01_compete/ImportData.vue b/src/modules/03_recruiting/views/01_compete/ImportData.vue
index 8c5b77d84..9066530fc 100644
--- a/src/modules/03_recruiting/views/01_compete/ImportData.vue
+++ b/src/modules/03_recruiting/views/01_compete/ImportData.vue
@@ -8,6 +8,7 @@ import { useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 
 import Table from "@/modules/03_recruiting/components/Table.vue";
+import type { Pagination } from "@/modules/03_recruiting/interface/index/Main";
 
 const mixin = useCounterMixin();
 const { onSearchDataTable } = mixin;
@@ -15,6 +16,10 @@ const $q = useQuasar(); // show dialog
 const router = useRouter();
 const file = ref<boolean>(true);
 const filter = ref<string>(""); //search data table
+  const initialPagination = ref<Pagination>({
+  rowsPerPage: 0,
+  sortBy: "year",
+});
 const visibleColumns = ref<String[]>([
   "no",
   "year",
@@ -156,6 +161,7 @@ function onSearch() {
         :visible-columns="visibleColumns"
         v-model:inputfilter="filter"
         v-model:inputvisible="visibleColumns"
+        v-model:pagination="initialPagination"
         :nornmalData="false"
       >
         <template #columns="props">
diff --git a/src/modules/03_recruiting/views/01_compete/Period.vue b/src/modules/03_recruiting/views/01_compete/Period.vue
index 1bc6c7ec3..fb463d570 100644
--- a/src/modules/03_recruiting/views/01_compete/Period.vue
+++ b/src/modules/03_recruiting/views/01_compete/Period.vue
@@ -53,6 +53,7 @@ const rows = ref<ResponseRecruitPeriod[]>([]);
 const rowsData = ref<ResponseRecruitPeriod[]>([]);
 const initialPagination = ref<Pagination>({
   rowsPerPage: 0,
+  sortBy: "year",
 });
 const visibleColumns = ref<String[]>([
   "no",
@@ -99,6 +100,7 @@ const columns = ref<QTableProps["columns"]>([
     field: "year",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: number, b: number) => b - a,
   },
   {
     name: "examCount",
diff --git a/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue b/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue
index 7def96c89..e7bf2fc08 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue
@@ -10,6 +10,8 @@ import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 
 import type { RecruitDetailResponse } from "@/modules/03_recruiting/interface/response/Period";
+import type { Pagination } from "@/modules/03_recruiting/interface/index/Main";
+
 import Table from "@/modules/03_recruiting/components/Table.vue";
 import genReportXLSX from "@/plugins/genreportxlsx";
 
@@ -23,6 +25,10 @@ const { messageError, success, showLoader, hideLoader, onSearchDataTable } =
 const year = ref<string>("2566");
 const round = ref<string>("1");
 const name = ref<string>("");
+const initialPagination = ref<Pagination>({
+  rowsPerPage: 0,
+  sortBy: "examID",
+});
 
 const count = ref<number>(0);
 const pass = ref<number>(0);
@@ -410,6 +416,7 @@ onMounted(async () => {
         :columns="columns"
         v-model:filter="filter"
         :onSearch="onSearch"
+        :pagination="initialPagination"
         :visible-columns="visibleColumns"
         v-model:inputfilter="filter"
         v-model:inputvisible="visibleColumns"
diff --git a/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue b/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
index 4c6650a87..fbda1be2c 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
@@ -56,6 +56,7 @@ const textTittleScore = ref<string>("");
 const textTittleCandidate = ref<string>("");
 const initialPagination = ref<Pagination>({
   rowsPerPage: 0,
+  sortBy: "year",
 });
 const visibleColumns = ref<String[]>([
   "no",
@@ -105,6 +106,7 @@ const columns = ref<QTableProps["columns"]>([
     format(val, row) {
       return `${row.year + 543}`;
     },
+    sort: (a: number, b: number) => b - a,
   },
   {
     name: "examCount",
@@ -442,7 +444,7 @@ onMounted(async () => {
         :visible-columns="visibleColumns"
         v-model:inputfilter="filter"
         v-model:inputvisible="visibleColumns"
-        :pagination="initialPagination"
+        v-model:pagination="initialPagination"
         :nornmalData="true"
         :add="clickAdd"
         :paging="true"
diff --git a/src/modules/03_recruiting/views/02_qualify/Manage.vue b/src/modules/03_recruiting/views/02_qualify/Manage.vue
index b00833943..b7f1a67d3 100644
--- a/src/modules/03_recruiting/views/02_qualify/Manage.vue
+++ b/src/modules/03_recruiting/views/02_qualify/Manage.vue
@@ -24,6 +24,7 @@ const rows = ref<ResponsePeriodExam[]>([]);
 const rowsData = ref<ResponsePeriodExam[]>([]);
 const initialPagination = ref<Pagination>({
   rowsPerPage: 0,
+  sortBy: "dateRegister",
 });
 const filter = ref<string>(""); //search data table
 const visibleColumns = ref<String[]>([
@@ -90,8 +91,6 @@ const columns = ref<QTableProps["columns"]>([
     field: "dateRegister",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "datePayment",
@@ -228,6 +227,7 @@ onMounted(async () => {
       :pagination="initialPagination"
       :nornmalData="true"
       :paging="true"
+      :sortBy="'dateRegister'"
       name="qualify"
     >
       <template #columns="props">
diff --git a/src/modules/03_recruiting/views/02_qualify/Period.vue b/src/modules/03_recruiting/views/02_qualify/Period.vue
index 7e5105c66..13b58326d 100644
--- a/src/modules/03_recruiting/views/02_qualify/Period.vue
+++ b/src/modules/03_recruiting/views/02_qualify/Period.vue
@@ -33,11 +33,12 @@ const {
   messageError,
   showLoader,
   hideLoader,
-  onSearchDataTable
+  onSearchDataTable,
 } = mixin;
 const filter = ref<string>(""); //search data table
 const initialPagination = ref<Pagination>({
   rowsPerPage: 0,
+  sortBy: "dateRegister",
 });
 const examData = ref<ResponsePeriodExam[]>([]);
 const examDataData = ref<ResponsePeriodExam[]>([]);