From f45af7bb86395b6021f3e529f7f5b388cc6f4f29 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Fri, 6 Oct 2023 01:28:25 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=95=E0=B9=88=E0=B8=AD=20api=20=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B8=E0=B8=84=E0=B8=84=E0=B8=A5=E0=B8=97=E0=B8=B5=E0=B9=88?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B2=E0=B8=A1=E0=B8=B2=E0=B8=A3=E0=B8=96=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=94=E0=B8=95=E0=B9=88=E0=B8=AD=E0=B9=84=E0=B8=94?=
 =?UTF-8?q?=E0=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/recruiting/api.period-exam.ts         |   2 +
 .../03_recruiting/components/Contact.vue      | 178 ++++++++++++++++++
 .../03_recruiting/components/Education.vue    |  18 +-
 .../03_recruiting/components/ExamFinished.vue |   7 +-
 .../03_recruiting/components/Profile.vue      |  20 ++
 .../components/TableCandidate.vue             |  68 +++----
 .../03_recruiting/interface/index/Main.ts     |  19 ++
 .../views/02_qualify/DisableDetailEx.vue      |   5 -
 .../views/02_qualify/ExamForm.vue             | 172 ++++++++++-------
 .../views/02_qualify/manageDetail.vue         |  24 +--
 .../03_recruiting/views/03_editor/index.vue   | 112 +++++------
 .../components/PersonalDetail/Detail.vue      |   2 +-
 12 files changed, 449 insertions(+), 178 deletions(-)
 create mode 100644 src/modules/03_recruiting/components/Contact.vue

diff --git a/src/api/recruiting/api.period-exam.ts b/src/api/recruiting/api.period-exam.ts
index 91d8dcb72..0cb91f2c0 100644
--- a/src/api/recruiting/api.period-exam.ts
+++ b/src/api/recruiting/api.period-exam.ts
@@ -42,6 +42,8 @@ export default {
     `${periodExam}family/${candidateId}`,
   candidateOccupation: (candidateId: string) =>
     `${periodExam}occupation/${candidateId}`,
+  candidateContact: (candidateId: string) =>
+    `${periodExam}contact/${candidateId}`,
   candidateEducation: (candidateId: string) =>
     `${periodExam}education/${candidateId}`,
   candidateAdminEducation: (candidateId: string) =>
diff --git a/src/modules/03_recruiting/components/Contact.vue b/src/modules/03_recruiting/components/Contact.vue
new file mode 100644
index 000000000..725f1348c
--- /dev/null
+++ b/src/modules/03_recruiting/components/Contact.vue
@@ -0,0 +1,178 @@
+<!-- card บุคคลที่สามารถติดต่อได้ -->
+<template>
+  <HeaderTop
+    v-model:edit="edit"
+    header="บุคคลที่สามารถติดต่อได้"
+    icon="mdi-account-circle"
+    :addData="true"
+    :editOnly="false"
+    :editData="false"
+  />
+  <q-form ref="myform">
+    <div class="row col-12 items-center q-col-gutter-x-sm q-col-gutter-y-xs">
+      <div class="col-xs-12 col-sm-3 col-md-2">
+        <q-select
+          :class="getClass(status == 'checkRegister' || status == 'payment')"
+          :readonly="!(status == 'checkRegister' || status == 'payment')"
+          :borderless="!(status == 'checkRegister' || status == 'payment')"
+          :rules="[(val) => !!val || `${'กรุณาเลือก คำนำหน้า'}`]"
+          :outlined="status == 'checkRegister' || status == 'payment'"
+          dense
+          lazy-rules
+          v-model="defaultContact.contactPrefixId"
+          emit-value
+          map-options
+          option-label="name"
+          :options="prefixOptions"
+          option-value="id"
+          :label="`${'คำนำหน้า'}`"
+        />
+      </div>
+      <div class="col-xs-12 col-sm-3 col-md-3">
+        <q-input
+          :class="getClass(status == 'checkRegister' || status == 'payment')"
+          :outlined="status == 'checkRegister' || status == 'payment'"
+          dense
+          lazy-rules
+          :readonly="!(status == 'checkRegister' || status == 'payment')"
+          :borderless="!(status == 'checkRegister' || status == 'payment')"
+          v-model="defaultContact.contactFirstname"
+          :rules="[(val) => !!val || `${'กรุณากรอก ชื่อ'}`]"
+          :label="`${'ชื่อ'}`"
+        />
+      </div>
+      <div class="col-xs-12 col-sm-3 col-md-3">
+        <q-input
+          :class="getClass(status == 'checkRegister' || status == 'payment')"
+          :outlined="status == 'checkRegister' || status == 'payment'"
+          dense
+          lazy-rules
+          :readonly="!(status == 'checkRegister' || status == 'payment')"
+          :borderless="!(status == 'checkRegister' || status == 'payment')"
+          v-model="defaultContact.contactLastname"
+          :rules="[(val) => !!val || `${'กรุณากรอก นามสกุล'}`]"
+          :label="`${'นามสกุล'}`"
+        />
+      </div>
+      <div class="col-xs-12 col-sm-3 col-md-4">
+        <q-input
+          :class="getClass(status == 'checkRegister' || status == 'payment')"
+          :outlined="status == 'checkRegister' || status == 'payment'"
+          dense
+          lazy-rules
+          :readonly="!(status == 'checkRegister' || status == 'payment')"
+          :borderless="!(status == 'checkRegister' || status == 'payment')"
+          v-model="defaultContact.contactRelations"
+          :rules="[(val) => !!val || `${'กรุณากรอกความสัมพันธ์'}`]"
+          :label="`${'เกี่ยวข้องเป็น'}`"
+        />
+      </div>
+      <div class="col-xs-12 col-sm-3 col-md-4">
+        <q-input
+          :outlined="status == 'checkRegister' || status == 'payment'"
+          dense
+          :counter="
+            status == 'checkRegister' || status == 'payment' ? true : false
+          "
+          lazy-rules
+          type="tel"
+          mask="##########"
+          maxlength="10"
+          :class="getClass(status == 'checkRegister' || status == 'payment')"
+          :readonly="!(status == 'checkRegister' || status == 'payment')"
+          :borderless="!(status == 'checkRegister' || status == 'payment')"
+          v-model="defaultContact.contactTel"
+          :label="`${'โทรศัพท์'}`"
+          :rules="[
+            (val) => val.length == 10 || `${'กรุณากรอก โทรศัพท์'}`,
+            (val) =>
+              /^[0-9]*$/.test(val) || `${'กรุณากรอกข้อมูลโทรศัพท์ให้ถูกต้อง'}`,
+          ]"
+        />
+      </div>
+    </div>
+  </q-form>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, watch, PropType } from "vue";
+import http from "@/plugins/http";
+import config from "@/app.config";
+import type {
+  Contact,
+  DataOption,
+} from "@/modules/03_recruiting/interface/index/Main";
+import {
+  defaultContact,
+  changeData,
+} from "@/modules/03_recruiting/interface/index/Main";
+import HeaderTop from "@/modules/03_recruiting/components/top.vue";
+import { useRoute } from "vue-router";
+
+import { useCounterMixin } from "@/stores/mixin";
+import { useQuasar } from "quasar";
+
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+  form: {
+    type: Object,
+    required: true,
+  },
+  prefixOptions: {
+    type: Array as PropType<DataOption[]>,
+    required: true,
+  },
+});
+const emit = defineEmits(["update:form"]);
+
+const $q = useQuasar();
+const mixin = useCounterMixin();
+const { messageError, showLoader, hideLoader } = mixin;
+const edit = ref<boolean>(true);
+const myform = ref<any>({});
+const route = useRoute();
+const candidateId = ref<string>(route.params.candidateId.toString());
+
+watch(myform, async (count: any, prevCount: any) => {
+  emit("update:form", count);
+});
+
+watch(defaultContact, async (count: Contact, prevCount: Contact) => {
+  await changeData("contact", count);
+});
+
+onMounted(async () => {
+  await fetchData();
+});
+
+const fetchData = async () => {
+  showLoader();
+  await http
+    .get(config.API.candidateContact(candidateId.value))
+    .then((res) => {
+      const data = res.data.result;
+      if (data != null) {
+        defaultContact.value.contactPrefixId = data.contactPrefixId;
+        defaultContact.value.contactFirstname = data.contactFirstname;
+        defaultContact.value.contactLastname = data.contactLastname;
+        defaultContact.value.contactRelations = data.contactRelations;
+        defaultContact.value.contactTel = data.contactTel;
+      }
+    })
+    .catch((e) => {
+      //   messageError($q, e)
+    })
+    .finally(() => {
+      hideLoader();
+    });
+};
+
+const getClass = (val: boolean) => {
+  return {
+    "full-width inputgreen cursor-pointer": val,
+    "full-width cursor-pointer": !val,
+  };
+};
+</script>
diff --git a/src/modules/03_recruiting/components/Education.vue b/src/modules/03_recruiting/components/Education.vue
index 01664bb7f..9a545b3c9 100644
--- a/src/modules/03_recruiting/components/Education.vue
+++ b/src/modules/03_recruiting/components/Education.vue
@@ -96,12 +96,13 @@
         </div>
         <div class="col-3">
           <datepicker
-            :readonly="!(status == 'checkRegister' || status == 'payment')"
             v-model="defaultEducation.educationEndDate"
             :locale="'th'"
             autoApply
             :enableTimePicker="false"
             week-start="0"
+            :max-date="new Date()"
+            :disabled="!(status == 'checkRegister' || status == 'payment')"
           >
             <template #year="{ year }">
               {{ year + 543 }}
@@ -112,11 +113,16 @@
             <template #trigger>
               <q-input
                 class="q-pl-sm"
-                :class="getClass(edit)"
-                :outlined="edit"
+                :class="
+                  getClass(status == 'checkRegister' || status == 'payment')
+                "
+                :outlined="status == 'checkRegister' || status == 'payment'"
                 dense
                 lazy-rules
-                :borderless="!edit"
+                :readonly="!(status == 'checkRegister' || status == 'payment')"
+                :borderless="
+                  !(status == 'checkRegister' || status == 'payment')
+                "
                 :model-value="date2Thai(defaultEducation.educationEndDate)"
                 :rules="[
                   (val) => !!val || `${'กรุณาเลือกวันที่สำเร็จการศึกษา'}`,
@@ -129,7 +135,9 @@
                     name="event"
                     class="cursor-pointer"
                     :style="
-                      edit ? 'color: var(--q-primary)' : 'color: var(--q-grey)'
+                      status == 'checkRegister' || status == 'payment'
+                        ? 'color: var(--q-primary)'
+                        : 'color: var(--q-grey)'
                     "
                   >
                   </q-icon>
diff --git a/src/modules/03_recruiting/components/ExamFinished.vue b/src/modules/03_recruiting/components/ExamFinished.vue
index 87282aa20..4c6153ab1 100644
--- a/src/modules/03_recruiting/components/ExamFinished.vue
+++ b/src/modules/03_recruiting/components/ExamFinished.vue
@@ -114,7 +114,7 @@
           วันหมดอายุบัญชีคัดเลือก
         </div>
         <div class="col-xs-8 col-sm-6 q-pr-xs">
-          {{ score_expired == null ? "" : date2Thai(score_expired) }}
+          {{ score_expired == null ? "-" : date2Thai(score_expired) }}
         </div>
       </div>
     </div>
@@ -188,7 +188,7 @@ const scoreSumFull = ref<number | null>(null);
 const scoreSum = ref<number | null>(null);
 const examResultinscore = ref<string>("");
 const avatar = ref<string>("");
-const score_expired = ref<Date>(new Date());
+const score_expired = ref<Date | null>(new Date());
 const reviewPoint = ref<number>();
 const review = ref<string>("-");
 
@@ -222,7 +222,8 @@ const fetchCard = async () => {
         parseInt(data.pointTotalC == null ? 0 : data.pointTotalC);
       examResultinscore.value = data.pass;
       avatar.value = data.avatar;
-      score_expired.value = new Date(data.announcementDate);
+      score_expired.value =
+        data.announcementDate == null ? null : new Date(data.announcementDate);
       number.value = data.number;
       reviewPoint.value = data.reviewPoint;
       review.value = data.review == null ? "-" : data.review;
diff --git a/src/modules/03_recruiting/components/Profile.vue b/src/modules/03_recruiting/components/Profile.vue
index d3203bf74..22923c693 100644
--- a/src/modules/03_recruiting/components/Profile.vue
+++ b/src/modules/03_recruiting/components/Profile.vue
@@ -47,6 +47,15 @@
     <Career :status="status" />
   </div>
 
+  <q-separator class="q-my-lg bg-gray" size="5px" />
+  <div class="q-px-sm">
+    <Contact
+      :status="status"
+      v-model:form="formContact"
+      :prefixOptions="prefixOptions"
+    />
+  </div>
+
   <!-- <q-separator class="q-my-lg bg-gray" size="5px" /> -->
   <!-- <div class="q-px-sm">
     <Document :status="status" />
@@ -61,6 +70,7 @@ import Information from "@/modules/03_recruiting/components/Information.vue";
 import Address from "@/modules/03_recruiting/components/Address.vue";
 import Family from "@/modules/03_recruiting/components/Family.vue";
 import Occupation from "@/modules/03_recruiting/components/Occupation.vue";
+import Contact from "@/modules/03_recruiting/components/Contact.vue";
 import Education from "@/modules/03_recruiting/components/Education.vue";
 import Career from "@/modules/03_recruiting/components/Career.vue";
 import Document from "@/modules/03_recruiting/components/Document.vue";
@@ -89,6 +99,10 @@ const props = defineProps({
     type: Object,
     required: true,
   },
+  formContact: {
+    type: Object,
+    required: true,
+  },
 });
 
 const $q = useQuasar();
@@ -101,6 +115,7 @@ const formInformation = ref<any>({});
 const formAddress = ref<any>({});
 const formEducation = ref<any>({});
 const formOccupation = ref<any>({});
+const formContact = ref<any>({});
 const mixin = useCounterMixin();
 const { messageError, showLoader, hideLoader } = mixin;
 
@@ -109,6 +124,7 @@ const emit = defineEmits([
   "update:formAddress",
   "update:formEducation",
   "update:formOccupation",
+  "update:formContact",
 ]);
 
 watch(formInformation, async (count: Object, prevCount: Object) => {
@@ -127,6 +143,10 @@ watch(formOccupation, async (count: Object, prevCount: Object) => {
   emit("update:formOccupation", count);
 });
 
+watch(formContact, async (count: Object, prevCount: Object) => {
+  emit("update:formContact", count);
+});
+
 onMounted(() => {
   hideLoader();
   fetchPrefix();
diff --git a/src/modules/03_recruiting/components/TableCandidate.vue b/src/modules/03_recruiting/components/TableCandidate.vue
index 5107d117d..f7b49eccf 100644
--- a/src/modules/03_recruiting/components/TableCandidate.vue
+++ b/src/modules/03_recruiting/components/TableCandidate.vue
@@ -1,6 +1,11 @@
 <template>
   <div class="q-px-md q-pb-md">
-    <q-card bordered flat class="col-12 row q-py-sm items-center bg-grey-1" v-show="statusPayment">
+    <q-card
+      bordered
+      flat
+      class="col-12 row q-py-sm items-center bg-grey-1"
+      v-show="statusPayment"
+    >
       <div class="col-12 row q-col-gutter-sm">
         <span class="text-subtitle1">{{ titleText }}</span>
         <q-select
@@ -16,7 +21,6 @@
           emit-value
           @update:model-value="updateVisibleFilter"
           v-if="optionsFilter != undefined && optionsFilter.length > 0"
-         
         />
         <q-file
           v-model="files"
@@ -49,7 +53,7 @@
           emit-value
           @update:model-value="updateVisibleFilter"
           v-if="optionsFilter != undefined && optionsFilter.length > 0"
-          />
+        />
       </div>
       <div>
         <q-btn
@@ -62,24 +66,23 @@
           :disabled="
             attrs.rows.filter((r) => r.status == 'checkRegister').length == 0
           "
-          
         >
           <q-tooltip>ตรวจสอบข้อมูล</q-tooltip>
         </q-btn>
       </div>
-      <div> 
+      <div>
         <q-btn
-        size="md"
-        icon="mdi-upload"
-        round
-        flat
-        color="blue"
-        v-if="statusPayment"
-        @click="uploadFile"
-      >
-        <q-tooltip v-if="setSeat == false">อัปโหลดที่นั่งสอบ</q-tooltip>
-        <q-tooltip v-if="setSeat == true">อัปโหลดคะแนนสอบ</q-tooltip>
-      </q-btn>
+          size="md"
+          icon="mdi-upload"
+          round
+          flat
+          color="blue"
+          v-if="statusPayment"
+          @click="uploadFile"
+        >
+          <q-tooltip v-if="setSeat == false">อัปโหลดที่นั่งสอบ</q-tooltip>
+          <q-tooltip v-if="setSeat == true">อัปโหลดคะแนนสอบ</q-tooltip>
+        </q-btn>
       </div>
       <div>
         <q-btn icon="mdi-download" round color="green-6" flat>
@@ -87,35 +90,35 @@
           <q-menu>
             <q-list style="min-width: 100px">
               <q-item clickable v-close-popup @click="downloadFileDashboard">
-                <q-item-section
-                  >ดาวน์โหลดสรุปข้อมูลสมัครสอบ</q-item-section
-                >
+                <q-item-section>ดาวน์โหลดสรุปข้อมูลสมัครสอบ</q-item-section>
               </q-item>
-              <q-item clickable v-close-popup @click.stop.prevent="clickCandidateList()">
-                <q-item-section
-                  >ดาวน์โหลดรายชื่อผู้มีสิทธิ์สอบ</q-item-section
-                >
+              <q-item
+                clickable
+                v-close-popup
+                @click.stop.prevent="clickCandidateList()"
+              >
+                <q-item-section>ดาวน์โหลดรายชื่อผู้มีสิทธิ์สอบ</q-item-section>
               </q-item>
-              <q-item clickable v-close-popup @click.stop.prevent="clickPassExam()">
+              <q-item
+                clickable
+                v-close-popup
+                @click.stop.prevent="clickPassExam()"
+              >
                 <q-item-section
                   >ดาวน์โหลดรายชื่อผู้สอบคัดเลือกได้</q-item-section
                 >
               </q-item>
               <q-item clickable v-close-popup @click="downloadFile()">
-                <q-item-section
-                  >ดาวน์โหลดจัดการรายชื่อผู้สมัคร</q-item-section
-                >
+                <q-item-section>ดาวน์โหลดจัดการรายชื่อผู้สมัคร</q-item-section>
               </q-item>
               <q-item clickable v-close-popup @click="downloadFileDetail()">
-                <q-item-section
-                  >ดาวน์โหลดข้อมูลผู้สมัคร</q-item-section
-                >
+                <q-item-section>ดาวน์โหลดข้อมูลผู้สมัคร</q-item-section>
               </q-item>
             </q-list>
           </q-menu>
         </q-btn>
       </div>
-      <div> 
+      <div>
         <q-btn
           size="md"
           icon="mdi-content-save-move-outline"
@@ -190,7 +193,7 @@
       <template v-slot:header="props">
         <q-tr :props="props">
           <q-th auto-width>
-            <q-checkbox v-model="props.selected"/>
+            <q-checkbox v-model="props.selected" />
           </q-th>
           <q-th auto-width v-if="boss == true" />
           <q-th v-for="col in props.cols" :key="col.name" :props="props">
@@ -476,6 +479,7 @@ const checkCandidates = async () => {
     })
     .then((res) => {
       success($q, "ตรวจสอบข้อมูลสำเร็จ");
+      selected.value = [];
     })
     .catch((e) => {
       messageError($q, e);
diff --git a/src/modules/03_recruiting/interface/index/Main.ts b/src/modules/03_recruiting/interface/index/Main.ts
index b086d91f9..2a92a069d 100644
--- a/src/modules/03_recruiting/interface/index/Main.ts
+++ b/src/modules/03_recruiting/interface/index/Main.ts
@@ -71,6 +71,14 @@ interface Occupation {
   tel: string | null;
 }
 
+interface Contact {
+  contactPrefixId: string | null;
+  contactFirstname: string | null;
+  contactLastname: string | null;
+  contactRelations: string | null;
+  contactTel: string | null;
+}
+
 interface Education {
   educationLevelExamId: string | null;
   educationName: string | null;
@@ -227,6 +235,14 @@ const defaultOccupation = ref<Occupation>({
   tel: null,
 });
 
+const defaultContact = ref<Contact>({
+  contactPrefixId: null,
+  contactFirstname: null,
+  contactLastname: null,
+  contactRelations: null,
+  contactTel: null,
+});
+
 const defaultEducation = ref<Education>({
   educationLevelExamId: null,
   educationName: null,
@@ -243,6 +259,7 @@ const changeData = (system: String, val: any) => {
   if (system == "address") defaultAddress.value = val;
   if (system == "famliy") defaultFamily.value = val;
   if (system == "occupation") defaultOccupation.value = val;
+  if (system == "contact") defaultContact.value = val;
   if (system == "education") defaultEducation.value = val;
 };
 
@@ -251,6 +268,7 @@ export {
   defaultFamily,
   defaultAddress,
   defaultOccupation,
+  defaultContact,
   defaultEducation,
   changeData,
 };
@@ -264,6 +282,7 @@ export type {
   Address,
   zipCodeOption,
   Occupation,
+  Contact,
   Education,
   ExamCard,
   UploadType,
diff --git a/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue b/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue
index d7f83f412..75a2f501f 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue
@@ -215,11 +215,6 @@
                 >
               </div>
 
-              <div class="col-xs-6 col-sm-5 text-grey-7">ลำดับที่สอบได้</div>
-              <div class="col-xs-6 col-sm-7 q-pr-xs">
-                {{ number }}
-              </div>
-
               <div class="col-xs-6 col-sm-5 text-grey-7">
                 วันหมดอายุบัญชีคัดเลือกคนพิการ
               </div>
diff --git a/src/modules/03_recruiting/views/02_qualify/ExamForm.vue b/src/modules/03_recruiting/views/02_qualify/ExamForm.vue
index 0208d7243..97da3c3d4 100644
--- a/src/modules/03_recruiting/views/02_qualify/ExamForm.vue
+++ b/src/modules/03_recruiting/views/02_qualify/ExamForm.vue
@@ -44,6 +44,7 @@
         v-model:formInformation="formInformation"
         v-model:formAddress="formAddress"
         v-model:formOccupation="formOccupation"
+        v-model:formContact="formContact"
         v-model:formEducation="formEducation"
       />
     </div>
@@ -131,6 +132,7 @@ import Profile from "@/modules/03_recruiting/components/Profile.vue";
 import {
   defaultInformation,
   defaultOccupation,
+  defaultContact,
   defaultAddress,
   defaultEducation,
 } from "@/modules/03_recruiting/interface/index/Main";
@@ -143,7 +145,14 @@ import config from "@/app.config";
 const router = useRouter();
 const $q = useQuasar();
 const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
-const { success, dateToISO, messageError, showLoader, hideLoader } = mixin;
+const {
+  success,
+  dateToISO,
+  messageError,
+  showLoader,
+  hideLoader,
+  notifyError,
+} = mixin;
 const route = useRoute();
 const examId = ref<string>(route.params.examId.toString());
 const candidateId = ref<string>(route.params.candidateId.toString());
@@ -154,6 +163,7 @@ const formInformation = ref<any>({});
 const formAddress = ref<any>({});
 const formEducation = ref<any>({});
 const formOccupation = ref<any>({});
+const formContact = ref<any>({});
 const status = ref<string>("");
 
 onMounted(async () => {
@@ -240,80 +250,106 @@ const clickSave = async () => {
                 .validate()
                 .then(async (suc: boolean) => {
                   if (suc) {
-                    showLoader();
-                    await http
-                      .post(config.API.candidateId(candidateId.value), {
-                        prefixId: defaultInformation.value.prefixId,
-                        lastName: defaultInformation.value.lastname,
-                        dateOfBirth:
-                          defaultInformation.value.birthDate == null
-                            ? null
-                            : dateToISO(defaultInformation.value.birthDate),
-                        citizenId: defaultInformation.value.cardid,
-                        firstName: defaultInformation.value.firstname,
-                        religionId: defaultInformation.value.religionId,
-                        nationality: defaultInformation.value.nationality,
-                        email: defaultInformation.value.email,
-                        mobilePhone: defaultInformation.value.phone,
-                        telephone: defaultInformation.value.tel,
-                        knowledge: defaultInformation.value.knowledge,
-                        occupationOrg: defaultOccupation.value.org,
-                        occupationPile: defaultOccupation.value.pile,
-                        occupationGroup: defaultOccupation.value.group,
-                        occupationSalary: defaultOccupation.value.salary,
-                        occupationPosition: defaultOccupation.value.position,
-                        occupationPositionType:
-                          defaultOccupation.value.positionType,
-                        occupationTelephone: defaultOccupation.value.tel,
-                        registAddress: defaultAddress.value.address,
-                        currentAddress: defaultAddress.value.addressC,
-                        registProvinceId: defaultAddress.value.provinceId,
-                        currentProvinceId: defaultAddress.value.provinceIdC,
-                        registDistrictId: defaultAddress.value.districtId,
-                        currentDistrictId: defaultAddress.value.districtIdC,
-                        registSubDistrictId: defaultAddress.value.subdistrictId,
-                        currentSubDistrictId:
-                          defaultAddress.value.subdistrictIdC,
-                        registZipCode: defaultAddress.value.code,
-                        currentZipCode: defaultAddress.value.codeC,
-                        registSame:
-                          defaultAddress.value.same == "1"
-                            ? true
-                            : defaultAddress.value.same == "0"
-                            ? false
-                            : null,
-                        educationLevelExamId:
-                          defaultEducation.value.educationLevelExamId,
-                        educationName: defaultEducation.value.educationName,
-                        educationMajor: defaultEducation.value.educationMajor,
-                        educationLocation:
-                          defaultEducation.value.educationLocation,
-                        educationType: defaultEducation.value.educationType,
-                        educationEndDate:
-                          defaultEducation.value.educationEndDate == null
-                            ? null
-                            : dateToISO(
-                                defaultEducation.value.educationEndDate
-                              ),
-                        educationScores: defaultEducation.value.educationScores,
-                        educationLevelHighId:
-                          defaultEducation.value.educationLevelHighId,
-                      })
-                      .then(async () => {
-                        success($q, "บันทึกข้อมูลส่วนตัวสำเร็จ");
-                      })
-                      .catch((e) => {
-                        messageError($q, e);
-                      })
-                      .finally(async () => {
-                        hideLoader();
+                    await formContact.value
+                      .validate()
+                      .then(async (suc: boolean) => {
+                        if (suc) {
+                          showLoader();
+                          await http
+                            .post(config.API.candidateId(candidateId.value), {
+                              prefixId: defaultInformation.value.prefixId,
+                              lastName: defaultInformation.value.lastname,
+                              dateOfBirth:
+                                defaultInformation.value.birthDate == null
+                                  ? null
+                                  : dateToISO(
+                                      defaultInformation.value.birthDate
+                                    ),
+                              citizenId: defaultInformation.value.cardid,
+                              firstName: defaultInformation.value.firstname,
+                              religionId: defaultInformation.value.religionId,
+                              nationality: defaultInformation.value.nationality,
+                              email: defaultInformation.value.email,
+                              mobilePhone: defaultInformation.value.phone,
+                              telephone: defaultInformation.value.tel,
+                              knowledge: defaultInformation.value.knowledge,
+                              occupationOrg: defaultOccupation.value.org,
+                              occupationPile: defaultOccupation.value.pile,
+                              occupationGroup: defaultOccupation.value.group,
+                              occupationSalary: defaultOccupation.value.salary,
+                              occupationPosition:
+                                defaultOccupation.value.position,
+                              occupationPositionType:
+                                defaultOccupation.value.positionType,
+                              occupationTelephone: defaultOccupation.value.tel,
+                              registAddress: defaultAddress.value.address,
+                              currentAddress: defaultAddress.value.addressC,
+                              registProvinceId: defaultAddress.value.provinceId,
+                              currentProvinceId:
+                                defaultAddress.value.provinceIdC,
+                              registDistrictId: defaultAddress.value.districtId,
+                              currentDistrictId:
+                                defaultAddress.value.districtIdC,
+                              registSubDistrictId:
+                                defaultAddress.value.subdistrictId,
+                              currentSubDistrictId:
+                                defaultAddress.value.subdistrictIdC,
+                              registZipCode: defaultAddress.value.code,
+                              currentZipCode: defaultAddress.value.codeC,
+                              registSame:
+                                defaultAddress.value.same == "1"
+                                  ? true
+                                  : defaultAddress.value.same == "0"
+                                  ? false
+                                  : null,
+                              educationLevelExamId:
+                                defaultEducation.value.educationLevelExamId,
+                              educationName:
+                                defaultEducation.value.educationName,
+                              educationMajor:
+                                defaultEducation.value.educationMajor,
+                              educationLocation:
+                                defaultEducation.value.educationLocation,
+                              educationType:
+                                defaultEducation.value.educationType,
+                              educationEndDate:
+                                defaultEducation.value.educationEndDate == null
+                                  ? null
+                                  : dateToISO(
+                                      defaultEducation.value.educationEndDate
+                                    ),
+                              educationScores:
+                                defaultEducation.value.educationScores,
+                              educationLevelHighId:
+                                defaultEducation.value.educationLevelHighId,
+                            })
+                            .then(async () => {
+                              success($q, "บันทึกข้อมูลส่วนตัวสำเร็จ");
+                            })
+                            .catch((e) => {
+                              messageError($q, e);
+                            })
+                            .finally(async () => {
+                              hideLoader();
+                            });
+                        } else {
+                          notifyError($q, "กรุณากรอกข้อมูลให้ครบถ้วน");
+                        }
                       });
+                  } else {
+                    notifyError($q, "กรุณากรอกข้อมูลให้ครบถ้วน");
                   }
                 });
+            } else {
+              notifyError($q, "กรุณากรอกข้อมูลให้ครบถ้วน");
             }
           });
+        } else {
+          notifyError($q, "กรุณากรอกข้อมูลให้ครบถ้วน");
         }
       });
+    } else {
+      notifyError($q, "กรุณากรอกข้อมูลให้ครบถ้วน");
     }
   });
 };
diff --git a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
index a332a0ecb..f2cd65577 100644
--- a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
+++ b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
@@ -261,7 +261,7 @@ const visibleColumns = ref<String[]>([
   "no",
   "number",
   "position",
-  "positionLevel",
+  //   "positionLevel",
   "registerDate",
   "examIdenNumber",
   "seatNumber",
@@ -346,15 +346,15 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px; min-width: 200px",
     style: "font-size: 14px; ",
   },
-  {
-    name: "positionLevel",
-    align: "left",
-    label: "ระดับ",
-    sortable: true,
-    field: "positionLevel",
-    headerStyle: "font-size: 14px; min-width: 200px",
-    style: "font-size: 14px; ",
-  },
+  //   {
+  //     name: "positionLevel",
+  //     align: "left",
+  //     label: "ระดับ",
+  //     sortable: true,
+  //     field: "positionLevel",
+  //     headerStyle: "font-size: 14px; min-width: 200px",
+  //     style: "font-size: 14px; ",
+  //   },
   {
     name: "citizenId",
     align: "left",
@@ -489,7 +489,9 @@ const fetchData = async () => {
           pass: r.pass,
           email: r.email,
           status: r.status,
-          position: r.positionExam == null ? "-" : r.positionExam.positionName,
+          position: `${
+            r.positionExam == null ? "-" : r.positionExam.positionName
+          }${r.positionExam == null ? "-" : r.positionExam.positionLevelName}`,
           positionLevel:
             r.positionExam == null ? "-" : r.positionExam.positionLevelName,
           check: false,
diff --git a/src/modules/03_recruiting/views/03_editor/index.vue b/src/modules/03_recruiting/views/03_editor/index.vue
index 399041376..50d05a178 100644
--- a/src/modules/03_recruiting/views/03_editor/index.vue
+++ b/src/modules/03_recruiting/views/03_editor/index.vue
@@ -23,8 +23,15 @@ import { useQuasar } from "quasar";
 const $q = useQuasar();
 const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
 
-const { date2Thai, messageError, showLoader, hideLoader, dialogMessageNotify,dialogConfirm ,dialogRemove} =
-  mixin;
+const {
+  date2Thai,
+  messageError,
+  showLoader,
+  hideLoader,
+  dialogMessageNotify,
+  dialogConfirm,
+  dialogRemove,
+} = mixin;
 const previous = ref<boolean>(false);
 const next = ref<boolean>(false);
 const addDialog = ref<boolean>(false);
@@ -192,8 +199,7 @@ const selectData = (id: string, agency: boolean) => {
 };
 
 const editDialog = () => {
-
-    inputName.value = inputNameBack.value
+  inputName.value = inputNameBack.value;
 
   editvisible.value = !editvisible.value;
 };
@@ -236,7 +242,7 @@ const saveAdd = async () => {
           name: inputName.value,
           link: inputLink.value,
         });
-        await saveDataAgency(arrData,'');
+        await saveDataAgency(arrData, "");
         dialog.value = false;
       } else {
         let arrData: DataLink[] = [];
@@ -250,14 +256,14 @@ const saveAdd = async () => {
           name: inputName.value,
           link: inputLink.value,
         });
-        await saveDataGoverment(arrData,'');
+        await saveDataGoverment(arrData, "");
         dialog.value = false;
       }
     }
   });
 };
 
-const saveDelete = async (del:string) => {
+const saveDelete = async (del: string) => {
   if (agencyRow.value) {
     const filt = cmsAgency.value.filter((r: any) => r.id != idRow.value);
     let arrData: DataLink[] = [];
@@ -267,7 +273,7 @@ const saveDelete = async (del:string) => {
         link: r.link,
       });
     });
-    await saveDataAgency(arrData,del);
+    await saveDataAgency(arrData, del);
     dialog.value = false;
   } else {
     const filt = cmsGoverment.value.filter((r: any) => r.id != idRow.value);
@@ -278,7 +284,7 @@ const saveDelete = async (del:string) => {
         link: r.link,
       });
     });
-    await saveDataGoverment(arrData,del);
+    await saveDataGoverment(arrData, del);
     dialog.value = false;
   }
 };
@@ -299,7 +305,7 @@ const saveEdit = async () => {
         });
       }
     });
-    await saveDataAgency(arrData,'');
+    await saveDataAgency(arrData, "");
     dialog.value = false;
   } else {
     let arrData: DataLink[] = [];
@@ -316,66 +322,65 @@ const saveEdit = async () => {
         });
       }
     });
-    await saveDataGoverment(arrData,'');
-
+    await saveDataGoverment(arrData, "");
   }
 };
 
-const saveDataAgency = async (data: DataLink[],del:string) => {
+const saveDataAgency = async (data: DataLink[], del: string) => {
   dialogform.value?.validate().then(async (result: boolean) => {
     if (result) {
-      if (data.length === 0) {
-        dialogMessageNotify($q, "ลบข้อมูลต้องมี 2 ลิ้งอย่างน้อย 2 ลิ้ง");
-      } else if(del){
-        dialogRemove($q,() => dataPostAgency(data))
-      }else {
-        dialogConfirm($q,() => dataPostAgency(data))
+      //   if (data.length === 0) {
+      //     dialogMessageNotify($q, "ลบข้อมูลต้องมี 2 ลิ้งอย่างน้อย 2 ลิ้ง");
+      //   } else
+      if (del) {
+        dialogRemove($q, () => dataPostAgency(data));
+      } else {
+        dialogConfirm($q, () => dataPostAgency(data));
       }
-
     }
   });
 };
 
-const saveDataGoverment = async (data: DataLink[],del:string) => {
+const saveDataGoverment = async (data: DataLink[], del: string) => {
   dialogform.value?.validate().then(async (result: boolean) => {
     if (result) {
-      if (data.length === 0) {
-        dialogMessageNotify($q, "ลบข้อมูลต้องมี 2 ลิ้งอย่างน้อย 2 ลิ้ง");
-      } else if(del){
-        dialogRemove($q,() => dataPost(data))
-      }else {
-        dialogConfirm($q,() => dataPost(data))
+      //   if (data.length === 0) {
+      //     dialogMessageNotify($q, "ลบข้อมูลต้องมี 2 ลิ้งอย่างน้อย 2 ลิ้ง");
+      //   } else
+      if (del) {
+        dialogRemove($q, () => dataPost(data));
+      } else {
+        dialogConfirm($q, () => dataPost(data));
       }
-
     }
   });
 };
-const dataPostAgency = async(data: DataLink[]) => {
+const dataPostAgency = async (data: DataLink[]) => {
   showLoader();
-        await http
-          .post(config.API.cmsAgency, data)
-          .then((res) => {})
-          .catch((e: any) => {
-            messageError($q, e);
-          })
-          .finally(async () => {
-            dialog.value = false;
-            await fetchData();
-          });
-}
-const dataPost = async(data: DataLink[]) => {
+  await http
+    .post(config.API.cmsAgency, data)
+    .then((res) => {})
+    .catch((e: any) => {
+      messageError($q, e);
+    })
+    .finally(async () => {
+      dialog.value = false;
+      await fetchData();
+    });
+};
+const dataPost = async (data: DataLink[]) => {
   showLoader();
-        await http
-          .post(config.API.cmsGoverment, data)
-          .then((res) => {})
-          .catch((e: any) => {
-            messageError($q, e);
-          })
-          .finally(async () => {
-            dialog.value = false;
-            await fetchData();
-          });
-}
+  await http
+    .post(config.API.cmsGoverment, data)
+    .then((res) => {})
+    .catch((e: any) => {
+      messageError($q, e);
+    })
+    .finally(async () => {
+      dialog.value = false;
+      await fetchData();
+    });
+};
 const fetchData = async () => {
   showLoader();
   await http
@@ -399,7 +404,7 @@ const fetchData = async () => {
       address.value.provinceId = data.provinceId;
       address.value.districtId = data.districtId;
       address.value.subdistrictId = data.subDistrictId;
-
+      cmsGoverment.value = [];
       if (data.cmsGovernments.length > 0) {
         let setData: CmsTable[] = [];
         data.cmsGovernments.map((r: CmsTable) => {
@@ -414,6 +419,7 @@ const fetchData = async () => {
         cmsGoverment.value = setData;
       }
 
+      cmsAgency.value = [];
       if (data.cmsAgencys.length > 0) {
         let setData: CmsTable[] = [];
         data.cmsAgencys.map((r: CmsTable) => {
diff --git a/src/modules/05_placement/components/PersonalDetail/Detail.vue b/src/modules/05_placement/components/PersonalDetail/Detail.vue
index 338b2da7f..a13b796e7 100644
--- a/src/modules/05_placement/components/PersonalDetail/Detail.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Detail.vue
@@ -16,7 +16,7 @@ import Certicate from "@/modules/05_placement/components/PersonalDetail/Informat
 import ExamResult from "@/modules/05_placement/components/PersonalDetail/ExamResult.vue";
 import Qualification from "@/modules/05_placement/components/PersonalDetail/Qualification.vue";
 import Familyvue from "@/modules/05_placement/components/PersonalDetail/Information/Family.vue";
-import Document from "@/modules/05_placement/components/PersonalDetail/Information/Document.vue";
+// import Document from "@/modules/05_placement/components/PersonalDetail/Information/Document.vue";
 
 import {
   AddressDataDefualt,