From 9d0f0eaabff66a5cf7ade02c9c64ba83b48db7c6 Mon Sep 17 00:00:00 2001
From: AnandaTon <ananda@frappet.com>
Date: Wed, 20 Sep 2023 13:03:54 +0700
Subject: [PATCH] =?UTF-8?q?refacter=20=E0=B8=9E=E0=B9=89=E0=B8=99=E0=B8=88?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=81=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../06_retirement/components/DialogFooter.vue | 22 ++++++++-----------
 .../06_retirement/components/DialogHeader.vue | 13 +++++++----
 .../components/Discharged/dischargedMain.vue  |  9 ++++----
 .../Discharged/dischargedRegistry.vue         |  5 +----
 .../components/DismissOrder/DismissOrder.vue  | 11 ++++++----
 .../components/DismissOrder/outRegistry.vue   |  3 ---
 .../components/ExitInterview/exitRegistry.vue |  1 -
 .../components/Expulsion/expulsionMain.vue    |  3 +--
 .../Expulsion/expulsionRegistry.vue           |  9 ++------
 .../components/ListRetirement/AddList.vue     |  5 +----
 .../components/resign/DetailByidDeceased.vue  | 14 ------------
 .../components/resign/ResignOrder.vue         |  2 --
 12 files changed, 34 insertions(+), 63 deletions(-)

diff --git a/src/modules/06_retirement/components/DialogFooter.vue b/src/modules/06_retirement/components/DialogFooter.vue
index d2358bb75..6f75a69b5 100644
--- a/src/modules/06_retirement/components/DialogFooter.vue
+++ b/src/modules/06_retirement/components/DialogFooter.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-
 const props = defineProps({
   editvisible: Boolean,
   modalEdit: Boolean,
@@ -29,9 +28,6 @@ const emit = defineEmits([
 const updateEdit = (value: Boolean) => {
   emit("update:editvisible", value);
 };
-// const cancel = async () => {
-//   props.cancel();
-// };
 const edit = async () => {
   updateEdit(!props.editvisible);
   props.edit();
@@ -39,30 +35,30 @@ const edit = async () => {
 const checkSave = () => {
   props.validate();
   props.save();
-
 };
 </script>
 <template>
   <q-card-actions class="text-primary">
     <q-space />
-    <q-btn 
-      v-if="!editvisible" 
+    <q-btn
+      v-if="!editvisible"
       outline
-      :disabled="editvisible" 
+      :disabled="editvisible"
       :color="editvisible ? 'grey-7' : 'primary'"
-      @click="edit" 
+      @click="edit"
       ><!-- icon="mdi-pencil-outline"
       <q-tooltip>แก้ไขข้อมูล</q-tooltip> -->
     </q-btn>
     <div v-else>
-      <q-btn 
+      <q-btn
         unelevated
         label="บันทึก"
-        :disabled="!editvisible" 
-        :color="!editvisible ? 'grey-7' : 'public'" 
+        :disabled="!editvisible"
+        :color="!editvisible ? 'grey-7' : 'public'"
         @click="checkSave"
       >
-      </q-btn><!-- icon="mdi-content-save-outline">
+      </q-btn
+      ><!-- icon="mdi-content-save-outline">
         <q-tooltip>บันทึก</q-tooltip> -->
     </div>
   </q-card-actions>
diff --git a/src/modules/06_retirement/components/DialogHeader.vue b/src/modules/06_retirement/components/DialogHeader.vue
index a20e917b0..82ba60d98 100644
--- a/src/modules/06_retirement/components/DialogHeader.vue
+++ b/src/modules/06_retirement/components/DialogHeader.vue
@@ -13,17 +13,22 @@ const close = async () => {
 <template>
   <q-toolbar class="q-py-md">
     <q-toolbar-title class="header-text">{{ title }}</q-toolbar-title>
-    <q-btn icon="close" unelevated round dense @click="close" style="color: #ff8080; background-color: #ffdede" />
+    <q-btn
+      icon="close"
+      unelevated
+      round
+      dense
+      @click="close"
+      style="color: #ff8080; background-color: #ffdede"
+    />
   </q-toolbar>
 </template>
 
 <style scoped lang="scss">
-
-
 .header-text {
   font-size: 18px;
   font-weight: 600;
   line-height: 26px;
-  color: #35373C;
+  color: #35373c;
 }
 </style>
diff --git a/src/modules/06_retirement/components/Discharged/dischargedMain.vue b/src/modules/06_retirement/components/Discharged/dischargedMain.vue
index 56507f4c7..86808e68a 100644
--- a/src/modules/06_retirement/components/Discharged/dischargedMain.vue
+++ b/src/modules/06_retirement/components/Discharged/dischargedMain.vue
@@ -5,12 +5,9 @@ import { useQuasar } from "quasar";
 import { useRouter } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 import { useTransferDataStore } from "@/modules/05_placement/store";
-
 import http from "@/plugins/http";
 import config from "@/app.config";
-
 import DialogHeader from "@/modules/06_retirement/components/DialogHeader.vue";
-
 import type { ResponseData } from "@/modules/06_retirement/interface/response/discharged";
 
 const selected = ref<ResponseData[]>([]);
@@ -52,7 +49,9 @@ const visibleColumns2 = ref<string[]>([
   "positionLevel",
   "organizationPositionOld",
   "statustext",
-]); //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
+]);
+
+//ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 const filterKeyword = ref<string>("");
 const filterKeyword2 = ref<string>("");
 const filterRef = ref<any>(null);
@@ -263,7 +262,6 @@ const deleteData = async (id: string) => {
     .delete(config.API.dischargeByid(id))
     .then((res) => {
       success($q, "ลบข้อมูลสำเร็จ");
-      console.log(res);
     })
     .catch((e) => {
       messageError($q, e);
@@ -273,6 +271,7 @@ const deleteData = async (id: string) => {
     });
 };
 
+//ส่งไปออกคำสั่ง
 const saveOrder = async () => {
   const id = selected.value.map((r) => r.id);
   const body = {
diff --git a/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue b/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue
index 38d2f7bc7..a781f114c 100644
--- a/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue
+++ b/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue
@@ -20,7 +20,6 @@ const mixin = useCounterMixin();
 const dataId = route.params.id.toString();
 const {
   date2Thai,
-  dialogMessage,
   messageError,
   showLoader,
   hideLoader,
@@ -61,7 +60,6 @@ const responseData = ref<ResponseDataDetail>({
 onMounted(async () => {
   if (keycloak.tokenParsed != null) {
     roleAdmin.value = await keycloak.tokenParsed.role.includes("placement1");
-    console.log("roleAdmin===>", roleAdmin.value);
   }
   await getData();
 });
@@ -124,6 +122,7 @@ const conditionSave = async () => {
   }
 };
 
+//บันทึกข้อมูล
 const saveData = async () => {
   const body = {
     organization: organization.value,
@@ -139,8 +138,6 @@ const saveData = async () => {
   await http
     .put(config.API.dischargeByid(dataId), body)
     .then((res: any) => {
-      //   const data = res.data.result;
-      //   console.log(data);
       success($q, "แก้ไขข้อมูลเพื่อลงบัญชีแนบท้ายสำเร็จ");
       edit.value = false;
     })
diff --git a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
index d9a8e1330..da7362a38 100644
--- a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
+++ b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
@@ -5,12 +5,9 @@ import { useQuasar } from "quasar";
 import { useRouter } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 import { useTransferDataStore } from "@/modules/05_placement/store";
-
 import http from "@/plugins/http";
 import config from "@/app.config";
-
 import DialogHeader from "@/modules/06_retirement/components/DialogHeader.vue";
-
 import type { ResponseData } from "@/modules/06_retirement/interface/response/out";
 
 const selected = ref<ResponseData[]>([]);
@@ -185,6 +182,7 @@ const columns2 = ref<QTableProps["columns"]>([
 onMounted(async () => {
   await getData();
 });
+
 const openModalOrder = () => {
   openModal();
   const row = filters.value.filter(
@@ -193,6 +191,7 @@ const openModalOrder = () => {
   );
   rows2.value = row;
 };
+
 const getData = async () => {
   showLoader();
   await http
@@ -234,6 +233,7 @@ const getData = async () => {
       hideLoader();
     });
 };
+
 const clickDelete = async (id: string) => {
   dialogMessage(
     $q,
@@ -246,12 +246,12 @@ const clickDelete = async (id: string) => {
     async () => await getData()
   );
 };
+
 const deleteData = async (id: string) => {
   await http
     .delete(config.API.outByid(id))
     .then((res) => {
       success($q, "ลบข้อมูลสำเร็จ");
-      console.log(res);
     })
     .catch((e) => {
       messageError($q, e);
@@ -260,6 +260,8 @@ const deleteData = async (id: string) => {
       await getData();
     });
 };
+
+//ส่งไปออกคำสั่ง
 const saveOrder = async () => {
   const id = selected.value.map((r) => r.id);
   const body = {
@@ -280,6 +282,7 @@ const saveOrder = async () => {
       hideLoader();
     });
 };
+
 const openModal = () => (modal.value = true);
 const closeModal = () => (modal.value = false);
 
diff --git a/src/modules/06_retirement/components/DismissOrder/outRegistry.vue b/src/modules/06_retirement/components/DismissOrder/outRegistry.vue
index 67c93f097..74597a732 100644
--- a/src/modules/06_retirement/components/DismissOrder/outRegistry.vue
+++ b/src/modules/06_retirement/components/DismissOrder/outRegistry.vue
@@ -59,7 +59,6 @@ const responseData = ref<ResponseDataDetail>({
 onMounted(async () => {
   if (keycloak.tokenParsed != null) {
     roleAdmin.value = await keycloak.tokenParsed.role.includes("placement1");
-    console.log("roleAdmin===>", roleAdmin.value);
   }
   await getData();
 });
@@ -140,8 +139,6 @@ const saveData = async () => {
   await http
     .put(config.API.outByid(dataId), body)
     .then((res: any) => {
-      //   const data = res.data.result;
-      //   console.log(data);
       success($q, "แก้ไขข้อมูลเพื่อลงบัญชีแนบท้ายสำเร็จ");
       edit.value = false;
     })
diff --git a/src/modules/06_retirement/components/ExitInterview/exitRegistry.vue b/src/modules/06_retirement/components/ExitInterview/exitRegistry.vue
index 607f14281..6d2ed5a64 100644
--- a/src/modules/06_retirement/components/ExitInterview/exitRegistry.vue
+++ b/src/modules/06_retirement/components/ExitInterview/exitRegistry.vue
@@ -117,7 +117,6 @@ const adjust_option = ref<any>([
 onMounted(async () => {
   if (keycloak.tokenParsed != null) {
     roleAdmin.value = await keycloak.tokenParsed.role.includes("placement1");
-    console.log("roleAdmin===>", roleAdmin.value);
   }
   await getData();
 });
diff --git a/src/modules/06_retirement/components/Expulsion/expulsionMain.vue b/src/modules/06_retirement/components/Expulsion/expulsionMain.vue
index cdc7e1c33..cda8cd274 100644
--- a/src/modules/06_retirement/components/Expulsion/expulsionMain.vue
+++ b/src/modules/06_retirement/components/Expulsion/expulsionMain.vue
@@ -30,7 +30,6 @@ const {
   showLoader,
   hideLoader,
   success,
-  dialogMessage,
   dialogRemove,
 } = mixin;
 const { statusText } = transferStore;
@@ -258,7 +257,6 @@ const deleteData = async (id: string) => {
     .delete(config.API.expulsionByid(id))
     .then((res) => {
       success($q, "ลบข้อมูลสำเร็จ");
-      console.log(res);
     })
     .catch((e) => {
       messageError($q, e);
@@ -269,6 +267,7 @@ const deleteData = async (id: string) => {
     });
 };
 
+//ส่งไปออกคำสั่ง
 const saveOrder = async () => {
   const id = selected.value.map((r) => r.id);
   const body = {
diff --git a/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue b/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue
index 1172a5b2e..bdee70e84 100644
--- a/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue
+++ b/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue
@@ -9,11 +9,8 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import keycloak from "@/plugins/keycloak";
 
-import type { QTableProps, QForm } from "quasar";
-import type {
-  TypeFile,
-  ResponseDataDetail,
-} from "@/modules/06_retirement/interface/response/expulsion";
+import type { QForm } from "quasar";
+import type { ResponseDataDetail } from "@/modules/06_retirement/interface/response/expulsion";
 
 const $q = useQuasar();
 const route = useRoute();
@@ -23,7 +20,6 @@ const mixin = useCounterMixin();
 const dataId = route.params.id.toString();
 const {
   date2Thai,
-  dialogMessage,
   messageError,
   showLoader,
   hideLoader,
@@ -64,7 +60,6 @@ const responseData = ref<ResponseDataDetail>({
 onMounted(async () => {
   if (keycloak.tokenParsed != null) {
     roleAdmin.value = await keycloak.tokenParsed.role.includes("placement1");
-    console.log("roleAdmin===>", roleAdmin.value);
   }
   await getData();
 });
diff --git a/src/modules/06_retirement/components/ListRetirement/AddList.vue b/src/modules/06_retirement/components/ListRetirement/AddList.vue
index aa0e0f08e..09bfab931 100644
--- a/src/modules/06_retirement/components/ListRetirement/AddList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/AddList.vue
@@ -84,7 +84,6 @@ const fecthlistRetire = async () => {
   await http
     .get(config.API.profileOrganizRoot)
     .then((res) => {
-      console.log(res);
       const id = res.data.result[0].id;
       if (id !== "") {
         findlist(id);
@@ -117,9 +116,7 @@ const findlist = async (id: string) => {
         organizationOrganization: e.oc,
       }));
     })
-    .catch((e) => {
-      console.log(e);
-    })
+    .catch((e) => {})
     .finally(() => {
       hideLoader();
     });
diff --git a/src/modules/06_retirement/components/resign/DetailByidDeceased.vue b/src/modules/06_retirement/components/resign/DetailByidDeceased.vue
index 920e5cfda..8c4b8f154 100644
--- a/src/modules/06_retirement/components/resign/DetailByidDeceased.vue
+++ b/src/modules/06_retirement/components/resign/DetailByidDeceased.vue
@@ -160,20 +160,6 @@ onMounted(async () => {
   await getData();
 });
 
-const getList = async () => {
-  showLoader();
-  await http
-    .get(config.API.detailByidDeceased(profileId.value))
-    .then((res) => {
-      const data = res.data.result;
-    })
-    .catch((e) => {
-      messageError($q, e);
-    })
-    .finally(async () => {
-      hideLoader();
-    });
-};
 const listModal = async (id: string) => {
   showLoader();
   await http
diff --git a/src/modules/06_retirement/components/resign/ResignOrder.vue b/src/modules/06_retirement/components/resign/ResignOrder.vue
index 256d80c95..cc4466b62 100644
--- a/src/modules/06_retirement/components/resign/ResignOrder.vue
+++ b/src/modules/06_retirement/components/resign/ResignOrder.vue
@@ -326,7 +326,6 @@ const addedOrderTypeValues: string[] = [];
 const OrderTypeFilter = async () => {
   for (let data of OriginalData.value) {
     const OrderTypeValue = data.OrderType;
-    console.log(OrderTypeValue);
     if (!addedOrderTypeValues.includes(OrderTypeValue)) {
       OrderTypeOption.push({
         id: OrderTypeOption.length,
@@ -342,7 +341,6 @@ const addedOrderStatusValues: string[] = [];
 const OrderStatusFilter = async () => {
   for (let data of OriginalData.value) {
     const OrderStatusValue = data.OrderStatus;
-    console.log(OrderStatusValue);
 
     if (
       OrderStatusValue === null ||