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(() => {
- {{ 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 : "" }} +
+
+ {{ col.value ? col.value : "-" }}
-
{{ col.value ? col.value : "-" }}