From cc3006b82583c35771ba53d101f7b8aa40712bda Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 3 Jul 2024 11:11:21 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=AB=E0=B8=A5=E0=B8=B1=E0=B8=81=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=B9=E0=B8=95=E0=B8=A3=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9D?=
 =?UTF-8?q?=E0=B8=B6=E0=B8=81=E0=B8=AD=E0=B8=9A=E0=B8=A3=E0=B8=A1=20=3D>?=
 =?UTF-8?q?=20=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81?=
 =?UTF-8?q?=E0=B8=9C=E0=B8=A5=20fix=20load?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../15_development/components/Record.vue      | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/modules/15_development/components/Record.vue b/src/modules/15_development/components/Record.vue
index 2bfd1cc2d..271d700f0 100644
--- a/src/modules/15_development/components/Record.vue
+++ b/src/modules/15_development/components/Record.vue
@@ -200,6 +200,7 @@ async function clickUpload(file: any) {
   dialogConfirm(
     $q,
     async () => {
+      showLoader();
       const selectedFile = file;
       const formData = new FormData();
       formData.append("file", selectedFile);
@@ -212,6 +213,7 @@ async function clickUpload(file: any) {
         })
         .catch((err) => {
           messageError($q, err);
+          showLoader();
         });
     },
     "ยืนยันการอัปโหลดไฟล์",
@@ -254,19 +256,16 @@ function sendRecordRegistry() {
   // ส่งไปบันทึกที่ทะเบียนประวัติ
   dialogConfirm(
     $q,
-    async () => {
+    () => {
       showLoader();
-      // post
-      await http
+      http
         .get(config.API.developmentMainTab("tab6/done", id.value))
-        .then((res) => {
-          success($q, "ส่งข้อมูลสำเร็จ");
-          getData();
+        .then(async () => {
+          await getData();
+          await success($q, "ส่งข้อมูลสำเร็จ");
         })
         .catch((e) => {
           messageError($q, e);
-        })
-        .finally(() => {
           hideLoader();
         });
     },
@@ -379,9 +378,13 @@ onMounted(() => {
         </q-td>
         <q-td v-for="col in props.cols" :key="col.id">
           <div v-if="col.name == 'fullName'">
-            {{ props.row.prefix ? props.row.prefix:''  }}{{ props.row.firstName ? props.row.firstName:''  }} {{ props.row.lastName ? props.row.lastName:''  }}
+            {{ props.row.prefix ? props.row.prefix : ""
+            }}{{ props.row.firstName ? props.row.firstName : "" }}
+            {{ props.row.lastName ? props.row.lastName : "" }}
+          </div>
+          <div v-else class="table_ellipsis2">
+            {{ col.value ? col.value : "-" }}
           </div>
-          <div v-else  class="table_ellipsis2">{{ col.value ? col.value : "-" }}</div>
         </q-td>
       </q-tr>
     </template>