Merge branch 'develop' into dev-tee

src/modules/04_registry/components/PopupHistory.vue

@@ -6,11 +6,13 @@ import config from "@/app.config";
 import type { QForm } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar } from "quasar";
+import { useRouter } from "vue-router";
 
 const myForm = ref<QForm>();
 const mixin = useCounterMixin();
-const { showLoader, hideLoader, messageError, date2Thai, notifyError } = mixin;
+const { showLoader, hideLoader, messageError, date2Thai, dialogMessageNotify } = mixin;
 const $q = useQuasar();
+const router = useRouter();
 
 const modal = ref<boolean>(false);
 const employeeClass = ref<string>("");
@@ -154,7 +156,7 @@ const clickSearch = async (type: string) => {
               date: date2Thai(e.date),
             }));
           } else {
-            notifyError($q, "ไม่มีข้อมูลที่ต้องการค้นหา");
+            dialogMessageNotify($q, "ไม่มีข้อมูลที่ต้องการค้นหา");
             rows.value = [];
           }
         })
@@ -183,6 +185,9 @@ const filterFn = (val: string, update: any) => {
     });
   }
 };
+const clickRedirect = (id: string) => {
+  router.push(`/registry/${id}`);
+};
 
 const paging = ref<boolean>(true);
 const pagination = ref({
@@ -353,10 +358,20 @@ const paginationLabel = (start: number, end: number, total: number) => {
             <q-tr :props="props" class="cursor-pointer">
               <q-td key="no" :props="props"> {{ props.rowIndex + 1 }}</q-td>
               <q-td key="order" :props="props">{{ props.row.order }} </q-td>
-              <q-td key="citizenId" :props="props">{{
-                props.row.citizenId
-              }}</q-td>
-              <q-td key="name" :props="props">{{ props.row.name }}</q-td>
+              <q-td
+                key="citizenId"
+                class="text-primary"
+                @click="clickRedirect(props.row.id)"
+                :props="props"
+                >{{ props.row.citizenId }}</q-td
+              >
+              <q-td
+                key="name"
+                class="text-primary"
+                @click="clickRedirect(props.row.id)"
+                :props="props"
+                >{{ props.row.name }}</q-td
+              >
 
               <q-td key="posNo" :props="props">{{ props.row.posNo }}</q-td>
               <q-td key="position" :props="props">{{