ปรับ เเสดงรายละเอียด รายบุคคลระบบ บรรจุ/พ้นราชการ

src/modules/06_retirement/components/resign/DetailDeceased.vue

@@ -5,7 +5,10 @@ import { ref, onMounted } from "vue";
 import { useCounterMixin } from "@/stores/mixin";
 import http from "@/plugins/http";
 import config from "@/app.config";
-
+import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
+  
+const modalPersonal = ref<boolean>(false);
+const personId = ref<string>("");
 /**use*/
 const $q = useQuasar();
 const router = useRouter();
@@ -39,10 +42,6 @@ const fectdata = async () => {
     });
 };
 
-//กลับไปหน้า registry
-const redirectToRegistry = (id: string) => {
-  router.push(`/registry/${id}`);
-};
 
 //เปิดdetail ของ deceased
 const openDeceased = (id: string) => {
@@ -88,6 +87,15 @@ const fileDownload = async (type: string) => {
       hideLoader();
     });
 };
+
+function onclickViewinfo(id: string) {
+  modalPersonal.value = true;
+  personId.value = id;
+}
+
+function updatemodalPersonal(modal: boolean) {
+  modalPersonal.value = modal;
+}
 </script>
 
 <template>
@@ -117,7 +125,7 @@ const fileDownload = async (type: string) => {
         icon-right="mdi-open-in-new"
         class="q-px-sm"
         label="ดูข้อมูลทะเบียนประวัติ"
-        @click="redirectToRegistry(detail.profileId)"
+        @click="onclickViewinfo(detail.profileId)"
       />
     </div>
     <div class="col-12"><q-separator /></div>
@@ -236,6 +244,12 @@ const fileDownload = async (type: string) => {
       </div>
     </div>
   </q-card>
+
+  <PopupPersonal
+    :modal="modalPersonal"
+    :id="personId"
+    @update:modal="updatemodalPersonal"
+  />
 </template>
 
 <style lang="scss" scope>

src/modules/06_retirement/components/resign/ResignByid.vue

@@ -15,7 +15,10 @@ import type {
   rowFile,
 } from "@/modules/06_retirement/interface/response/Main";
 import type { QTableProps } from "quasar";
-
+import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
+  
+const modalPersonal = ref<boolean>(false);
+const personId = ref<string>("");
 /** Use */
 const $q = useQuasar();
 const route = useRoute();
@@ -269,14 +272,6 @@ const rejectpopUp = async () => {
   );
 };
 
-/**
- * ไปยังข้อมูล
- * @param id ไอดีข้อมูล
- */
-const redirectToRegistry = (id: string) => {
-  router.push(`/registry/${id}`);
-};
-
 /**
  * กดยกเลิก
  */
@@ -395,6 +390,15 @@ const downloadFile = (response: any, filename: string) => {
   link.click();
   document.body.removeChild(link);
 };
+
+function onclickViewinfo(id: string) {
+  modalPersonal.value = true;
+  personId.value = id;
+}
+
+function updatemodalPersonal(modal: boolean) {
+  modalPersonal.value = modal;
+}
 </script>
 <template>
   <div class="toptitle text-dark col-12 row items-center">
@@ -424,7 +428,7 @@ const downloadFile = (response: any, filename: string) => {
         icon-right="mdi-open-in-new"
         class="q-px-sm"
         label="ดูข้อมูลทะเบียนประวัติ"
-        @click="redirectToRegistry(dataDetail.profileId)"
+        @click="onclickViewinfo(dataDetail.profileId)"
       />
     </div>
     <div class="col-12"><q-separator /></div>
@@ -1091,6 +1095,13 @@ const downloadFile = (response: any, filename: string) => {
       </q-form>
     </q-card>
   </q-dialog>
+
+  <PopupPersonal
+    :modal="modalPersonal"
+    :id="personId"
+    @update:modal="updatemodalPersonal"
+  />
+
 </template>
 
 <style lang="scss" scope>