ปรับ ui สรรหาสอบคัดเลือก

src/modules/01_exam/components/Form/Career.vue

@@ -1,4 +1,4 @@
-<!-- tab ประวัติการทำงาน/ฝึกงาน -->
+<!-- tab ประวัติการทำงาน -->
 <template>
   <q-form ref="myForm">
     <Table
@@ -13,7 +13,7 @@
       :edit="clickEdit"
       :addData="false"
       :editData="status == 'register' || status == 'rejectRegister'"
-      name="ประวัติการทำงาน/ฝึกงาน"
+      name="ประวัติการทำงาน (ตั้งแต่เริ่มปฏิบัติงานกับกรุงเทพมหานคร - ปัจจุบัน)"
       icon="mdi-briefcase"
     >
       <template #columns="props">
@@ -25,13 +25,10 @@
             @click="selectData(props)"
             class="cursor-pointer"
           >
-            <div v-if="col.name == 'salary'" class="">
-              {{ col.value.toLocaleString('en-US') }}
+            <div v-if="col.name == 'startDate' || col.name == 'endDate'">
+              {{ date2Thai(col.value) }}
             </div>
-            <div v-else-if="col.name == 'duration'" class="">
-              {{ dateThaiRange(col.value) }}
-            </div>
-            <div v-else class="">
+            <div v-else>
               {{ col.value }}
             </div>
           </q-td>
@@ -53,25 +50,13 @@
   <q-dialog v-model="modal" persistent>
     <q-card style="width: 600px">
       <q-form ref="myForm">
-        <DialogHeader tittle="ประวัติการทำงาน/ฝึกงาน" :close="checkClose" />
+        <DialogHeader
+          tittle="ประวัติการทำงาน (ตั้งแต่เริ่มปฏิบัติงานกับกรุงเทพมหานคร - ปัจจุบัน)"
+          :close="checkClose"
+        />
         <q-separator />
         <q-card-section class="q-p-sm">
           <div class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs">
-            <div class="col-xs-12 col-sm-6 col-md-6">
-              <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="location"
-                :rules="[(val) => !!val || `${'กรุณากรอกสถานที่ทำงาน/ฝึกงาน'}`]"
-                :label="`${'สถานที่ทำงาน/ฝึกงาน'}`"
-                @update:modelValue="clickEditRow"
-                hide-bottom-space
-              />
-            </div>
             <div class="col-xs-12 col-sm-6 col-md-6">
               <q-input
                 :class="getClass(edit)"
@@ -95,23 +80,51 @@
                 lazy-rules
                 :readonly="!edit"
                 :borderless="!edit"
-                v-model="salary"
-                :rules="[(val) => !!val || `${'กรุณากรอกเงินเดือนสุดท้ายก่อนออก'}`]"
-                :label="`${'เงินเดือนสุดท้ายก่อนออก'}`"
+                v-model="group"
+                :rules="[(val) => !!val || `${'กรุณากรอกกลุ่ม/ฝ่าย'}`]"
+                :label="`${'กลุ่ม/ฝ่าย'}`"
+                @update:modelValue="clickEditRow"
+                hide-bottom-space
+              />
+            </div>
+            <div class="col-xs-12 col-sm-6 col-md-6">
+              <q-input
+                :class="getClass(edit)"
+                :outlined="edit"
+                dense
+                lazy-rules
+                :readonly="!edit"
+                :borderless="!edit"
+                v-model="pile"
+                :rules="[(val) => !!val || `${'กรุณากรอกกอง'}`]"
+                :label="`${'กอง'}`"
+                @update:modelValue="clickEditRow"
+                hide-bottom-space
+              />
+            </div>
+            <div class="col-xs-12 col-sm-6 col-md-6">
+              <q-input
+                :class="getClass(edit)"
+                :outlined="edit"
+                dense
+                lazy-rules
+                :readonly="!edit"
+                :borderless="!edit"
+                v-model="org"
+                :rules="[(val) => !!val || `${'กรุณากรอกสังกัด'}`]"
+                :label="`${'สังกัด'}`"
                 @update:modelValue="clickEditRow"
-                type="number"
                 hide-bottom-space
               />
             </div>
             <div class="col-xs-12 col-sm-6 col-md-6">
               <datepicker
-                menu-class-name="modalfix"
                 :readonly="!edit"
-                v-model="duration"
+                v-model="startDate"
                 :locale="'th'"
                 autoApply
-                range
                 :enableTimePicker="false"
+                @update:modelValue="clickEditRow"
                 week-start="0"
               >
                 <template #year="{ year }">
@@ -123,19 +136,60 @@
                 <template #trigger>
                   <q-input
                     :class="getClass(edit)"
-                    class="datepicker"
                     :outlined="edit"
                     dense
                     lazy-rules
                     :borderless="!edit"
-                    :model-value="dateThaiRange(duration)"
+                    :model-value="date2Thai(startDate)"
+                    :rules="[(val) => !!val || `${'กรุณาเลือกวันที่เริ่ม'}`]"
                     hide-bottom-space
+                    :label="`${'วันที่เริ่ม'}`"
                   >
                     <template v-slot:prepend>
                       <q-icon
-                        name="mdi-calendar-outline"
+                        name="event"
                         class="cursor-pointer"
-                        style="color: var(--q-primary)"
+                        :style="edit ? 'color: var(--q-primary)' : 'color: var(--q-grey)'"
+                      >
+                      </q-icon>
+                    </template>
+                  </q-input>
+                </template>
+              </datepicker>
+            </div>
+            <div class="col-xs-12 col-sm-6 col-md-6">
+              <datepicker
+                :readonly="!edit"
+                v-model="endDate"
+                :locale="'th'"
+                autoApply
+                :enableTimePicker="false"
+                @update:modelValue="clickEditRow"
+                week-start="0"
+              >
+                <template #year="{ year }">
+                  {{ year + 543 }}
+                </template>
+                <template #year-overlay-value="{ value }">
+                  {{ parseInt(value + 543) }}
+                </template>
+                <template #trigger>
+                  <q-input
+                    :class="getClass(edit)"
+                    :outlined="edit"
+                    dense
+                    lazy-rules
+                    :borderless="!edit"
+                    :model-value="date2Thai(endDate)"
+                    :rules="[(val) => !!val || `${'กรุณาเลือกวันที่สิ้นสุด'}`]"
+                    hide-bottom-space
+                    :label="`${'วันที่สิ้นสุด'}`"
+                  >
+                    <template v-slot:prepend>
+                      <q-icon
+                        name="event"
+                        class="cursor-pointer"
+                        :style="edit ? 'color: var(--q-primary)' : 'color: var(--q-grey)'"
                       >
                       </q-icon>
                     </template>
@@ -145,17 +199,15 @@
             </div>
             <div class="col-xs-12 col-sm-12 col-md-12">
               <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
+                :class="getClass(false)"
+                :outlined="false"
                 dense
                 lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="reason"
-                :rules="[(val) => !!val || `${'กรุณากรอกเหตุผลที่ออก'}`]"
-                :label="`${'เหตุผลที่ออก'}`"
+                :readonly="!false"
+                :borderless="!false"
+                v-model="rangeDate"
+                :label="`${'ระยะเวลา'}`"
                 @update:modelValue="clickEditRow"
-                type="textarea"
                 hide-bottom-space
               />
             </div>
@@ -180,7 +232,7 @@
 </template>
 <script setup lang="ts">
 import { onMounted, ref, watch } from 'vue'
-import { useQuasar } from 'quasar'
+import { QTableProps, useQuasar } from 'quasar'
 import { useCounterMixin } from '@/stores/mixin'
 import { useDataStore } from '@/stores/data'
 import http from '@/plugins/http'
@@ -206,17 +258,19 @@ const props = defineProps({
 
 const $q = useQuasar()
 const mixin = useCounterMixin() //เรียกฟังก์ชันกลาง
-const { dateThaiRange, modalDelete, modalConfirm, dateToISO, success, messageError } = mixin
+const { date2Thai, modalDelete, modalConfirm, dateToISO, success, messageError } = mixin
 const store = useExamDataStore()
 const { examData, changeExamColumns } = store
 const dataStore = useDataStore()
 const { loaderPage } = dataStore
 const id = ref<string>('')
-const location = ref<string>()
-const position = ref<string>()
-const salary = ref<number | null>()
-const duration = ref<[Date, Date]>([new Date(), new Date()])
-const reason = ref<string>()
+const position = ref<string | null>()
+const group = ref<string | null>()
+const pile = ref<string | null>()
+const org = ref<string | null>()
+const startDate = ref<Date>(new Date())
+const endDate = ref<Date>(new Date())
+const rangeDate = ref<string | null>()
 const myForm = ref<any>() //form data input
 const edit = ref<boolean>(true) //เช็คการกดปุ่มแก้ไขใน dialog
 const modal = ref<boolean>(false) //modal add detail
@@ -230,60 +284,100 @@ const checkValidate = ref<boolean>(false) //validate data ผ่านหรื
 const route = useRoute()
 const examId = ref<string>(route.params.id.toString())
 const positionId = ref<string>(route.params.positionId.toString())
-const rows = ref<RequestItemsObject[]>([])
+const rows = ref<any>([])
 const filter = ref<string>('') //search data table
 
 const visibleColumns = ref<String[]>([])
 
 examData.career.columns.length == 0
-  ? (visibleColumns.value = ['location', 'position', 'salary', 'duration', 'reason'])
+  ? (visibleColumns.value = [
+      'position',
+      'group',
+      'pile',
+      'org',
+      'startDate',
+      'endDate',
+      'rangeDate'
+    ])
   : (visibleColumns.value = examData.career.columns)
 
-const columns = ref<Columns>([
-  {
-    name: 'location',
-    align: 'left',
-    label: 'สถานที่ทำงาน/ฝึกงาน',
-    sortable: true,
-    field: 'location',
-    headerStyle: 'font-size: 14px',
-    style: 'font-size: 14px'
-  },
+const columns = ref<QTableProps['columns']>([
   {
     name: 'position',
     align: 'left',
-    label: 'ตำแหน่ง/ลักษณะงาน',
+    label: 'ชื่อตำแหน่ง',
     sortable: true,
     field: 'position',
     headerStyle: 'font-size: 14px',
-    style: 'font-size: 14px'
+    style: 'font-size: 14px',
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: 'base' })
   },
   {
-    name: 'salary',
+    name: 'group',
     align: 'left',
-    label: 'เงินเดือนสุดท้ายก่อนออก',
+    label: 'กลุ่ม/ฝ่าย',
     sortable: true,
-    field: 'salary',
+    field: 'group',
     headerStyle: 'font-size: 14px',
-    style: 'font-size: 14px'
+    style: 'font-size: 14px',
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: 'base' })
   },
   {
-    name: 'duration',
+    name: 'pile',
+    align: 'left',
+    label: 'กอง',
+    sortable: true,
+    field: 'pile',
+    headerStyle: 'font-size: 14px',
+    style: 'font-size: 14px',
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: 'base' })
+  },
+  {
+    name: 'org',
+    align: 'left',
+    label: 'สังกัด',
+    sortable: true,
+    field: 'org',
+    headerStyle: 'font-size: 14px',
+    style: 'font-size: 14px',
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: 'base' })
+  },
+  {
+    name: 'startDate',
+    align: 'left',
+    label: 'เริ่ม',
+    sortable: true,
+    field: 'startDate',
+    headerStyle: 'font-size: 14px',
+    style: 'font-size: 14px',
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: 'base' })
+  },
+  {
+    name: 'endDate',
+    align: 'left',
+    label: 'สิ้นสุด',
+    sortable: true,
+    field: 'endDate',
+    headerStyle: 'font-size: 14px',
+    style: 'font-size: 14px',
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: 'base' })
+  },
+  {
+    name: 'rangeDate',
     align: 'left',
     label: 'ระยะเวลา',
     sortable: true,
-    field: 'duration',
+    field: 'rangeDate',
     headerStyle: 'font-size: 14px',
-    style: 'font-size: 14px'
-  },
-  {
-    name: 'reason',
-    align: 'left',
-    label: 'เหตุผลที่ออก',
-    sortable: true,
-    field: 'reason',
-    headerStyle: 'font-size: 14px',
-    style: 'font-size: 14px'
+    style: 'font-size: 14px',
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: 'base' })
   }
 ])
 
@@ -302,11 +396,11 @@ const fetchData = async () => {
     .then((res) => {
       const data = res.data.result
       rows.value = []
-      data.map((r: ResponseObject) => {
+      data.map((r: any) => {
         rows.value.push({
           ...r,
-          location: r.name,
-          duration: [r.durationStart, r.durationEnd]
+          startDate: r.durationStart,
+          endDate: r.durationEnd
         })
       })
     })
@@ -324,11 +418,13 @@ const fetchData = async () => {
 const clickPrevious = async () => {
   rowIndex.value -= 1
   const row = rows.value[rowIndex.value]
-  location.value = row.location
   position.value = row.position
-  salary.value = row.salary
-  duration.value = row.duration
-  reason.value = row.reason
+  group.value = row.group
+  pile.value = row.pile
+  org.value = row.org
+  startDate.value = row.startDate
+  endDate.value = row.endDate
+  rangeDate.value = row.rangeDate
   id.value = row.id
   await checkRowPage()
 }
@@ -339,11 +435,13 @@ const clickPrevious = async () => {
 const clickNext = async () => {
   rowIndex.value += 1
   const row = rows.value[rowIndex.value]
-  location.value = row.location
   position.value = row.position
-  salary.value = row.salary
-  duration.value = row.duration
-  reason.value = row.reason
+  group.value = row.group
+  pile.value = row.pile
+  org.value = row.org
+  startDate.value = row.startDate
+  endDate.value = row.endDate
+  rangeDate.value = row.rangeDate
   id.value = row.id
   await checkRowPage()
 }
@@ -427,12 +525,13 @@ const saveData = async () => {
   loaderPage(true)
   await http
     .post(config.API.candidateCareer(examId.value, positionId.value), {
-      name: location.value,
       position: position.value,
-      salary: salary.value,
-      durationStart: dateToISO(new Date(duration.value[0])),
-      durationEnd: dateToISO(new Date(duration.value[1])),
-      reason: reason.value
+      group: group.value,
+      pile: pile.value,
+      org: org.value,
+      durationStart: dateToISO(new Date(startDate.value)),
+      durationEnd: dateToISO(new Date(endDate.value)),
+      rangeDate: rangeDate.value == null ? '-' : rangeDate.value //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
     })
     .then(() => {
       success($q, 'บันทึกข้อมูลสำเร็จ')
@@ -453,12 +552,13 @@ const editData = async () => {
   loaderPage(true)
   await http
     .put(config.API.candidateCareer(id.value, ''), {
-      name: location.value,
       position: position.value,
-      salary: salary.value,
-      durationStart: dateToISO(new Date(duration.value[0])),
-      durationEnd: dateToISO(new Date(duration.value[1])),
-      reason: reason.value
+      group: group.value,
+      pile: pile.value,
+      org: org.value,
+      durationStart: dateToISO(new Date(startDate.value)),
+      durationEnd: dateToISO(new Date(endDate.value)),
+      rangeDate: rangeDate.value == null ? '-' : rangeDate.value //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
     })
     .then(() => {
       success($q, 'บันทึกข้อมูลสำเร็จ')
@@ -495,17 +595,19 @@ const clickClose = async () => {
  * กดเลือกข้อมูลที่จะแก้ไข
  * @param props ค่า props ใน row ที่เลือก
  */
-const selectData = (props: DataProps) => {
+const selectData = (props: any) => {
   modalEdit.value = true
   modal.value = true
   editRow.value = false
   rawItem.value = props.row
   rowIndex.value = props.rowIndex
-  location.value = props.row.location
   position.value = props.row.position
-  salary.value = props.row.salary
-  duration.value = props.row.duration
-  reason.value = props.row.reason
+  group.value = props.row.group
+  pile.value = props.row.pile
+  org.value = props.row.org
+  startDate.value = props.row.startDate
+  endDate.value = props.row.endDate
+  rangeDate.value = props.row.rangeDate
   id.value = props.row.id
   next.value = false
   previous.value = false
@@ -517,11 +619,13 @@ const selectData = (props: DataProps) => {
 const addRow = () => {
   modalEdit.value = false
   modal.value = true
-  location.value = ''
-  position.value = ''
-  salary.value = null
-  duration.value = [new Date(), new Date()]
-  reason.value = ''
+  position.value = null
+  group.value = null
+  pile.value = null
+  org.value = null
+  startDate.value = new Date()
+  endDate.value = new Date()
+  rangeDate.value = null
 }
 
 /**

src/modules/01_exam/components/Form/Document.vue

@@ -4,8 +4,8 @@
     v-model:edit="edit"
     :header="
       $q.screen.gt.xs
-        ? 'อัปโหลดเอกสาร(เช่น สำเนาบัตรประชาชน ทะเบียนบ้าน วุฒิการศึกษา)'
-        : 'อัปโหลดเอกสาร'
+        ? 'Upload รูปถ่าย (รูปถ่ายหน้าตรง ชุดสุภาพ ไม่สวมหมวก/แว่นตาดำ และไม่มีลวดลายใด ๆ บนรูปถ่าย)'
+        : 'Upload'
     "
     icon="mdi-file-document"
     :addData="true"
@@ -182,7 +182,7 @@ const fileDelete = async (val: any) => {
 const getData = async () => {
   name.value = ''
   file.value = []
-  uploader.value.reset()
+  if (uploader.value != null) uploader.value.reset()
   loaderPage(true)
   await http
     .get(config.API.candidateUpload(examId.value, positionId.value))

src/modules/01_exam/components/Form/Education.vue

@@ -1,302 +1,243 @@
-<!-- tab ประวัติการศึกษา -->
+<!-- card วุฒิที่ใช้สมัครสอบ -->
 <template>
-  <q-form ref="myForm">
-    <Table
-      :rows="rows"
-      :columns="columns"
-      :filter="filter"
-      :visible-columns="visibleColumns"
-      v-model:inputfilter="filter"
-      v-model:inputvisible="visibleColumns"
-      v-model:editvisible="edit"
-      :add="clickAdd"
-      :edit="clickEdit"
-      :addData="false"
-      :editData="status == 'register' || status == 'rejectRegister'"
-      name="ประวัติการศีกษา"
-      icon="mdi-school"
-    >
-      <template #columns="props">
-        <q-tr :props="props">
-          <q-td
-            v-for="col in props.cols"
-            :key="col.name"
-            :props="props"
-            @click="selectData(props)"
-            class="cursor-pointer"
+  <HeaderTop
+    v-model:edit="edit"
+    header="วุฒิที่ใช้สมัครสอบ"
+    icon="mdi-briefcase"
+    :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-12 row">
+        <div class="col-3">
+          <q-select
+            :class="getClass(status == 'register' || status == 'rejectRegister')"
+            :readonly="!(status == 'register' || status == 'rejectRegister')"
+            :borderless="!(status == 'register' || status == 'rejectRegister')"
+            :outlined="status == 'register' || status == 'rejectRegister'"
+            dense
+            lazy-rules
+            emit-value
+            map-options
+            option-label="name"
+            option-value="id"
+            :options="educationLevelOptions"
+            v-model="defaultEducation.educationLevelExamId"
+            :rules="[(val) => !!val || `${'กรุณาเลือก วุฒิที่ใช้สมัครสอบ'}`]"
+            :label="`${'วุฒิที่ใช้สมัครสอบ'}`"
+          />
+        </div>
+        <div class="col-3">
+          <q-input
+            class="q-pl-sm"
+            :class="getClass(status == 'register' || status == 'rejectRegister')"
+            :outlined="status == 'register' || status == 'rejectRegister'"
+            dense
+            lazy-rules
+            autogrow
+            :readonly="!(status == 'register' || status == 'rejectRegister')"
+            :borderless="!(status == 'register' || status == 'rejectRegister')"
+            v-model="defaultEducation.educationName"
+            :rules="[(val) => !!val || `${'กรุณากรอก ชื่อปริญญา'}`]"
+            :label="`${'ชื่อปริญญา'}`"
+          />
+        </div>
+        <div class="col-3">
+          <q-input
+            class="q-pl-sm"
+            :class="getClass(status == 'register' || status == 'rejectRegister')"
+            :outlined="status == 'register' || status == 'rejectRegister'"
+            dense
+            lazy-rules
+            autogrow
+            :readonly="!(status == 'register' || status == 'rejectRegister')"
+            :borderless="!(status == 'register' || status == 'rejectRegister')"
+            v-model="defaultEducation.educationMajor"
+            :rules="[(val) => !!val || `${'กรุณากรอก สาขาวิชา/วิชาเอก'}`]"
+            :label="`${'สาขาวิชา/วิชาเอก'}`"
+          />
+        </div>
+      </div>
+      <div class="col-12 row">
+        <div class="col-3">
+          <q-input
+            :class="getClass(status == 'register' || status == 'rejectRegister')"
+            :outlined="status == 'register' || status == 'rejectRegister'"
+            dense
+            lazy-rules
+            autogrow
+            :readonly="!(status == 'register' || status == 'rejectRegister')"
+            :borderless="!(status == 'register' || status == 'rejectRegister')"
+            v-model="defaultEducation.educationLocation"
+            :rules="[(val) => !!val || `${'กรุณากรอก ชื่อสถานศึกษา'}`]"
+            :label="`${'ชื่อสถานศึกษา'}`"
+          />
+        </div>
+        <div class="col-3">
+          <q-select
+            class="q-pl-sm"
+            :class="getClass(status == 'register' || status == 'rejectRegister')"
+            :readonly="!(status == 'register' || status == 'rejectRegister')"
+            :borderless="!(status == 'register' || status == 'rejectRegister')"
+            :outlined="status == 'register' || status == 'rejectRegister'"
+            dense
+            lazy-rules
+            emit-value
+            map-options
+            option-label="name"
+            option-value="id"
+            :options="educationTypeOptions"
+            v-model="defaultEducation.educationType"
+            :rules="[(val) => !!val || `${'กรุณาเลือก ประเภทสถานศึกษา'}`]"
+            :label="`${'ประเภทสถานศึกษา'}`"
+          />
+        </div>
+        <div class="col-3">
+          <datepicker
+            :readonly="!(status == 'register' || status == 'rejectRegister')"
+            v-model="defaultEducation.educationEndDate"
+            :locale="'th'"
+            autoApply
+            :enableTimePicker="false"
+            week-start="0"
+            :max-date="new Date()"
+            :disabled="!(status == 'register' || status == 'rejectRegister')"
           >
-            <div v-if="col.name == 'duration'" class="">
-              {{ dateThaiRange(col.value) }}
-            </div>
-            <div v-else class="">
-              {{ col.value }}
-            </div>
-          </q-td>
-          <q-td auto-width v-if="edit === true">
-            <q-btn
-              color="red"
-              flat
-              dense
-              round
-              size="14px"
-              icon="mdi-trash-can-outline"
-              @click="checkDelete(props.row)"
-            />
-          </q-td>
-        </q-tr>
-      </template>
-    </Table>
-  </q-form>
-  <q-dialog v-model="modal" persistent>
-    <q-card style="width: 600px">
-      <q-form ref="myForm">
-        <DialogHeader tittle="ประวัติการศึกษา" :close="checkClose" />
-        <q-separator />
-        <q-card-section class="q-p-sm">
-          <div class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs">
-            <div class="col-xs-6 col-sm-6 col-md-6">
-              <q-select
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="educationLevelId"
-                :rules="[(val) => !!val || `${'กรุณาเลือกวุฒิที่ได้รับ'}`]"
-                :label="`${'วุฒิที่ได้รับ'}`"
-                @update:modelValue="clickEditRow"
-                emit-value
-                map-options
-                option-label="name"
-                :options="educationLevelOptions"
-                option-value="id"
-                hide-bottom-space
-              />
-            </div>
-            <div class="col-xs-6 col-sm-6 col-md-6">
+            <template #year="{ year }">
+              {{ year + 543 }}
+            </template>
+            <template #year-overlay-value="{ value }">
+              {{ parseInt(value + 543) }}
+            </template>
+            <template #trigger>
               <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
+                class="q-pl-sm"
+                :class="getClass(status == 'register' || status == 'rejectRegister')"
+                :outlined="status == 'register' || status == 'rejectRegister'"
                 dense
                 lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="major"
-                :rules="[(val) => !!val || `${'กรุณากรอกสาขาวิชา/วิชาเอก'}`]"
-                :label="`${'สาขาวิชา/วิชาเอก'}`"
-                @update:modelValue="clickEditRow"
+                :readonly="!(status == 'register' || status == 'rejectRegister')"
+                :borderless="!(status == 'register' || status == 'rejectRegister')"
+                :model-value="date2Thai(defaultEducation.educationEndDate)"
+                :rules="[(val) => !!val || `${'กรุณาเลือกวันที่สำเร็จการศึกษา'}`]"
                 hide-bottom-space
-              />
-            </div>
-            <div class="col-xs-6 col-sm-6 col-md-6">
-              <q-input
-                type="number"
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="scores"
-                :rules="[(val) => !!val || `${'กรุณากรอกคะแนนเฉลี่ยตลอดหลักสูตร'}`]"
-                :label="`${'คะแนนเฉลี่ยตลอดหลักสูตร'}`"
-                @update:modelValue="clickEditRow"
-                hide-bottom-space
-              />
-            </div>
-            <div class="col-xs-6 col-sm-6 col-md-6">
-              <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="name"
-                :rules="[(val) => !!val || `${'กรุณากรอกชื่อสถานศึกษา'}`]"
-                :label="`${'ชื่อสถานศึกษา'}`"
-                @update:modelValue="clickEditRow"
-                hide-bottom-space
-              />
-            </div>
-            <div class="col-xs-6 col-sm-6 col-md-6">
-              <datepicker
-                menu-class-name="modalfix"
-                :readonly="!edit"
-                v-model="duration"
-                :locale="'th'"
-                autoApply
-                range
-                :enableTimePicker="false"
-                week-start="0"
+                :label="`${'วันที่สำเร็จการศึกษา'}`"
               >
-                <template #year="{ year }">
-                  {{ year + 543 }}
-                </template>
-                <template #year-overlay-value="{ value }">
-                  {{ parseInt(value + 543) }}
-                </template>
-                <template #trigger>
-                  <q-input
-                    :class="getClass(edit)"
-                    class="datepicker"
-                    :outlined="edit"
-                    dense
-                    lazy-rules
-                    :borderless="!edit"
-                    :model-value="dateThaiRange(duration)"
-                    hide-bottom-space
+                <template v-slot:prepend>
+                  <q-icon
+                    name="event"
+                    class="cursor-pointer"
+                    :style="
+                      status == 'register' || status == 'rejectRegister'
+                        ? 'color: var(--q-primary)'
+                        : 'color: var(--q-grey)'
+                    "
                   >
-                    <template v-slot:prepend>
-                      <q-icon
-                        name="mdi-calendar-outline"
-                        class="cursor-pointer"
-                        style="color: var(--q-primary)"
-                      >
-                      </q-icon>
-                    </template>
-                  </q-input>
+                  </q-icon>
                 </template>
-              </datepicker>
-            </div>
-          </div>
-        </q-card-section>
-        <q-separator />
-        <DialogFooter
-          :edit="clickEdit"
-          :save="clickSave"
-          :validate="validateData"
-          :clickNext="clickNext"
-          :clickPrevious="clickPrevious"
-          :editData="status == 'register' || status == 'rejectRegister'"
-          v-model:editvisible="edit"
-          v-model:next="next"
-          v-model:previous="previous"
-          v-model:modalEdit="modalEdit"
-        />
-      </q-form>
-    </q-card>
-  </q-dialog>
+              </q-input>
+            </template>
+          </datepicker>
+        </div>
+        <div class="col-3">
+          <q-input
+            class="q-pl-sm"
+            :class="getClass(status == 'register' || status == 'rejectRegister')"
+            :outlined="status == 'register' || status == 'rejectRegister'"
+            dense
+            lazy-rules
+            type="number"
+            :readonly="!(status == 'register' || status == 'rejectRegister')"
+            :borderless="!(status == 'register' || status == 'rejectRegister')"
+            v-model="defaultEducation.educationScores"
+            :rules="[(val) => !!val || `${'กรุณากรอก คะแนนเฉลี่ยสะสม'}`]"
+            :label="`${'คะแนนเฉลี่ยสะสม'}`"
+          />
+        </div>
+      </div>
+      <div class="col-12 row">
+        <div class="col-3">
+          <q-select
+            :class="getClass(status == 'register' || status == 'rejectRegister')"
+            :readonly="!(status == 'register' || status == 'rejectRegister')"
+            :borderless="!(status == 'register' || status == 'rejectRegister')"
+            :outlined="status == 'register' || status == 'rejectRegister'"
+            dense
+            lazy-rules
+            emit-value
+            map-options
+            option-label="name"
+            option-value="id"
+            :options="educationLevelOptions"
+            v-model="defaultEducation.educationLevelHighId"
+            :rules="[(val) => !!val || `${'กรุณาเลือก วุฒิการศึกษาสูงสุด'}`]"
+            :label="`${'วุฒิการศึกษาสูงสุด'}`"
+          />
+        </div>
+      </div>
+    </div>
+  </q-form>
 </template>
 <script setup lang="ts">
-import { onMounted, ref, watch } from 'vue'
-import type { PropType } from 'vue'
-import { useQuasar } from 'quasar'
-import { useCounterMixin } from '@/stores/mixin'
-import { useDataStore } from '@/stores/data'
+import { ref, onMounted, watch, PropType } from 'vue'
 import http from '@/plugins/http'
 import config from '@/app.config'
-import { useExamDataStore } from '@/modules/01_exam/store'
+import type { DataOption, Education } from '@/modules/01_exam/interface/index/Main'
+import { defaultEducation, changeData } from '@/modules/01_exam/interface/index/Main'
+import HeaderTop from '@/components/top.vue'
 import { useRoute } from 'vue-router'
-import type {
-  RequestItemsObject,
-  Columns,
-  DataProps
-} from '@/modules/01_exam/interface/request/Education'
-import type { DataOption } from '@/modules/01_exam/interface/index/Main'
-import type { ResponseObject } from '@/modules/01_exam/interface/response/Education'
-import Table from '@/components/Table.vue'
-import DialogHeader from '@/components/DialogHeader.vue'
-import DialogFooter from '@/components/DialogFooter.vue'
+
+import { useCounterMixin } from '@/stores/mixin'
+import { useDataStore } from '@/stores/data'
+import { useQuasar } from 'quasar'
 
 const props = defineProps({
-  educationLevelOptions: {
-    type: Array as PropType<DataOption[]>,
-    required: true
-  },
   status: {
     type: String,
     required: true
+  },
+  form: {
+    type: Object,
+    required: true
+  },
+  educationLevelOptions: {
+    type: Array as PropType<DataOption[]>,
+    required: true
   }
 })
 
 const $q = useQuasar()
-const mixin = useCounterMixin() //เรียกฟังก์ชันกลาง
-const { dateThaiRange, modalDelete, modalConfirm, dateToISO, success, messageError } = mixin
-const store = useExamDataStore()
-const { examData, changeExamColumns } = store
-const dataStore = useDataStore()
-const { loaderPage } = dataStore
-const id = ref<string>('')
-const educationLevel = ref<string>()
-const educationLevelId = ref<string>()
-const major = ref<string>()
-const scores = ref<number | null>()
-const name = ref<string>()
-const duration = ref<[Date, Date]>([new Date(), new Date()])
-const myForm = ref<any>() //form data input
-const edit = ref<boolean>(true) //เช็คการกดปุ่มแก้ไขใน dialog
-const modal = ref<boolean>(false) //modal add detail
-const modalEdit = ref<boolean>(false) //modal ที่แสดงใช้สำหรับแก้ไขหรือไม่
-const rawItem = ref<RequestItemsObject>() //ข้อมูลเดิมที่เลือกใน row นั้น
-const rowIndex = ref<number>(0) //indexข้อมูลเดิมที่เลือกใน row นั้น
-const previous = ref<boolean>() //แสดงปุ่มดูข้อมูลก่อนหน้า
-const next = ref<boolean>() //แสดงปุ่มดูข้อมูลต่อไป
-const editRow = ref<boolean>(false) //เช็คมีการแก้ไขข้อมูล
-const checkValidate = ref<boolean>(false) //validate data ผ่านหรือไม่
-const rows = ref<RequestItemsObject[]>([])
+const edit = ref<boolean>(true)
+const myform = ref<any>({})
 const route = useRoute()
 const examId = ref<string>(route.params.id.toString())
 const positionId = ref<string>(route.params.positionId.toString())
-const filter = ref<string>('') //search data table
-
-const visibleColumns = ref<String[]>([])
-
-examData.education.columns.length == 0
-  ? (visibleColumns.value = ['educationLevel', 'major', 'scores', 'name', 'duration'])
-  : (visibleColumns.value = examData.education.columns)
-
-const columns = ref<Columns>([
+const educationTypeOptions = ref<any>([
   {
-    name: 'educationLevel',
-    align: 'left',
-    label: 'วุฒิที่ได้รับ',
-    sortable: true,
-    field: 'educationLevel',
-    headerStyle: 'font-size: 14px',
-    style: 'font-size: 14px'
+    name: 'รัฐบาล',
+    id: 'รัฐบาล'
   },
   {
-    name: 'major',
-    align: 'left',
-    label: 'สาขาวิชา/วิชาเอก',
-    sortable: true,
-    field: 'major',
-    headerStyle: 'font-size: 14px',
-    style: 'font-size: 14px'
-  },
-  {
-    name: 'scores',
-    align: 'left',
-    label: 'คะแนนเฉลี่ยตลอดหลักสูตร',
-    sortable: true,
-    field: 'scores',
-    headerStyle: 'font-size: 14px',
-    style: 'font-size: 14px'
-  },
-  {
-    name: 'name',
-    align: 'left',
-    label: 'ชื่อสถานศึกษา',
-    sortable: true,
-    field: 'name',
-    headerStyle: 'font-size: 14px',
-    style: 'font-size: 14px'
-  },
-  {
-    name: 'duration',
-    align: 'left',
-    label: 'ระยะเวลา',
-    sortable: true,
-    field: 'duration',
-    headerStyle: 'font-size: 14px',
-    style: 'font-size: 14px'
+    name: 'เอกชน',
+    id: 'เอกชน'
   }
 ])
 
-watch(visibleColumns, async (count: String[], prevCount: String[]) => {
-  await changeExamColumns('education', count)
+const mixin = useCounterMixin()
+const { messageError, date2Thai } = mixin
+const dataStore = useDataStore()
+const { loaderPage } = dataStore
+
+const emit = defineEmits(['update:form'])
+
+watch(myform, async (count: any, prevCount: any) => {
+  emit('update:form', count)
+})
+
+watch(defaultEducation, async (count: Education, prevCount: Education) => {
+  await changeData('education', count)
 })
 
 onMounted(async () => {
@@ -309,15 +250,14 @@ const fetchData = async () => {
     .get(config.API.candidateEducation(examId.value, positionId.value))
     .then((res) => {
       const data = res.data.result
-      rows.value = []
-      data.map((r: ResponseObject) => {
-        rows.value.push({
-          ...r,
-          educationLevelId: r.educationLevelId,
-          educationLevel: r.educationLevelName,
-          duration: [r.durationStart, r.durationEnd]
-        })
-      })
+      defaultEducation.value.educationLevelExamId = data.educationLevelExamId
+      defaultEducation.value.educationName = data.educationName
+      defaultEducation.value.educationMajor = data.educationMajor
+      defaultEducation.value.educationLocation = data.educationLocation
+      defaultEducation.value.educationType = data.educationType
+      defaultEducation.value.educationEndDate = new Date(data.educationEndDate)
+      defaultEducation.value.educationScores = data.educationScores
+      defaultEducation.value.educationLevelHighId = data.educationLevelHighId
     })
     .catch((e) => {
       //   messageError($q, e)
@@ -327,239 +267,6 @@ const fetchData = async () => {
     })
 }
 
-/**
- * กดดูข้อมูลก่อนหน้า
- */
-const clickPrevious = async () => {
-  rowIndex.value -= 1
-  const row = rows.value[rowIndex.value]
-  educationLevel.value = row.educationLevel
-  educationLevelId.value = row.educationLevelId
-  major.value = row.major
-  scores.value = row.scores
-  name.value = row.name
-  duration.value = row.duration
-  id.value = row.id
-  await checkRowPage()
-}
-
-/**
- * กดดูข้อมูลต่อไป
- */
-const clickNext = async () => {
-  rowIndex.value += 1
-  const row = rows.value[rowIndex.value]
-  educationLevel.value = row.educationLevel
-  educationLevelId.value = row.educationLevelId
-  major.value = row.major
-  scores.value = row.scores
-  name.value = row.name
-  duration.value = row.duration
-  id.value = row.id
-  await checkRowPage()
-}
-
-/**
- * เช็คปุ่มดูข้อมูล ย้อน กับ ต่อไป ว่าต้องแสดงไหม
- */
-const checkRowPage = () => {
-  editRow.value = false
-  next.value = true
-  previous.value = true
-  if (rowIndex.value + 1 >= rows.value.length) {
-    next.value = false
-  }
-  if (rowIndex.value - 1 < 0) {
-    previous.value = false
-  }
-}
-
-/**
- * กดปุ่มแก้ไขใน dialog
- */
-const clickEdit = () => {
-  next.value = false
-  previous.value = false
-}
-
-/**
- * กดปุ่มเพิ่มด้านบน table
- */
-const clickAdd = async () => {
-  await addRow()
-}
-
-const checkDelete = (row: RequestItemsObject) => {
-  rawItem.value = row
-  modalDelete($q, 'ยืนยันการลบข้อมูล', 'หากต้องการลบกดให้กดตกลง', clickDeleteRow)
-}
-
-/**
- * ลบข้อมูลใน table
- */
-const clickDeleteRow = async () => {
-  if (rawItem.value != null) {
-    loaderPage(true)
-    await http
-      .delete(config.API.candidateEducation(rawItem.value.id, ''))
-      .then(() => {
-        success($q, 'ลบข้อมูลสำเร็จ')
-      })
-      .catch((e) => {
-        messageError($q, e)
-      })
-      .finally(async () => {
-        await fetchData()
-      })
-  } else {
-    await fetchData()
-  }
-}
-
-/**
- * กดบันทึกใน dialog
- */
-const clickSave = async () => {
-  myForm.value.validate().then(async (result: boolean) => {
-    if (result) {
-      if (modalEdit.value) {
-        await editData()
-      } else {
-        await saveData()
-      }
-    }
-  })
-}
-
-/**
- * บันทึกเพิ่มข้อมูล
- */
-const saveData = async () => {
-  loaderPage(true)
-  await http
-    .post(config.API.candidateEducation(examId.value, positionId.value), {
-      educationLevelId: educationLevelId.value,
-      major: major.value,
-      scores: scores.value,
-      name: name.value,
-      durationStart: dateToISO(new Date(duration.value[0])),
-      durationEnd: dateToISO(new Date(duration.value[1]))
-    })
-    .then(() => {
-      success($q, 'บันทึกข้อมูลสำเร็จ')
-    })
-    .catch((e) => {
-      messageError($q, e)
-    })
-    .finally(async () => {
-      modal.value = false
-      await fetchData()
-    })
-}
-
-/**
- * บันทึกแก้ไขข้อมูล
- */
-const editData = async () => {
-  loaderPage(true)
-  await http
-    .put(config.API.candidateEducation(id.value, ''), {
-      educationLevelId: educationLevelId.value,
-      major: major.value,
-      scores: scores.value,
-      name: name.value,
-      durationStart: dateToISO(new Date(duration.value[0])),
-      durationEnd: dateToISO(new Date(duration.value[1]))
-    })
-    .then(() => {
-      success($q, 'บันทึกข้อมูลสำเร็จ')
-    })
-    .catch((e) => {
-      messageError($q, e)
-    })
-    .finally(async () => {
-      modal.value = false
-      await fetchData()
-    })
-}
-
-const checkClose = async () => {
-  if (editRow.value == true) {
-    modalConfirm($q, 'ข้อมูลมีการแก้ไข', 'ยืนยันการดำเนินต่อใช่หรือไม่', clickClose)
-  } else {
-    await clickClose()
-  }
-  await fetchData()
-}
-
-/**
- * กดปิด dialog
- */
-const clickClose = async () => {
-  modal.value = false
-  editRow.value = false
-  next.value = false
-  previous.value = false
-}
-
-/**
- * กดเลือกข้อมูลที่จะแก้ไข
- * @param props ค่า props ใน row ที่เลือก
- */
-const selectData = (props: DataProps) => {
-  modalEdit.value = true
-  modal.value = true
-  editRow.value = false
-  rawItem.value = props.row
-  rowIndex.value = props.rowIndex
-  educationLevel.value = props.row.educationLevel
-  educationLevelId.value = props.row.educationLevelId
-  major.value = props.row.major
-  scores.value = props.row.scores
-  name.value = props.row.name
-  duration.value = props.row.duration
-  id.value = props.row.id
-  next.value = false
-  previous.value = false
-}
-
-/**
- * กดปุ่มเพิ่มบน table
- */
-const addRow = () => {
-  modalEdit.value = false
-  modal.value = true
-  educationLevel.value = ''
-  educationLevelId.value = ''
-  major.value = ''
-  scores.value = null
-  name.value = ''
-  duration.value = [new Date(), new Date()]
-}
-
-/**
- * เช็คว่ามีการแก้ไขข้อมูล
- */
-const clickEditRow = () => {
-  editRow.value = true
-}
-
-/**
- * validate input ใน dialog
- */
-const validateData = async () => {
-  checkValidate.value = true
-  await myForm.value.validate().then((result: boolean) => {
-    if (result == false) {
-      checkValidate.value = false
-    }
-  })
-}
-
-/**
- * class จัดรูปแบบแสดงระหว่างข้อมูลที่แก้ไขหรือแสดงเฉยๆ
- * @param val ข้อมูล input สำหรับแก้ไขหรือไม่
- */
 const getClass = (val: boolean) => {
   return {
     'full-width inputgreen cursor-pointer': val,
@@ -567,8 +274,3 @@ const getClass = (val: boolean) => {
   }
 }
 </script>
-<style lang="scss">
-.modalfix {
-  position: fixed !important;
-}
-</style>

src/modules/01_exam/components/Form/Information.vue

@@ -10,7 +10,7 @@
   />
   <q-form ref="myform" class="col-12 row q-col-gutter-x-sm justify-center q-col-gutter-sm">
     <div class="row col-xs-12 col-sm-12 col-md-10 items-center q-col-gutter-x-sm q-col-gutter-y-xs">
-      <div class="col-xs-12 col-sm-2 col-md-2">
+      <div class="col-xs-12 col-sm-3 col-md-3">
         <q-select
           :class="getClass(status == 'register' || status == 'rejectRegister')"
           :readonly="!(status == 'register' || status == 'rejectRegister')"
@@ -28,7 +28,7 @@
           :label="`${'คำนำหน้า'}`"
         />
       </div>
-      <div class="col-xs-12 col-sm-5 col-md-5">
+      <div class="col-xs-12 col-sm-3 col-md-3">
         <q-input
           :class="getClass(status == 'register' || status == 'rejectRegister')"
           :outlined="status == 'register' || status == 'rejectRegister'"
@@ -41,7 +41,7 @@
           :label="`${'ชื่อ'}`"
         />
       </div>
-      <div class="col-xs-12 col-sm-5 col-md-5">
+      <div class="col-xs-12 col-sm-3 col-md-3">
         <q-input
           :class="getClass(status == 'register' || status == 'rejectRegister')"
           :outlined="status == 'register' || status == 'rejectRegister'"
@@ -67,6 +67,24 @@
           :label="`${'สัญชาติ'}`"
         />
       </div>
+      <div class="col-xs-12 col-sm-3 col-md-3">
+        <q-select
+          :class="getClass(status == 'register' || status == 'rejectRegister')"
+          :readonly="!(status == 'register' || status == 'rejectRegister')"
+          :borderless="!(status == 'register' || status == 'rejectRegister')"
+          :rules="[(val) => !!val || `${'กรุณาเลือก ศาสนา'}`]"
+          :outlined="status == 'register' || status == 'rejectRegister'"
+          dense
+          lazy-rules
+          v-model="defaultInformation.religionId"
+          emit-value
+          map-options
+          option-label="name"
+          :options="religionOptions"
+          option-value="id"
+          :label="`${'ศาสนา'}`"
+        />
+      </div>
       <div class="col-xs-12 col-sm-3 col-md-3">
         <datepicker
           menu-class-name="modalfix"
@@ -132,21 +150,23 @@
         />
       </div>
       <div class="col-xs-12 col-sm-3 col-md-3">
-        <q-select
+        <q-input
+          :outlined="status == 'register' || status == 'rejectRegister'"
+          dense
+          :counter="status == 'register' || status == 'rejectRegister' ? true : false"
+          lazy-rules
+          type="tel"
+          mask="##########"
+          maxlength="10"
           :class="getClass(status == 'register' || status == 'rejectRegister')"
           :readonly="!(status == 'register' || status == 'rejectRegister')"
           :borderless="!(status == 'register' || status == 'rejectRegister')"
-          :rules="[(val) => !!val || `${'กรุณาเลือก ศาสนา'}`]"
-          :outlined="status == 'register' || status == 'rejectRegister'"
-          dense
-          lazy-rules
-          v-model="defaultInformation.religionId"
-          emit-value
-          map-options
-          option-label="name"
-          :options="religionOptions"
-          option-value="id"
-          :label="`${'ศาสนา'}`"
+          v-model="defaultInformation.tel"
+          :label="`${'โทรศัพท์'}`"
+          :rules="[
+            (val) => val.length == 10 || `${'กรุณากรอก โทรศัพท์'}`,
+            (val) => /^[0-9]*$/.test(val) || `${'กรุณากรอกข้อมูลโทรศัพท์ให้ถูกต้อง'}`
+          ]"
         />
       </div>
       <div class="col-xs-12 col-sm-3 col-md-3">
@@ -169,28 +189,7 @@
           label="เลขบัตรประจำตัวประชาชน"
         />
       </div>
-      <div class="col-xs-12 col-sm-3 col-md-3">
-        <q-input
-          :outlined="status == 'register' || status == 'rejectRegister'"
-          dense
-          :counter="status == 'register' || status == 'rejectRegister' ? true : false"
-          lazy-rules
-          type="tel"
-          mask="##########"
-          maxlength="10"
-          :class="getClass(status == 'register' || status == 'rejectRegister')"
-          :readonly="!(status == 'register' || status == 'rejectRegister')"
-          :borderless="!(status == 'register' || status == 'rejectRegister')"
-          v-model="defaultInformation.tel"
-          :label="`${'โทรศัพท์'}`"
-          :rules="[
-            (val) => val.length == 10 || `${'กรุณากรอก โทรศัพท์'}`,
-            (val) => /^[0-9]*$/.test(val) || `${'กรุณากรอกข้อมูลโทรศัพท์ให้ถูกต้อง'}`
-          ]"
-        />
-        <!--  -->
-      </div>
-      <div class="col-xs-12 col-sm-3 col-md-3">
+      <!-- <div class="col-xs-12 col-sm-3 col-md-3">
         <q-input
           :outlined="status == 'register' || status == 'rejectRegister'"
           dense
@@ -209,7 +208,7 @@
           ]"
           :label="`${'โทรศัพท์มือถือ'}`"
         />
-      </div>
+      </div> -->
       <div class="col-xs-12 col-sm-3 col-md-3 q-pb-md">
         <q-input
           :class="getClass(status == 'register' || status == 'rejectRegister')"

src/modules/01_exam/components/Form/Occupation.vue

@@ -1,8 +1,8 @@
-<!-- card อาชีพ -->
+<!-- card ตำแหน่งปัจจุบัน -->
 <template>
   <HeaderTop
     v-model:edit="edit"
-    header="อาชีพ"
+    header="ตำแหน่งปัจจุบัน"
     icon="mdi-briefcase"
     :addData="true"
     :editOnly="false"
@@ -10,231 +10,128 @@
   />
   <q-form ref="myform">
     <div class="row col-12 items-center q-col-gutter-x-sm q-col-gutter-y-xs">
-      <div class="col-12 row q-pb-lg">
-        <q-input
-          :class="getClass(status == 'register' || status == 'rejectRegister')"
-          hide-bottom-space
-          dense
-          lazy-rules
-          type="textarea"
-          autogrow
-          :readonly="!(status == 'register' || status == 'rejectRegister')"
-          :borderless="!(status == 'register' || status == 'rejectRegister')"
-          v-model="defaultOccupation.official"
-          :disable="
-            defaultOccupation.status !== 'official' ||
-            !(status == 'register' || status == 'rejectRegister')
-          "
-        >
-          <template v-slot:before>
-            <q-radio
-              v-model="defaultOccupation.status"
-              checked-icon="task_alt"
-              unchecked-icon="panorama_fish_eye"
-              val="official"
-              label="ข้าราชการกรุงเทพมหานคร ตำแหน่ง"
-              dense
-              :disable="!(status == 'register' || status == 'rejectRegister')"
-              size="md"
-              style="font-size: 14px; color: black"
-            />
-          </template>
-        </q-input>
-        <q-input
-          :class="getClass(status == 'register' || status == 'rejectRegister')"
-          hide-bottom-space
-          dense
-          lazy-rules
-          type="textarea"
-          autogrow
-          :readonly="!(status == 'register' || status == 'rejectRegister')"
-          :borderless="!(status == 'register' || status == 'rejectRegister')"
-          v-model="defaultOccupation.personnel"
-          :disable="
-            defaultOccupation.status !== 'personnel' ||
-            !(status == 'register' || status == 'rejectRegister')
-          "
-        >
-          <template v-slot:before>
-            <q-radio
-              v-model="defaultOccupation.status"
-              checked-icon="task_alt"
-              unchecked-icon="panorama_fish_eye"
-              val="personnel"
-              label="บุคลากรกรุงเทพมหานคร ตำแหน่ง"
-              dense
-              :disable="!(status == 'register' || status == 'rejectRegister')"
-              size="md"
-              style="font-size: 14px; color: black"
-            />
-          </template>
-        </q-input>
-        <q-input
-          :class="getClass(status == 'register' || status == 'rejectRegister')"
-          hide-bottom-space
-          dense
-          lazy-rules
-          type="textarea"
-          autogrow
-          :readonly="!(status == 'register' || status == 'rejectRegister')"
-          :borderless="!(status == 'register' || status == 'rejectRegister')"
-          v-model="defaultOccupation.officialsOther"
-          :disable="
-            defaultOccupation.status !== 'officialsOther' ||
-            !(status == 'register' || status == 'rejectRegister')
-          "
-        >
-          <template v-slot:before>
-            <q-radio
-              v-model="defaultOccupation.status"
-              checked-icon="task_alt"
-              unchecked-icon="panorama_fish_eye"
-              val="officialsOther"
-              label="ข้าราชการประเภทอื่น ตำแหน่ง"
-              dense
-              :disable="!(status == 'register' || status == 'rejectRegister')"
-              size="md"
-              style="font-size: 14px; color: black"
-            />
-          </template>
-        </q-input>
-        <q-input
-          :class="getClass(status == 'register' || status == 'rejectRegister')"
-          hide-bottom-space
-          dense
-          lazy-rules
-          type="textarea"
-          autogrow
-          :readonly="!(status == 'register' || status == 'rejectRegister')"
-          :borderless="!(status == 'register' || status == 'rejectRegister')"
-          v-model="defaultOccupation.employee"
-          :disable="
-            defaultOccupation.status !== 'employee' ||
-            !(status == 'register' || status == 'rejectRegister')
-          "
-        >
-          <template v-slot:before>
-            <q-radio
-              v-model="defaultOccupation.status"
-              checked-icon="task_alt"
-              unchecked-icon="panorama_fish_eye"
-              val="employee"
-              label="ลูกจ้าง/พนักงานราชการของส่วนราชการอื่น ตำแหน่ง"
-              dense
-              :disable="!(status == 'register' || status == 'rejectRegister')"
-              size="md"
-              style="font-size: 14px; color: black"
-            />
-          </template>
-        </q-input>
+      <div class="col-12">
         <q-radio
-          v-model="defaultOccupation.status"
-          checked-icon="task_alt"
-          unchecked-icon="panorama_fish_eye"
-          val="studying"
-          label="กำลังศึกษาต่อ"
-          dense
+          v-model="defaultOccupation.positionType"
+          label="ลูกจ้างประจำ"
+          color="teal"
+          val="prem"
           :disable="!(status == 'register' || status == 'rejectRegister')"
-          size="md"
-          style="font-size: 14px; color: black"
         />
-        <q-input
-          :class="getClass(status == 'register' || status == 'rejectRegister')"
-          hide-bottom-space
-          dense
-          lazy-rules
-          type="textarea"
-          autogrow
-          :readonly="!(status == 'register' || status == 'rejectRegister')"
-          :borderless="!(status == 'register' || status == 'rejectRegister')"
-          v-model="defaultOccupation.other"
-          :disable="
-            defaultOccupation.status !== 'other' ||
-            !(status == 'register' || status == 'rejectRegister')
-          "
-        >
-          <template v-slot:before>
-            <q-radio
-              v-model="defaultOccupation.status"
-              checked-icon="task_alt"
-              unchecked-icon="panorama_fish_eye"
-              val="other"
-              label="อื่นๆ"
-              dense
-              :disable="!(status == 'register' || status == 'rejectRegister')"
-              size="md"
-              style="font-size: 14px; color: black"
-            />
-          </template>
-        </q-input>
-      </div>
-      <div class="col-xs-12 col-sm-3 col-md-3">
-        <q-input
-          :class="getClass(status == 'register' || status == 'rejectRegister')"
-          :outlined="status == 'register' || status == 'rejectRegister'"
-          dense
-          lazy-rules
-          type="textarea"
-          autogrow
-          :readonly="!(status == 'register' || status == 'rejectRegister')"
-          :borderless="!(status == 'register' || status == 'rejectRegister')"
-          v-model="defaultOccupation.company"
-          :label="`${'สำนัก/บริษัท'}`"
-          hide-bottom-space
+        <q-radio
+          v-model="defaultOccupation.positionType"
+          label="ลูกจ้างชั่วคราว"
+          color="teal"
+          val="temp"
+          :disable="!(status == 'register' || status == 'rejectRegister')"
+        />
+        <q-radio
+          v-model="defaultOccupation.positionType"
+          label="ผู้ปฏิบัติงานอื่นในกรุงเทพมหานคร"
+          color="teal"
+          val="other"
+          :disable="!(status == 'register' || status == 'rejectRegister')"
         />
       </div>
-      <div class="col-xs-12 col-sm-3 col-md-3">
-        <q-input
-          :class="getClass(status == 'register' || status == 'rejectRegister')"
-          :outlined="status == 'register' || status == 'rejectRegister'"
-          dense
-          lazy-rules
-          type="textarea"
-          autogrow
-          :readonly="!(status == 'register' || status == 'rejectRegister')"
-          :borderless="!(status == 'register' || status == 'rejectRegister')"
-          v-model="defaultOccupation.department"
-          :label="`${'กอง/ฝ่าย'}`"
-          hide-bottom-space
-        />
+      <div class="col-12 row">
+        <div class="col-3">
+          <q-input
+            :class="getClass(status == 'register' || status == 'rejectRegister')"
+            :outlined="status == 'register' || status == 'rejectRegister'"
+            dense
+            lazy-rules
+            autogrow
+            :readonly="!(status == 'register' || status == 'rejectRegister')"
+            :borderless="!(status == 'register' || status == 'rejectRegister')"
+            v-model="defaultOccupation.position"
+            :rules="[(val) => !!val || `${'กรุณากรอก ชื่อตำแหน่ง'}`]"
+            :label="`${'ชื่อตำแหน่ง'}`"
+          />
+        </div>
+        <div class="col-3">
+          <q-input
+            class="q-pl-sm"
+            :class="getClass(status == 'register' || status == 'rejectRegister')"
+            :outlined="status == 'register' || status == 'rejectRegister'"
+            dense
+            lazy-rules
+            type="number"
+            autogrow
+            :readonly="!(status == 'register' || status == 'rejectRegister')"
+            :borderless="!(status == 'register' || status == 'rejectRegister')"
+            v-model="defaultOccupation.salary"
+            :rules="[(val) => !!val || `${'กรุณากรอก เงินเดือน'}`]"
+            :label="`${'เงินเดือน'}`"
+          />
+        </div>
       </div>
-      <div class="col-xs-12 col-sm-3 col-md-3">
-        <q-input
-          :class="getClass(status == 'register' || status == 'rejectRegister')"
-          :outlined="status == 'register' || status == 'rejectRegister'"
-          dense
-          lazy-rules
-          type="textarea"
-          autogrow
-          :readonly="!(status == 'register' || status == 'rejectRegister')"
-          :borderless="!(status == 'register' || status == 'rejectRegister')"
-          v-model="defaultOccupation.email"
-          :label="`${'E-mail address'}`"
-          hide-bottom-space
-        />
-        <!-- :rules="[
-            (val) =>
-              /^([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})$/.test(val) ||
-              'E-mail address ไม่ถูกต้อง'
-          ]" -->
-      </div>
-      <div class="col-xs-12 col-sm-3 col-md-3">
-        <q-input
-          :class="getClass(status == 'register' || status == 'rejectRegister')"
-          :outlined="status == 'register' || status == 'rejectRegister'"
-          dense
-          :counter="status == 'register' || status == 'rejectRegister' ? true : false"
-          maxlength="10"
-          lazy-rules
-          type="tel"
-          mask="##########"
-          autogrow
-          :readonly="!(status == 'register' || status == 'rejectRegister')"
-          :borderless="!(status == 'register' || status == 'rejectRegister')"
-          v-model="defaultOccupation.tel"
-          :label="`${'โทรศัพท์'}`"
-          hide-bottom-space
-        />
+      <div class="col-12 row">
+        <div class="col-3">
+          <q-input
+            :class="getClass(status == 'register' || status == 'rejectRegister')"
+            :outlined="status == 'register' || status == 'rejectRegister'"
+            dense
+            lazy-rules
+            autogrow
+            :readonly="!(status == 'register' || status == 'rejectRegister')"
+            :borderless="!(status == 'register' || status == 'rejectRegister')"
+            v-model="defaultOccupation.group"
+            :rules="[(val) => !!val || `${'กรุณากรอก กลุ่ม/ฝ่าย'}`]"
+            :label="`${'กลุ่ม/ฝ่าย'}`"
+          />
+        </div>
+        <div class="col-3">
+          <q-input
+            class="q-pl-sm"
+            :class="getClass(status == 'register' || status == 'rejectRegister')"
+            :outlined="status == 'register' || status == 'rejectRegister'"
+            dense
+            lazy-rules
+            autogrow
+            :readonly="!(status == 'register' || status == 'rejectRegister')"
+            :borderless="!(status == 'register' || status == 'rejectRegister')"
+            v-model="defaultOccupation.pile"
+            :rules="[(val) => !!val || `${'กรุณากรอก กอง'}`]"
+            :label="`${'กอง'}`"
+          />
+        </div>
+        <div class="col-3">
+          <q-input
+            class="q-pl-sm"
+            :class="getClass(status == 'register' || status == 'rejectRegister')"
+            :outlined="status == 'register' || status == 'rejectRegister'"
+            dense
+            lazy-rules
+            autogrow
+            :readonly="!(status == 'register' || status == 'rejectRegister')"
+            :borderless="!(status == 'register' || status == 'rejectRegister')"
+            v-model="defaultOccupation.org"
+            :rules="[(val) => !!val || `${'กรุณากรอก สังกัด'}`]"
+            :label="`${'สังกัด'}`"
+          />
+        </div>
+        <div class="col-3">
+          <q-input
+            class="q-pl-sm"
+            :class="getClass(status == 'register' || status == 'rejectRegister')"
+            :outlined="status == 'register' || status == 'rejectRegister'"
+            dense
+            :counter="status == 'register' || status == 'rejectRegister' ? true : false"
+            maxlength="10"
+            lazy-rules
+            type="tel"
+            mask="##########"
+            autogrow
+            :readonly="!(status == 'register' || status == 'rejectRegister')"
+            :borderless="!(status == 'register' || status == 'rejectRegister')"
+            v-model="defaultOccupation.tel"
+            :rules="[
+              (val) => val.length == 10 || `${'กรุณากรอก เบอร์โทรที่ทำงาน'}`,
+              (val) => /^[0-9]*$/.test(val) || 'กรุณากรอก เบอร์โทรที่ทำงานให้ถูกต้อง'
+            ]"
+            :label="`${'เบอร์โทรที่ทำงาน'}`"
+          />
+        </div>
       </div>
     </div>
   </q-form>
@@ -293,21 +190,13 @@ const fetchData = async () => {
     .then((res) => {
       const data = res.data.result
       if (data != null) {
-        defaultOccupation.value.status = data.occupationType
-        defaultOccupation.value.company = data.occupationCompany
-        defaultOccupation.value.department = data.occupationDepartment
-        defaultOccupation.value.email = data.occupationEmail
+        defaultOccupation.value.org = data.occupationOrg
+        defaultOccupation.value.pile = data.occupationPile
+        defaultOccupation.value.group = data.occupationGroup
+        defaultOccupation.value.salary = data.occupationSalary
+        defaultOccupation.value.position = data.occupationPosition
+        defaultOccupation.value.positionType = data.occupationPositionType
         defaultOccupation.value.tel = data.occupationTelephone
-        defaultOccupation.value.official =
-          data.occupationType == 'official' ? data.occupationPosition : null
-        defaultOccupation.value.personnel =
-          data.occupationType == 'personnel' ? data.occupationPosition : null
-        defaultOccupation.value.officialsOther =
-          data.occupationType == 'officialsOther' ? data.occupationPosition : null
-        defaultOccupation.value.employee =
-          data.occupationType == 'employee' ? data.occupationPosition : null
-        defaultOccupation.value.other =
-          data.occupationType == 'other' ? data.occupationPosition : null
       }
     })
     .catch((e) => {

src/modules/01_exam/components/Form/Profile.vue

@@ -22,12 +22,16 @@
 
   <q-separator class="q-my-lg bg-gray" size="5px" />
   <div class="q-px-sm">
-    <Occupation :status="status" v-model:form="formOccupation" />
+    <Education
+      :status="status"
+      v-model:form="formEducation"
+      :educationLevelOptions="educationLevelOptions"
+    />
   </div>
 
   <q-separator class="q-my-lg bg-gray" size="5px" />
   <div class="q-px-sm">
-    <Education :educationLevelOptions="educationLevelOptions" :status="status" />
+    <Occupation :status="status" v-model:form="formOccupation" />
   </div>
 
   <q-separator class="q-my-lg bg-gray" size="5px" />
@@ -50,7 +54,7 @@ import { useQuasar } from 'quasar'
 import type { DataOption } from '@/modules/01_exam/interface/index/Main'
 import Information from '@/modules/01_exam/components/Form/Information.vue'
 import Address from '@/modules/01_exam/components/Form/Address.vue'
-// import Family from '@/modules/01_exam/components/Form/Family.vue'
+import Family from '@/modules/01_exam/components/Form/Family.vue'
 import Occupation from '@/modules/01_exam/components/Form/Occupation.vue'
 import Education from '@/modules/01_exam/components/Form/Education.vue'
 import Career from '@/modules/01_exam/components/Form/Career.vue'
@@ -69,10 +73,10 @@ const props = defineProps({
     type: Object,
     required: true
   },
-  //   formFamily: {
-  //     type: Object,
-  //     required: true
-  //   },
+  formEducation: {
+    type: Object,
+    required: true
+  },
   formOccupation: {
     type: Object,
     required: true
@@ -81,7 +85,7 @@ const props = defineProps({
 const emit = defineEmits([
   'update:formInformation',
   'update:formAddress',
-  //   'update:formFamily',
+  'update:formEducation',
   'update:formOccupation'
 ])
 
@@ -96,7 +100,7 @@ const provinceOptions = ref<DataOption[]>([])
 const educationLevelOptions = ref<DataOption[]>([])
 const formInformation = ref<any>({})
 const formAddress = ref<any>({})
-// const formFamily = ref<any>({})
+const formEducation = ref<any>({})
 const formOccupation = ref<any>({})
 
 watch(formInformation, async (count: Object, prevCount: Object) => {
@@ -107,9 +111,9 @@ watch(formAddress, async (count: Object, prevCount: Object) => {
   emit('update:formAddress', count)
 })
 
-// watch(formFamily, async (count: Object, prevCount: Object) => {
-//   emit('update:formFamily', count)
-// })
+watch(formEducation, async (count: Object, prevCount: Object) => {
+  emit('update:formEducation', count)
+})
 
 watch(formOccupation, async (count: Object, prevCount: Object) => {
   emit('update:formOccupation', count)