diff --git a/src/modules/03_recruiting/components/Career.vue b/src/modules/03_recruiting/components/Career.vue
index 76b4d06f4..21cf8c076 100644
--- a/src/modules/03_recruiting/components/Career.vue
+++ b/src/modules/03_recruiting/components/Career.vue
@@ -13,6 +13,7 @@
       :edit="clickEdit"
       :addData="false"
       :bottom="true"
+      :boss="status == 'checkRegister' || status == 'payment'"
       :editData="status == 'checkRegister' || status == 'payment'"
       name="ประวัติการทำงาน (ตั้งแต่เริ่มปฏิบัติงานกับกรุงเทพมหานคร - ปัจจุบัน)"
       icon="mdi-briefcase"
@@ -83,12 +84,14 @@
           >
             <div class="col-xs-12 col-sm-6 col-md-6">
               <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
+                :class="
+                  getClass(status == 'checkRegister' || status == 'payment')
+                "
+                :outlined="status == 'checkRegister' || status == 'payment'"
                 dense
                 lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
+                :readonly="!status == 'checkRegister' || status == 'payment'"
+                :borderless="!status == 'checkRegister' || status == 'payment'"
                 v-model="position"
                 :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง/ลักษณะงาน'}`]"
                 :label="`${'ตำแหน่ง/ลักษณะงาน'}`"
@@ -98,17 +101,19 @@
             </div>
             <div class="col-xs-12 col-sm-6 col-md-6">
               <q-select
-                :class="getClass(edit)"
-                :outlined="edit"
+                :class="
+                  getClass(status == 'checkRegister' || status == 'payment')
+                "
+                :outlined="status == 'checkRegister' || status == 'payment'"
                 dense
                 lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
+                :readonly="!status == 'checkRegister' || status == 'payment'"
+                :borderless="!status == 'checkRegister' || status == 'payment'"
                 v-model="type"
                 :options="opType"
                 :rules="[(val) => !!val || `${'กรุณาเลือกประเภท'}`]"
                 :label="`${'ประเภท'}`"
-                @update:modelValue="clickEditRow"
+                @update:modelValue="clickEditRowPosition"
                 hide-bottom-space
               />
             </div>
@@ -160,7 +165,7 @@
             <div class="col-xs-12 col-sm-6 col-md-6">
               <datepicker
                 menu-class-name="modalfix"
-                :readonly="!edit"
+                :readonly="!status == 'checkRegister' || status == 'payment'"
                 v-model="startDate"
                 :locale="'th'"
                 autoApply
@@ -176,11 +181,15 @@
                 </template>
                 <template #trigger>
                   <q-input
-                    :class="getClass(edit)"
-                    :outlined="edit"
+                    :class="
+                      getClass(status == 'checkRegister' || status == 'payment')
+                    "
+                    :outlined="status == 'checkRegister' || status == 'payment'"
                     dense
                     lazy-rules
-                    :borderless="!edit"
+                    :borderless="
+                      !status == 'checkRegister' || status == 'payment'
+                    "
                     :model-value="date2Thai(startDate)"
                     :rules="[
                       (val) => !!val || `${'กรุณาเลือกวันที่เริ่ม'}`,
@@ -196,7 +205,7 @@
                         name="event"
                         class="cursor-pointer"
                         :style="
-                          edit
+                          status == 'checkRegister' || status == 'payment'
                             ? 'color: var(--q-primary)'
                             : 'color: var(--q-grey)'
                         "
@@ -210,7 +219,7 @@
             <div class="col-xs-12 col-sm-6 col-md-6">
               <datepicker
                 menu-class-name="modalfix"
-                :readonly="!edit"
+                :readonly="!status == 'checkRegister' || status == 'payment'"
                 v-model="endDate"
                 :locale="'th'"
                 autoApply
@@ -226,11 +235,15 @@
                 </template>
                 <template #trigger>
                   <q-input
-                    :class="getClass(edit)"
-                    :outlined="edit"
+                    :class="
+                      getClass(status == 'checkRegister' || status == 'payment')
+                    "
+                    :outlined="status == 'checkRegister' || status == 'payment'"
                     dense
                     lazy-rules
-                    :borderless="!edit"
+                    :borderless="
+                      !status == 'checkRegister' || status == 'payment'
+                    "
                     :model-value="date2Thai(endDate)"
                     :rules="[
                       (val) => !!val || `${'กรุณาเลือกวันที่สิ้นสุด'}`,
@@ -246,7 +259,7 @@
                         name="event"
                         class="cursor-pointer"
                         :style="
-                          edit
+                          status == 'checkRegister' || status == 'payment'
                             ? 'color: var(--q-primary)'
                             : 'color: var(--q-grey)'
                         "
@@ -506,6 +519,14 @@ const calDate = async () => {
     }
     dayDiff += daysInMonth[_startDate.getMonth()];
   }
+  if (dayDiff >= 30) {
+    monthDiff = monthDiff + 1;
+    dayDiff = 0;
+    if (monthDiff >= 12) {
+      yearDiff = yearDiff + 1;
+      monthDiff = 0;
+    }
+  }
   rangeDate.value = `${yearDiff > 0 ? yearDiff + " ปี " : ""}${
     monthDiff > 0 ? monthDiff + " เดือน " : ""
   }${dayDiff > 0 ? dayDiff + " วัน " : ""}`;
@@ -543,6 +564,14 @@ const calDateSplit = async (startDate: Date, endDate: Date) => {
     }
     dayDiff += daysInMonth[_startDate.getMonth()];
   }
+  if (dayDiff >= 30) {
+    monthDiff = monthDiff + 1;
+    dayDiff = 0;
+    if (monthDiff >= 12) {
+      yearDiff = yearDiff + 1;
+      monthDiff = 0;
+    }
+  }
   var obj = {
     yearDiff: yearDiff,
     monthDiff: monthDiff,
diff --git a/src/modules/03_recruiting/components/Education.vue b/src/modules/03_recruiting/components/Education.vue
index 898bdc7c5..bffbc5790 100644
--- a/src/modules/03_recruiting/components/Education.vue
+++ b/src/modules/03_recruiting/components/Education.vue
@@ -10,8 +10,8 @@
   />
   <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">
+      <div class="col-12 row q-col-gutter-sm">
+        <div class="col-xs-12 col-sm-3">
           <q-select
             :class="getClass(status == 'checkRegister' || status == 'payment')"
             :readonly="!(status == 'checkRegister' || status == 'payment')"
@@ -30,9 +30,8 @@
             @update:model-value="(value) => checkInputName()"
           />
         </div>
-        <div class="col-3" v-if="showEducationName">
+        <div class="col-xs-12 col-sm-3" v-if="showEducationName">
           <q-input
-            class="q-pl-sm"
             :class="getClass(status == 'checkRegister' || status == 'payment')"
             :outlined="status == 'checkRegister' || status == 'payment'"
             dense
@@ -45,9 +44,8 @@
             :label="`${'ชื่อปริญญา'}`"
           />
         </div>
-        <div class="col-3">
+        <div class="col-xs-12 col-sm-3">
           <q-input
-            class="q-pl-sm"
             :class="getClass(status == 'checkRegister' || status == 'payment')"
             :outlined="status == 'checkRegister' || status == 'payment'"
             dense
@@ -60,9 +58,7 @@
             :label="`${'สาขาวิชา/วิชาเอก'}`"
           />
         </div>
-      </div>
-      <div class="col-12 row">
-        <div class="col-3">
+        <div class="col-xs-12 col-sm-3">
           <q-input
             :class="getClass(status == 'checkRegister' || status == 'payment')"
             :outlined="status == 'checkRegister' || status == 'payment'"
@@ -76,9 +72,8 @@
             :label="`${'ชื่อสถานศึกษา'}`"
           />
         </div>
-        <div class="col-3">
+        <div class="col-xs-12 col-sm-3">
           <q-select
-            class="q-pl-sm"
             :class="getClass(status == 'checkRegister' || status == 'payment')"
             :readonly="!(status == 'checkRegister' || status == 'payment')"
             :borderless="!(status == 'checkRegister' || status == 'payment')"
@@ -95,7 +90,7 @@
             :label="`${'ประเภทสถานศึกษา'}`"
           />
         </div>
-        <div class="col-3">
+        <div class="col-xs-12 col-sm-3">
           <datepicker
             v-model="defaultEducation.educationEndDate"
             :locale="'th'"
@@ -113,7 +108,6 @@
             </template>
             <template #trigger>
               <q-input
-                class="q-pl-sm"
                 :class="
                   getClass(status == 'checkRegister' || status == 'payment')
                 "
@@ -147,9 +141,8 @@
             </template>
           </datepicker>
         </div>
-        <div class="col-3">
+        <div class="col-xs-12 col-sm-3">
           <q-input
-            class="q-pl-sm"
             :class="getClass(status == 'checkRegister' || status == 'payment')"
             :outlined="status == 'checkRegister' || status == 'payment'"
             dense
@@ -162,9 +155,7 @@
             :label="`${'คะแนนเฉลี่ยสะสม'}`"
           />
         </div>
-      </div>
-      <div class="col-12 row">
-        <div class="col-3">
+        <div class="col-xs-12 col-sm-3">
           <q-select
             :class="getClass(status == 'checkRegister' || status == 'payment')"
             :readonly="!(status == 'checkRegister' || status == 'payment')"
@@ -268,6 +259,7 @@ const fetchData = async () => {
         defaultEducation.value.educationEndDate = data.educationEndDate;
         defaultEducation.value.educationScores = data.educationScores;
         defaultEducation.value.educationLevelHighId = data.educationLevelHighId;
+        checkInputName();
       }
     })
     .catch((e) => {
diff --git a/src/modules/03_recruiting/components/TableCan.vue b/src/modules/03_recruiting/components/TableCan.vue
index 097cf69c1..9bf9e5ac2 100644
--- a/src/modules/03_recruiting/components/TableCan.vue
+++ b/src/modules/03_recruiting/components/TableCan.vue
@@ -71,7 +71,7 @@
         <q-th v-for="col in props.cols" :key="col.name" :props="props">
           <span class="text-weight-medium">{{ col.label }}</span>
         </q-th>
-        <q-th auto-width v-if="editBtn == true" />
+        <q-th auto-width v-if="boss == true" />
       </q-tr>
     </template>
     <template #body="props">
@@ -103,6 +103,7 @@ const props = defineProps({
   editvisible: Boolean,
   nameHeader: Boolean,
   bottom: Boolean,
+  boss: Boolean,
   addData: {
     type: Boolean,
     defualt: true,
diff --git a/src/modules/03_recruiting/components/TableCandidate.vue b/src/modules/03_recruiting/components/TableCandidate.vue
index b986db0c1..c5efec41e 100644
--- a/src/modules/03_recruiting/components/TableCandidate.vue
+++ b/src/modules/03_recruiting/components/TableCandidate.vue
@@ -78,7 +78,8 @@
           color="primary"
           @click="candidateCheckProfileDialog"
           :disabled="
-            attrs.rows.filter((r) => r.status == 'checkRegister').length == 0
+            attrs.rows.filter((r) => r.status == 'checkRegister').length == 0 ||
+            selected.length == 0
           "
         >
           <q-tooltip>ตรวจสอบข้อมูล/ได้รับใบสมัครแล้ว</q-tooltip>
diff --git a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
index 16f962af9..f8d3cdff3 100644
--- a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
+++ b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
@@ -993,10 +993,10 @@
               type="textarea"
             />
           </div>
-          <div class="col-12">
+          <div class="col-12" v-if="announcementExam">
             <q-separator size="5px" color="grey-2" class="q-my-lg" />
           </div>
-          <div class="col-12">
+          <div class="col-12" v-if="announcementExam">
             <div class="text-bold text-subtitle2 q-pb-sm">
               ข้อกำหนดและเงื่อนไข
             </div>
@@ -1060,10 +1060,10 @@
               }"
             />
           </div>
-          <div class="col-12">
+          <div class="col-12" v-if="announcementExam">
             <q-separator size="5px" color="grey-2" class="q-my-lg" />
           </div>
-          <div class="col-12">
+          <div class="col-12" v-if="announcementExam">
             <div class="text-bold text-subtitle2 q-pb-sm">คำรับรอง</div>
             <q-editor
               v-model="editorConfirm"