Merge branch 'develop' into devTee

src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue

@@ -14,6 +14,8 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
 
+import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
+
 const qualification = ref<string>("");
 const mainStore = useDisciplineMainStore();
 const searchRef = ref<any>(null);
@@ -308,13 +310,31 @@ function returnDetail(data: any) {
   formData.phone = data.phone;
   formData.email = data.email;
 }
+
+const modalPersonal = ref<boolean>(false);
+const personId = ref<string>("");
+/**
+ * function ดูประวัติแบบย่อย
+ * @param id  personId
+ */
+function onclickViewinfo(id: string) {
+  modalPersonal.value = true;
+  personId.value = id;
+}
+/**
+ * function อัปเดท modal
+ * @param modal ค่า modal
+ */
+function updatemodalPersonal(modal: boolean) {
+  modalPersonal.value = modal;
+}
 </script>
 <template>
   <form @submit.prevent.stop="onValidate">
     <q-card bordered>
       <div class="col-12 q-pa-md">
         <div class="row col-12 q-col-gutter-md">
-          <div class=" col-12 q-gutter-y-sm" v-if="data === null">
+          <div class="col-12 q-gutter-y-sm" v-if="data === null">
             <div class="row q-col-gutter-md items-start">
               <div class="col-12 col-sm-6 col-md-3">
                 <q-select
@@ -356,7 +376,6 @@ function returnDetail(data: any) {
               </div>
             </div>
 
-
             <div class="col-12">
               <d-table
                 ref="table"
@@ -394,13 +413,24 @@ function returnDetail(data: any) {
                         {{ props.rowIndex + 1 }}
                       </div>
                       <div v-else-if="col.name == 'info'">
-                        <router-link
+                        <!-- <router-link
                           target="_blank"
                           :to="`/registry/${props.row.personId}`"
-                          ><q-icon name="info" color="info" size="sm"
-                            ><q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
-                          </q-icon></router-link
+                          > -->
+                        <q-btn
+                          dense
+                          flat
+                          round
+                          color="info"
+                          icon="info"
+                          @click="onclickViewinfo(props.row.personId)"
                         >
+                          <q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
+                        </q-btn>
+                        <!-- <q-icon name="info" color="info" size="sm"
+                          ><q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
+                        </q-icon> -->
+                        <!-- </router-link> -->
                       </div>
 
                       <div v-else>
@@ -516,4 +546,10 @@ function returnDetail(data: any) {
       </div>
     </q-card>
   </form>
+
+  <PopupPersonal
+    :modal="modalPersonal"
+    :id="personId"
+    @update:modal="updatemodalPersonal"
+  />
 </template>