วินัยรองรับลูกจ้างประจำ กทม.

src/modules/11_discipline/components/4_Result/Form.vue

@@ -13,13 +13,14 @@ import type {
   FormData,
   FormRef,
   DataOption,
-} from "@/modules/11_discipline/interface/request/result";
+} from "@/modules/11_discipline/interface/request/Result";
 
 import DialogHistory from "@/modules/11_discipline/components/4_Result/DialogHistory.vue";
 import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
 
 const mainStore = useDisciplineMainStore();
 
+const isEmpType = ref<string>('')
 const dataStore = useDisciplineResultStore();
 const mixin = useCounterMixin();
 const {
@@ -227,9 +228,10 @@ function closeDetail() {
 }
 
 /** เปิดรายละเอียด */
-function onclickViewinfo(id: string) {
+function onclickViewinfo(id: string,type:string) {
   modalPersonal.value = true;
   personId.value = id;
+  isEmpType.value = type
 }
 
 function updatemodalPersonal(modal: boolean) {
@@ -394,7 +396,7 @@ watch(
                               round
                               color="info"
                               icon="mdi-eye"
-                              @click="onclickViewinfo(props.row.personId)"
+                              @click="onclickViewinfo(props.row.personId,props.row.profileType)"
                             >
                               <q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
                             </q-btn>
@@ -431,6 +433,13 @@ watch(
                                   : ""
                               }}
                             </div>
+                            <div v-else-if="col.name === 'profileType'">
+                              {{
+                                props.row.profileType
+                                  ? mainStore.convertType(props.row.profileType)
+                                  : "-"
+                              }}
+                            </div>
                             <div v-else>
                               {{ col.value }}
                             </div>
@@ -644,6 +653,7 @@ watch(
   <PopupPersonal
     :modal="modalPersonal"
     :id="personId"
+    v-model:is-employee="isEmpType"
     @update:modal="updatemodalPersonal"
   />