From 6130d8bf9eaaee82fc14c903f3678e3609d38d65 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 2 Jul 2024 08:16:18 +0700
Subject: [PATCH] fix bug

---
 .../components/3_result/DialogForm.vue        |  9 ++++----
 .../components/3_result/Dialogbody.vue        |  4 ++--
 .../components/5_Borrow/DialogForm.vue        | 22 +++++++++----------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/modules/07_insignia/components/3_result/DialogForm.vue b/src/modules/07_insignia/components/3_result/DialogForm.vue
index b866cd8ce..5106683b9 100644
--- a/src/modules/07_insignia/components/3_result/DialogForm.vue
+++ b/src/modules/07_insignia/components/3_result/DialogForm.vue
@@ -298,14 +298,13 @@ async function onSubmit() {
       };
       http
         .put(config.API.noteAdd(props.roundId), body)
-        .then(() => {
-          success($q, "บันทึกข้อมูลสำเร็จ");
-          props.close?.();
+        .then(async () => {
+          await props.close?.();
+          await success($q, "บันทึกข้อมูลสำเร็จ");
+          await showLoader();
         })
         .catch((err) => {
           messageError($q, err);
-        })
-        .finally(() => {
           hideLoader();
         });
     }
diff --git a/src/modules/07_insignia/components/3_result/Dialogbody.vue b/src/modules/07_insignia/components/3_result/Dialogbody.vue
index 7cce222c1..d6772eb94 100644
--- a/src/modules/07_insignia/components/3_result/Dialogbody.vue
+++ b/src/modules/07_insignia/components/3_result/Dialogbody.vue
@@ -80,11 +80,11 @@ async function onSubmit(type: string, id: string) {
     if (props.dateCheckReceive === null) {
       formData.append("Date", dateToISO((Datereceive.value as Date) ?? nullii));
       formData.append("File", files.value);
-      formData.append("OrgId", OrganazationId.value);
+      // formData.append("OrgId", OrganazationId.value);
     } else {
       formData.append("Date", dateToISO((Datereturn.value as Date) ?? nullii));
       formData.append("File", filesReturn.value);
-      formData.append("OrgId", OrganazationId2.value);
+      // formData.append("OrgId", OrganazationId2.value);
     }
     showLoader();
     http
diff --git a/src/modules/07_insignia/components/5_Borrow/DialogForm.vue b/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
index ca078b437..47e722c7c 100644
--- a/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
+++ b/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
@@ -169,15 +169,14 @@ async function onSubmit() {
           borrowDate: receivedate.value,
           insigniaNoteProfileId: insigniaNoteProfileId.value,
         })
-        .then(() => {
-          success($q, "บันทึกข้อมูลสำเร็จ");
-          clearData();
-          props.closeAndFecth();
+        .then(async () => {
+          await props.closeAndFecth();
+          await clearData();
+          await hideLoader();
+          await success($q, "บันทึกข้อมูลสำเร็จ");
         })
         .catch((err) => {
           messageError($q, err);
-        })
-        .finally(() => {
           hideLoader();
         });
     } else {
@@ -187,15 +186,14 @@ async function onSubmit() {
           returnOrganizationId: OrganazationId.value,
           returnReason: reason.value,
         })
-        .then(() => {
-          success($q, "บันทึกข้อมูลสำเร็จ");
-          clearData();
-          props.closeAndFecth();
+        .then(async () => {
+          await clearData();
+          await hideLoader();
+          await props.closeAndFecth();
+          await success($q, "บันทึกข้อมูลสำเร็จ");
         })
         .catch((err) => {
           messageError($q, err);
-        })
-        .finally(() => {
           hideLoader();
         });
     }