diff --git a/src/modules/06_evaluate/components/DialogMain.vue b/src/modules/06_evaluate/components/DialogMain.vue
index e450b92..6393079 100644
--- a/src/modules/06_evaluate/components/DialogMain.vue
+++ b/src/modules/06_evaluate/components/DialogMain.vue
@@ -29,7 +29,8 @@ function onCklicNext() {
   dialogConfirm(
     $q,
     () => {
-      router.push("/evaluate/add");
+      const type = props.menu ? props.menu.val?.toLowerCase() : "";
+      router.push(`/evaluate/add/${type}`);
     },
     "ยืนยันการดำเนินการ",
     "ต้องการยืนยันการดำเนินการต่อใช่หรือไม่?"
@@ -53,7 +54,7 @@ function onCklicNext() {
           dense
           color="public"
           label="ดำเนินการต่อ"
-          @click="onCklicNext"
+          @click="onCklicNext()"
         />
       </q-card-actions>
     </q-card>
diff --git a/src/modules/06_evaluate/router.ts b/src/modules/06_evaluate/router.ts
index 3e0c639..3f279bd 100644
--- a/src/modules/06_evaluate/router.ts
+++ b/src/modules/06_evaluate/router.ts
@@ -15,7 +15,7 @@ export default [
   },
 
   {
-    path: "/evaluate/add",
+    path: "/evaluate/add/:type",
     name: "evaluate-add",
     component: evaluateStep,
     meta: {