รวมไฟล์แก้งานงวด2

src/modules/04_registry/components/Information/Certicate.vue

@@ -285,10 +285,6 @@ const props = defineProps({
     type: String,
     required: true,
   },
-  statusAdd: {
-    type: Boolean,
-    default: false,
-  },
 });
 
 const $q = useQuasar();
@@ -320,9 +316,7 @@ const tittleHistory = ref<string>("ประวัติแก้ไขใบอ
 const filterHistory = ref<string>(""); //search data table history
 const modalHistory = ref<boolean>(false); //modal ประวัติการแก้ไขข้อมูล
 const checkValidate = ref<boolean>(false); //validate data ผ่านหรือไม่
-const profileId = ref<string>(
-  route.params.id ? route.params.id.toString() : ""
-);
+const profileId = ref<string>(route.params.id.toString());
 const rows = ref<RequestItemsObject[]>([]);
 const filter = ref<string>(""); //search data table
 const visibleColumns = ref<String[]>([]);
@@ -490,33 +484,31 @@ onMounted(async () => {
 });
 
 const fetchData = async () => {
-  if (profileId.value !== "") {
-    loaderPage(true);
-    await http
-      .get(config.API.profileCertId(profileId.value))
-      .then((res) => {
-        let data = res.data.result;
-        rows.value = [];
-        data.map((e: ResponseObject) => {
-          rows.value.push({
-            id: e.id,
-            certificateNo: e.certificateNo,
-            issuer: e.issuer,
-            issueDate: new Date(e.issueDate),
-            expireDate: new Date(e.expireDate),
-            certificateType: e.certificateType,
-            createdFullName: e.createdFullName,
-            createdAt: new Date(e.createdAt),
-          });
+  loaderPage(true);
+  await http
+    .get(config.API.profileCertId(profileId.value))
+    .then((res) => {
+      let data = res.data.result;
+      rows.value = [];
+      data.map((e: ResponseObject) => {
+        rows.value.push({
+          id: e.id,
+          certificateNo: e.certificateNo,
+          issuer: e.issuer,
+          issueDate: new Date(e.issueDate),
+          expireDate: new Date(e.expireDate),
+          certificateType: e.certificateType,
+          createdFullName: e.createdFullName,
+          createdAt: new Date(e.createdAt),
         });
-      })
-      .catch((e) => {
-        messageError($q, e);
-      })
-      .finally(() => {
-        loaderPage(false);
       });
-  }
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      loaderPage(false);
+    });
 };
 
 /**
@@ -603,28 +595,26 @@ const clickSave = async () => {
  * บันทึกเพิ่มข้อมูล
  */
 const saveData = async () => {
-  if (profileId.value !== "") {
-    loaderPage(true);
-    await http
-      .post(config.API.profileCertId(profileId.value), {
-        id: id.value,
-        certificateNo: certificateNo.value,
-        issuer: issuer.value,
-        issueDate: dateToISO(issueDate.value),
-        expireDate: dateToISO(expireDate.value),
-        certificateType: certificateType.value,
-      })
-      .then((res) => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
-        modal.value = false;
-      })
-      .catch((e) => {
-        messageError($q, e);
-      })
-      .finally(async () => {
-        await fetchData();
-      });
-  }
+  loaderPage(true);
+  await http
+    .post(config.API.profileCertId(profileId.value), {
+      id: id.value,
+      certificateNo: certificateNo.value,
+      issuer: issuer.value,
+      issueDate: dateToISO(issueDate.value),
+      expireDate: dateToISO(expireDate.value),
+      certificateType: certificateType.value,
+    })
+    .then((res) => {
+      success($q, "บันทึกข้อมูลสำเร็จ");
+      modal.value = false;
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(async () => {
+      await fetchData();
+    });
 };
 
 /**