api บรรจุ

src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue

@@ -18,6 +18,8 @@ import HistoryTable from "@/components/TableHistory.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import type { QTableProps } from "quasar";
+import type { PropType } from "vue";
+import type { Certificate } from "@/modules/05_placement/interface/index/Main";
 
 const props = defineProps({
   statusEdit: {
@@ -32,13 +34,16 @@ const props = defineProps({
     type: Function,
     default: () => console.log("not function"),
   },
+  data: {
+    type: Array as PropType<Certificate[]>,
+    default: [],
+  },
 });
 
 const $q = useQuasar();
 const store = useProfileDataStore();
 const { profileData, changeProfileColumns } = store;
-const dataStore = useDataStore();
-const { loaderPage } = dataStore;
+
 const mixin = useCounterMixin();
 const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader } =
   mixin;
@@ -68,7 +73,7 @@ const checkValidate = ref<boolean>(false); //validate data ผ่านหรื
 //   route.params.id ? route.params.id.toString() : ""
 // );
 const profileId = ref<string>("");
-const rows = ref<RequestItemsObject[]>([]);
+const rows = ref<Certificate[]>([]);
 const filter = ref<string>(""); //search data table
 const visibleColumns = ref<String[]>([]);
 profileData.certicate.columns.length == 0
@@ -233,40 +238,12 @@ watch(visibleColumns, async (count: String[], prevCount: String[]) => {
 onMounted(async () => {
   // await fetchData();
   if (route.params.id) {
-    profileId.value = route.params.id.toString();
+    profileId.value = route.params.personalId.toString();
   }
+  await props.fetch();
+  rows.value = props.data;
 });
 
-const fetchData = async () => {
-  if (profileId.value != "") {
-    showLoader();
-    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(() => {
-        hideLoader();
-      });
-  }
-};
-
 /**
  * กดดูข้อมูลก่อนหน้า
  */
@@ -351,42 +328,16 @@ const clickSave = async () => {
  * บันทึกเพิ่มข้อมูล
  */
 const saveData = async () => {
-  if (profileId.value !== "") {
-    showLoader();
-    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();
-      });
-  }
-};
+  //   console.log("saveData");
 
-/**
- * บันทึกแก้ไขข้อมูล
- */
-const editData = async () => {
   showLoader();
   await http
-    .put(config.API.profileCertId(id.value), {
+    .post(config.API.placementCertId(route.params.personalId.toString()), {
       id: id.value,
       certificateNo: certificateNo.value,
       issuer: issuer.value,
-      issueDate: dateToISO(issueDate.value),
-      expireDate: dateToISO(expireDate.value),
+      issueDate: new Date(issueDate.value),
+      expireDate: new Date(expireDate.value),
       certificateType: certificateType.value,
     })
     .then((res) => {
@@ -397,7 +348,35 @@ const editData = async () => {
       messageError($q, e);
     })
     .finally(async () => {
-      await fetchData();
+      await props.fetch();
+      rows.value = props.data;
+    });
+};
+
+/**
+ * บันทึกแก้ไขข้อมูล
+ */
+const editData = async () => {
+  showLoader();
+  await http
+    .put(config.API.placementCertId(route.params.personalId.toString()), {
+      id: id.value,
+      certificateNo: certificateNo.value,
+      issuer: issuer.value,
+      issueDate: new Date(issueDate.value),
+      expireDate: new Date(expireDate.value),
+      certificateType: certificateType.value,
+    })
+    .then((res) => {
+      success($q, "บันทึกข้อมูลสำเร็จ");
+      modal.value = false;
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(async () => {
+      await props.fetch();
+      rows.value = props.data;
     });
 };
 
@@ -415,7 +394,12 @@ const clickDelete = async () => {
     .onOk(async () => {
       showLoader();
       await http
-        .delete(config.API.profileCertId(id.value))
+        .delete(
+          config.API.placementCertDetailId(
+            route.params.personalId.toString(),
+            id.value
+          )
+        )
         .then((res) => {
           success($q, "ลบข้อมูลสำเร็จ");
           modal.value = false;
@@ -424,11 +408,13 @@ const clickDelete = async () => {
           messageError($q, e);
         })
         .finally(async () => {
-          await fetchData();
+          await props.fetch();
+          rows.value = props.data;
         });
     })
     .onCancel(async () => {
-      await fetchData();
+      await props.fetch();
+      rows.value = props.data;
     });
 };
 

src/modules/05_placement/components/PersonalDetail/Information/Information.vue

@@ -115,7 +115,7 @@ const fetchPerson = async () => {
     .then((res) => {
       const data = res.data.result;
       let optionbloodGroups: optionData[] = [];
-      console.log(data);
+      //   console.log(data);
       data.bloodGroups.map((r: any) => {
         optionbloodGroups.push({
           id: r.id ?? "",