From b4126340961b31f4ff9b69dc87220f9b92fd7fc7 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Fri, 18 Aug 2023 11:11:37 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=20dialog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../08_registryEmployee/views/Assessment.vue  | 26 ++++---
 .../08_registryEmployee/views/Discipline.vue  | 26 ++++---
 .../08_registryEmployee/views/Document.vue    | 38 +++++++++-
 .../08_registryEmployee/views/Education.vue   | 25 ++++---
 .../views/Information/Address.vue             |  6 +-
 .../views/Information/Certicate.vue           | 26 ++++---
 .../views/Information/Family.vue              |  8 +-
 .../views/Information/Information.vue         |  6 +-
 .../08_registryEmployee/views/Leave.vue       | 25 ++++---
 .../08_registryEmployee/views/Main.vue        | 74 +++++++++----------
 .../08_registryEmployee/views/Other.vue       | 24 +++---
 .../views/SalaryEmployee.vue                  | 32 +++++---
 .../08_registryEmployee/views/Talent.vue      | 26 ++++---
 .../08_registryEmployee/views/Train.vue       | 26 ++++---
 .../08_registryEmployee/views/Work.vue        | 26 ++++---
 .../08_registryEmployee/views/information.vue |  8 +-
 src/views/MainLayout.vue                      | 56 +++++++-------
 17 files changed, 264 insertions(+), 194 deletions(-)

diff --git a/src/modules/08_registryEmployee/views/Assessment.vue b/src/modules/08_registryEmployee/views/Assessment.vue
index 981e8cc44..2ff696e02 100644
--- a/src/modules/08_registryEmployee/views/Assessment.vue
+++ b/src/modules/08_registryEmployee/views/Assessment.vue
@@ -260,7 +260,6 @@
           :cancel="clickCancel"
           :edit="clickEdit"
           :save="clickSave"
-          :validate="validateData"
           :clickNext="clickNext"
           :clickPrevious="clickPrevious"
           :clickDelete="clickDelete"
@@ -340,7 +339,7 @@ const store = useProfileDataStore();
 const { profileData, changeProfileColumns } = store;
 
 const mixin = useCounterMixin();
-const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader } =
+const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader,dialogConfirm } =
   mixin;
 const route = useRoute();
 const id = ref<string>("");
@@ -700,8 +699,11 @@ const clickAdd = async () => {
 /**
  * กดบันทึกใน dialog
  */
-const clickSave = async () => {
-  myForm.value.validate().then(async (result: boolean) => {
+const clickSave = () =>{
+  dialogConfirm($q,()=>SaveData())
+}
+const SaveData = async () => {
+  await myForm.value.validate().then(async (result: boolean) => {
     if (result) {
       if (modalEdit.value) {
         await editData();
@@ -934,14 +936,14 @@ const clickHistory = async (row: RequestItemsObject) => {
 /**
  * validate input ใน dialog
  */
-const validateData = async () => {
-  checkValidate.value = true;
-  await myForm.value.validate().then((result: boolean) => {
-    if (result == false) {
-      checkValidate.value = false;
-    }
-  });
-};
+// const validateData = async () => {
+//   checkValidate.value = true;
+//   await myForm.value.validate().then((result: boolean) => {
+//     if (result == false) {
+//       checkValidate.value = false;
+//     }
+//   });
+// };
 
 /**
  * class จัดรูปแบบแสดงระหว่างข้อมูลที่แก้ไขหรือแสดงเฉยๆ
diff --git a/src/modules/08_registryEmployee/views/Discipline.vue b/src/modules/08_registryEmployee/views/Discipline.vue
index b2c4f2bc0..d7a66f07a 100644
--- a/src/modules/08_registryEmployee/views/Discipline.vue
+++ b/src/modules/08_registryEmployee/views/Discipline.vue
@@ -230,7 +230,6 @@
           :cancel="clickCancel"
           :edit="clickEdit"
           :save="clickSave"
-          :validate="validateData"
           :clickNext="clickNext"
           :clickPrevious="clickPrevious"
           :clickDelete="clickDelete"
@@ -309,7 +308,7 @@ const store = useProfileDataStore();
 const { profileData, changeProfileColumns } = store;
 
 const mixin = useCounterMixin();
-const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader } =
+const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader, dialogConfirm } =
   mixin;
 const route = useRoute();
 const id = ref<string>("");
@@ -689,8 +688,11 @@ const clickAdd = async () => {
 /**
  * กดบันทึกใน dialog
  */
-const clickSave = async () => {
-  myForm.value.validate().then(async (result: boolean) => {
+const clickSave = () => {
+  dialogConfirm($q,()=>SaveData())
+}
+const SaveData = async () => {
+  await myForm.value.validate().then(async (result: boolean) => {
     if (result) {
       if (modalEdit.value) {
         await editData();
@@ -915,14 +917,14 @@ const clickHistory = async (row: RequestItemsObject) => {
 /**
  * validate input ใน dialog
  */
-const validateData = async () => {
-  checkValidate.value = true;
-  await myForm.value.validate().then((result: boolean) => {
-    if (result == false) {
-      checkValidate.value = false;
-    }
-  });
-};
+// const validateData = async () => {
+//   checkValidate.value = true;
+//   await myForm.value.validate().then((result: boolean) => {
+//     if (result == false) {
+//       checkValidate.value = false;
+//     }
+//   });
+// };
 
 /**
  * class จัดรูปแบบแสดงระหว่างข้อมูลที่แก้ไขหรือแสดงเฉยๆ
diff --git a/src/modules/08_registryEmployee/views/Document.vue b/src/modules/08_registryEmployee/views/Document.vue
index f9f5f32fb..bcc2c1204 100644
--- a/src/modules/08_registryEmployee/views/Document.vue
+++ b/src/modules/08_registryEmployee/views/Document.vue
@@ -1,11 +1,13 @@
 <template>
   <q-card flat bordered class="col-12 row q-px-lg q-py-md">
+    <q-form ref="myform" class="col-12">
     <HeaderTop
       v-model:edit="edit"
       header="เอกสารหลักฐาน"
       icon="mdi-file-document"
       :history="false"
       :changeBtn="changeBtn"
+      :cancel="onCancel"
       :disable="statusEdit"
       :save="uploadData"
     />
@@ -48,6 +50,7 @@
           </q-item>
         </q-list>
       </q-card>
+
       <q-input
         v-if="edit"
         class="q-mt-sm col-12 q-pb-xs"
@@ -131,6 +134,7 @@
         </template>
       </q-uploader>
     </div>
+  </q-form>
   </q-card>
 </template>
 <script setup lang="ts">
@@ -153,13 +157,17 @@ const props = defineProps({
     type: Function,
     default: () => console.log("not function"),
   },
+  statusAdd: {
+    type: Boolean,
+    default: false,
+  },
 });
 const emit = defineEmits(["update:statusEdit"]);
 
 const $q = useQuasar(); // show dialog
 const mixin = useCounterMixin();
 const route = useRoute();
-const { success, messageError, showLoader, hideLoader } = mixin;
+const { success, messageError, showLoader, hideLoader ,dialogConfirm} = mixin;
 const profileId = ref<string>(
   route.params.id ? route.params.id.toString() : ""
 );
@@ -168,7 +176,7 @@ const uploader = ref<any>();
 const files = ref<any>([]);
 const file = ref<any>([]);
 const name = ref<string>("");
-
+  const myform = ref<QForm | null>(null);
 onMounted(async () => {
   await getData();
 });
@@ -205,8 +213,30 @@ const deleteData = async (id: string) => {
       await getData();
     });
 };
-
-const uploadData = async () => {
+const uploadData = () =>{
+  dialogConfirm($q,()=> Datasave())
+}
+const Datasave = async () => {
+  if (myform.value != null) {
+    await myform.value.validate().then(async (success: boolean) => {
+      if (success) {
+        if (props.statusAdd) {
+          // await addData();
+        } else {
+          await Dataupload();
+        }
+      } else {
+      }
+    });
+  }
+};
+const onCancel = async () => {
+  if (myform.value != null) {
+    myform.value.reset();
+  }
+  await getData();
+};
+const Dataupload = async () => {
   if (profileId.value) {
     if (file.value.length > 0) {
       const blob = file.value.slice(0, file.value[0].size);
diff --git a/src/modules/08_registryEmployee/views/Education.vue b/src/modules/08_registryEmployee/views/Education.vue
index 75756891b..794af7613 100644
--- a/src/modules/08_registryEmployee/views/Education.vue
+++ b/src/modules/08_registryEmployee/views/Education.vue
@@ -611,7 +611,7 @@ const store = useProfileDataStore();
 const { profileData, changeProfileColumns } = store;
 
 const mixin = useCounterMixin();
-const { success, dateToISO, date2Thai, messageError, showLoader, hideLoader } =
+const { success, dateToISO, date2Thai, messageError, showLoader, hideLoader,dialogConfirm } =
   mixin;
 const route = useRoute();
 const id = ref<string>("");
@@ -1235,8 +1235,11 @@ const clickAdd = async () => {
 /**
  * กดบันทึกใน dialog
  */
-const clickSave = async () => {
-  myForm.value.validate().then(async (result: boolean) => {
+const clickSave = () => {
+  dialogConfirm($q,() => SaveData() )
+}
+const SaveData = async () => {
+  await myForm.value.validate().then(async (result: boolean) => {
     if (result) {
       if (modalEdit.value) {
         await editData();
@@ -1537,14 +1540,14 @@ const clickHistory = async (row: RequestItemsObject) => {
 /**
  * validate input ใน dialog
  */
-const validateData = async () => {
-  checkValidate.value = true;
-  await myForm.value.validate().then((result: boolean) => {
-    if (result == false) {
-      checkValidate.value = false;
-    }
-  });
-};
+// const validateData = async () => {
+//   checkValidate.value = true;
+//   await myForm.value.validate().then((result: boolean) => {
+//     if (result == false) {
+//       checkValidate.value = false;
+//     }
+//   });
+// };
 
 /**
  * class จัดรูปแบบแสดงระหว่างข้อมูลที่แก้ไขหรือแสดงเฉยๆ
diff --git a/src/modules/08_registryEmployee/views/Information/Address.vue b/src/modules/08_registryEmployee/views/Information/Address.vue
index 95c6d657e..0d56d8047 100644
--- a/src/modules/08_registryEmployee/views/Information/Address.vue
+++ b/src/modules/08_registryEmployee/views/Information/Address.vue
@@ -323,7 +323,7 @@ const route = useRoute();
 const $q = useQuasar();
 
 const mixin = useCounterMixin();
-const { date2Thai, success, messageError, showLoader, hideLoader } = mixin;
+const { date2Thai, success, messageError, showLoader, hideLoader, dialogConfirm } = mixin;
 const edit = ref<boolean>(false);
 const addressData = ref<Address>(defaultAddress);
 const myform = ref<any>();
@@ -714,8 +714,10 @@ const addData = async () => {
   //       await changeBirth(informaData.value.birthDate ?? new Date());
   //     });
 };
-
 const saveData = async () => {
+  dialogConfirm($q,() => Datasave())
+}
+const Datasave = async () => {
   await myform.value.validate().then(async (success: boolean) => {
     if (success) {
       if (props.statusAdd) {
diff --git a/src/modules/08_registryEmployee/views/Information/Certicate.vue b/src/modules/08_registryEmployee/views/Information/Certicate.vue
index 0c8754f2e..857977ac8 100644
--- a/src/modules/08_registryEmployee/views/Information/Certicate.vue
+++ b/src/modules/08_registryEmployee/views/Information/Certicate.vue
@@ -213,7 +213,6 @@
           :cancel="clickCancel"
           :edit="clickEdit"
           :save="clickSave"
-          :validate="validateData"
           :clickNext="clickNext"
           :clickPrevious="clickPrevious"
           :clickDelete="clickDelete"
@@ -292,7 +291,7 @@ const store = useProfileDataStore();
 const { profileData, changeProfileColumns } = store;
 
 const mixin = useCounterMixin();
-const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader } =
+const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader ,dialogConfirm} =
   mixin;
 const route = useRoute();
 const id = ref<string>("");
@@ -583,8 +582,11 @@ const clickAdd = async () => {
 /**
  * กดบันทึกใน dialog
  */
-const clickSave = async () => {
-  myForm.value.validate().then(async (result: boolean) => {
+const clickSave = () => {
+  dialogConfirm($q,() => SaveData())
+}
+const SaveData = async () => {
+ await myForm.value?.validate().then(async (result: boolean) => {
     if (result) {
       if (modalEdit.value) {
         await editData();
@@ -803,14 +805,14 @@ const clickHistory = async (row: RequestItemsObject) => {
 /**
  * validate input ใน dialog
  */
-const validateData = async () => {
-  checkValidate.value = true;
-  await myForm.value.validate().then((result: boolean) => {
-    if (result == false) {
-      checkValidate.value = false;
-    }
-  });
-};
+// const validateData = async () => {
+//   checkValidate.value = true;
+//   await myForm.value.validate().then((result: boolean) => {
+//     if (result == false) {
+//       checkValidate.value = false;
+//     }
+//   });
+// };
 
 /**
  * class จัดรูปแบบแสดงระหว่างข้อมูลที่แก้ไขหรือแสดงเฉยๆ
diff --git a/src/modules/08_registryEmployee/views/Information/Family.vue b/src/modules/08_registryEmployee/views/Information/Family.vue
index 346a2ad9e..edda7a750 100644
--- a/src/modules/08_registryEmployee/views/Information/Family.vue
+++ b/src/modules/08_registryEmployee/views/Information/Family.vue
@@ -1126,7 +1126,7 @@ const route = useRoute();
 const $q = useQuasar();
 
 const mixin = useCounterMixin();
-const { date2Thai, success, messageError, showLoader, hideLoader } = mixin;
+const { date2Thai, success, messageError, showLoader, hideLoader ,dialogConfirm} = mixin;
 const edit = ref<boolean>(false);
 const fix = ref<boolean>(true);
 const myform = ref<QForm | null>(null);
@@ -1456,8 +1456,10 @@ const addData = async () => {
   //       await changeBirth(informaData.value.birthDate ?? new Date());
   //     });
 };
-
-const saveData = async () => {
+const saveData = () =>{
+  dialogConfirm($q,() => Datasave())
+}
+const Datasave = async () => {
   await myform.value?.validate().then(async (success: boolean) => {
     if (success) {
       if (props.statusAdd) {
diff --git a/src/modules/08_registryEmployee/views/Information/Information.vue b/src/modules/08_registryEmployee/views/Information/Information.vue
index 2937e53cb..bf6a869f4 100644
--- a/src/modules/08_registryEmployee/views/Information/Information.vue
+++ b/src/modules/08_registryEmployee/views/Information/Information.vue
@@ -458,6 +458,7 @@ const {
   dialogMessage,
   showLoader,
   hideLoader,
+  dialogConfirm
 } = mixin;
 
 const profileStore = useProfileDataStore();
@@ -1103,7 +1104,10 @@ const addData = async () => {
   //     });
 };
 
-const saveData = async () => {
+const saveData = async () =>{
+  dialogConfirm($q,()=>Datasave())
+}
+const Datasave = async () => {
   if (myform.value != null) {
     await myform.value.validate().then(async (success: boolean) => {
       if (success) {
diff --git a/src/modules/08_registryEmployee/views/Leave.vue b/src/modules/08_registryEmployee/views/Leave.vue
index ff4f5da94..6608958f3 100644
--- a/src/modules/08_registryEmployee/views/Leave.vue
+++ b/src/modules/08_registryEmployee/views/Leave.vue
@@ -233,7 +233,6 @@
           :cancel="clickCancel"
           :edit="clickEdit"
           :save="clickSave"
-          :validate="validateData"
           :clickNext="clickNext"
           :clickPrevious="clickPrevious"
           :clickDelete="clickDelete"
@@ -391,6 +390,7 @@ const {
   dateToISO,
   showLoader,
   hideLoader,
+  dialogConfirm
 } = mixin;
 const route = useRoute();
 
@@ -951,8 +951,11 @@ const clickCancel = async () => {
 // /**
 //  * กดบันทึกใน dialog
 //  */
-const clickSave = async () => {
-  myFormAdd.value.validate().then(async (result: boolean) => {
+const clickSave = () => {
+  dialogConfirm($q,() => SaveData())
+}
+const SaveData = async () => {
+ await myFormAdd.value.validate().then(async (result: boolean) => {
     if (result) {
       if (modalEdit.value) {
         await editData();
@@ -1220,14 +1223,14 @@ const clickTotal = async () => {
 // /**
 //  * validate input ใน dialog
 //  */
-const validateData = async () => {
-  checkValidate.value = true;
-  await myFormAdd.value.validate().then((result: boolean) => {
-    if (result == false) {
-      checkValidate.value = false;
-    }
-  });
-};
+// const validateData = async () => {
+//   checkValidate.value = true;
+//   await myFormAdd.value.validate().then((result: boolean) => {
+//     if (result == false) {
+//       checkValidate.value = false;
+//     }
+//   });
+// };
 
 // /**
 //  * class จัดรูปแบบแสดงระหว่างข้อมูลที่แก้ไขหรือแสดงเฉยๆ
diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue
index 5e84ae330..acb3d0e6c 100644
--- a/src/modules/08_registryEmployee/views/Main.vue
+++ b/src/modules/08_registryEmployee/views/Main.vue
@@ -491,6 +491,9 @@ const {
   hideLoader,
   date2Thai,
   dialogMessage,
+  dialogRemove,
+  dialogConfirm,
+  dialogMessageNotify
 } = mixin;
 
 const modaladdOrder = ref<boolean>(false);
@@ -1256,38 +1259,42 @@ const clickAddOrder = () => {
 const clickCloseSendModal = () => {
   modaladdOrder.value = false;
 };
-
-const checkSave = async () => {
+const checkSave = () =>{
+  dialogConfirm($q,async() => await saveData())
+}
+const saveData = async () => {
   if (selectedPosition.value.length == 0) {
-    dialogMessage(
+    dialogMessageNotify(
       $q,
-      "ไม่สามารถบันทึกข้อมูลได้",
-      "กรุณาเลือกตำแหน่ง",
-      "warning",
-      undefined,
-      "orange",
-      undefined,
-      undefined,
-      true
+      "ไม่สามารถบันทึกข้อมูลได้ กรุณาเลือกตำแหน่ง",
+      // "กรุณาเลือกตำแหน่ง",
+      // "warning",
+      // undefined,
+      // "orange",
+      // undefined,
+      // undefined,
+      // true
     );
     return;
   } else {
     await savePosition();
   }
 };
-
-const checkSaveOrder = async () => {
+const checkSaveOrder = () =>{
+  dialogConfirm($q,async() => await SaveOrder())
+}
+const SaveOrder = async () => {
   if (selectedToOrder.value.length == 0) {
-    dialogMessage(
+    dialogMessageNotify(
       $q,
-      "ไม่สามารถบันทึกข้อมูลได้",
-      "กรุณาเลือกตำแหน่ง",
-      "warning",
-      undefined,
-      "orange",
-      undefined,
-      undefined,
-      true
+      "ไม่สามารถบันทึกข้อมูลได้ กรุณาเลือกตำแหน่ง",
+      // "กรุณาเลือกตำแหน่ง",
+      // "warning",
+      // undefined,
+      // "orange",
+      // undefined,
+      // undefined,
+      // true
     );
     return;
   } else {
@@ -1396,17 +1403,12 @@ const editDetail = async (row: any) => {
   modal.value = true;
 };
 
-const clickDelete = (id: string) => {
-  $q.dialog({
-    title: "ยืนยันการลบข้อมูล",
-    message: "ต้องการลบข้อมูลนี้ใช่หรือไม่?",
-    cancel: {
-      flat: true,
-      color: "negative",
-    },
-    persistent: true,
-  })
-    .onOk(async () => {
+
+const clickDelete = (id: string) =>{
+  dialogRemove($q,async () => await deleteData(id))
+}
+
+const deleteData = async(id: string) => {
       showLoader();
       await http
         .delete(config.API.profileInforId(id))
@@ -1419,10 +1421,7 @@ const clickDelete = (id: string) => {
         })
         .finally(() => {
           hideLoader();
-        });
-    })
-    .onCancel(() => {})
-    .onDismiss(() => {});
+        })
 };
 
 const nodeTree = async () => {
@@ -1578,6 +1577,5 @@ const onSelected = async (id: string) => {
   //   await fetchPositionNumber(id);
 };
 
-const deleteData = async (id: string) => {};
 </script>
 <style lang="scss"></style>
diff --git a/src/modules/08_registryEmployee/views/Other.vue b/src/modules/08_registryEmployee/views/Other.vue
index 5acb4b600..977265bec 100644
--- a/src/modules/08_registryEmployee/views/Other.vue
+++ b/src/modules/08_registryEmployee/views/Other.vue
@@ -122,7 +122,6 @@
           :cancel="clickCancel"
           :edit="clickEdit"
           :save="clickSave"
-          :validate="validateData"
           :clickNext="clickNext"
           :clickPrevious="clickPrevious"
           :clickDelete="clickDelete"
@@ -193,7 +192,7 @@ const store = useProfileDataStore();
 const { profileData, changeProfileColumns } = store;
 
 const mixin = useCounterMixin();
-const { date2Thai, success, messageError, showLoader, hideLoader } = mixin;
+const { date2Thai, success, messageError, showLoader, hideLoader ,dialogConfirm} = mixin;
 const route = useRoute();
 const id = ref<string>("");
 const date = ref<Date>(new Date());
@@ -394,7 +393,10 @@ const clickAdd = async () => {
 /**
  * กดบันทึกใน dialog
  */
-const clickSave = async () => {
+ const clickSave =  () => {
+  dialogConfirm($q,()=>SaveData())
+ }
+const SaveData = async () => {
   myForm.value.validate().then(async (result: boolean) => {
     if (result) {
       if (modalEdit.value) {
@@ -597,14 +599,14 @@ const clickHistory = async (row: RequestItemsObject) => {
 /**
  * validate input ใน dialog
  */
-const validateData = async () => {
-  checkValidate.value = true;
-  await myForm.value.validate().then((result: boolean) => {
-    if (result == false) {
-      checkValidate.value = false;
-    }
-  });
-};
+// const validateData = async () => {
+//   checkValidate.value = true;
+//   await myForm.value.validate().then((result: boolean) => {
+//     if (result == false) {
+//       checkValidate.value = false;
+//     }
+//   });
+// };
 
 /**
  * class จัดรูปแบบแสดงระหว่างข้อมูลที่แก้ไขหรือแสดงเฉยๆ
diff --git a/src/modules/08_registryEmployee/views/SalaryEmployee.vue b/src/modules/08_registryEmployee/views/SalaryEmployee.vue
index e7df68c72..1d5834c90 100644
--- a/src/modules/08_registryEmployee/views/SalaryEmployee.vue
+++ b/src/modules/08_registryEmployee/views/SalaryEmployee.vue
@@ -204,6 +204,7 @@
                         :borderless="!edit"
                         v-model="posNoEmployee"
                         :label="`${'ตำแหน่งเลขที่'}`"
+                        :rules="[(val:string) => !!val || `${'กรุณากรอกตำแหน่งเลขที่'}`]"
                         @update:modelValue="clickEditRow"
                         hide-bottom-space
                         autogrow
@@ -242,6 +243,7 @@
                         lazy-rules
                         :readonly="!edit"
                         :borderless="!edit"
+                        :rules="[(val:string) => !!val || `${'กรุณาเลือกด้านของตำแหน่ง'}`]"
                         v-model="employeePositionSideId"
                         :label="`${'ด้านของตำแหน่ง'}`"
                         @update:modelValue="clickEditRow"
@@ -271,6 +273,7 @@
                         @update:modelValue="clickEditRow"
                         emit-value
                         map-options
+                        :rules="[(val:string) => !!val || `${'กรุณาเลือกระดับ'}`]"
                         option-label="name"
                         :options="employeeLevelOptions"
                         option-value="id"
@@ -297,6 +300,7 @@
                         map-options
                         option-label="name"
                         :options="employeeGroupOptions"
+                        :rules="[(val:string) => !!val || `${'กรุณาเลือกกุ่มงาน'}`]"
                         option-value="id"
                         hide-bottom-space
                         use-input
@@ -339,6 +343,7 @@
                         :readonly="!edit"
                         :borderless="!edit"
                         v-model="amount"
+                        :rules="[(val:string) => !!val || `${'กรุณากรอกค่าจ้าง'}`]"
                         :label="`${'ค่าจ้าง'}`"
                         @update:modelValue="clickEditRow"
                         type="number"
@@ -429,6 +434,7 @@
                         option-label="name"
                         :options="refOptions"
                         option-value="id"
+                        :rules="[(val:string) => !!val || `${'กรุณาเลือกต้นแบบ (template) เอกสารอ้างอิง'}`]"
                         hide-bottom-space
                         use-input
                         input-debounce="0"
@@ -447,6 +453,7 @@
                         :borderless="!edit"
                         v-model="salaryRef"
                         :label="`${'เอกสารอ้างอิง'}`"
+                        :rules="[(val:string) => !!val || `${'กรุณากรอกเอกสารอ้างอิง'}`]"
                         @update:modelValue="clickEditRow"
                         type="textarea"
                         hide-bottom-space
@@ -509,7 +516,6 @@
           :cancel="clickCancel"
           :edit="clickEdit"
           :save="clickSave"
-          :validate="validateData"
           :clickNext="clickNext"
           :clickPrevious="clickPrevious"
           :clickDelete="clickDelete"
@@ -602,6 +608,7 @@ const {
   dialogMessage,
   showLoader,
   hideLoader,
+  dialogConfirm
 } = mixin;
 const route = useRoute();
 const id = ref<string>("");
@@ -1686,8 +1693,11 @@ const templateDetail = async () => {
 /**
  * กดบันทึกใน dialog
  */
-const clickSave = async () => {
-  myForm.value.validate().then(async (result: boolean) => {
+const clickSave = () =>{
+  dialogConfirm($q,() => SaveData())
+}
+const SaveData = async () => {
+  await myForm.value.validate().then(async (result: boolean) => {
     if (result) {
       if (modalEdit.value) {
         await editData();
@@ -1988,14 +1998,14 @@ const clickHistory = async (row: RequestItemsEmployee) => {
 /**
  * validate input ใน dialog
  */
-const validateData = async () => {
-  checkValidate.value = true;
-  await myForm.value.validate().then((result: boolean) => {
-    if (result == false) {
-      checkValidate.value = false;
-    }
-  });
-};
+// const validateData = async () => {
+//   checkValidate.value = true;
+//   await myForm.value.validate().then((result: boolean) => {
+//     if (result == false) {
+//       checkValidate.value = false;
+//     }
+//   });
+// };
 
 /**
  * class จัดรูปแบบแสดงระหว่างข้อมูลที่แก้ไขหรือแสดงเฉยๆ
diff --git a/src/modules/08_registryEmployee/views/Talent.vue b/src/modules/08_registryEmployee/views/Talent.vue
index 868a2305e..a3d4d6b4a 100644
--- a/src/modules/08_registryEmployee/views/Talent.vue
+++ b/src/modules/08_registryEmployee/views/Talent.vue
@@ -123,7 +123,6 @@
           :cancel="clickCancel"
           :edit="clickEdit"
           :save="clickSave"
-          :validate="validateData"
           :clickNext="clickNext"
           :clickPrevious="clickPrevious"
           :clickDelete="clickDelete"
@@ -191,7 +190,7 @@ const store = useProfileDataStore();
 const { profileData, changeProfileColumns } = store;
 
 const mixin = useCounterMixin();
-const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader } =
+const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader,dialogConfirm } =
   mixin;
 const route = useRoute();
 const id = ref<string>("");
@@ -449,8 +448,11 @@ const clickAdd = async () => {
 /**
  * กดบันทึกใน dialog
  */
-const clickSave = async () => {
-  myForm.value.validate().then(async (result: boolean) => {
+ const clickSave =  () => {
+  dialogConfirm($q,()=>SaveData())
+ }
+const SaveData = async () => {
+ await myForm.value.validate().then(async (result: boolean) => {
     if (result) {
       if (modalEdit.value) {
         await editData();
@@ -662,14 +664,14 @@ const clickHistory = async (row: RequestItemsObject) => {
 /**
  * validate input ใน dialog
  */
-const validateData = async () => {
-  checkValidate.value = true;
-  await myForm.value.validate().then((result: boolean) => {
-    if (result == false) {
-      checkValidate.value = false;
-    }
-  });
-};
+// const validateData = async () => {
+//   checkValidate.value = true;
+//   await myForm.value.validate().then((result: boolean) => {
+//     if (result == false) {
+//       checkValidate.value = false;
+//     }
+//   });
+// };
 
 /**
  * class จัดรูปแบบแสดงระหว่างข้อมูลที่แก้ไขหรือแสดงเฉยๆ
diff --git a/src/modules/08_registryEmployee/views/Train.vue b/src/modules/08_registryEmployee/views/Train.vue
index 8928f623c..d06149fde 100644
--- a/src/modules/08_registryEmployee/views/Train.vue
+++ b/src/modules/08_registryEmployee/views/Train.vue
@@ -351,7 +351,6 @@
           :cancel="clickCancel"
           :edit="clickEdit"
           :save="clickSave"
-          :validate="validateData"
           :clickNext="clickNext"
           :clickPrevious="clickPrevious"
           :clickDelete="clickDelete"
@@ -430,7 +429,7 @@ const store = useProfileDataStore();
 const { profileData, changeProfileColumns } = store;
 
 const mixin = useCounterMixin();
-const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader } =
+const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader,dialogConfirm } =
   mixin;
 const route = useRoute();
 const id = ref<string>("");
@@ -860,8 +859,8 @@ const clickAdd = async () => {
 /**
  * กดบันทึกใน dialog
  */
-const clickSave = async () => {
-  myForm.value.validate().then(async (result: boolean) => {
+const SaveData = async () => {
+  await myForm.value.validate().then(async (result: boolean) => {
     if (result) {
       if (modalEdit.value) {
         await editData();
@@ -875,6 +874,9 @@ const clickSave = async () => {
 /**
  * บันทึกเพิ่มข้อมูล
  */
+const clickSave = () => {
+  dialogConfirm($q,() => SaveData())
+}
 const saveData = async () => {
   if (profileId.value) {
     showLoader();
@@ -1103,14 +1105,14 @@ const clickHistory = async (row: RequestItemsObject) => {
 /**
  * validate input ใน dialog
  */
-const validateData = async () => {
-  checkValidate.value = true;
-  await myForm.value.validate().then((result: boolean) => {
-    if (result == false) {
-      checkValidate.value = false;
-    }
-  });
-};
+// const validateData = async () => {
+//   checkValidate.value = true;
+//   await myForm.value.validate().then((result: boolean) => {
+//     if (result == false) {
+//       checkValidate.value = false;
+//     }
+//   });
+// };
 
 /**
  * class จัดรูปแบบแสดงระหว่างข้อมูลที่แก้ไขหรือแสดงเฉยๆ
diff --git a/src/modules/08_registryEmployee/views/Work.vue b/src/modules/08_registryEmployee/views/Work.vue
index 1754fcaa6..91e579e91 100644
--- a/src/modules/08_registryEmployee/views/Work.vue
+++ b/src/modules/08_registryEmployee/views/Work.vue
@@ -255,7 +255,6 @@
           :cancel="clickCancel"
           :edit="clickEdit"
           :save="clickSave"
-          :validate="validateData"
           :clickNext="clickNext"
           :clickPrevious="clickPrevious"
           :clickDelete="clickDelete"
@@ -331,7 +330,7 @@ const store = useProfileDataStore();
 const { profileData, changeProfileColumns } = store;
 
 const mixin = useCounterMixin();
-const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader } =
+const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader,dialogConfirm } =
   mixin;
 const route = useRoute();
 const id = ref<string>("");
@@ -654,8 +653,11 @@ const clickAdd = async () => {
 /**
  * กดบันทึกใน dialog
  */
-const clickSave = async () => {
-  myForm.value.validate().then(async (result: boolean) => {
+ const clickSave =  () => {
+  dialogConfirm($q,() => SaveData())
+ }
+const SaveData = async () => {
+ await myForm.value.validate().then(async (result: boolean) => {
     if (result) {
       if (modalEdit.value) {
         await editData();
@@ -880,14 +882,14 @@ const clickHistory = async (row: RequestItemsObject) => {
 /**
  * validate input ใน dialog
  */
-const validateData = async () => {
-  checkValidate.value = true;
-  await myForm.value.validate().then((result: boolean) => {
-    if (result == false) {
-      checkValidate.value = false;
-    }
-  });
-};
+// const validateData = async () => {
+//   checkValidate.value = true;
+//   await myForm.value.validate().then((result: boolean) => {
+//     if (result == false) {
+//       checkValidate.value = false;
+//     }
+//   });
+// };
 
 /**
  * class จัดรูปแบบแสดงระหว่างข้อมูลที่แก้ไขหรือแสดงเฉยๆ
diff --git a/src/modules/08_registryEmployee/views/information.vue b/src/modules/08_registryEmployee/views/information.vue
index 9a6d6644d..0f83e7fbe 100644
--- a/src/modules/08_registryEmployee/views/information.vue
+++ b/src/modules/08_registryEmployee/views/information.vue
@@ -439,6 +439,7 @@ const {
   dialogMessage,
   showLoader,
   hideLoader,
+  dialogConfirm
 } = mixin;
 
 const profileStore = useProfileDataStore();
@@ -1090,6 +1091,7 @@ const addData = async () => {
       emit("update:statusEdit", false);
       await fetchData();
       await changeBirth(informaData.value.birthDate ?? new Date());
+      await clickBack()
       hideLoader();
     });
   console.log(body);
@@ -1101,8 +1103,10 @@ const saveData = async () => {
   if (myform.value != null) {
     await myform.value.validate().then(async (saveDataTest: Boolean) => {
       if (saveDataTest) {
-        await addData();
-        await clickBack();
+        dialogConfirm(
+          $q,
+          () =>  addData()
+          )
       }
     });
   }
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index 73622e73e..d0b672c84 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -79,34 +79,34 @@ const options = ref<optionType[]>([
   },
 ]);
 
-const getDataNotification = async () => {
-  showLoader();
-  await http
-    .get(config.API.msgNotificate)
-    .then((res: any) => {
-      const response = res.data.result;
-      //   console.log("response", response);
-      let list: notiType[] = [];
-      response.map((e: any) => {
-        list.push({
-          id: e.id,
-          sender:
-            e.createdFullName == "" || e.createdFullName == null
-              ? "เจ้าหน้าที่"[0]
-              : e.createdFullName[0],
-          body: e.body ?? "",
-          timereceive: new Date(e.createdAt),
-        });
-      });
-      notiList.value = list;
-    })
-    .catch((e) => {
-      // messageError($q, e);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-};
+// const getDataNotification = async () => {
+//   showLoader();
+//   await http
+//     .get(config.API.msgNotificate)
+//     .then((res: any) => {
+//       const response = res.data.result;
+//       //   console.log("response", response);
+//       let list: notiType[] = [];
+//       response.map((e: any) => {
+//         list.push({
+//           id: e.id,
+//           sender:
+//             e.createdFullName == "" || e.createdFullName == null
+//               ? "เจ้าหน้าที่"[0]
+//               : e.createdFullName[0],
+//           body: e.body ?? "",
+//           timereceive: new Date(e.createdAt),
+//         });
+//       });
+//       notiList.value = list;
+//     })
+//     .catch((e) => {
+//       // messageError($q, e);
+//     })
+//     .finally(() => {
+//       hideLoader();
+//     });
+// };
 
 /**
  * ให้แสดง แทปด้านขวา เมื่อเข้าหน้า รายละเอียดทะเบียนประวัติ