From 9f4aeec57593ef8cba592a23e94388788fdaefc4 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 19 Aug 2024 09:40:57 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B4=20=3D>=20=E0=B8=82=E0=B9=89=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88?=
 =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=87=20=E0=B8=9B=E0=B8=A3=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=9A=20load?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/Employee/01_DataEmployee.vue       | 29 +++++++++----------
 .../detail/Employee/02_Employment.vue         |  6 ++--
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue b/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
index 230ff4f78..ad174cacf 100644
--- a/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
+++ b/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
@@ -27,7 +27,6 @@ const {
   date2Thai,
   messageError,
   dialogConfirm,
-  dialogMessageNotify,
 } = useCounterMixin();
 
 const profileId = ref<string>(
@@ -124,9 +123,9 @@ function onSubmit() {
     showLoader();
     http
       .put(config.API.informationEmployee(profileId.value), formData)
-      .then(() => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
-        fetchData();
+      .then(async () => {
+        await fetchData();
+        await success($q, "บันทึกข้อมูลสำเร็จ");
         onCloseDialog();
       })
       .catch((err) => {
@@ -386,7 +385,7 @@ onMounted(() => {
   </q-card>
 
   <!-- Dialog แก้ไขข้อมูลลูกจ้างชั่วคราว -->
-  <q-dialog v-model="modalEdit" persistent full-width>
+  <q-dialog v-model="modalEdit" persistent>
     <q-card>
       <q-form greedy @submit.prevent @validation-success="onSubmit">
         <DialogHeader
@@ -397,7 +396,7 @@ onMounted(() => {
         <q-separator />
         <q-card-section>
           <div class="row col-12 q-col-gutter-sm">
-            <div class="col-xs-6 col-sm-3 col-md-3">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <q-input
                 dense
                 outlined
@@ -409,7 +408,7 @@ onMounted(() => {
                 :rules="[(val: string) => !!val || `${'กรุณากรอกกลุ่มงาน'}`]"
               />
             </div>
-            <div class="col-xs-6 col-sm-3 col-md-3">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <q-input
                 dense
                 outlined
@@ -421,7 +420,7 @@ onMounted(() => {
                 :rules="[(val: string) => !!val || `${'กรุณากรอกสายงาน'}`]"
               />
             </div>
-            <div class="col-xs-6 col-sm-3 col-md-3">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <q-input
                 dense
                 outlined
@@ -433,7 +432,7 @@ onMounted(() => {
                 :rules="[(val: string) => !!val || `${'กรุณากรอกตำแหน่งทางสายงาน'}`]"
               />
             </div>
-            <div class="col-xs-6 col-sm-3 col-md-3">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <q-input
                 dense
                 outlined
@@ -446,7 +445,7 @@ onMounted(() => {
               <!-- :rules="[(val: string) => !!val || `${'กรุณากรอกสังกัด'}`]" -->
             </div>
 
-            <div class="col-xs-6 col-sm-3 col-md-3">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <q-input
                 dense
                 outlined
@@ -458,7 +457,7 @@ onMounted(() => {
               />
               <!-- :rules="[(val: string) => !!val || `${'กรุณากรอกประเภทบุคคล'}`]" -->
             </div>
-            <div class="col-xs-6 col-sm-3 col-md-3">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <q-input
                 dense
                 outlined
@@ -473,7 +472,7 @@ onMounted(() => {
               <!-- :rules="[(val: string) => !!val || `${'กรุณากรอกค่าจ้าง'}`]" -->
             </div>
 
-            <div class="col-xs-6 col-sm-3 col-md-3">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <q-input
                 dense
                 outlined
@@ -487,7 +486,7 @@ onMounted(() => {
               />
               <!-- :rules="[(val: string) => !!val || `${'กรุณากรอกเงินเพิ่มการครองชึพชั่วคราว'}`]" -->
             </div>
-            <div class="col-xs-6 col-sm-3 col-md-3">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <q-input
                 dense
                 outlined
@@ -501,7 +500,7 @@ onMounted(() => {
               />
               <!-- :rules="[(val: string) => !!val || `${'กรุณากรอกเงินช่วยเหลือการครองชึพชั่วคราว'}`]" -->
             </div>
-            <div class="col-xs-6 col-sm-3 col-md-3">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <q-input
                 dense
                 outlined
@@ -515,7 +514,7 @@ onMounted(() => {
               />
               <!-- :rules="[(val: string) => !!val || `${'กรุณากรอกเงินสมทบประกันสังคม(ลูกจ้าง)'}`]" -->
             </div>
-            <div class="col-xs-6 col-sm-3 col-md-3">
+            <div class="col-xs-12 col-sm-6 col-md-6">
               <q-input
                 dense
                 outlined
diff --git a/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue b/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
index 79612f3ac..799dec715 100644
--- a/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
+++ b/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
@@ -156,9 +156,9 @@ function onSubmit() {
     const methods = isEdit.value ? "put" : "post";
     const id = isEdit.value ? employmentId.value : profileId.value;
     http[methods](config.API.employmentEmployee(id), formData)
-      .then(() => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
-        fetchListEmployment();
+      .then(async () => {
+        await fetchListEmployment();
+        await success($q, "บันทึกข้อมูลสำเร็จ");
         onCloseDialog();
       })
       .catch((err) => {