From 1977cdb928e98a88f2c44cd1047306d63f25f480 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Wed, 20 Sep 2023 13:58:12 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B9=80=E0=B8=81=E0=B9=89=20?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B3=E0=B8=94=E0=B8=B1=E0=B8=9A=20=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=A3=E0=B8=88=E0=B8=B8/=E0=B8=9E=E0=B9=89?=
 =?UTF-8?q?=E0=B8=99=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AppointMent/Dialogbody.vue       |  2 +-
 .../components/AppointMent/Main.vue             |  2 +-
 src/modules/05_placement/components/Main.vue    |  8 +++-----
 .../components/Other/Dialogbody.vue             |  2 +-
 .../05_placement/components/Other/Main.vue      |  4 ++--
 .../components/PersonalList/Table.vue           |  2 +-
 .../components/Receive/receiveMain.vue          |  6 ++----
 .../components/Repatriate/RepatriateMain.vue    | 17 ++++-------------
 .../components/Transfer/transferMain.vue        |  6 ++----
 .../components/helpgovernment/mainHelp.vue      | 17 ++++-------------
 .../components/probation/MainProbation.vue      |  4 ++--
 .../components/probation/ProbationDetail.vue    |  9 +++------
 .../components/Discharged/dischargedMain.vue    |  4 ++--
 .../components/DismissOrder/DismissOrder.vue    |  4 ++--
 .../components/ExitInterview/exitMain.vue       |  2 +-
 .../components/Expulsion/expulsionMain.vue      |  4 ++--
 .../components/resign/Deceased.vue              |  2 +-
 .../06_retirement/components/resign/Resign.vue  | 16 ++--------------
 18 files changed, 36 insertions(+), 75 deletions(-)

diff --git a/src/modules/05_placement/components/AppointMent/Dialogbody.vue b/src/modules/05_placement/components/AppointMent/Dialogbody.vue
index d2484b1af..b441b031a 100644
--- a/src/modules/05_placement/components/AppointMent/Dialogbody.vue
+++ b/src/modules/05_placement/components/AppointMent/Dialogbody.vue
@@ -42,7 +42,7 @@ const columns2 = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
diff --git a/src/modules/05_placement/components/AppointMent/Main.vue b/src/modules/05_placement/components/AppointMent/Main.vue
index 50b6a6b1c..7e5ed0036 100644
--- a/src/modules/05_placement/components/AppointMent/Main.vue
+++ b/src/modules/05_placement/components/AppointMent/Main.vue
@@ -58,7 +58,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
diff --git a/src/modules/05_placement/components/Main.vue b/src/modules/05_placement/components/Main.vue
index 5d249d31b..3349f00ba 100644
--- a/src/modules/05_placement/components/Main.vue
+++ b/src/modules/05_placement/components/Main.vue
@@ -23,7 +23,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "id",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "id",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -61,18 +61,16 @@ const columns = ref<QTableProps["columns"]>([
     name: "numberOfCandidates",
     align: "left",
     label: "จำนวนผู้สอบได้",
-    sortable: false,
+    sortable: true,
     field: "numberOfCandidates",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "examTypeName",
     align: "left",
     label: "ประเภทการสอบ",
-    sortable: false,
+    sortable: true,
     field: "examTypeName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
diff --git a/src/modules/05_placement/components/Other/Dialogbody.vue b/src/modules/05_placement/components/Other/Dialogbody.vue
index 77b786a4f..f11c7d6b3 100644
--- a/src/modules/05_placement/components/Other/Dialogbody.vue
+++ b/src/modules/05_placement/components/Other/Dialogbody.vue
@@ -42,7 +42,7 @@ const columns2 = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
diff --git a/src/modules/05_placement/components/Other/Main.vue b/src/modules/05_placement/components/Other/Main.vue
index db43aa88e..2daf16387 100644
--- a/src/modules/05_placement/components/Other/Main.vue
+++ b/src/modules/05_placement/components/Other/Main.vue
@@ -40,7 +40,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -260,7 +260,7 @@ onMounted(() => {
             :columns="columns"
             :rows="rows"
             :filter="filterKeyword"
-            row-key="fullname"
+            row-key="id"
             :visible-columns="visibleColumns"
             v-model:pagination="pagination"
           >
diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index d084cdb54..5266a9f61 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -86,7 +86,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "position",
     align: "center",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "position",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue
index a0ad7d8e7..499caca9d 100644
--- a/src/modules/05_placement/components/Receive/receiveMain.vue
+++ b/src/modules/05_placement/components/Receive/receiveMain.vue
@@ -113,12 +113,10 @@ const columns = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "citizenId",
@@ -193,7 +191,7 @@ const columns2 = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
diff --git a/src/modules/05_placement/components/Repatriate/RepatriateMain.vue b/src/modules/05_placement/components/Repatriate/RepatriateMain.vue
index f5600b3f4..2e65fa1f7 100644
--- a/src/modules/05_placement/components/Repatriate/RepatriateMain.vue
+++ b/src/modules/05_placement/components/Repatriate/RepatriateMain.vue
@@ -46,7 +46,6 @@ const visibleColumns = ref<string[]>([
   "organization",
   "createdAt",
   "statusText",
-  "btn",
 ]);
 const visibleColumns2 = ref<string[]>([
   "no",
@@ -78,7 +77,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -157,23 +156,14 @@ const columns = ref<QTableProps["columns"]>([
     field: "statusText",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-  },
-  {
-    name: "btn",
-    align: "left",
-    label: "",
-    sortable: true,
-    field: "btn",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
+  }
 ]);
 const columns2 = ref<QTableProps["columns"]>([
   {
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -422,6 +412,7 @@ onMounted(async () => {
                 <q-th v-for="col in props.cols" :key="col.name" :props="props">
                   <span class="text-weight-medium">{{ col.label }}</span>
                 </q-th>
+                <q-th auto-width />
               </q-tr>
             </template>
             <template v-slot:body="props">
diff --git a/src/modules/05_placement/components/Transfer/transferMain.vue b/src/modules/05_placement/components/Transfer/transferMain.vue
index fbc901b77..76d6ff010 100644
--- a/src/modules/05_placement/components/Transfer/transferMain.vue
+++ b/src/modules/05_placement/components/Transfer/transferMain.vue
@@ -70,12 +70,10 @@ const columns = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "fullname",
@@ -161,7 +159,7 @@ const columns2 = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
diff --git a/src/modules/05_placement/components/helpgovernment/mainHelp.vue b/src/modules/05_placement/components/helpgovernment/mainHelp.vue
index c5dcaca70..5d889564e 100644
--- a/src/modules/05_placement/components/helpgovernment/mainHelp.vue
+++ b/src/modules/05_placement/components/helpgovernment/mainHelp.vue
@@ -48,7 +48,6 @@ const visibleColumns = ref<string[]>([
   "dateEnd",
   "createdAt",
   "statusText",
-  "btn",
 ]);
 const visibleColumns2 = ref<string[]>([
   "no",
@@ -128,7 +127,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -229,23 +228,14 @@ const columns = ref<QTableProps["columns"]>([
     field: "statusText",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-  },
-  {
-    name: "btn",
-    align: "left",
-    label: "",
-    sortable: true,
-    field: "btn",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
+  }
 ]);
 const columns2 = ref<QTableProps["columns"]>([
   {
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -519,6 +509,7 @@ onMounted(async () => {
                 <q-th v-for="col in props.cols" :key="col.name" :props="props">
                   <span class="text-weight-medium">{{ col.label }}</span>
                 </q-th>
+                <q-th auto-width />
               </q-tr>
             </template>
             <template v-slot:body="props">
diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue
index e3fc9a74a..116a92c29 100644
--- a/src/modules/05_placement/components/probation/MainProbation.vue
+++ b/src/modules/05_placement/components/probation/MainProbation.vue
@@ -32,7 +32,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -109,7 +109,7 @@ const columns2 = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
diff --git a/src/modules/05_placement/components/probation/ProbationDetail.vue b/src/modules/05_placement/components/probation/ProbationDetail.vue
index 5ea9b9027..4cdc5de4a 100644
--- a/src/modules/05_placement/components/probation/ProbationDetail.vue
+++ b/src/modules/05_placement/components/probation/ProbationDetail.vue
@@ -43,7 +43,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -428,11 +428,8 @@ const paginationLabel = (start: string, end: string, total: string) => {
                   {{ col.value }}
                 </div>
               </q-td>
-              <!-- <q-td auto-width>
-								<q-btn flat dense size="12px" round color="blue" icon="mdi-file-download-outline">
-									<q-tooltip> ดาวน์โหลด .Docx</q-tooltip>
-								</q-btn>
-							</q-td> -->
+              <q-td auto-width>
+							</q-td>
             </q-tr>
           </template>
           <template v-slot:pagination="scope">
diff --git a/src/modules/06_retirement/components/Discharged/dischargedMain.vue b/src/modules/06_retirement/components/Discharged/dischargedMain.vue
index 56507f4c7..deb80b899 100644
--- a/src/modules/06_retirement/components/Discharged/dischargedMain.vue
+++ b/src/modules/06_retirement/components/Discharged/dischargedMain.vue
@@ -70,7 +70,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -135,7 +135,7 @@ const columns2 = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
diff --git a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
index d9a8e1330..e58ee62b9 100644
--- a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
+++ b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
@@ -65,7 +65,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -130,7 +130,7 @@ const columns2 = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
diff --git a/src/modules/06_retirement/components/ExitInterview/exitMain.vue b/src/modules/06_retirement/components/ExitInterview/exitMain.vue
index 2a927a9e7..fe08d327b 100644
--- a/src/modules/06_retirement/components/ExitInterview/exitMain.vue
+++ b/src/modules/06_retirement/components/ExitInterview/exitMain.vue
@@ -34,7 +34,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
diff --git a/src/modules/06_retirement/components/Expulsion/expulsionMain.vue b/src/modules/06_retirement/components/Expulsion/expulsionMain.vue
index cdc7e1c33..c7116e721 100644
--- a/src/modules/06_retirement/components/Expulsion/expulsionMain.vue
+++ b/src/modules/06_retirement/components/Expulsion/expulsionMain.vue
@@ -70,7 +70,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -135,7 +135,7 @@ const columns2 = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
diff --git a/src/modules/06_retirement/components/resign/Deceased.vue b/src/modules/06_retirement/components/resign/Deceased.vue
index 763c15975..02cda7b90 100644
--- a/src/modules/06_retirement/components/resign/Deceased.vue
+++ b/src/modules/06_retirement/components/resign/Deceased.vue
@@ -17,7 +17,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
diff --git a/src/modules/06_retirement/components/resign/Resign.vue b/src/modules/06_retirement/components/resign/Resign.vue
index afa888874..4418b53f4 100644
--- a/src/modules/06_retirement/components/resign/Resign.vue
+++ b/src/modules/06_retirement/components/resign/Resign.vue
@@ -23,24 +23,13 @@ const columns = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
-  {
-    name: "prefix",
-    align: "left",
-    label: "คำนำหน้า",
-    sortable: true,
-    field: "prefix",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
   {
     name: "fullname",
     align: "left",
@@ -151,7 +140,7 @@ const columns2 = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -532,7 +521,6 @@ const pagination = ref({
           :visible-columns="visibleColumns2"
           selection="multiple"
           v-model:selected="selected"
-          v-model:pagination="pagination"
         >
           <template v-slot:header-selection="scope">
             <q-checkbox