From 9aa0708c48d06927f61c8819735eb7f8a0c31e8a Mon Sep 17 00:00:00 2001
From: AnandaTon <ananda@frappet.com>
Date: Fri, 22 Sep 2023 14:43:47 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=8A=E0=B8=B7?=
 =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B9=80=E0=B8=AD=E0=B8=81=E0=B8=AA=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=95=E0=B8=AD=E0=B8=99=E0=B8=94=E0=B8=B2=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=99=E0=B9=8C=E0=B9=82=E0=B8=AB=E0=B8=A5=E0=B8=94=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A1=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B9=80?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=81=E0=B8=AA=E0=B8=B2=E0=B8=A3=E0=B8=97=E0=B8=B5?=
 =?UTF-8?q?=E0=B9=88=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Transfer/transferRegistry.vue  |  8 +++----
 .../DismissOrder/DialogSendToCommand.vue      | 21 +++++++------------
 .../components/resign/ResignByid.vue          | 18 ++++++++--------
 3 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/modules/05_placement/components/Transfer/transferRegistry.vue b/src/modules/05_placement/components/Transfer/transferRegistry.vue
index a0ee73414..e683d8ca9 100644
--- a/src/modules/05_placement/components/Transfer/transferRegistry.vue
+++ b/src/modules/05_placement/components/Transfer/transferRegistry.vue
@@ -68,14 +68,14 @@ const downloadFile = (response: any, filename: string) => {
   link.click();
   document.body.removeChild(link);
 };
-const fileDownload = async (no: number, type: string) => {
+const fileDownload = async (no: number, type: string, fileName: string) => {
   showLoader();
   await http
     .get(config.API.reportTransferFile(no, type, id.value), {
       responseType: "blob",
     })
     .then(async (res) => {
-      downloadFile(res, `_ครั้งที่.${type}`);
+      downloadFile(res, `${fileName}.${type}`);
     })
     .catch((e) => {
       messageError($q, e);
@@ -463,7 +463,7 @@ onMounted(async () => {
                 round
                 color="red"
                 icon="picture_as_pdf"
-                @click="fileDownload(props.row.no, 'pdf')"
+                @click="fileDownload(props.row.no, 'pdf', props.row.fileName)"
               >
                 <q-tooltip>ไฟล์ PDF</q-tooltip>
               </q-btn>
@@ -473,7 +473,7 @@ onMounted(async () => {
                 round
                 color="blue"
                 icon="mdi-file-word"
-                @click="fileDownload(props.row.no, 'docx')"
+                @click="fileDownload(props.row.no, 'docx', props.row.fileName)"
               >
                 <q-tooltip>ไฟล์ WORD</q-tooltip>
               </q-btn>
diff --git a/src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue b/src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue
index e6e6f1c12..668d0d63b 100644
--- a/src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue
+++ b/src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue
@@ -218,29 +218,24 @@ watchEffect(() => {
               <q-td key="no" :props="props">
                 {{ props.rowIndex + 1 }}
               </q-td>
-              <q-td key="prefix" :props="props">
-                {{ props.row.prefix }}
-              </q-td>
               <q-td key="fullname" :props="props">
                 {{ props.row.fullname }}
               </q-td>
-              <q-td key="positionTypeOld" :props="props">
-                {{ props.row.positionTypeOld }}
+              <q-td key="position" :props="props">
+                {{ props.row.position }}
               </q-td>
-              <q-td key="positionLevelOld" :props="props">
-                {{ props.row.positionLevelOld }}
+              <q-td key="positionLevel" :props="props">
+                {{ props.row.positionLevel }}
               </q-td>
-              <q-td key="positionNumberOld" :props="props">
-                {{ props.row.positionNumberOld }}
-              </q-td>
-
               <q-td key="organizationPositionOld" :props="props">
                 <div class="table_ellipsis">
                   {{ props.row.organizationPositionOld }}
                 </div>
               </q-td>
-              <q-td key="datetext" :props="props">
-                {{ props.row.datetext }}
+              <q-td key="organization" :props="props">
+                <div class="table_ellipsis">
+                  {{ props.row.organization }}
+                </div>
               </q-td>
               <q-td key="statustext" :props="props">
                 {{ props.row.statustext }}
diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue
index dcebf1ce5..6e2c8469b 100644
--- a/src/modules/06_retirement/components/resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/resign/ResignByid.vue
@@ -173,15 +173,15 @@ const fetchData = async (id: string) => {
       hideLoader();
     });
 };
-const downloadFile = (response: any, filename: string) => {
-  const link = document.createElement("a");
-  var fileName = filename;
-  link.href = window.URL.createObjectURL(new Blob([response.data]));
-  link.setAttribute("download", fileName);
-  document.body.appendChild(link);
-  link.click();
-  document.body.removeChild(link);
-};
+// const downloadFile = (response: any, filename: string) => {
+//   const link = document.createElement("a");
+//   var fileName = filename;
+//   link.href = window.URL.createObjectURL(new Blob([response.data]));
+//   link.setAttribute("download", fileName);
+//   document.body.appendChild(link);
+//   link.click();
+//   document.body.removeChild(link);
+// };
 
 const popUp = (action: "pass" | "passNot") => {
   reasonReign.value = "";