From 015d2d9857729db502dd67fa456b8e881c3b187a Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Fri, 19 Jan 2024 10:51:17 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=99=E0=B8=B1=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/1_Complaint/EditPage.vue       |  2 +-
 .../components/1_Complaint/Form.vue           |  4 +--
 .../2_InvestigateFacts/EditPage.vue           |  2 +-
 .../components/2_InvestigateFacts/Form.vue    | 33 ++++++++++---------
 .../3_InvestigateDisciplinary/EditPage.vue    | 28 +++++++---------
 .../3_InvestigateDisciplinary/Form.vue        |  4 +--
 .../components/4_Result/Form.vue              |  4 +--
 .../components/8_AppealComplain/Form.vue      |  4 +--
 .../11_discipline/components/DialogDuty.vue   |  4 +--
 9 files changed, 35 insertions(+), 50 deletions(-)

diff --git a/src/modules/11_discipline/components/1_Complaint/EditPage.vue b/src/modules/11_discipline/components/1_Complaint/EditPage.vue
index 9a4fdc218..06c4935e3 100644
--- a/src/modules/11_discipline/components/1_Complaint/EditPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/EditPage.vue
@@ -200,13 +200,13 @@ async function onSubmit(data: any) {
   http
     .put(config.API.complaintbyId(id.value), data)
     .then((res) => {
+      getData();
       success($q, "บันทึกข้อมูลสำเร็จ");
     })
     .catch((e) => {
       messageError($q, e);
     })
     .finally(async () => {
-      getData();
       hideLoader();
     });
 }
diff --git a/src/modules/11_discipline/components/1_Complaint/Form.vue b/src/modules/11_discipline/components/1_Complaint/Form.vue
index 48805fa17..7dea69fef 100644
--- a/src/modules/11_discipline/components/1_Complaint/Form.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Form.vue
@@ -175,9 +175,7 @@ function onSubmit() {
       }
       await props.onSubmit(formData);
       isSave.value = false;
-    },
-    "ยืนยันการบันทึกข้อมูล",
-    "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?"
+    }
   );
 }
 
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue b/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue
index 44596fb22..5d924f173 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue
@@ -185,6 +185,7 @@ async function onSubmit(data: any) {
   http
     .put(config.API.investigateById(id.value), data)
     .then((res) => {
+      getData();
       success($q, "บันทึกข้อมูลสำเร็จ");
       // router.push(`/discipline/complaints`);
     })
@@ -193,7 +194,6 @@ async function onSubmit(data: any) {
     })
     .finally(async () => {
       hideLoader();
-      getData();
     });
   // router.push(`/discipline/investigatefacts`);
 }
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index 8bd85a2d6..fa14fb397 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -137,10 +137,6 @@ const formData = reactive<FormData>({
 });
 
 const rows = ref([]);
-const rowsChack = ref([]);
-const statusStep = computed(() => {
-  return route.name === "/discipline-disciplinaryEdit" ? true : false;
-});
 const dateEndInputStyle = computed(() => {
   const currentDate = new Date();
   const investigationDateEnd = new Date(formData.investigationDateEnd as Date);
@@ -150,7 +146,6 @@ const dateEndInputStyle = computed(() => {
     investigationDateEnd <=
       new Date(currentDate.getTime() + 7 * 24 * 60 * 60 * 1000);
 
-  console.log(isInNext7Days);
   return isInNext7Days ? "input-alert" : "";
 });
 
@@ -173,7 +168,6 @@ function validateForm() {
  * หากยกเลิกจะกลับไปหน้าฟอร์ม
  */
 function onSubmit() {
-  console.log(formData);
   dialogConfirm(
     $q,
     async () => {
@@ -199,9 +193,7 @@ function onSubmit() {
       props.onSubmit(formData);
       isSave.value = false;
       investigationExtendStatus.value = false;
-    },
-    "ยืนยันการบันทึกข้อมูล",
-    "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?"
+    }
   );
 }
 
@@ -621,10 +613,10 @@ watch(
 );
 
 function calculateMinDate() {
-      const startDate = new Date(formData.investigationDateStart as Date);
-      startDate.setDate(startDate.getDate() + 1);
-      return startDate;
-    }
+  const startDate = new Date(formData.investigationDateStart as Date);
+  startDate.setDate(startDate.getDate() + 1);
+  return startDate;
+}
 
 onMounted(async () => {
   mainStore.rowsAdd = [];
@@ -1020,7 +1012,12 @@ onMounted(async () => {
                                     </q-icon>
                                   </template>
                                   <template
-                                    v-if="formData.investigationDateStart && isReadonly === false && formData.investigationExtendHistory.length === 0"
+                                    v-if="
+                                      formData.investigationDateStart &&
+                                      isReadonly === false &&
+                                      formData.investigationExtendHistory
+                                        .length === 0
+                                    "
                                     v-slot:append
                                   >
                                     <q-icon
@@ -1093,7 +1090,12 @@ onMounted(async () => {
                                     </q-icon>
                                   </template>
                                   <template
-                                    v-if="formData.investigationDateEnd && isReadonly === false && formData.investigationExtendHistory.length === 0"
+                                    v-if="
+                                      formData.investigationDateEnd &&
+                                      isReadonly === false &&
+                                      formData.investigationExtendHistory
+                                        .length === 0
+                                    "
                                     v-slot:append
                                   >
                                     <q-icon
@@ -1277,7 +1279,6 @@ onMounted(async () => {
                         :options="mainStore.statusResultOptions"
                         label="ผลการสืบสวน"
                         emit-value
-                        
                         map-options
                         option-label="name"
                         option-value="id"
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
index adccb812b..fa66bd1b7 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
@@ -220,25 +220,18 @@ async function fetchDetailComplaints() {
  * @param data ข้อมูล ใน form
  */
 async function onSubmitDisciplinary(data: any) {
+  showLoader();
   await http
     .put(config.API.disciplineDisciplinaryById(id.value), data)
-    .then(() => {
+    .then(async () => {
+      await fetchDetailDisciplinary();
       success($q, "บันทึกข้อมูลสำเร็จ");
     })
-    .catch((err) => {})
-    .finally(async () => {
-      const fetchFunction =
-        store.tabMenu === "disciplinary"
-          ? fetchDetailDisciplinary
-          : store.tabMenu === "investigatefacts"
-          ? fetchDetailInvestigate
-          : store.tabMenu === "complaints"
-          ? fetchDetailComplaints
-          : null;
-
-      if (fetchFunction) {
-        await fetchFunction();
-      }
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
     });
 }
 
@@ -271,13 +264,14 @@ function confirmSentIssueGate() {
   showLoader();
   http
     .get(config.API.disciplinaryApprove(id.value))
-    .then((res) => {})
+    .then((res) => {
+      // fetchDetailDisciplinary();
+    })
     .catch((e) => {
       messageError($q, e);
     })
     .finally(() => {
       router.push(`/discipline/disciplinary`);
-      fetchDetailDisciplinary();
     });
 }
 
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index bfaf3e1de..75fc2963c 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -264,9 +264,7 @@ function onSubmit() {
       emit("submit:disciplinary", formData);
       isSave.value = false;
       extendStatus.value = false;
-    },
-    "ยืนยันการบันทึกข้อมูล",
-    "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?"
+    }
   );
 }
 
diff --git a/src/modules/11_discipline/components/4_Result/Form.vue b/src/modules/11_discipline/components/4_Result/Form.vue
index 4035049c3..29d9cb808 100644
--- a/src/modules/11_discipline/components/4_Result/Form.vue
+++ b/src/modules/11_discipline/components/4_Result/Form.vue
@@ -141,9 +141,7 @@ function onSubmit() {
           messageError($q, err);
         })
         .finally(async () => {});
-    },
-    "ยืนยันการบันทึกข้อมูล",
-    "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?"
+    }
   );
 }
 
diff --git a/src/modules/11_discipline/components/8_AppealComplain/Form.vue b/src/modules/11_discipline/components/8_AppealComplain/Form.vue
index b805ef4d0..44a59e5f3 100644
--- a/src/modules/11_discipline/components/8_AppealComplain/Form.vue
+++ b/src/modules/11_discipline/components/8_AppealComplain/Form.vue
@@ -331,9 +331,7 @@ function onSubmit() {
         status: formData.status,
       };
       props.onSubmit(data);
-    },
-    "ยืนยันการบันทึกข้อมูล",
-    "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?"
+    }
   );
 }
 
diff --git a/src/modules/11_discipline/components/DialogDuty.vue b/src/modules/11_discipline/components/DialogDuty.vue
index 4fc2128b0..efd7532c9 100644
--- a/src/modules/11_discipline/components/DialogDuty.vue
+++ b/src/modules/11_discipline/components/DialogDuty.vue
@@ -55,9 +55,7 @@ async function submit() {
             await props.save(props.id, duty.value, resolution.value);
             duty.value = "";
             resolution.value = "";
-          },
-          "ยืนยันการบันทึกข้อมูล",
-          "ต้องการยืนยันการบันทึกข้อมูลหรือไม่?"
+          }
         );
       }
     });