From 082f0a3bd9695b15d0ef2adae612d8717a51aadf Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Fri, 15 Dec 2023 14:58:56 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=84=E0=B8=B3=E0=B8=82=E0=B8=AD=E0=B8=9B=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../12_evaluatePersonal/store/Evaluate.ts     | 32 ++++++++++++-------
 .../12_evaluatePersonal/views/MainPage.vue    | 13 ++------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/modules/12_evaluatePersonal/store/Evaluate.ts b/src/modules/12_evaluatePersonal/store/Evaluate.ts
index f94e7d0f9..1560fa238 100644
--- a/src/modules/12_evaluatePersonal/store/Evaluate.ts
+++ b/src/modules/12_evaluatePersonal/store/Evaluate.ts
@@ -43,6 +43,7 @@ export const useEvalutuonStore = defineStore("EvalutuonStore", () => {
   // เสร็จสิ้น -> DONE
 
   const visibleColumns = ref<String[]>([
+    "no",
     "citizanId",
     "fullName",
     "position",
@@ -67,6 +68,26 @@ export const useEvalutuonStore = defineStore("EvalutuonStore", () => {
   }
 
   const columns = ref<QTableProps["columns"]>([
+    {
+      name: "no",
+      align: "center",
+      label: "ลำดับ",
+      sortable: false,
+      field: "no",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "level",
+      align: "left",
+      label: "ระดับที่ยื่นขอ",
+      sortable: true,
+      field: "level",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+      sort: (a: string, b: string) =>
+        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    },
     {
       name: "citizanId",
       align: "center",
@@ -96,17 +117,6 @@ export const useEvalutuonStore = defineStore("EvalutuonStore", () => {
       sort: (a: string, b: string) =>
         a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
     },
-    {
-      name: "level",
-      align: "left",
-      label: "ระดับ",
-      sortable: true,
-      field: "level",
-      headerStyle: "font-size: 14px",
-      style: "font-size: 14px",
-      sort: (a: string, b: string) =>
-        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-    },
     {
       name: "positionNumber",
       align: "left",
diff --git a/src/modules/12_evaluatePersonal/views/MainPage.vue b/src/modules/12_evaluatePersonal/views/MainPage.vue
index 830d51936..8f3f9d2ec 100644
--- a/src/modules/12_evaluatePersonal/views/MainPage.vue
+++ b/src/modules/12_evaluatePersonal/views/MainPage.vue
@@ -43,15 +43,6 @@ onMounted(async () => {
       agency: "กลุ่มงานกฎหมาย",
       status: "WAIT_CHECK_DOC_V1",
     },
-    {
-      citizanId: "172223000401",
-      fullName: "นางธัญพร ปัทมเดชา",
-      position: "หัวหน้าสำนักงาน",
-      level: "ปฏิบัติการ",
-      positionNumber: "สก.ก412",
-      agency: "กลุ่มงานกฎหมาย",
-      status: "WAIT_CHECK_DOC_V1",
-    },
     {
       citizanId: "122222000401",
       fullName: "นายสิริศักดิ์ พรมบุตร",
@@ -176,10 +167,10 @@ onMounted(async () => {
                         <q-icon
                           color="primary"
                           size="xs"
-                          name="mdi-bookmark-outline"
+                          name="mdi-eye"
                         />
                       </q-item-section>
-                      <q-item-section>ตรวจสอบคุณสมบัติ</q-item-section>
+                      <q-item-section>รายละเอียดคำขอ</q-item-section>
                     </q-item>
 
                     <q-separator />