From 7a394bce3a15d74abef4d91c2775d504ef47c03a Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 15 May 2024 14:59:57 +0700
Subject: [PATCH] =?UTF-8?q?fixing=20=E0=B9=80=E0=B8=A1=E0=B8=99=E0=B8=B9?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=A3=E0=B8=A3=E0=B8=88=E0=B8=B8=20=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=99=E0=B9=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../05_placement/components/Other/Detail.vue  | 12 ++-----
 .../05_placement/components/Other/Main.vue    | 35 +++++++++----------
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/src/modules/05_placement/components/Other/Detail.vue b/src/modules/05_placement/components/Other/Detail.vue
index 9a914a036..07bb5e70d 100644
--- a/src/modules/05_placement/components/Other/Detail.vue
+++ b/src/modules/05_placement/components/Other/Detail.vue
@@ -6,20 +6,13 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import keycloak from "@/plugins/keycloak";
 
-import type { ResponseDataDetail } from "@/modules/05_placement/interface/response/Transfer";
-import type {
-  OtherdataInterface,
-  resApiData,
-} from "@/modules/05_placement/interface/response/OhterMain";
+import type { resApiData } from "@/modules/05_placement/interface/response/OhterMain";
 import type { QForm } from "quasar";
 import type { DataProfile } from "@/modules/05_placement/interface/index/Main";
 
 /** importComponents*/
 
-
 import CardProfile from "@/components/CardProfile.vue";
-import CurruncyInput from "@/components/CurruncyInput.vue";
-
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
 
@@ -102,7 +95,7 @@ const onSubmit = async () => {
         positionTypeOld: positionTypeOld.value,
         positionLevelOld: positionLevelOld.value,
         positionNumberOld: posNo.value,
-        amountOld: Number(salary.value),
+        amountOld: salary.value.toString().replace(/,/g, ""),
         positionDate: date.value,
         militaryDate: militaryDate.value,
         reason: reason.value,
@@ -145,6 +138,7 @@ onMounted(async () => {
   await fetchData();
 });
 </script>
+
 <template>
   <div class="toptitle text-dark col-12 row items-center">
     <q-btn
diff --git a/src/modules/05_placement/components/Other/Main.vue b/src/modules/05_placement/components/Other/Main.vue
index 31f2adc32..93a89aaeb 100644
--- a/src/modules/05_placement/components/Other/Main.vue
+++ b/src/modules/05_placement/components/Other/Main.vue
@@ -186,22 +186,6 @@ const fecthTypeOption = async () => {
     });
 };
 
-//----(ลบข้อมูลจากไอดี)------//
-const deleteOther = async (id: string) => {
-  showLoader();
-  await http
-    .delete(config.API.otherByid(id))
-    .then(() => {
-      success($q, "ลบข้อมูลสำเร็จ");
-    })
-    .catch((e) => {
-      messageError($q, e);
-    })
-    .finally(() => {
-      fecthlistOthet();
-    });
-};
-
 //----(รีเซ็ตข้อมูลในช่อง input)------//
 const resetFilter = () => {
   filterKeyword.value = "";
@@ -224,10 +208,23 @@ const clickClose = () => {
 
 //----(เปิด Dialog ลบข้อมูล)------//
 const clickDelete = (id: string) => {
-  dialogRemove($q, () => deleteOther(id));
+  dialogRemove($q, async () => {
+    showLoader();
+    await http
+      .delete(config.API.otherByid(id))
+      .then(() => {
+        success($q, "ลบข้อมูลสำเร็จ");
+      })
+      .catch((e) => {
+        messageError($q, e);
+      })
+      .finally(() => {
+        fecthlistOthet();
+      });
+  });
 };
 
-//----(เปิดหน้าถัดไป)------//
+//----(เปิดหน้ารายละเอียด)------//
 const nextPage = (id: string) => {
   router.push({
     path: `/other/detail/${id}`,
@@ -351,7 +348,7 @@ onMounted(() => {
                     class="text-red-14"
                     icon="mdi-delete"
                     dense
-                    @click.stop="clickDelete(props.row.personalId)"
+                    @click.stop="clickDelete(props.row.id)"
                     ><q-tooltip>ลบข้อมูล</q-tooltip></q-btn
                   >
                 </q-td>