Merge branch 'develop' of github.com:Frappet/BMA-EHR-USER into develop

src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue

@@ -284,7 +284,6 @@ onMounted(async () => {
     formDataFollowSpouse.leaveStartDate = new Date(props.data.leaveStartDate);
     formDataFollowSpouse.leaveEndDate = new Date(props.data.leaveEndDate);
     formDataFollowSpouse.leaveDetail = props.data.leaveDetail;
-		formDataFollowSpouse.leaveDocument = props.data.leaveDocument;
     formDataFollowSpouse.leaveTotal = props.data.leaveTotal;
     formDataFollowSpouse.leaveSalaryText = props.data.leaveSalaryText;
     formDataFollowSpouse.leaveSalary = props.data.leaveSalary;

src/modules/08_KPI/components/Tab/05_File.vue

@@ -130,17 +130,17 @@ function deleteFile(fileName: string) {
     showLoader();
     http
       .delete(config.API.file("ไฟล์เอกสาร", "KPI", id.value) + `/${fileName}`)
-      .catch((e) => {
+      .then((res) => {
-        messageError($q, e);
-      })
-      .finally(() => {
-        getData();
-
         setTimeout(() => {
+          getData();
           success($q, `ลบไฟล์สำเร็จ`);
           hideLoader();
         }, 500);
-      });
+      })
+      .catch((e) => {
+        messageError($q, e);
+      })
+      .finally(() => {});
   });
 }