Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop

src/modules/10_order/components/PopupHistory.vue

@@ -6,12 +6,15 @@ import type { QForm, QTableProps } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar } from "quasar";
 import { useRouter } from "vue-router";
+import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
 import type {
   history,
   ColumnData,
   DataOptionInsigniaType,
 } from "@/modules/10_order/interface/index/Main";
 
+const modalPersonal = ref<boolean>(false);
+const personId = ref<string>("");
 const myForm = ref<QForm>();
 const mixin = useCounterMixin();
 const { showLoader, hideLoader, messageError } = mixin;
@@ -139,6 +142,16 @@ const paginationLabel = (start: number, end: number, total: number) => {
   if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
   else return start + "-" + end + " ใน " + total;
 };
+
+function onclickViewinfo(id: string) {
+  modalPersonal.value = true;
+  personId.value = id;
+}
+
+function updatemodalPersonal(modal: boolean) {
+  modalPersonal.value = modal;
+}
+
 </script>
 
 <template>
@@ -290,14 +303,14 @@ const paginationLabel = (start: number, end: number, total: number) => {
                 key="citizenId"
                 class="text-primary"
                 :props="props"
-                @click="clickRedirect(props.row.id)"
+                @click="onclickViewinfo(props.row.id)"
                 >{{ props.row.citizenId }}</q-td
               >
               <q-td
                 key="name"
                 class="text-primary"
                 :props="props"
-                @click="clickRedirect(props.row.id)"
+                @click="onclickViewinfo(props.row.id)"
                 >{{ props.row.name }}</q-td
               >
 
@@ -323,6 +336,12 @@ const paginationLabel = (start: number, end: number, total: number) => {
       </q-card-section>
     </q-card>
   </q-dialog>
+
+  <PopupPersonal
+    :modal="modalPersonal"
+    :id="personId"
+    @update:modal="updatemodalPersonal"
+  />
 </template>
 
 <style scoped>