From e3365235c652b869cb5f7e4c060b0a6d9ff4ce9e Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 23 May 2024 13:10:14 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=9C=E0=B8=B4=E0=B8=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/interface/request/main/main.ts            |  6 +-
 src/modules/01_metadataNew/views/position.vue |  2 +-
 .../components/resign/ResignByid.vue          | 98 +++++++++++--------
 src/modules/06_retirement/store.ts            |  2 +
 src/modules/13_salary/views/salaryLists.vue   |  2 +-
 .../components/history/AddPage.vue            |  2 +-
 .../components/history/DialogGov.vue          |  2 +-
 src/modules/15_development/views/MainPage.vue |  4 +-
 .../15_development/views/Scholarship.vue      |  2 +-
 9 files changed, 68 insertions(+), 52 deletions(-)

diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index fbf30d8f4..35fae14ef 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -66,7 +66,7 @@ const menuList = readonly<any[]>([
       },
       {
         key: 2.0,
-        label: "ข้อมูลตำแหน่งข้าราชการฯ",
+        label: "ข้อมูลตำแหน่งข้าราชการ ฯ",
         path: "masterPosition",
       },
       {
@@ -507,7 +507,7 @@ const menuList = readonly<any[]>([
     role: "salary",
     children: [
       {
-        label: "ผังบัญชีเงินเดือนข้าราชการฯ",
+        label: "ผังบัญชีเงินเดือนข้าราชการ ฯ",
         path: "salaryChart",
         role: "salary",
       },
@@ -522,7 +522,7 @@ const menuList = readonly<any[]>([
         role: "salary",
       },
       {
-        label: "เลื่อนเงินเดือนข้าราชการฯ",
+        label: "เลื่อนเงินเดือนข้าราชการ ฯ",
         path: "salaryLists",
         role: "salary",
       },
diff --git a/src/modules/01_metadataNew/views/position.vue b/src/modules/01_metadataNew/views/position.vue
index 0bc59bb19..afce4bba2 100644
--- a/src/modules/01_metadataNew/views/position.vue
+++ b/src/modules/01_metadataNew/views/position.vue
@@ -21,7 +21,7 @@ onMounted(() => {
 
 <template>
   <div class="toptitle text-dark col-12 row items-center">
-    ข้อมูลตำแหน่งข้าราชการฯ
+    ข้อมูลตำแหน่งข้าราชการ ฯ
   </div>
 
   <q-card flat bordered>
diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue
index dd390f9d4..1b0720fdc 100644
--- a/src/modules/06_retirement/components/resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/resign/ResignByid.vue
@@ -18,6 +18,10 @@ import type {
 } from "@/modules/06_retirement/interface/response/Main";
 import type { QTableProps } from "quasar";
 import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
+import type { DataProfile } from "@/modules/05_placement/interface/index/Main";
+
+/** importComponents*/
+import CardProfile from "@/components/CardProfile.vue";
 
 const avatar = ref<string>("");
 const modalPersonal = ref<boolean>(false);
@@ -42,6 +46,8 @@ const { statusText } = RetirementData;
 
 /** ตัวแปร */
 const roleUser = ref<string>("");
+const dataProfile = ref<DataProfile>();
+
 const id = ref<string>(route.params.id.toString());
 const myForm = ref<QForm | null>(null);
 const myFormConfirm = ref<QForm | null>(null);
@@ -166,7 +172,7 @@ const fetchData = async (id: string) => {
     .get(config.API.resingByid(id))
     .then((res: any) => {
       const data = res.data.result;
-      console.log(data);
+      dataProfile.value = data as DataProfile;
 
       let list: TypeFile[] = [];
       if (data.docs.length > 0) {
@@ -190,7 +196,7 @@ const fetchData = async (id: string) => {
       location.value = data.location ?? "";
       status.value = data.status ?? "";
       remarkHorizontal.value = data.remarkHorizontal ?? "-";
-      getAvatar(data.profileId);
+      // getAvatar(data.profileId);
     })
     .catch((e) => {
       messageError($q, e);
@@ -200,19 +206,19 @@ const fetchData = async (id: string) => {
     });
 };
 
-function getAvatar(id: string) {
-  if (id) {
-    http
-      .get(config.API.profileAvaId(id))
-      .then((res) => {
-        console.log(res);
-        const dataList = res.data.result;
-        avatar.value = dataList.avatar;
-      })
-      .catch((e) => {})
-      .finally(() => {});
-  }
-}
+// function getAvatar(id: string) {
+//   if (id) {
+//     http
+//       .get(config.API.profileAvaId(id))
+//       .then((res) => {
+//         console.log(res);
+//         const dataList = res.data.result;
+//         avatar.value = dataList.avatar;
+//       })
+//       .catch((e) => {})
+//       .finally(() => {});
+//   }
+// }
 
 // const downloadFile = (response: any, filename: string) => {
 //   const link = document.createElement("a");
@@ -318,16 +324,19 @@ const saveConditions = () => {
   if (myForm.value !== null) {
     myForm.value.validate().then((success) => {
       if (success) {
-        dialogMessage(
-          $q,
-          "ต้องการแก้ไขข้อมูลหรือไม่?",
-          "แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย",
-          "mdi-help-circle-outline",
-          "ตกลง",
-          "public",
-          async () => await dataSave(),
-          undefined
-        );
+        dialogConfirm($q, () => {
+          dataSave();
+        });
+        // dialogMessage(
+        //   $q,
+        //   "ต้องการแก้ไขข้อมูลหรือไม่?",
+        //   "แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย",
+        //   "mdi-help-circle-outline",
+        //   "ตกลง",
+        //   "public",
+        //   async () => await dataSave(),
+        //   undefined
+        // );
       }
     });
   }
@@ -343,16 +352,19 @@ const conditionSave = () => {
   if (myForm.value !== null) {
     myForm.value.validate().then((success) => {
       if (success) {
-        dialogMessage(
-          $q,
-          "ต้องการแก้ไขข้อมูลหรือไม่?",
-          "แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย",
-          "mdi-help-circle-outline",
-          "ตกลง",
-          "public",
-          async () => await saveData(),
-          undefined
-        );
+        dialogConfirm($q, () => {
+          saveData();
+        });
+        // dialogMessage(
+        //   $q,
+        //   "ต้องการแก้ไขข้อมูลหรือไม่?",
+        //   "แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย",
+        //   "mdi-help-circle-outline",
+        //   "ตกลง",
+        //   "public",
+        //   async () => ,
+        //   undefined
+        // );
       }
     });
   }
@@ -448,11 +460,6 @@ const downloadFile = (response: any, filename: string) => {
   document.body.removeChild(link);
 };
 
-function onclickViewinfo(id: string) {
-  modalPersonal.value = true;
-  personId.value = id;
-}
-
 function updatemodalPersonal(modal: boolean) {
   modalPersonal.value = modal;
 }
@@ -463,7 +470,7 @@ function uploadFiles() {
   showLoader();
   http
     .put(config.API.investigateRelevantUploadFile(id.value), Data)
-    .then((res) => {
+    .then(() => {
       success($q, "อัปโหลดไฟล์สำเร็จ");
     })
     .catch((e) => {
@@ -520,7 +527,10 @@ function confirmRemove(fileId: string) {
     รายละเอียดการลาออกของ
     {{ dataDetail.firstName + "  " + dataDetail.lastName }}
   </div>
-  <q-card bordered class="row col-12 text-dark">
+
+  <CardProfile :data="dataProfile as DataProfile" />
+
+  <!-- <q-card bordered class="row col-12 text-dark">
     <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
       <div class="q-pl-sm text-weight-bold text-subtitle2">
         {{ dataDetail.firstName + "  " + dataDetail.lastName }}
@@ -577,7 +587,7 @@ function confirmRemove(fileId: string) {
         </div>
       </div>
     </div>
-  </q-card>
+  </q-card> -->
 
   <q-card bordered class="row col-12 text-dark q-mt-sm">
     <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
@@ -661,6 +671,7 @@ function confirmRemove(fileId: string) {
       </div>
     </div>
   </q-card>
+
   <q-card v-if="rows.length > 0" bordered class="row col-12 text-dark q-mt-sm">
     <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
       <div class="q-pl-sm text-weight-bold text-dark">เอกสารเพิ่มเติม</div>
@@ -932,6 +943,7 @@ function confirmRemove(fileId: string) {
       </div>
     </div>
   </q-card>
+
   <q-card bordered class="row col-12 text-dark q-mt-sm">
     <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
       <div class="q-pl-sm text-weight-bold text-dark">
diff --git a/src/modules/06_retirement/store.ts b/src/modules/06_retirement/store.ts
index 0a91a5198..f9d24a266 100644
--- a/src/modules/06_retirement/store.ts
+++ b/src/modules/06_retirement/store.ts
@@ -15,6 +15,8 @@ export const useRetirementDataStore = defineStore("retirement", () => {
         return "ส่งรายชื่อไปออกคำสั่ง";
       case "DONE":
         return "ออกคำสั่งเสร็จแล้ว";
+      case "CANCEL":
+        return "ยกเลิกการลาออก";
 
       default:
         return "-";
diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue
index ad76e071c..ea6bfab5b 100644
--- a/src/modules/13_salary/views/salaryLists.vue
+++ b/src/modules/13_salary/views/salaryLists.vue
@@ -366,7 +366,7 @@ onMounted(() => {
 <template>
   <div class="row items-center">
     <div class="toptitle text-dark row items-center q-py-xs">
-      รายการเลื่อนเงินเดือนข้าราชการฯ
+      รายการเลื่อนเงินเดือนข้าราชการ ฯ
     </div>
     <q-space />
     <datepicker
diff --git a/src/modules/15_development/components/history/AddPage.vue b/src/modules/15_development/components/history/AddPage.vue
index 8eabe81bc..da37ed648 100644
--- a/src/modules/15_development/components/history/AddPage.vue
+++ b/src/modules/15_development/components/history/AddPage.vue
@@ -134,7 +134,7 @@ onMounted(() => {
       <!-- Card ข้อมูลข้าราชการฯ -->
       <q-card flat bordered style="border: 1px solid #d6dee1">
         <div class="col-12 text-weight-bold bg-grey-1 q-py-sm q-px-md">
-          ข้อมูลข้าราชการฯ
+          ข้อมูลข้าราชการ ฯ
         </div>
         <div class="col-12"><q-separator /></div>
         <div class="row q-pa-md q-col-gutter-md">
diff --git a/src/modules/15_development/components/history/DialogGov.vue b/src/modules/15_development/components/history/DialogGov.vue
index 42d63bd93..f23272f3e 100644
--- a/src/modules/15_development/components/history/DialogGov.vue
+++ b/src/modules/15_development/components/history/DialogGov.vue
@@ -238,7 +238,7 @@ watch(
 <template>
   <q-dialog v-model="modal" persistent>
     <q-card class="col-12" style="width: 60%">
-      <Header :tittle="'เลือกข้าราชการฯ'" :close="closeDialog" />
+      <Header :tittle="'เลือกข้าราชการ ฯ'" :close="closeDialog" />
       <q-separator />
 
       <q-card-section>
diff --git a/src/modules/15_development/views/MainPage.vue b/src/modules/15_development/views/MainPage.vue
index a29b7688d..5e4365e88 100644
--- a/src/modules/15_development/views/MainPage.vue
+++ b/src/modules/15_development/views/MainPage.vue
@@ -33,6 +33,8 @@ const { showLoader, hideLoader, messageError, dialogMessageNotify } =
 
 const node = ref<any>([]);
 const expanded = ref<string[]>([]);
+const expandedDialog = ref<string[]>([]);
+
 const filter = ref<string>("");
 const filterMain = ref<string>("");
 const splitterModel = ref<number>(60);
@@ -553,7 +555,7 @@ onMounted(() => {
                   :nodes="node"
                   node-key="orgTreeName"
                   label-key="labelName"
-                  v-model:expanded="expanded"
+                  v-model:expanded="expandedDialog"
                   :filter="filter"
                   no-results-label="ไม่พบข้อมูลที่ค้นหา"
                   no-nodes-label="ไม่มีข้อมูล"
diff --git a/src/modules/15_development/views/Scholarship.vue b/src/modules/15_development/views/Scholarship.vue
index 38acec699..b2d8f1729 100644
--- a/src/modules/15_development/views/Scholarship.vue
+++ b/src/modules/15_development/views/Scholarship.vue
@@ -184,7 +184,7 @@ function onDownload() {
     .get(config.API.developmentReportScholarship())
     .then((res) => {
       const dataList = res.data.result;
-      genReportXLSX(dataList, "รายการข้าราชการฯที่ได้รับทุนการศึกษา/ฝึกอบรม");
+      genReportXLSX(dataList, "รายการข้าราชการ ฯ ที่ได้รับทุนการศึกษา/ฝึกอบรม");
     })
     .catch((e) => {
       messageError($q, e);