From b338ebd24f77c8513462e29d142752bd7646b3b9 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Thu, 24 Aug 2023 15:57:11 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=9F=E0=B8=B4=E0=B8=A5=20=E0=B8=AA=E0=B8=96=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=A2=E0=B8=B7=E0=B9=88?=
 =?UTF-8?q?=E0=B8=99=E0=B8=82=E0=B8=AD=E0=B8=A5=E0=B8=B2=E0=B8=AD=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=81=E0=B8=88=E0=B8=B2=E0=B8=81=E0=B8=A3=E0=B8=B2=E0=B8=8A?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../06_retirement/components/resign/Resign.vue  | 17 ++++++++++++++++-
 .../components/resign/ResignByid.vue            |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/modules/06_retirement/components/resign/Resign.vue b/src/modules/06_retirement/components/resign/Resign.vue
index a4e94b459..e126f459f 100644
--- a/src/modules/06_retirement/components/resign/Resign.vue
+++ b/src/modules/06_retirement/components/resign/Resign.vue
@@ -54,7 +54,17 @@ const columns = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
-
+  {
+    name: "location",
+    align: "left",
+    label: "สถานที่ยื่นขอลาออกจากราชการ",
+    sortable: true,
+    field: "location",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
   {
     name: "positionTypeOld",
     align: "left",
@@ -127,6 +137,7 @@ const visibleColumns = ref<string[]>([
   "no",
   "prefix",
   "fullname",
+  "location",
   "positionTypeOld",
   "positionLevelOld",
   "positionNumberOld",
@@ -172,6 +183,7 @@ const columns2 = ref<QTableProps["columns"]>([
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 
+
   {
     name: "positionTypeOld",
     align: "left",
@@ -442,6 +454,9 @@ const saveOrder = async () => {
                 <q-td key="fullname" :props="props">
                   {{ props.row.fullname }}
                 </q-td>
+                <q-td key="location" :props="props">
+                  {{ props.row.location }}
+                </q-td>
                 <q-td key="positionTypeOld" :props="props">
                   {{ props.row.positionTypeOld }}
                 </q-td>
diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue
index 4460bc3f7..62aaf40e3 100644
--- a/src/modules/06_retirement/components/resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/resign/ResignByid.vue
@@ -167,7 +167,7 @@
               {{ props.row.fileName }}
             </q-td>
             <q-td key="btnMicrosoft" :props="props">
-              <q-btn flat dense round color="red" icon="picture_as_pdf">
+              <q-btn type="a" target="_blank" :href="props.row.pathName" flat dense round color="red" icon="picture_as_pdf">
                 <q-tooltip>ไฟล์ PDF</q-tooltip>
               </q-btn>
             </q-td>