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

src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue

@@ -56,6 +56,7 @@ const calendarModal = ref<boolean>(false);
 const calendarModalclose = () => (calendarModal.value = !calendarModal.value);
 const modalPopup = ref<boolean>(false);
 
+const isEmpType = ref<string>("");
 const checkRoutePermisson = ref<boolean>(
   route.name == "disciplineDisciplinaryDetail"
 );
@@ -286,6 +287,7 @@ async function fetchDatadetail() {
         id: person.id,
         idcard: person.idcard,
         name: person.name,
+        profileType: person.profileType,
         prefix: person.prefix,
         firstName: person.firstName,
         lastName: person.lastName,
@@ -334,6 +336,7 @@ async function fetchDatadetail() {
         idcard: person.idcard,
         name: person.name,
         prefix: person.prefix,
+        profileType: person.profileType,
         firstName: person.firstName,
         lastName: person.lastName,
         posLevelName: person.posLevelName,
@@ -397,14 +400,6 @@ function returnCount(num: number) {
 
 async function addPerson(data: any) {
   await mainStore.fetchData(data);
-}
-
-/**
- * ฟังชั่น รับค่าจาก คอมโพเเนน
- * @param returnData ค่าที่ได้คืนมา
- */
-function handleSave(returnData: any) {
-  addPerson(returnData);
   changeFormData();
   toggleModal();
 }
@@ -630,9 +625,10 @@ async function saveDuty(id: string, duty: string, resolution: string) {
     });
 }
 
-function onclickViewinfo(id: string) {
+function onclickViewinfo(id: string, type: string) {
   modalPersonal.value = true;
   personId.value = id;
+  isEmpType.value = type;
 }
 
 function updatemodalPersonal(modal: boolean) {
@@ -918,7 +914,12 @@ onMounted(async () => {
                               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>
@@ -955,6 +956,13 @@ onMounted(async () => {
                             <div v-else-if="col.name === 'salary'">
                               {{ props.row.salary.toLocaleString() }}
                             </div>
+                            <div v-else-if="col.name === 'profileType'">
+                              {{
+                                props.row.profileType
+                                  ? mainStore.convertType(props.row.profileType)
+                                  : "-"
+                              }}
+                            </div>
                             <div v-else>
                               {{ col.value ? col.value : "-" }}
                             </div>
@@ -1946,7 +1954,6 @@ onMounted(async () => {
     :close="toggleModal"
     :save="addPerson"
     :selected-data="mainStore.rowsAdd"
-    @returnData="handleSave"
   />
 
   <DialogDirector
@@ -1986,6 +1993,7 @@ onMounted(async () => {
     :modal="modalPersonal"
     :id="personId"
     @update:modal="updatemodalPersonal"
+    v-model:is-employee="isEmpType"
   />
 </template>