diff --git a/src/modules/06_evaluate/components/EvaluateStepMain.vue b/src/modules/06_evaluate/components/EvaluateStepMain.vue
index 1181aec..1df15d8 100644
--- a/src/modules/06_evaluate/components/EvaluateStepMain.vue
+++ b/src/modules/06_evaluate/components/EvaluateStepMain.vue
@@ -568,7 +568,7 @@ onMounted(async () => {
           flat
           color="primary"
           class="q-mr-sm"
-          @click="router.go(-1)"
+          @click="router.push('/evaluate')"
         />
         <div>ประเมินบุคคล</div>
       </div>
@@ -612,8 +612,8 @@ onMounted(async () => {
             </template>
 
             <template v-slot:after>
-              <div class="col-12 row q-pa-md" v-if="showLoadStatus">
-                <div class="col-12 row">
+              <div class="col-12 row q-pa-md" >
+                <div class="col-12 row" v-if="showLoadStatus">
                     <div class="toptitle2 q-pt-xs">
                       {{ store.step }}.{{ store.title[store.step - 1] }}
                     </div>
diff --git a/src/modules/06_evaluate/components/Stepper.vue b/src/modules/06_evaluate/components/Stepper.vue
index e5eebfa..f00c3d3 100644
--- a/src/modules/06_evaluate/components/Stepper.vue
+++ b/src/modules/06_evaluate/components/Stepper.vue
@@ -7,6 +7,108 @@ const store = useEvaluateStore();
 
 <template>
   <q-stepper
+    v-model="store.step"
+    vertical
+    animated
+    flat
+    ref="stepper"
+    :bordered="false"
+    header-nav
+    dense
+    class="stepEva"
+  >
+    <q-step
+      keep-alive
+      :name="1"
+      prefix="1"
+      title="ตรวจสอบคุณสมบัติ"
+      :done="store.currentStep >= 1"
+      :disable="store.currentStep < 1"
+      class="subStep"
+    >
+    </q-step>
+
+    <q-step
+      :name="2"
+      prefix="2"
+      title="จัดเตรียมเอกสารเล่ม 1"
+      :done="store.currentStep >= 2"
+      :disable="store.currentStep < 2"
+      class="subStep"
+    >
+    </q-step>
+
+    <q-step
+      :name="3"
+      prefix="3"
+      title="ตรวจสอบเอกสารเล่ม 1"
+      :done="store.currentStep >= 3"
+      :disable="store.currentStep < 3"
+      class="subStep"
+    >
+    </q-step>
+
+    <q-step
+      :name="4"
+      prefix="4"
+      title="รอตรวจสอบคุณสมบัติ"
+      :done="store.currentStep >= 4"
+      :disable="store.currentStep < 4"
+      class="subStep"
+    >
+    </q-step>
+
+    <q-step
+      :name="5"
+      prefix="5"
+      title="ประกาศบนเว็บไซต์"
+      :done="store.currentStep >= 5"
+      :disable="store.currentStep < 5"
+      class="subStep"
+    >
+    </q-step>
+
+    <q-step
+      :name="6"
+      prefix="6"
+      title="จัดเตรียมเอกสารเล่ม 2"
+      :done="store.currentStep >= 6"
+      :disable="store.currentStep < 6"
+      class="subStep"
+    >
+    </q-step>
+
+    <q-step
+      :name="7"
+      prefix="7"
+      title="รอพิจารณาผลการประเมิน 2"
+      :done="store.currentStep >= 7"
+      :disable="store.currentStep < 7"
+      class="subStep"
+    >
+    </q-step>
+
+    <q-step
+      :name="8"
+      prefix="8"
+      title="ตรวจสอบความถูกต้องของเอกสารเล่ม 2"
+      :done="store.currentStep >= 8"
+      :disable="store.currentStep < 8"
+      class="subStep"
+    >
+    </q-step>
+
+    <q-step
+      :name="9"
+      prefix="9"
+      title="เสร็จสิ้น"
+      :done="store.currentStep >= 9"
+      :disable="store.currentStep < 9"
+      class="subStep"
+    >
+    </q-step>
+  </q-stepper>
+  <!-- <q-stepper
     v-model="store.step"
     dense
     vertical
@@ -105,7 +207,7 @@ const store = useEvaluateStore();
       class="subStep"
     >
     </q-step>
-  </q-stepper>
+  </q-stepper> -->
 </template>
 
 <style>
@@ -113,6 +215,8 @@ const store = useEvaluateStore();
   padding: 0px !important;
 }
 .subStep .q-stepper__tab{
-  padding: 12px 0px !important;
+  padding: 10px 10px !important;
+  border-radius: 8px;
+  font-size: 0.9rem;
 }
 </style>