Merge branch 'develop' into dev-tee

src/modules/05_placement/components/probation/MainProbation.vue

@@ -189,7 +189,7 @@ const ProbationMainFilter = () => {
 };
 const dataUpdate = ref<any>([]);
 const updateRows = (body: any) => {
-  console.log(body.value);
+  // console.log(body.value);
   if (body.value !== "ทั้งหมด") {
     const filteredRows = dataUpdate.value.filter(
       (item: any) => item.probation_status === body.value
@@ -207,10 +207,6 @@ const getpersonalList = async () => {
     .then((res) => {
       const data = res.data.data;
       fillterStatus.value = data;
-      console.log(
-        "🚀 ~ file: MainProbation.vue:193 ~ .then ~ fillterStatus:",
-        fillterStatus
-      );
       rows.value = data.map((item: FormMainProbation) => ({
         personal_id: item.personal_id,
         name: item.name,
@@ -282,7 +278,7 @@ const findlist = async (id: string) => {
   response2.forEach((e: any) =>
     probationlist.value.push({ ...e, probation: false })
   );
-  console.log(probationlist.value);
+  // console.log(probationlist.value);
   rows2.value = probationlist.value.map((e: any) => ({
     id: e.id,
     fullname: e.fullname,

src/stores/mixin.ts

@@ -353,6 +353,17 @@ export const useCounterMixin = defineStore("mixin", () => {
               onlycancel: true,
             },
           });
+        } else if (e.response.data.successful === false) {
+          q.dialog({
+            component: CustomComponent,
+            componentProps: {
+              title: `พบข้อผิดพลาด`,
+              message: e.response.data.message,
+              icon: "warning",
+              color: "red",
+              onlycancel: true,
+            },
+          });
         } else {
           q.dialog({
             component: CustomComponent,

src/views/MainLayout.vue

@@ -99,7 +99,7 @@ const getDataNotification = async () => {
               ? "เจ้าหน้าที่"[0]
               : e.createdFullName[0],
           body: e.body ?? "",
-          timereceive: new Date(e.createdAt),
+          timereceive: new Date(e.receiveDate),
         });
       });
       notiList.value = list;