From 4cfcc2d018bdf1bdd9ed6a9e3ac7db64976f2d2e Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 13 Mar 2025 15:46:55 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9A=E0=B8=A3=E0=B8=A3=E0=B8=88=E0=B8=B8?=
 =?UTF-8?q?=20=E0=B8=97=E0=B8=94=E0=B8=A5=E0=B8=AD=E0=B8=87=E0=B8=87?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppointMent/AppointMentDetail.vue         |   3 +-
 .../Help-Government/HelpGovernmentDetail.vue  |   5 +-
 .../components/Other/OtherDetail.vue          |   5 +-
 .../PersonalDetail/DialogCheckInformation.vue | 146 +++---------------
 .../PersonalDetail/Information/Certicate.vue  |  23 +--
 .../PersonalDetail/Information/Education.vue  |  19 +--
 .../Information/Information.vue               |   3 +-
 .../PersonalList/DialogSelectOrg.vue          |   3 +-
 .../components/PersonalList/Table.vue         |   5 +-
 .../components/Receive/receiveDetail.vue      |   4 +-
 .../Repatriate/RepatriateDetail.vue           |   3 +-
 .../components/Transfer/TransferDetail.vue    |   3 +-
 .../probation/FormEvaluation/FormEvaluate.vue |  16 +-
 .../FormEvaluation/FormEvaluateAdd.vue        |   8 +-
 .../FormEvaluation/FormEvaluateScore.vue      |  12 +-
 .../FormEvaluation/FormEvaluateScoreAdd.vue   |  12 +-
 .../probation/FormEvaluation/FormReport.vue   |   7 +-
 .../FormEvaluation/FormSaveResult.vue         |  12 +-
 .../FormEvaluation/FormSaveResultAdd.vue      |   9 +-
 .../FormSaveResultAddCommander.vue            |   7 +-
 .../FormEvaluation/FormSaveResultCommader.vue |   7 +-
 21 files changed, 113 insertions(+), 199 deletions(-)

diff --git a/src/modules/05_placement/components/AppointMent/AppointMentDetail.vue b/src/modules/05_placement/components/AppointMent/AppointMentDetail.vue
index 31c93a36d..f89bcba65 100644
--- a/src/modules/05_placement/components/AppointMent/AppointMentDetail.vue
+++ b/src/modules/05_placement/components/AppointMent/AppointMentDetail.vue
@@ -25,6 +25,7 @@ const {
   hideLoader,
   success,
   dialogConfirm,
+  convertDateToAPI
 } = useCounterMixin();
 
 const paramsId = route.params.id; //id รายการที่เลือก
@@ -90,7 +91,7 @@ function putAppointment() {
         positionNumberOld: posNo.value,
         amountOld: salary.value.toString().replace(/,/g, ""),
         reason: reason.value,
-        positionDate: date.value,
+        positionDate: convertDateToAPI(date.value),
       };
       showLoader();
       await http
diff --git a/src/modules/05_placement/components/Help-Government/HelpGovernmentDetail.vue b/src/modules/05_placement/components/Help-Government/HelpGovernmentDetail.vue
index 5ccf51fd4..a3b5a16c4 100644
--- a/src/modules/05_placement/components/Help-Government/HelpGovernmentDetail.vue
+++ b/src/modules/05_placement/components/Help-Government/HelpGovernmentDetail.vue
@@ -29,6 +29,7 @@ const {
   hideLoader,
   success,
   findOrgName,
+  convertDateToAPI
 } = mixin;
 
 const dataId = route.params.id as string;
@@ -83,8 +84,8 @@ function onSubmit() {
       const body = {
         organizationPositionOld: organizationPositionOld.value,
         organization: organization.value,
-        dateStart: dateStart.value,
-        dateEnd: dateEnd.value,
+        dateStart: convertDateToAPI(dateStart.value),
+        dateEnd: convertDateToAPI(dateEnd.value),
         reason: reason.value,
       };
       await http
diff --git a/src/modules/05_placement/components/Other/OtherDetail.vue b/src/modules/05_placement/components/Other/OtherDetail.vue
index 7abc5c3a5..f89603145 100644
--- a/src/modules/05_placement/components/Other/OtherDetail.vue
+++ b/src/modules/05_placement/components/Other/OtherDetail.vue
@@ -29,6 +29,7 @@ const {
   dialogConfirm,
   findOrgName,
   success,
+  convertDateToAPI,
 } = mixin;
 
 const paramsId = route.params.id;
@@ -98,8 +99,8 @@ function onSubmit() {
         positionLevelOld: positionLevelOld.value,
         positionNumberOld: posNo.value,
         amountOld: salary.value.toString().replace(/,/g, ""),
-        positionDate: date.value,
-        militaryDate: militaryDate.value,
+        positionDate: convertDateToAPI(date.value),
+        militaryDate: convertDateToAPI(militaryDate.value),
         reason: reason.value,
       };
       await http
diff --git a/src/modules/05_placement/components/PersonalDetail/DialogCheckInformation.vue b/src/modules/05_placement/components/PersonalDetail/DialogCheckInformation.vue
index d0ff69c33..461dfcbe3 100644
--- a/src/modules/05_placement/components/PersonalDetail/DialogCheckInformation.vue
+++ b/src/modules/05_placement/components/PersonalDetail/DialogCheckInformation.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { watch, reactive, type PropType, ref } from "vue";
 import { useQuasar } from "quasar";
-import { useRoute, useRouter } from "vue-router";
+import { useRoute } from "vue-router";
 
 import http from "@/plugins/http";
 import config from "@/app.config";
@@ -20,8 +20,6 @@ import type {
   Family,
   AddressData,
   AddressOps,
-  Address,
-  optionData,
 } from "@/modules/05_placement/interface/index/Main";
 
 import Header from "@/components/DialogHeader.vue";
@@ -34,10 +32,9 @@ const idCard = defineModel<string>("idCard", { required: true });
 
 const $q = useQuasar();
 const route = useRoute();
-const router = useRouter();
 const mixin = useCounterMixin();
 const profileStore = useProfileDataStore();
-const { changeRetireText, changeBirth } = profileStore;
+const { changeBirth } = profileStore;
 const {
   showLoader,
   hideLoader,
@@ -45,6 +42,7 @@ const {
   dialogConfirm,
   modalError,
   success,
+  convertDateToAPI,
 } = mixin;
 const store = useLinkageStore();
 
@@ -116,80 +114,26 @@ function closeDialog() {
 }
 
 function onSubmit() {
-  const body = {
-    citizenId: formInformations.idCard,
-    prefix: formInformations.prefixId,
-    firstName: formInformations.firstname,
-    lastName: formInformations.lastname,
-    gender: formInformations.genderId,
-    nationality: formInformations.nationality,
-    race: formInformations.race,
-    religion: formInformations.religionId,
-    birthDate: formInformations.dateOfBirth,
-    bloodGroup: formInformations.bloodGroupId,
-    relationship: formInformations.relationshipId,
-    telephoneNumber: formInformations.telephone,
-
-    registrationSame: addressData.value.registSame == "1",
-    registrationAddress: addressData.value.registAddress,
-    registrationSubDistrictId: registAddress.subDistrictId,
-    registrationDistrictId: registAddress.districtId,
-    registrationProvinceId: registAddress.provinceId,
-    registrationZipCode: registAddress.zipCode,
-    currentAddress:
-      addressData.value.registSame == "1"
-        ? addressData.value.registAddress
-        : addressData.value.currentAddress,
-    currentSubDistrictId:
-      addressData.value.registSame == "1"
-        ? registAddress.subDistrictId
-        : currentAddress.subDistrictId,
-    currentDistrictId:
-      addressData.value.registSame == "1"
-        ? registAddress.districtId
-        : currentAddress.districtId,
-    currentProvinceId:
-      addressData.value.registSame == "1"
-        ? registAddress.provinceId
-        : currentAddress.provinceId,
-    currentZipCode:
-      addressData.value.registSame == "1"
-        ? registAddress.zipCode
-        : currentAddress.zipCode,
-
-    couple: familyData.value.couple == "1",
-    couplePrefix: familyData.value.marryPrefixId,
-    coupleFirstName: familyData.value.marryFirstName,
-    coupleLastName: familyData.value.marryLastName,
-    coupleLastNameOld: "",
-    coupleCareer: familyData.value.marryOccupation,
-
-    fatherPrefix: familyData.value.fatherPrefixId,
-    fatherFirstName: familyData.value.fatherFirstName,
-    fatherLastName: familyData.value.fatherLastName,
-    fatherCareer: familyData.value.fatherOccupation,
-
-    motherPrefix: familyData.value.motherPrefixId,
-    motherFirstName: familyData.value.motherFirstName,
-    motherLastName: familyData.value.motherLastName,
-    motherCareer: familyData.value.motherOccupation,
-  };
-
   dialogConfirm($q, async () => {
     if (age.value == false) {
       modalError($q, "พบข้อผิดพลาด", "วันเกิดไม่ถูกต้อง");
       return;
     } else {
-      showLoader();
-      await upDateInfomation();
-      await upDateAddress();
-      await upDateFamily();
+      try {
+        showLoader();
+        await upDateInfomation();
+        await upDateAddress();
+        await upDateFamily();
 
-      success($q, "บันทึกข้อมูลสำเร็จ");
-      closeDialog();
-      await props.getAll?.();
-      await changeBirth(formInformations.dateOfBirth ?? new Date());
-      hideLoader();
+        success($q, "บันทึกข้อมูลสำเร็จ");
+        closeDialog();
+        await props.getAll?.();
+        await changeBirth(formInformations.dateOfBirth ?? new Date());
+      } catch (err) {
+        messageError($q, err);
+      } finally {
+        hideLoader();
+      }
     }
   });
 }
@@ -222,49 +166,12 @@ async function amiRequest() {
 
   familyData.value.fatherFirstName = data.value.fatherName;
   familyData.value.motherFirstName = data.value.motherName;
-
-  // data.value = {
-  //   titleCode: 3,
-  //   titleDesc: "นาย",
-  //   titleName: "นาย",
-  //   titleSex: 1,
-  //   firstName: "สุพลชัย",
-  //   middleName: "",
-  //   lastName: "พูลสวัสดิ์",
-  //   genderCode: 1,
-  //   genderDesc: "ชาย",
-  //   dateOfBirth: 25211228,
-  //   nationalityCode: 99,
-  //   nationalityDesc: "ไทย",
-  //   ownerStatusDesc: "เจ้าบ้าน",
-  //   statusOfPersonCode: 0,
-  //   statusOfPersonDesc: "บุคคลนี้มีภูมิลำเนาอยู่ในบ้านนี้",
-  //   dateOfMoveIn: 25580728,
-  //   age: 45,
-
-  //   fatherPersonalID: 3102100621479,
-  //   fatherName: "บุญเชิด",
-  //   fatherNationalityCode: 99,
-  //   fatherNationalityDesc: "ไทย",
-
-  //   motherPersonalID: 3102100621487,
-  //   motherName: "พยอม",
-  //   motherNationalityCode: 99,
-  //   motherNationalityDesc: "ไทย",
-
-  //   fullnameAndRank: "นายสุพลชัย พูลสวัสดิ์",
-  //   englishTitleDesc: "MR.",
-  //   englishFirstName: "SUPHONCHAI",
-  //   englishMiddleName: "",
-  //   englishLastName: "PHOONSAWAT",
-  // };
 }
 
 /**
  * อัพเดตข้อมูลส่วนตัว
  */
 async function upDateInfomation() {
-  showLoader();
   const body: any = {
     citizenId: formInformations.idCard,
     prefix: formInformations.prefixId,
@@ -274,24 +181,18 @@ async function upDateInfomation() {
     nationality: formInformations.nationality,
     race: formInformations.race,
     religion: formInformations.religionId,
-    birthDate: formInformations.dateOfBirth,
+    birthDate: convertDateToAPI(formInformations.dateOfBirth),
     bloodGroup: formInformations.bloodGroupId,
     relationship: formInformations.relationshipId,
     telephoneNumber: formInformations.telephone,
   };
-  showLoader();
   await http
     .put(
       config.API.placementInformationId(route.params.personalId.toString()),
       body
     )
-    .then(async () => {})
     .catch((e) => {
       messageError($q, e);
-      hideLoader();
-    })
-    .finally(() => {
-      hideLoader();
     });
 }
 
@@ -332,12 +233,10 @@ async function upDateAddress() {
       config.API.placementAddressId(route.params.personalId.toString()),
       body
     )
-    .then(async () => {})
+
     .catch((e) => {
       messageError($q, e);
-      hideLoader();
-    })
-    .finally(() => {});
+    });
 }
 
 /** อัพเดตข้อมูลครอบครัว */
@@ -360,12 +259,9 @@ async function upDateFamily() {
   };
   await http
     .put(config.API.placementFamilyId(route.params.personalId.toString()), body)
-    .then(async () => {})
     .catch((e) => {
       messageError($q, e);
-      hideLoader();
-    })
-    .finally(() => {});
+    });
 }
 
 /** เช็คค่า modal เมื่อเป็น true ใช้งาน ฟังชั่น */
diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue b/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue
index 446df1a7f..f2b171e81 100644
--- a/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue
@@ -57,6 +57,7 @@ const {
   showLoader,
   hideLoader,
   dialogConfirm,
+  convertDateToAPI,
 } = mixin;
 const route = useRoute();
 const id = ref<string>("");
@@ -263,7 +264,7 @@ const clickNext = async () => {
 /**
  * กดดูข้อมูลต่อไป
  */
-const getData = () => {
+async function getData() {
   const row = rows.value[rowIndex.value];
   certificateNo.value = row.certificateNo;
   issuer.value = row.issuer;
@@ -271,12 +272,12 @@ const getData = () => {
   expireDate.value = row.expireDate;
   certificateType.value = row.certificateType;
   id.value = row.id;
-};
+}
 
 /**
  * เช็คปุ่มดูข้อมูล ย้อน กับ ต่อไป ว่าต้องแสดงไหม
  */
-const checkRowPage = () => {
+async function checkRowPage() {
   editRow.value = false;
   next.value = true;
   previous.value = true;
@@ -286,7 +287,7 @@ const checkRowPage = () => {
   if (rowIndex.value - 1 < 0) {
     previous.value = false;
   }
-};
+}
 
 /**
  * กดปุ่มแก้ไขใน dialog
@@ -302,7 +303,7 @@ const clickEdit = () => {
  */
 const clickAdd = async () => {
   editRow.value = false;
-  await addData();
+  addData();
 };
 
 /**
@@ -310,9 +311,9 @@ const clickAdd = async () => {
  */
 const clickSave = async () => {
   if (modalEdit.value) {
-    await dialogConfirm($q, () => editData());
+    dialogConfirm($q, () => editData());
   } else {
-    await dialogConfirm($q, () => saveData());
+    dialogConfirm($q, () => saveData());
   }
 };
 
@@ -326,8 +327,8 @@ const saveData = async () => {
       id: id.value,
       certificateNo: certificateNo.value,
       issuer: issuer.value,
-      issueDate: new Date(issueDate.value),
-      expireDate: new Date(expireDate.value),
+      issueDate: convertDateToAPI(new Date(issueDate.value)),
+      expireDate: convertDateToAPI(new Date(expireDate.value)),
       certificateType: certificateType.value,
     })
     .then(async () => {
@@ -353,8 +354,8 @@ const editData = async () => {
       id: id.value,
       certificateNo: certificateNo.value,
       issuer: issuer.value,
-      issueDate: new Date(issueDate.value),
-      expireDate: new Date(expireDate.value),
+      issueDate: convertDateToAPI(new Date(issueDate.value)),
+      expireDate: convertDateToAPI(new Date(expireDate.value)),
       certificateType: certificateType.value,
     })
     .then(async () => {
diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Education.vue b/src/modules/05_placement/components/PersonalDetail/Information/Education.vue
index 1cd7825b1..4e76ab812 100644
--- a/src/modules/05_placement/components/PersonalDetail/Information/Education.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/Education.vue
@@ -38,6 +38,7 @@ const {
   hideLoader,
   dialogRemove,
   dialogConfirm,
+  convertDateToAPI,
 } = mixin;
 
 const props = defineProps({
@@ -444,15 +445,15 @@ const saveData = async () => {
       durationYear: Number(durationYear.value),
       other: other.value,
       fundName: fundName.value,
-      finishDate: dateToISO(finishDate.value),
+      finishDate: convertDateToAPI(finishDate.value),
       startDate:
         isDate.value == "true"
-          ? new Date(startDate2.value)
-          : new Date(`${startDate.value}-01-01`),
+          ? convertDateToAPI(new Date(startDate2.value))
+          : convertDateToAPI(new Date(`${startDate.value}-01-01`)),
       endDate:
         isDate.value == "true"
-          ? new Date(endDate2.value)
-          : new Date(`${endDate.value}-01-01`),
+          ? convertDateToAPI(new Date(endDate2.value))
+          : convertDateToAPI(new Date(`${endDate.value}-01-01`)),
       isDate: isDate.value == "true",
     })
     .then(async () => {
@@ -492,12 +493,12 @@ const editData = async () => {
       finishDate: new Date(finishDate.value),
       startDate:
         isDate.value == "true"
-          ? new Date(startDate2.value)
-          : new Date(`${startDate.value}-01-01`),
+          ? convertDateToAPI(new Date(startDate2.value))
+          : convertDateToAPI(new Date(`${startDate.value}-01-01`)),
       endDate:
         isDate.value == "true"
-          ? new Date(endDate2.value)
-          : new Date(`${endDate.value}-01-01`),
+          ? convertDateToAPI(new Date(endDate2.value))
+          : convertDateToAPI(new Date(`${endDate.value}-01-01`)),
       isDate: isDate.value == "true",
     })
     .then(async () => {
diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Information.vue b/src/modules/05_placement/components/PersonalDetail/Information/Information.vue
index 47c53d6c5..ace0d61c2 100644
--- a/src/modules/05_placement/components/PersonalDetail/Information/Information.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/Information.vue
@@ -33,6 +33,7 @@ const {
   showLoader,
   hideLoader,
   dialogConfirm,
+  convertDateToAPI,
 } = mixin;
 
 const props = defineProps({
@@ -208,7 +209,7 @@ const editData = async () => {
       nationality: informaData.value.nationality,
       race: informaData.value.race,
       religion: informaData.value.religionId,
-      birthDate: informaData.value.dateOfBirth,
+      birthDate: convertDateToAPI(informaData.value.dateOfBirth),
       bloodGroup: informaData.value.bloodGroupId,
       relationship: informaData.value.relationshipId,
       telephoneNumber: informaData.value.telephone,
diff --git a/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue b/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
index 06ee7b79f..3f7bbcd0c 100644
--- a/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
+++ b/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
@@ -36,6 +36,7 @@ const {
   messageError,
   dialogMessageNotify,
   dialogConfirm,
+  convertDateToAPI,
 } = useCounterMixin();
 
 /**props*/
@@ -233,7 +234,7 @@ async function onClickSubmit() {
         posTypeName: selectedPos.value[0].posTypeName, //ชื่อตำแหน่ง
         posLevelId: selectedPos.value[0].posLevelId, //ชื่อตำแหน่ง
         posLevelName: selectedPos.value[0].posLevelName, //ชื่อตำแหน่ง
-        reportingDate: datePos.value,
+        reportingDate: convertDateToAPI(datePos.value),
         posmasterId: dataPosMaster.id,
       };
 
diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index d9f57abed..6d5d2af9b 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -39,6 +39,7 @@ const {
   dialogConfirm,
   date2Thai,
   onSearchDataTable,
+  convertDateToAPI,
 } = mixin;
 
 /** รับค่ามาจากหน้าหลัก */
@@ -732,7 +733,9 @@ function onSubmitDate() {
   dialogConfirm($q, () => {
     showLoader();
     http
-      .put(config.API.clearDate(rowId.value), { date: reportingDate.value })
+      .put(config.API.clearDate(rowId.value), {
+        date: convertDateToAPI(reportingDate.value),
+      })
       .then(async () => {
         await Promise.all([getTable(), props.statCard()]);
         await success($q, "บันทึกข้อมูลสำเร็จ");
diff --git a/src/modules/05_placement/components/Receive/receiveDetail.vue b/src/modules/05_placement/components/Receive/receiveDetail.vue
index e8261e6d3..85c57430b 100644
--- a/src/modules/05_placement/components/Receive/receiveDetail.vue
+++ b/src/modules/05_placement/components/Receive/receiveDetail.vue
@@ -38,7 +38,7 @@ const {
   showLoader,
   hideLoader,
   success,
-  dateToISO,
+  convertDateToAPI,
   dialogConfirm,
 } = mixin;
 
@@ -454,7 +454,7 @@ function saveData() {
         lastname: informaData.value.lastname,
         dateOfBirth:
           informaData.value.birthDate !== null
-            ? dateToISO(informaData.value.birthDate)
+            ? convertDateToAPI(informaData.value.birthDate)
             : null,
         gender: informaData.value.genderId,
         nationality: informaData.value.nationality,
diff --git a/src/modules/05_placement/components/Repatriate/RepatriateDetail.vue b/src/modules/05_placement/components/Repatriate/RepatriateDetail.vue
index 3a6f43974..1f7f682f8 100644
--- a/src/modules/05_placement/components/Repatriate/RepatriateDetail.vue
+++ b/src/modules/05_placement/components/Repatriate/RepatriateDetail.vue
@@ -28,6 +28,7 @@ const {
   hideLoader,
   success,
   dialogConfirm,
+  convertDateToAPI,
   findOrgName,
 } = useCounterMixin();
 
@@ -95,7 +96,7 @@ function onSubmit() {
         amountOld: salary.value,
         organization: organization.value,
         date: date.value,
-        dateRepatriation: dateRepatriation.value,
+        dateRepatriation: convertDateToAPI(dateRepatriation.value),
         reason: reason.value,
       };
       showLoader();
diff --git a/src/modules/05_placement/components/Transfer/TransferDetail.vue b/src/modules/05_placement/components/Transfer/TransferDetail.vue
index 75a1b6f01..2f1824c59 100644
--- a/src/modules/05_placement/components/Transfer/TransferDetail.vue
+++ b/src/modules/05_placement/components/Transfer/TransferDetail.vue
@@ -33,6 +33,7 @@ const {
   hideLoader,
   success,
   dialogConfirm,
+  convertDateToAPI,
 } = mixin;
 
 const myForm = ref<QForm | null>(null);
@@ -252,7 +253,7 @@ function onSubmit() {
         organization: organization.value,
         reason: reason.value,
         organizationPositionOld: organizationPositionOld.value,
-        date: date.value,
+        date: convertDateToAPI(date.value),
         positionTypeOld: positionTypeOld.value,
         positionLevelOld: positionLevelOld.value,
         positionNumberOld: posNo.value,
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
index 8e14422e4..9e3d35c81 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
@@ -24,7 +24,7 @@ const {
   showLoader,
   hideLoader,
   success,
-  dateToISO,
+  convertDateToAPI,
   dialogConfirm,
 } = mixin;
 
@@ -228,8 +228,8 @@ function savaForm() {
 function save() {
   const data = {
     evaluate_no: evaluate_no.value,
-    start_date: start_date.value,
-    date_finish: date_finish.value,
+    start_date: convertDateToAPI(start_date.value),
+    date_finish: convertDateToAPI(date_finish.value),
     knowledge_level: knowledge_level.value,
     skill_level: skill_level.value,
     competency_level: competency_level.value,
@@ -256,7 +256,7 @@ function save() {
     self_learning: Number(self_learning.value),
     training_seminar: Number(training_seminar.value),
     other_training: Number(other_training.value),
-    commander_dated: dateToISO(dateAutherise.value),
+    commander_dated: convertDateToAPI(dateAutherise.value),
   };
 
   dialogConfirm($q, async () => {
@@ -266,12 +266,12 @@ function save() {
         config.API.editFormEvaluateCommader(assignId.value, evaluate_id.value),
         data
       )
-      .then((res: any) => {
+      .then(() => {
         status.value = false;
         success($q, "บันทึกสำเร็จ");
         hideLoader();
       })
-      .catch((e: any) => {
+      .catch((e) => {
         messageError($q, e);
         hideLoader();
       });
@@ -304,7 +304,9 @@ onMounted(async () => {
       <div v-if="!status">
         <q-btn
           v-if="
-            !checkRoutePermisson && probationStore.dataPermissions?.tab4.isEdit && !isCheckFile
+            !checkRoutePermisson &&
+            probationStore.dataPermissions?.tab4.isEdit &&
+            !isCheckFile
           "
           dense
           flat
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateAdd.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateAdd.vue
index bc136102f..f4d3f0f09 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateAdd.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateAdd.vue
@@ -18,7 +18,7 @@ const {
   showLoader,
   hideLoader,
   success,
-  dateToISO,
+  convertDateToAPI,
   dialogConfirm,
   dialogMessageNotify,
 } = mixin;
@@ -197,8 +197,8 @@ async function fecthAssign(id: string) {
 function putformData() {
   const data = {
     evaluate_no: evaluate_no.value,
-    start_date: start_date.value,
-    date_finish: date_finish.value,
+    start_date: convertDateToAPI(start_date.value),
+    date_finish: convertDateToAPI(date_finish.value),
     knowledge_level: knowledge_level.value,
     skill_level: skill_level.value,
     competency_level: competency_level.value,
@@ -225,7 +225,7 @@ function putformData() {
     self_learning: Number(self_learning.value),
     training_seminar: Number(training_seminar.value),
     other_training: Number(other_training.value),
-    commander_dated: dateToISO(dateAutherise.value),
+    commander_dated: convertDateToAPI(dateAutherise.value),
   };
   dialogConfirm($q, async () => {
     showLoader();
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
index a6f1eb53c..ac3e0ef5f 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
@@ -30,7 +30,7 @@ const {
   messageError,
   showLoader,
   hideLoader,
-  dateToISO,
+  convertDateToAPI,
   success,
   dialogConfirm,
 } = mixin;
@@ -364,8 +364,8 @@ function savaForm() {
 function putformData() {
   const data = {
     evaluate_no: evaluate_no.value,
-    start_date: start_date.value,
-    date_finish: date_finish.value,
+    start_date: convertDateToAPI(start_date.value),
+    date_finish: convertDateToAPI(date_finish.value),
     knowledge_level: learn_level.value,
     apply_level: apply_level.value,
     success_level: success_level.value,
@@ -401,11 +401,11 @@ function putformData() {
     behavior_result: Number(behavior_result.value),
     sum_score: (Number(score1Per60.value) + Number(score2.value)) / 2,
     sum_percent: percent_sum.value,
-    chairman_dated: dateToISO(dateAutherise.value),
+    chairman_dated: convertDateToAPI(dateAutherise.value),
     develop_result: Number(develop_result.value),
     evaluate_result: Number(evaluate_result.value),
-    director1_dated: dateToISO(director1_dated.value),
-    director2_dated: dateToISO(director2_dated.value),
+    director1_dated: convertDateToAPI(director1_dated.value),
+    director2_dated: convertDateToAPI(director2_dated.value),
   };
 
   dialogConfirm($q, async () => {
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
index 2aaa5d924..35fb6e4e5 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
@@ -27,7 +27,7 @@ const {
   messageError,
   showLoader,
   hideLoader,
-  dateToISO,
+  convertDateToAPI,
   success,
   dialogConfirm,
   dialogMessageNotify,
@@ -336,8 +336,8 @@ async function savaForm() {
 const putformData = () => {
   const data = {
     evaluate_no: evaluate_no.value,
-    start_date: start_date.value,
-    date_finish: date_finish.value,
+    start_date: convertDateToAPI(start_date.value),
+    date_finish: convertDateToAPI(date_finish.value),
     knowledge_level: learn_level.value,
     apply_level: apply_level.value,
     success_level: success_level.value,
@@ -374,10 +374,10 @@ const putformData = () => {
     sum_score: (Number(score1Per60.value) + Number(score2.value)) / 2,
     sum_percent: percent_sum.value,
     develop_result: Number(develop_result.value),
-    chairman_dated: dateToISO(dateAutherise.value),
+    chairman_dated: convertDateToAPI(dateAutherise.value),
     evaluate_result: Number(evaluate_result.value),
-    director1_dated: dateToISO(director1_dated.value),
-    director2_dated: dateToISO(director2_dated.value),
+    director1_dated: convertDateToAPI(director1_dated.value),
+    director2_dated: convertDateToAPI(director2_dated.value),
   };
   dialogConfirm($q, async () => {
     showLoader();
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
index 481bedfdd..75241f9f0 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
@@ -24,6 +24,7 @@ const {
   showLoader,
   hideLoader,
   dialogConfirm,
+  convertDateToAPI,
   dialogMessageNotify,
 } = mixin;
 const route = useRoute();
@@ -187,8 +188,8 @@ async function savaForm() {
  */
 async function postData(action: string) {
   const data = {
-    start_date: date_start.value,
-    date_finish: date_finish.value,
+    start_date: convertDateToAPI(date_start.value),
+    date_finish: date_finish.value ? convertDateToAPI(date_finish.value) : null,
     develop_complete: props.tab === "save1" ? 0 : develop.value,
     pass_result: result.value,
     reson: reson.value,
@@ -201,7 +202,7 @@ async function postData(action: string) {
     authority_pos: authority_pos.value,
     authority_type: authority_type.value,
     authority_level: authority_level.value,
-    authority_dated: authority_dated.value,
+    authority_dated: convertDateToAPI(authority_dated.value),
   };
   if (action === "post") {
     showLoader();
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
index 326bb9729..c17c85523 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
@@ -27,7 +27,7 @@ const {
   date2Thai,
   success,
   notifyError,
-  dateToISO,
+  convertDateToAPI,
   messageError,
   hideLoader,
   showLoader,
@@ -278,8 +278,8 @@ function savaForm() {
 function putformData() {
   const data = {
     evaluate_no: evaluate_no.value,
-    start_date: start_date.value,
-    date_finish: date_finish.value,
+    start_date: convertDateToAPI(start_date.value),
+    date_finish: convertDateToAPI(date_finish.value),
     evaluate_expenct_level: evaluate_expenct_level.value,
     evaluate_ouptut: evaluate_ouptut.value,
     knowledge_level: knowledge_level.value,
@@ -309,7 +309,7 @@ function putformData() {
     self_learning: Number(self_learning.value),
     training_seminar: Number(training_seminar.value),
     other_training: Number(other_training.value),
-    assessor_dated: dateToISO(dateAutherise.value),
+    assessor_dated: convertDateToAPI(dateAutherise.value),
   };
 
   dialogConfirm($q, () =>
@@ -380,7 +380,9 @@ onMounted(async () => {
       <div v-if="!status">
         <q-btn
           v-if="
-            !checkRoutePermisson && probationStore.dataPermissions?.tab2.isEdit && !isCheckFile
+            !checkRoutePermisson &&
+            probationStore.dataPermissions?.tab2.isEdit &&
+            !isCheckFile
           "
           dense
           flat
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue
index 97ed378d7..395a452f0 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue
@@ -21,8 +21,7 @@ const mixin = useCounterMixin();
 const {
   date2Thai,
   success,
-  notifyError,
-  dateToISO,
+  convertDateToAPI,
   messageError,
   dialogConfirm,
   dialogMessageNotify,
@@ -252,8 +251,8 @@ function savaForm() {
 function putformData() {
   const data = {
     evaluate_no: evaluate_no.value,
-    start_date: start_date.value,
-    date_finish: date_finish.value,
+    start_date: convertDateToAPI(start_date.value),
+    date_finish: convertDateToAPI(date_finish.value),
     evaluate_expenct_level: evaluate_expenct_level.value,
     evaluate_ouptut: evaluate_ouptut.value,
     knowledge_level: knowledge_level.value,
@@ -284,7 +283,7 @@ function putformData() {
     self_learning: Number(self_learning.value),
     training_seminar: Number(training_seminar.value),
     other_training: Number(other_training.value),
-    assessor_dated: dateToISO(dateAutherise.value),
+    assessor_dated: convertDateToAPI(dateAutherise.value),
   };
   dialogConfirm($q, async () => await saveformdata(data));
 }
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAddCommander.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAddCommander.vue
index 252bb74b4..3c05bb2f4 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAddCommander.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAddCommander.vue
@@ -26,6 +26,7 @@ const {
   messageError,
   dialogConfirm,
   dialogMessageNotify,
+  convertDateToAPI
 } = mixin;
 
 const assignId = ref<string>(route.params.form.toString());
@@ -257,8 +258,8 @@ async function fecthFormdata(id: string) {
 function putformData() {
   const data = {
     evaluate_no: evaluate_no.value,
-    start_date: start_date.value,
-    date_finish: date_finish.value,
+    start_date: convertDateToAPI(start_date.value),
+    date_finish: convertDateToAPI(date_finish.value),
     evaluate_expenct_level: evaluate_expenct_level.value,
     evaluate_ouptut: evaluate_ouptut.value,
     knowledge_level: knowledge_level.value,
@@ -289,7 +290,7 @@ function putformData() {
     self_learning: Number(self_learning.value),
     training_seminar: Number(training_seminar.value),
     other_training: Number(other_training.value),
-    assessor_dated: dateToISO(dateAutherise.value),
+    assessor_dated: convertDateToAPI(dateAutherise.value),
   };
   dialogConfirm($q, async () => await saveformdata(data));
 }
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
index 5a8692d45..66255b5d1 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
@@ -32,6 +32,7 @@ const {
   showLoader,
   hideLoader,
   dialogConfirm,
+  convertDateToAPI
 } = mixin;
 
 const assignId = ref<string>(route.params.form.toString());
@@ -288,8 +289,8 @@ function savaForm() {
 function putformData() {
   const data = {
     evaluate_no: evaluate_no.value,
-    start_date: start_date.value,
-    date_finish: date_finish.value,
+    start_date: convertDateToAPI(start_date.value),
+    date_finish: convertDateToAPI(date_finish.value),
     evaluate_expenct_level: evaluate_expenct_level.value,
     evaluate_ouptut: evaluate_ouptut.value,
     knowledge_level: knowledge_level.value,
@@ -319,7 +320,7 @@ function putformData() {
     self_learning: Number(self_learning.value),
     training_seminar: Number(training_seminar.value),
     other_training: Number(other_training.value),
-    assessor_dated: dateToISO(dateAutherise.value),
+    assessor_dated: convertDateToAPI(dateAutherise.value),
   };
 
   dialogConfirm($q, () =>