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

src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue

@@ -10,7 +10,7 @@ import { useInvestigateFactStore } from "@/modules/11_discipline/store/Investiga
 import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
 import type { ArrayPersonAdd } from "@/modules/11_discipline/interface/response/investigate";
-import type { FormData } from "@/modules/11_discipline/interface/request/investigateFact";
+import type { FormData } from "@/modules/11_discipline/interface/request/InvestigateFact";
 import type {
   FormData as FormDataComplaint,
   ArrayPerson,

src/modules/11_discipline/components/2_InvestigateFacts/Form.vue

@@ -11,7 +11,7 @@ import { useInvestigateDisStore } from "@/modules/11_discipline/store/Investigat
 import { useInvestigateFactStore } from "@/modules/11_discipline/store/InvestigateFactStore";
 import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
-import type { FormData } from "@/modules/11_discipline/interface/request/investigateFact";
+import type { FormData } from "@/modules/11_discipline/interface/request/InvestigateFact";
 import type { OptionData } from "@/modules/07_insignia/interface/index/Main";
 
 import CalandarDialog from "@/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue";
@@ -33,7 +33,7 @@ const checkRoutePermisson = ref<boolean>(
 const id = ref<string>(route.params.id as string);
 const modalPerson = ref<boolean>(false);
 const toggleModal = () => (modalPerson.value = !modalPerson.value);
-
+const isEmpType = ref<string>('')
 /**เรียกใช้ store */
 const investigateFactStore = useInvestigateFactStore();
 const mainStore = useDisciplineMainStore();
@@ -313,16 +313,8 @@ function confirmDelete(id: string) {
     .finally(() => {});
 }
 
-async function addPerson(data: any) {
-  await mainStore.fetchData(data);
-}
-
-/**
- * ฟังชั่น รับค่าจาก คอมโพเเนน
- * @param returnData ค่าที่ได้คืนมา
- */
-function handleSave(returnData: any) {
-  addPerson(returnData);
+async function addPerson(data: any, type: string) {
+  await mainStore.fetchData(data, type);
   changeFormData();
   toggleModal();
 }
@@ -552,9 +544,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
 }
 
 /** อัพเดต ปิด/เปิดเมนู ทะเบียนประวัติ */
@@ -658,6 +651,7 @@ watch(props.data, async () => {
         idcard: person.idcard,
         name: person.name,
         prefix: person.prefix,
+        profileType: person.profileType,
         firstName: person.firstName,
         lastName: person.lastName,
         position: person.position,
@@ -958,7 +952,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>
@@ -994,6 +993,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 ?? "-" }}
                             </div>
@@ -1755,7 +1761,7 @@ onMounted(async () => {
     btn-title="เพิ่มรายชื่อผู้ถูกร้องเรียน"
     :close="toggleModal"
     :selected-data="mainStore.rowsAdd"
-    @returnData="handleSave"
+    :save="addPerson"
   />
 
   <DialogDirector
@@ -1796,6 +1802,7 @@ onMounted(async () => {
     :modal="modalPersonal"
     :id="personId"
     @update:modal="updatemodalPersonal"
+    v-model:is-employee="isEmpType"
   />
 </template>