diff --git a/src/modules/06_evaluate/components/PopupCheckFeatures.vue b/src/modules/06_evaluate/components/PopupCheckFeatures.vue
index 00f9583..54df3ff 100644
--- a/src/modules/06_evaluate/components/PopupCheckFeatures.vue
+++ b/src/modules/06_evaluate/components/PopupCheckFeatures.vue
@@ -36,8 +36,8 @@ const rows = ref<any[]>([
     level: "หลักสูตร ๔ ปี",
     expert: "๖ ปี",
     special: "๘ ปี",
-    checked: "ต่ำกว่าปริญญาตรี",
-    // year: 4,
+    checked: "ปริญญาตรี",
+    year: 4,
   },
   {
     degree: "ปริญญาตรี หรือเทียบเท่า",
@@ -178,9 +178,9 @@ watch(props, () => {
               </q-td>
               <q-td key="checked" :props="props">
                 <!-- v-if="educations?.find((x:any)=> (props.row.year && x.educationLevel == props.row.checked && x.year == props.row.year) || (!props.row.year && x.educationLevel == props.row.checked))" -->
-
+                <!-- {{ props.row.year }}-{{ props.row.checked }}-{{ educations }} -->
                 <q-icon
-                  v-if="props.rowIndex == 0"
+                  v-if="educations?.find((x:any)=> (props.row.year && x.educationLevel == props.row.checked && x.durationYear == props.row.year) || (!props.row.year && x.educationLevel == props.row.checked))"
                   name="checked"
                   color="primary"
                   size="xs"
diff --git a/src/modules/06_evaluate/components/Tab1.vue b/src/modules/06_evaluate/components/Tab1.vue
index e5bd5d3..786fc44 100644
--- a/src/modules/06_evaluate/components/Tab1.vue
+++ b/src/modules/06_evaluate/components/Tab1.vue
@@ -391,8 +391,10 @@ onMounted(async () => {
         <q-btn
           v-if="
             store.step >= store.currentStep &&
+            store.step !== 3 &&
             store.step !== 4 &&
             store.step !== 5 &&
+            store.step !== 7 &&
             store.step !== 8 &&
             store.step !== 9
           "
@@ -401,6 +403,16 @@ onMounted(async () => {
           color="public"
           @click="onCilckNextStep"
         />
+        <q-btn
+          v-else-if="
+            store.step >= store.currentStep &&
+            (store.step == 3 || store.step == 7)
+          "
+          unelevated
+          label="ยื่นเอกการ"
+          color="public"
+          @click="onCilckNextStep"
+        />
       </div>
     </div>
   </div>
diff --git a/src/modules/06_evaluate/components/viewstep/viewStep1.vue b/src/modules/06_evaluate/components/viewstep/viewStep1.vue
index cf23bcd..2924ebc 100644
--- a/src/modules/06_evaluate/components/viewstep/viewStep1.vue
+++ b/src/modules/06_evaluate/components/viewstep/viewStep1.vue
@@ -61,7 +61,7 @@ async function fetchDetail() {
       formDetail.fullName = `${data.firstName}  ${data.lastName}`;
       formDetail.position = data.position;
       formDetail.oc = data.oc;
-      formDetail.salary = data.salary;
+      formDetail.salary = data.salary.toLocaleString("th-TH");
       formDetail.positionLevel = data.positionLevel;
       formDetail.posNo = data.posNo;
       formDetail.birthDate = data.birthDate && date2Thai(data.birthDate);
@@ -240,120 +240,123 @@ onMounted(async () => {
             <span class="q-ml-lg q-my-sm">ประวัติการศึกษา </span>
           </div>
           <q-separator />
-          <div
-            class="row q-pa-sm"
-            v-for="(education, index) in formDetail.educations"
-            :key="index"
-          >
-            <div class="col-xs-6 col-sm-4 col-md-3">
-              <q-input
-                borderless
-                readonly
-                :model-value="education.educationLevel"
-                label="ระดับศึกษา"
-              />
-            </div>
+          <div v-if="formDetail.educations.length > 0">
+            <div
+              class="row q-pa-sm"
+              v-for="(education, index) in formDetail.educations"
+              :key="index"
+            >
+              <div class="col-xs-6 col-sm-4 col-md-3">
+                <q-input
+                  borderless
+                  readonly
+                  :model-value="education.educationLevel"
+                  label="ระดับศึกษา"
+                />
+              </div>
 
-            <div class="col-xs-6 col-sm-4 col-md-3">
-              <q-input
-                borderless
-                readonly
-                :model-value="education.institute"
-                label="สถานศึกษา"
-              />
-            </div>
+              <div class="col-xs-6 col-sm-4 col-md-3">
+                <q-input
+                  borderless
+                  readonly
+                  :model-value="education.institute"
+                  label="สถานศึกษา"
+                />
+              </div>
 
-            <div class="col-xs-6 col-sm-4 col-md-3">
-              <q-input
-                borderless
-                :model-value="date2Thai(education.startDate)"
-                readonly
-                label="ตั้งแต่"
-              >
-                <template v-slot:prepend>
-                  <q-icon class="size-icon" name="o_calendar_today" />
-                </template>
-              </q-input>
-            </div>
+              <div class="col-xs-6 col-sm-4 col-md-3">
+                <q-input
+                  borderless
+                  :model-value="date2Thai(education.startDate)"
+                  readonly
+                  label="ตั้งแต่"
+                >
+                  <template v-slot:prepend>
+                    <q-icon class="size-icon" name="o_calendar_today" />
+                  </template>
+                </q-input>
+              </div>
 
-            <div class="col-xs-6 col-sm-4 col-md-3">
-              <q-input
-                borderless
-                :model-value="date2Thai(education.endDate)"
-                readonly
-                label="ถึง"
-              >
-                <template v-slot:prepend>
-                  <q-icon class="size-icon" name="o_calendar_today" />
-                </template>
-              </q-input>
-            </div>
-            <div class="col-xs-6 col-sm-4 col-md-3">
-              <q-input
-                borderless
-                :model-value="date2Thai(education.finishDate)"
-                readonly
-                label="วันทราสำเร็จการศึกษา"
-              >
-                <template v-slot:prepend>
-                  <q-icon class="size-icon" name="o_calendar_today" />
-                </template>
-              </q-input>
-            </div>
+              <div class="col-xs-6 col-sm-4 col-md-3">
+                <q-input
+                  borderless
+                  :model-value="date2Thai(education.endDate)"
+                  readonly
+                  label="ถึง"
+                >
+                  <template v-slot:prepend>
+                    <q-icon class="size-icon" name="o_calendar_today" />
+                  </template>
+                </q-input>
+              </div>
+              <div class="col-xs-6 col-sm-4 col-md-3">
+                <q-input
+                  borderless
+                  :model-value="date2Thai(education.finishDate)"
+                  readonly
+                  label="วันทราสำเร็จการศึกษา"
+                >
+                  <template v-slot:prepend>
+                    <q-icon class="size-icon" name="o_calendar_today" />
+                  </template>
+                </q-input>
+              </div>
 
-            <div class="col-xs-6 col-sm-4 col-md-3">
-              <q-input
-                borderless
-                readonly
-                :model-value="education.degree"
-                label="วุฒิการศึกษาในตําแหน่ง"
-              />
-            </div>
+              <div class="col-xs-6 col-sm-4 col-md-3">
+                <q-input
+                  borderless
+                  readonly
+                  :model-value="education.degree"
+                  label="วุฒิการศึกษาในตําแหน่ง"
+                />
+              </div>
 
-            <div class="col-xs-6 col-sm-4 col-md-3">
-              <q-input
-                borderless
-                readonly
-                :model-value="education.degree"
-                label="วุฒิการศึกษา"
-              />
-            </div>
+              <div class="col-xs-6 col-sm-4 col-md-3">
+                <q-input
+                  borderless
+                  readonly
+                  :model-value="education.degree"
+                  label="วุฒิการศึกษา"
+                />
+              </div>
 
-            <div class="col-xs-6 col-sm-4 col-md-3">
-              <q-input
-                borderless
-                readonly
-                :model-value="education.field"
-                label="สาขาวิชา/ทาง"
-              />
-            </div>
-            <div class="col-xs-6 col-sm-4 col-md-3">
-              <q-input
-                borderless
-                readonly
-                :model-value="education.fundName"
-                label="ทุน"
-              />
-            </div>
+              <div class="col-xs-6 col-sm-4 col-md-3">
+                <q-input
+                  borderless
+                  readonly
+                  :model-value="education.field"
+                  label="สาขาวิชา/ทาง"
+                />
+              </div>
+              <div class="col-xs-6 col-sm-4 col-md-3">
+                <q-input
+                  borderless
+                  readonly
+                  :model-value="education.fundName"
+                  label="ทุน"
+                />
+              </div>
 
-            <div class="col-xs-6 col-sm-4 col-md-3">
-              <q-input
-                borderless
-                readonly
-                :model-value="education.gpa"
-                label="เกรดเฉลี่ย"
-              />
-            </div>
+              <div class="col-xs-6 col-sm-4 col-md-3">
+                <q-input
+                  borderless
+                  readonly
+                  :model-value="education.gpa"
+                  label="เกรดเฉลี่ย"
+                />
+              </div>
 
-            <div class="col-xs-6 col-sm-4 col-md-6">
-              <q-input
-                borderless
-                readonly
-                :model-value="education.country"
-                label="ประเทศ"
-              />
+              <div class="col-xs-6 col-sm-4 col-md-6">
+                <q-input
+                  borderless
+                  readonly
+                  :model-value="education.country"
+                  label="ประเทศ"
+                />
+              </div>
             </div>
           </div>
+          <div v-else class="row col-12 q-pa-md">ไม่มีประวัติการศึกษา</div>
           <q-separator />
         </q-card>
 
@@ -406,6 +409,7 @@ onMounted(async () => {
           <q-separator />
           <div class="row q-pa-sm">
             <div class="col-xs-12 col-sm-12 col-md-12">
+              -
               <!-- <TableData
                 :columns="columnTraining"
                 :row="formDetail.Trainings"