diff --git a/src/modules/06_retirement/components/02_resign/ResignByid.vue b/src/modules/06_retirement/components/02_resign/ResignByid.vue
index 4d4dac874..881bf0260 100644
--- a/src/modules/06_retirement/components/02_resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/02_resign/ResignByid.vue
@@ -47,6 +47,7 @@ const {
success,
dialogConfirm,
dialogRemove,
+ convertDateToAPI,
} = mixin;
/** ตัวแปร */
@@ -477,9 +478,8 @@ function onSubmitConditions() {
function onSubmitAttached() {
dialogConfirm($q, async () => {
const formData = new FormData();
- const send = date.value !== null ? new Date(date.value).toUTCString() : "";
- const activeDate =
- dateLeave.value !== null ? new Date(dateLeave.value).toUTCString() : "";
+ const send: string = convertDateToAPI(date.value) ?? "";
+ const activeDate: string = convertDateToAPI(dateLeave.value) ?? "";
formData.append("Location", location.value);
formData.append("SendDate", send);
formData.append("ActiveDate", activeDate);
@@ -771,7 +771,7 @@ onMounted(async () => {
{
const formData = new FormData();
- const send = date.value !== null ? new Date(date.value).toUTCString() : "";
- const activeDate =
- dateLeave.value !== null ? new Date(dateLeave.value).toUTCString() : "";
+ const send: string = convertDateToAPI(date.value) ?? "";
+ const activeDate: string = convertDateToAPI(dateLeave.value) ?? "";
formData.append("Location", location.value);
formData.append("SendDate", send);
formData.append("ActiveDate", activeDate);
@@ -439,7 +439,7 @@ onMounted(async () => {
class="q-mr-sm"
@click="router.push('/retirement/resign')"
/>
- รายละเอียดการยกเลิกลาออก
+ รายละเอียดการยกเลิกลาออก
{{
dataDetail.prefix + dataDetail.firstName + " " + dataDetail.lastName
}}
diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue b/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
index ff5313b80..51ddb7e8c 100644
--- a/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
@@ -38,6 +38,7 @@ const {
hideLoader,
success,
dialogConfirm,
+ convertDateToAPI,
} = mixin;
/** ตัวแปร */
@@ -301,9 +302,9 @@ async function clickCancel() {
function onSubmitAttached() {
dialogConfirm($q, () => {
const formData = new FormData();
- const send = date.value !== null ? new Date(date.value).toUTCString() : "";
- const activeDate =
- dateLeave.value !== null ? new Date(dateLeave.value).toUTCString() : "";
+ const send: string = convertDateToAPI(date.value) ?? "";
+ const activeDate: string = convertDateToAPI(dateLeave.value) ?? "";
+
formData.append("Location", location.value);
formData.append("SendDate", send);
formData.append("ActiveDate", activeDate);