diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index f03753da2..9594a2523 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -417,7 +417,7 @@ const menuList = readonly<any[]>([
   {
     key: 11,
     icon: "mdi-scale-balance",
-    activeIcon: "mdi-calendar",
+    activeIcon: "mdi-scale-balance",
     label: "วินัย",
     role: "discipline",
     children: [
@@ -483,13 +483,72 @@ const menuList = readonly<any[]>([
       },
     ],
   },
+  // {
+  //   key: 11,
+  //   icon: "mdi-account-check",
+  //   activeIcon: "mdi-account-check",
+  //   label: "ประเมิน",
+  //   // path: "evaluate",
+  //   role: "discipline", // evaluate
+  //   children: [
+  //     {
+  //       key: 12.1,
+  //       label: "ประเมินบุคคล",
+  //       path: "evaluate",
+  //       role: "discipline",
+  //     },
+  //     {
+  //       label: "ข้อมูลพื้นฐาน",
+  //       path: "",
+  //       key: 12.2,
+  //       role: "discipline",
+  //       children: [
+  //         {
+  //           label: "กรรมการ",
+  //           path: "evaluateDirector",
+  //           role: "discipline",
+  //         },
+  //         {
+  //           label: "การประชุม",
+  //           path: "evaluateMeeting",
+  //           role: "discipline",
+  //         },
+  //       ],
+  //     },
+  //   ],
+  // },
   {
-    key: 12,
+    key: 11,
     icon: "mdi-account-check",
-    activeIcon: "evaluate",
+    activeIcon: "mdi-account-check",
     label: "ประเมินบุคคล",
-    path: "evaluate",
-    role: "discipline", // evaluate
+    role: "discipline",
+    children: [
+      {
+        key: 11.1,
+        label: "คำขอประเมิน",
+        path: "evaluate",
+        role: "discipline",
+      },
+      {
+        label: "กรรมการและการประชุม",
+        path: "",
+        key: 11.7,
+        role: "discipline",
+        children: [
+          {
+            label: "กรรมการ",
+            path: "evaluateDirector",
+            role: "discipline",
+          },
+          {
+            label: "การประชุม",
+            path: "evaluateMeeting",
+            role: "discipline",
+          },
+        ],
+      },
+    ],
   },
 ]);
 
diff --git a/src/modules/12_Evaluate/components/Detail/Tab2.vue b/src/modules/12_Evaluate/components/Detail/Tab2.vue
deleted file mode 100644
index 1e8f6ef1b..000000000
--- a/src/modules/12_Evaluate/components/Detail/Tab2.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted } from "vue";
-import { useQuasar } from "quasar";
-
-import Stepper from "@/modules/12_evaluate/components/Detail/Stepper.vue";
-import Step1 from "@/modules/12_evaluate/components/Detail/step/step1.vue";
-import Step2 from "@/modules/12_evaluate/components/Detail/step/step2.vue";
-import Step3 from "@/modules/12_evaluate/components/Detail/step/step3.vue";
-import Step4 from "@/modules/12_evaluate/components/Detail/step/step4.vue";
-import Step5 from "@/modules/12_evaluate/components/Detail/step/step5.vue";
-import Step6 from "@/modules/12_evaluate/components/Detail/step/step6.vue";
-import Step7 from "@/modules/12_evaluate/components/Detail/step/step7.vue";
-import Step8 from "@/modules/12_evaluate/components/Detail/step/step8.vue";
-import Step9 from "@/modules/12_evaluate/components/Detail/step/step9.vue";
-
-import ViewStep1 from "@/modules/12_evaluate/components/Detail/viewstep/viewStep1.vue";
-import ViewStep3 from "@/modules/12_evaluate/components/Detail/viewstep/viewStep3.vue";
-import ViewStep7 from "@/modules/12_evaluate/components/Detail/viewstep/viewStep7.vue";
-
-import { useEvaluateDetailStore } from "@/modules/12_evaluate/store/EvaluateDetail";
-import { useCounterMixin } from "@/stores/mixin";
-
-const store = useEvaluateDetailStore();
-const mixin = useCounterMixin();
-const { dialogConfirm } = mixin;
-
-const $q = useQuasar();
-
-function onCilckNextStep() {
-  store.step < 9 &&
-    dialogConfirm($q, () => {
-      store.step++;
-    });
-}
-
-function onCilckprPeviousStep() {
-  store.step > 1 &&
-    dialogConfirm($q, () => {
-      store.step--;
-    });
-}
-
-onMounted(() => {
-  store.step = 1;
-});
-</script>
-
-<template>
-  <div class="row q-col-gutter-md">
-    <div class="col-xs-12 col-sm-3">
-      <div class="toptitle">ประเมินชำนาญการพิเศษ</div>
-      <Stepper />
-    </div>
-
-    <div class="col-xs-12 col-sm-9">
-      <div class="toptitle">
-        {{ store.step }}.{{ store.titel[store.step - 1] }}
-      </div>
-      <div class="row q-col-gutter-md col-12">
-        <div
-          :class="
-            store.step === 2 ||
-            store.step === 4 ||
-            store.step === 5 ||
-            store.step === 6 ||
-            store.step === 8 ||
-            store.step === 9
-              ? 'col-xs-12 col-sm-12 row'
-              : 'col-xs-12 col-sm-5 row'
-          "
-        >
-          <q-card flat bordered class="col-12 q-pa-md">
-            <q-card-section>
-              <Step1 v-if="store.step === 1" />
-              <Step2 v-if="store.step === 2" />
-              <Step3 v-if="store.step === 3" />
-              <Step4 v-if="store.step === 4" />
-              <Step5 v-if="store.step === 5" />
-              <Step6 v-if="store.step === 6" />
-              <Step7 v-if="store.step === 7" />
-              <Step8 v-if="store.step === 8" />
-              <Step9 v-if="store.step === 9" />
-            </q-card-section>
-          </q-card>
-        </div>
-        <div
-          class="col-xs-12 col-sm-7 row"
-          v-if="store.step === 1 || store.step === 3 || store.step === 7"
-        >
-          <q-card flat bordered class="col-12">
-            <q-card-section>
-              <ViewStep1 v-if="store.step === 1" />
-              <ViewStep3 v-if="store.step === 3" />
-              <ViewStep7 v-if="store.step === 7" /> </q-card-section
-          ></q-card>
-        </div>
-      </div>
-      <div class="q-mt-md q-gutter-md" align="right">
-        <q-btn
-          v-if="store.step !== 1"
-          unelevated
-          outline
-          label="ย้อนกลับ"
-          color="public"
-          @click="onCilckprPeviousStep"
-        />
-        <q-btn
-          unelevated
-          label="ดำเนินการต่อ"
-          color="public"
-          @click="onCilckNextStep"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-
-<style>
-.q-stepper--vertical .q-stepper__step-inner {
-  padding: 0;
-}
-</style>
diff --git a/src/modules/12_Evaluate/components/Detail/viewstep/viewStep1.vue b/src/modules/12_Evaluate/components/Detail/viewstep/viewStep1.vue
deleted file mode 100644
index 9c84ddb58..000000000
--- a/src/modules/12_Evaluate/components/Detail/viewstep/viewStep1.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<script setup lang="ts"></script>
-
-<template>
-  <div>ข้อมูลคุณสมบัติ</div>
-</template>
-
-<style scoped></style>
diff --git a/src/modules/12_Evaluate/store/Evaluate.ts b/src/modules/12_Evaluate/store/Evaluate.ts
deleted file mode 100644
index 80e4e9498..000000000
--- a/src/modules/12_Evaluate/store/Evaluate.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import { defineStore } from "pinia";
-import { ref } from "vue";
-import type { QTableProps } from "quasar";
-import type { DataOption } from "@/modules/12_Evaluate/interface/index/Main";
-import { useCounterMixin } from "@/stores/mixin";
-
-const mixin = useCounterMixin();
-const { date2Thai } = mixin;
-export const useEvalutuonStore = defineStore("EvalutuonStore", () => {
-  /** function สถานะ*/
-  function convertStatus(val: string) {
-    switch (val) {
-      // case "NEW":
-      //   return "กำลังสรุปผลการพิจารณา";
-      // case "STOP":
-      //   return "ยุติเรื่อง";
-      case "DONE":
-        return "กำลังสรุปผลการพิจารณา";
-      case "REPORT":
-        return "ส่งไปออกคำสั่ง";
-    }
-  }
-
-  const visibleColumns = ref<String[]>([
-    "citizanId",
-    "fullName",
-    "position",
-    "level",
-    "positionNumber",
-    "agency",
-    "status",
-  ]);
-  const rows = ref<any[]>([]);
-
-  const columns = ref<QTableProps["columns"]>([
-    {
-      name: "citizanId",
-      align: "center",
-      label: "เลขประจำตัวประชาชน",
-      sortable: false,
-      field: "citizanId",
-      headerStyle: "font-size: 14px",
-      style: "font-size: 14px",
-    },
-    {
-      name: "fullName",
-      align: "left",
-      label: "ชื่อ-นามสกุล",
-      sortable: true,
-      field: "fullName",
-      headerStyle: "font-size: 14px",
-      style: "font-size: 14px",
-    },
-    {
-      name: "position",
-      align: "left",
-      label: "ตำแหน่ง",
-      sortable: true,
-      field: "position",
-      headerStyle: "font-size: 14px",
-      style: "font-size: 14px",
-      sort: (a: string, b: string) =>
-        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-    },
-    {
-      name: "level",
-      align: "left",
-      label: "ระดับ",
-      sortable: true,
-      field: "level",
-      headerStyle: "font-size: 14px",
-      style: "font-size: 14px",
-      sort: (a: string, b: string) =>
-        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-    },
-    {
-      name: "positionNumber",
-      align: "left",
-      label: "ตำแหน่งเลขที่",
-      sortable: true,
-      field: "positionNumber",
-      headerStyle: "font-size: 14px",
-      style: "font-size: 14px",
-      sort: (a: string, b: string) =>
-        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-    },
-    {
-      name: "agency",
-      align: "left",
-      label: "สังกัด",
-      sortable: true,
-      field: "agency",
-      headerStyle: "font-size: 14px",
-      style: "font-size: 14px",
-      sort: (a: string, b: string) =>
-        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-    },
-    {
-      name: "status",
-      align: "left",
-      label: "สถานะ(ตรวจสอบคุณสมบัติ)",
-      sortable: true,
-      field: "status",
-      headerStyle: "font-size: 14px",
-      style: "font-size: 14px",
-    },
-  ]);
-
-  return {
-    visibleColumns,
-    columns,
-    rows,
-  };
-});
diff --git a/src/modules/12_Evaluate/views/MainPage.vue b/src/modules/12_Evaluate/views/MainPage.vue
deleted file mode 100644
index 91f98d6d4..000000000
--- a/src/modules/12_Evaluate/views/MainPage.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<script setup lang="ts">
-import { onMounted, ref } from "vue";
-import { useQuasar } from "quasar";
-import { useRouter } from "vue-router";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-import Table from "@/modules/12_Evaluate/components/Table.vue";
-import { useCounterMixin } from "@/stores/mixin";
-import { useEvalutuonStore } from "@/modules/12_Evaluate/store/Evaluate";
-import type { Pagination } from "@/modules/03_recruiting/interface/index/Main";
-
-const $q = useQuasar(); // show dialog
-const router = useRouter();
-//search data table
-const mixin = useCounterMixin();
-const store = useEvalutuonStore();
-const { showLoader, hideLoader, messageError } = mixin;
-
-const initialPagination = ref<Pagination>({
-  rowsPerPage: 0,
-});
-
-const page = ref<number>(1);
-const pageSize = ref<number>(5);
-const maxPage = ref<number>(1);
-const filter = ref<string>("");
-
-/**เมื่อเริ่มโหลดหน้า
- * ส่งข้อมูลจำลองไปยัง store
- */
-onMounted(async () => {});
-</script>
-
-<template>
-  <div class="toptitle text-dark col-12 row items-center">
-    รายการคำขอประเมิน
-  </div>
-  <q-card flat bordered class="col-12 q-mt-sm q-pt-sm q-pa-md">
-    <div>
-      <Table
-        style="max-height: 80vh"
-        :rows="store.rows"
-        :columns="store.columns"
-        :visible-columns="store.visibleColumns"
-        v-model:inputfilter="filter"
-        v-model:inputvisible="store.visibleColumns"
-        :pagination="initialPagination"
-        :nornmalData="true"
-        :paging="true"
-        :titleText="''"
-        :page="page"
-        :pageSize="pageSize"
-        :maxPage="maxPage"
-      >
-        <template #columns="props">
-          <q-tr :props="props" class="cursor-pointer">
-            <q-td v-for="col in props.cols" :key="col.name" :props="props">
-              <div v-if="col.name == 'no'">
-                {{ props.rowIndex + 1 }}
-              </div>
-              <div v-else>
-                {{ col.value }}
-              </div>
-            </q-td>
-          </q-tr>
-        </template>
-      </Table>
-    </div>
-  </q-card>
-</template>
-
-<style></style>
diff --git a/src/modules/12_Evaluate/components/Detail/Stepper.vue b/src/modules/12_evaluatePersonal/components/Detail/Stepper.vue
similarity index 94%
rename from src/modules/12_Evaluate/components/Detail/Stepper.vue
rename to src/modules/12_evaluatePersonal/components/Detail/Stepper.vue
index c4eecdb71..3c221f21b 100644
--- a/src/modules/12_Evaluate/components/Detail/Stepper.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/Stepper.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref } from "vue";
 
-import { useEvaluateDetailStore } from "@/modules/12_evaluate/store/EvaluateDetail";
+import { useEvaluateDetailStore } from "@/modules/12_evaluatePersonal/store/EvaluateDetail";
 
 const store = useEvaluateDetailStore();
 </script>
diff --git a/src/modules/12_Evaluate/components/Detail/Tab1.vue b/src/modules/12_evaluatePersonal/components/Detail/Tab1.vue
similarity index 67%
rename from src/modules/12_Evaluate/components/Detail/Tab1.vue
rename to src/modules/12_evaluatePersonal/components/Detail/Tab1.vue
index 0032a2ca0..91569f9d1 100644
--- a/src/modules/12_Evaluate/components/Detail/Tab1.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/Tab1.vue
@@ -2,22 +2,22 @@
 import { onMounted } from "vue";
 import { useQuasar } from "quasar";
 
-import Stepper from "@/modules/12_evaluate/components/Detail/Stepper.vue";
-import Step1 from "@/modules/12_evaluate/components/Detail/step/step1.vue";
-import Step2 from "@/modules/12_evaluate/components/Detail/step/step2.vue";
-import Step3 from "@/modules/12_evaluate/components/Detail/step/step3.vue";
-import Step4 from "@/modules/12_evaluate/components/Detail/step/step4.vue";
-import Step5 from "@/modules/12_evaluate/components/Detail/step/step5.vue";
-import Step6 from "@/modules/12_evaluate/components/Detail/step/step6.vue";
-import Step7 from "@/modules/12_evaluate/components/Detail/step/step7.vue";
-import Step8 from "@/modules/12_evaluate/components/Detail/step/step8.vue";
-import Step9 from "@/modules/12_evaluate/components/Detail/step/step9.vue";
+import Stepper from "@/modules/12_evaluatePersonal/components/Detail/Stepper.vue";
+import Step1 from "@/modules/12_evaluatePersonal/components/Detail/step/step1.vue";
+import Step2 from "@/modules/12_evaluatePersonal/components/Detail/step/step2.vue";
+import Step3 from "@/modules/12_evaluatePersonal/components/Detail/step/step3.vue";
+import Step4 from "@/modules/12_evaluatePersonal/components/Detail/step/step4.vue";
+import Step5 from "@/modules/12_evaluatePersonal/components/Detail/step/step5.vue";
+import Step6 from "@/modules/12_evaluatePersonal/components/Detail/step/step6.vue";
+import Step7 from "@/modules/12_evaluatePersonal/components/Detail/step/step7.vue";
+import Step8 from "@/modules/12_evaluatePersonal/components/Detail/step/step8.vue";
+import Step9 from "@/modules/12_evaluatePersonal/components/Detail/step/step9.vue";
 
-import ViewStep1 from "@/modules/12_evaluate/components/Detail/viewstep/viewStep1.vue";
-import ViewStep3 from "@/modules/12_evaluate/components/Detail/viewstep/viewStep3.vue";
-import ViewStep7 from "@/modules/12_evaluate/components/Detail/viewstep/viewStep7.vue";
+import ViewStep1 from "@/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue";
+import ViewStep3 from "@/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep3.vue";
+import ViewStep7 from "@/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep7.vue";
 
-import { useEvaluateDetailStore } from "@/modules/12_evaluate/store/EvaluateDetail";
+import { useEvaluateDetailStore } from "@/modules/12_evaluatePersonal/store/EvaluateDetail";
 import { useCounterMixin } from "@/stores/mixin";
 
 const store = useEvaluateDetailStore();
@@ -67,21 +67,8 @@ onMounted(() => {
 
     <div class="col-xs-12 col-sm-9">
       <div class="col-12 row">
-        <div class="col-9">
-          <div class="toptitle">
-            {{ store.step }}.{{ store.titel[store.step - 1] }}
-          </div>
-        </div>
-        <div v-if="store.step === 1" class="col-3 text-right">
-          <q-btn
-            :href="externalLink"
-            target="_blank"
-            outline
-            color="blue"
-            no-caps
-          >
-            ตรวจสอบคุณสมบัติกับ ก.พ.
-          </q-btn>
+        <div class="toptitle">
+          {{ store.step }}.{{ store.titel[store.step - 1] }}
         </div>
       </div>
       <div class="row q-col-gutter-md col-12">
diff --git a/src/modules/12_evaluatePersonal/components/Detail/Tab2.vue b/src/modules/12_evaluatePersonal/components/Detail/Tab2.vue
new file mode 100644
index 000000000..13f0e362d
--- /dev/null
+++ b/src/modules/12_evaluatePersonal/components/Detail/Tab2.vue
@@ -0,0 +1,62 @@
+<script setup lang="ts">
+import { ref, onMounted } from "vue";
+import { useQuasar } from "quasar";
+
+import Stepper from "@/modules/12_evaluatePersonal/components/Detail/Stepper.vue";
+import Step1 from "@/modules/12_evaluatePersonal/components/Detail/step/step1.vue";
+import Step2 from "@/modules/12_evaluatePersonal/components/Detail/step/step2.vue";
+import Step3 from "@/modules/12_evaluatePersonal/components/Detail/step/step3.vue";
+import Step4 from "@/modules/12_evaluatePersonal/components/Detail/step/step4.vue";
+import Step5 from "@/modules/12_evaluatePersonal/components/Detail/step/step5.vue";
+import Step6 from "@/modules/12_evaluatePersonal/components/Detail/step/step6.vue";
+import Step7 from "@/modules/12_evaluatePersonal/components/Detail/step/step7.vue";
+import Step8 from "@/modules/12_evaluatePersonal/components/Detail/step/step8.vue";
+import Step9 from "@/modules/12_evaluatePersonal/components/Detail/step/step9.vue";
+
+import ViewStep1 from "@/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue";
+import ViewStep3 from "@/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep3.vue";
+import ViewStep7 from "@/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep7.vue";
+
+import { useEvaluateDetailStore } from "@/modules/12_evaluatePersonal/store/EvaluateDetail";
+import { useCounterMixin } from "@/stores/mixin";
+
+const store = useEvaluateDetailStore();
+const mixin = useCounterMixin();
+const { dialogConfirm } = mixin;
+
+const $q = useQuasar();
+
+function onCilckNextStep() {
+  store.step < 9 &&
+    dialogConfirm($q, () => {
+      store.step++;
+    });
+}
+
+function onCilckprPeviousStep() {
+  store.step > 1 &&
+    dialogConfirm($q, () => {
+      store.step--;
+    });
+}
+
+onMounted(() => {
+  store.step = 1;
+});
+</script>
+
+<template>
+  <div class="row col-12">
+    <div class="toptitle">กรรมการและการประชุม</div>
+
+    <div class="row col-12">
+      <q-card> xx </q-card>
+    </div>
+  </div>
+</template>
+
+<style>
+.q-stepper--vertical .q-stepper__step-inner {
+  padding: 0;
+}
+</style>
diff --git a/src/modules/12_Evaluate/components/Detail/step/step1.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step1.vue
similarity index 100%
rename from src/modules/12_Evaluate/components/Detail/step/step1.vue
rename to src/modules/12_evaluatePersonal/components/Detail/step/step1.vue
diff --git a/src/modules/12_Evaluate/components/Detail/step/step2.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue
similarity index 100%
rename from src/modules/12_Evaluate/components/Detail/step/step2.vue
rename to src/modules/12_evaluatePersonal/components/Detail/step/step2.vue
diff --git a/src/modules/12_Evaluate/components/Detail/step/step3.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step3.vue
similarity index 96%
rename from src/modules/12_Evaluate/components/Detail/step/step3.vue
rename to src/modules/12_evaluatePersonal/components/Detail/step/step3.vue
index 6a7fe3103..200ef6d48 100644
--- a/src/modules/12_Evaluate/components/Detail/step/step3.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step3.vue
@@ -2,7 +2,7 @@
 import { reactive, ref } from "vue";
 
 import { useCounterMixin } from "@/stores/mixin";
-import { useEvaluateDetailStore } from "@/modules/12_evaluate/store/EvaluateDetail";
+import { useEvaluateDetailStore } from "@/modules/12_evaluatePersonal/store/EvaluateDetail";
 
 const store = useEvaluateDetailStore();
 const mixin = useCounterMixin();
diff --git a/src/modules/12_Evaluate/components/Detail/step/step4.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step4.vue
similarity index 100%
rename from src/modules/12_Evaluate/components/Detail/step/step4.vue
rename to src/modules/12_evaluatePersonal/components/Detail/step/step4.vue
diff --git a/src/modules/12_Evaluate/components/Detail/step/step5.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue
similarity index 100%
rename from src/modules/12_Evaluate/components/Detail/step/step5.vue
rename to src/modules/12_evaluatePersonal/components/Detail/step/step5.vue
diff --git a/src/modules/12_Evaluate/components/Detail/step/step6.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue
similarity index 97%
rename from src/modules/12_Evaluate/components/Detail/step/step6.vue
rename to src/modules/12_evaluatePersonal/components/Detail/step/step6.vue
index 909a62c5f..b1a274b66 100644
--- a/src/modules/12_Evaluate/components/Detail/step/step6.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref } from "vue";
-import ViewPDF from "@/modules/12_evaluate/components/Detail/viewstep/viewPDF.vue";
+import ViewPDF from "@/modules/12_evaluatePersonal/components/Detail/viewstep/viewPDF.vue";
 
 const fileEvaluation1 = ref<any>();
 
diff --git a/src/modules/12_Evaluate/components/Detail/step/step7.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step7.vue
similarity index 88%
rename from src/modules/12_Evaluate/components/Detail/step/step7.vue
rename to src/modules/12_evaluatePersonal/components/Detail/step/step7.vue
index 547aa84cf..7f44c7998 100644
--- a/src/modules/12_Evaluate/components/Detail/step/step7.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step7.vue
@@ -2,7 +2,7 @@
 import { reactive, ref } from "vue";
 
 import { useCounterMixin } from "@/stores/mixin";
-import { useEvaluateDetailStore } from "@/modules/12_evaluate/store/EvaluateDetail";
+import { useEvaluateDetailStore } from "@/modules/12_evaluatePersonal/store/EvaluateDetail";
 
 const store = useEvaluateDetailStore();
 const mixin = useCounterMixin();
diff --git a/src/modules/12_Evaluate/components/Detail/step/step8.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step8.vue
similarity index 100%
rename from src/modules/12_Evaluate/components/Detail/step/step8.vue
rename to src/modules/12_evaluatePersonal/components/Detail/step/step8.vue
diff --git a/src/modules/12_Evaluate/components/Detail/step/step9.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step9.vue
similarity index 100%
rename from src/modules/12_Evaluate/components/Detail/step/step9.vue
rename to src/modules/12_evaluatePersonal/components/Detail/step/step9.vue
diff --git a/src/modules/12_Evaluate/components/Detail/viewstep/viewPDF.vue b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewPDF.vue
similarity index 100%
rename from src/modules/12_Evaluate/components/Detail/viewstep/viewPDF.vue
rename to src/modules/12_evaluatePersonal/components/Detail/viewstep/viewPDF.vue
diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue
new file mode 100644
index 000000000..7bb1f2bf1
--- /dev/null
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue
@@ -0,0 +1,304 @@
+<script setup lang="ts">
+import { storeToRefs } from "pinia";
+import { useEvalutuonStore } from "@/modules/12_evaluatePersonal/store/Evaluate";
+
+const storageEvalutuon = useEvalutuonStore();
+const {
+  rows,
+  columnsLicense,
+  columnPeriodhistory,
+  columnTrainingHistory,
+  columnProjectsProposed,
+} = storeToRefs(storageEvalutuon);
+</script>
+
+<template>
+  <q-card class="bg-grey-2">
+    <div class="text-weight-bold row items-center">
+      <span class="q-ml-lg q-my-sm">ข้อมูลส่วนตัว</span>
+    </div>
+
+    <q-separator />
+
+    <q-card-actions class="q-ml-md">
+      <div class="col-xs-6 col-sm-3 col-md-3">
+        <q-input borderless readonly model-value="นาย" label="คำนำหน้าชื่อ" />
+      </div>
+
+      <div class="col-xs-6 col-sm-3 col-md-3">
+        <q-input
+          borderless
+          readonly
+          model-value="ธนพนธ์ แสงจันทร์"
+          label="ชื่อ - นามสกุล"
+        />
+      </div>
+
+      <div class="col-xs-6 col-sm-6 col-md-6">
+        <q-input
+          borderless
+          model-value="19/03/44"
+          readonly
+          label="วันเดือนปีเกิด"
+        >
+          <template v-slot:prepend>
+            <q-icon class="size-icon" name="o_calendar_today" />
+          </template>
+        </q-input>
+      </div>
+
+   
+    </q-card-actions>
+
+    <q-card-actions class="q-ml-md">
+      <div class="col-xs-6 col-sm-3 col-md-3">
+        <q-input borderless readonly model-value="ไม่มี" label="ตำแหน่ง" />
+      </div>
+
+      <div class="col-xs-6 col-sm-3 col-md-3">
+        <q-input
+          borderless
+          readonly
+          model-value="กย.11"
+          label="ตำแหน่งเลขที่"
+        />
+      </div>
+
+      <div class="col-xs-9 col-sm-6 col-md-6">
+        <q-input
+          borderless
+          readonly
+          model-value="หน่วยใหม่กับหน่วยเก่า"
+          label="สังกัด"
+        />
+      </div>
+    </q-card-actions>
+
+    <q-card-actions class="q-ml-md">
+      <div class="col-xs-6 col-sm-3 col-md-3">
+        <q-input borderless readonly model-value="" label="เงินเดือน" />
+      </div>
+
+      <div class="col-xs-6 col-sm-3 col-md-3">
+        <q-input borderless readonly model-value="" label="ระดับปัจจุบัน" />
+      </div>
+
+      <div class="col-xs-6 col-sm-3 col-md-3">
+        <q-input borderless readonly model-value="" label="ระดับที่ประเมิน" />
+      </div>
+
+      <div class="col-xs-6 col-sm-3 col-md-3">
+        <q-input borderless readonly model-value="1000 ปี" label="อายุราชการ" />
+      </div>
+    </q-card-actions>
+  </q-card>
+
+  <q-card class="bg-grey-2 q-mt-xl">
+    <div class=" text-weight-bold row items-center">
+      <span class="q-ml-lg q-my-sm">ประวัติการศึกษา</span>
+    </div>
+
+    <q-separator />
+
+    <q-card-actions class="q-ml-md">
+      <div class="col-xs-6 col-sm-3 col-md-3">
+        <q-input
+          borderless
+          readonly
+          model-value="ปริญญาตรี"
+          label="ระดับศึกษา"
+        />
+      </div>
+
+      <div class="col-xs-6 col-sm-3 col-md-3">
+        <q-input
+          borderless
+          readonly
+          model-value="มหาวิทยาลัยก."
+          label="สถานศึกษา"
+        />
+      </div>
+
+      <div class="col-xs-6 col-sm-3 col-md-3">
+        <q-input borderless model-value="19/03/44" 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-3 col-md-3">
+        <q-input borderless model-value="19/03/44" readonly label="ถึง">
+          <template v-slot:prepend>
+            <q-icon class="size-icon" name="o_calendar_today" />
+          </template>
+        </q-input>
+      </div>
+    </q-card-actions>
+
+    <q-card-actions class="q-ml-md">
+      <div class="col-xs-6 col-sm-6 col-md-6">
+        <q-input
+          borderless
+          model-value="19/03/44"
+          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-6 col-md-6">
+        <q-input
+          borderless
+          readonly
+          model-value="ปริญญาตรี"
+          label="วุฒิการศึกษาในตําแหน่ง"
+        />
+      </div>
+
+      <div class="col-xs-6 col-sm-6 col-md-6">
+        <q-input
+          borderless
+          readonly
+          model-value="ปริญญาตรี"
+          label="วุฒิการศึกษา"
+        />
+      </div>
+
+      <div class="col-xs-6 col-sm-6 col-md-6">
+        <q-input borderless readonly model-value="-" label="สาขาวิชา/ทาง" />
+      </div>
+    </q-card-actions>
+
+    <q-card-actions class="q-ml-md">
+      <div class="col-xs-6 col-sm-3 col-md-3">
+        <q-input borderless readonly model-value="-" label="ทุน" />
+      </div>
+
+      <div class="col-xs-6 col-sm-3 col-md-3">
+        <q-input borderless readonly model-value="3.33" label="เกรดเฉลี่ย" />
+      </div>
+
+      <div class="col-xs-6 col-sm-6 col-md-6">
+        <q-input borderless readonly model-value="ไทย" label="ประเทศ" />
+      </div>
+    </q-card-actions>
+  </q-card>
+
+  <q-card class="bg-grey-2 q-mt-xl">
+    <div class=" text-weight-bold row items-center">
+      <span class="q-ml-lg q-my-sm">ใบอนุญาตประกอบวิชาชีพ</span>
+    </div>
+
+    <q-separator />
+
+    <q-card-actions class="q-ma-md">
+      <div class="col-xs-12 col-sm-12 col-md-12">
+        <q-table
+          table-header-class="bg-grey-4 "
+          flat
+          bordered
+          :rows="rows"
+          :columns="columnsLicense"
+        >
+        </q-table>
+      </div>
+    </q-card-actions>
+  </q-card>
+
+  <q-card class="bg-grey-2 q-mt-xl">
+    <div class=" text-weight-bold row items-center">
+      <span class="q-ml-lg q-my-sm">ประวัติการรับราชการ</span>
+    </div>
+
+    <q-separator />
+
+    <q-card-actions class="q-ma-md">
+      <div class="col-xs-12 col-sm-12 col-md-12">
+        <q-table
+          table-header-class="bg-grey-4 "
+          flat
+          bordered
+          :rows="rows"
+          :columns="columnPeriodhistory"
+        >
+        </q-table>
+      </div>
+    </q-card-actions>
+  </q-card>
+
+  <q-card class="bg-grey-2 q-mt-xl">
+    <div class=" text-weight-bold row items-center">
+      <span class="q-ml-lg q-my-sm">ประวัติการฝึกอบรมดูงาน</span>
+    </div>
+
+    <q-separator />
+
+    <q-card-actions class="q-ma-md">
+      <div class="col-xs-12 col-sm-12 col-md-12">
+        <q-table
+          table-header-class="bg-grey-4 "
+          flat
+          bordered
+          :rows="rows"
+          :columns="columnTrainingHistory"
+        >
+        </q-table>
+      </div>
+    </q-card-actions>
+  </q-card>
+
+  <q-card class="bg-grey-2 q-mt-xl">
+    <div class=" text-weight-bold row items-center">
+      <span class="q-ml-lg q-my-sm">ประสบการณ์ในการปฏิบัติงาน</span>
+    </div>
+
+    <q-separator />
+
+    <q-card-actions class="q-ma-md">
+      <div class="col-xs-12 col-sm-12 col-md-12">
+        <q-table
+          table-header-class="bg-grey-4 "
+          flat
+          bordered
+          :rows="rows"
+          :columns="columnTrainingHistory"
+        >
+        </q-table>
+      </div>
+    </q-card-actions>
+  </q-card>
+
+  <q-card class="bg-grey-2 q-mt-xl">
+    <div class=" text-weight-bold row items-center">
+      <span class="q-ml-lg q-my-sm">ผลงานทีเคยเสนอขอประเมิน (ถ้ามี)</span>
+    </div>
+
+    <q-separator />
+
+    <q-card-actions class="q-ma-md">
+      <div class="col-xs-12 col-sm-12 col-md-12">
+        <q-table
+          table-header-class="bg-grey-4 "
+          flat
+          bordered
+          :rows="rows"
+          :columns="columnProjectsProposed"
+        >
+        </q-table>
+      </div>
+    </q-card-actions>
+  </q-card>
+</template>
+
+<style scoped lang="scss">
+
+.size-icon {
+    font-size: 20px; /* ปรับขนาดตามที่คุณต้องการ */
+  }
+
+</style>
+@/modules/12_evaluatePersonal/store/evaluate
\ No newline at end of file
diff --git a/src/modules/12_Evaluate/components/Detail/viewstep/viewStep3.vue b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep3.vue
similarity index 76%
rename from src/modules/12_Evaluate/components/Detail/viewstep/viewStep3.vue
rename to src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep3.vue
index fca3e2a02..0908466f3 100644
--- a/src/modules/12_Evaluate/components/Detail/viewstep/viewStep3.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep3.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import ViewPDF from "@/modules/12_evaluate/components/Detail/viewstep/viewPDF.vue";
+import ViewPDF from "@/modules/12_evaluatePersonal/components/Detail/viewstep/viewPDF.vue";
 
-import { useEvaluateDetailStore } from "@/modules/12_evaluate/store/EvaluateDetail";
+import { useEvaluateDetailStore } from "@/modules/12_evaluatePersonal/store/EvaluateDetail";
 
 const store = useEvaluateDetailStore();
 </script>
diff --git a/src/modules/12_Evaluate/components/Detail/viewstep/viewStep7.vue b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep7.vue
similarity index 60%
rename from src/modules/12_Evaluate/components/Detail/viewstep/viewStep7.vue
rename to src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep7.vue
index 34bbf2482..abae328e2 100644
--- a/src/modules/12_Evaluate/components/Detail/viewstep/viewStep7.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep7.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import ViewPDF from "@/modules/12_evaluate/components/Detail/viewstep/viewPDF.vue";
+import ViewPDF from "@/modules/12_evaluatePersonal/components/Detail/viewstep/viewPDF.vue";
 
-import { useEvaluateDetailStore } from "@/modules/12_evaluate/store/EvaluateDetail";
+import { useEvaluateDetailStore } from "@/modules/12_evaluatePersonal/store/EvaluateDetail";
 
 const store = useEvaluateDetailStore();
 </script>
diff --git a/src/modules/12_Evaluate/components/Table.vue b/src/modules/12_evaluatePersonal/components/Table.vue
similarity index 99%
rename from src/modules/12_Evaluate/components/Table.vue
rename to src/modules/12_evaluatePersonal/components/Table.vue
index 862cb5f87..9c159f90e 100644
--- a/src/modules/12_Evaluate/components/Table.vue
+++ b/src/modules/12_evaluatePersonal/components/Table.vue
@@ -161,6 +161,7 @@ watch([() => currentPage.value, () => pagination.value.rowsPerPage], () => {
         <q-th v-for="col in props.cols" :key="col.name" :props="props">
           <span class="text-weight-medium" v-html="col.label" />
         </q-th>
+        <q-th auto-width />
       </q-tr>
     </template>
     <template #body="props">
diff --git a/src/modules/12_Evaluate/interface/index/Main.ts b/src/modules/12_evaluatePersonal/interface/index/Main.ts
similarity index 100%
rename from src/modules/12_Evaluate/interface/index/Main.ts
rename to src/modules/12_evaluatePersonal/interface/index/Main.ts
diff --git a/src/modules/12_Evaluate/router.ts b/src/modules/12_evaluatePersonal/router.ts
similarity index 72%
rename from src/modules/12_Evaluate/router.ts
rename to src/modules/12_evaluatePersonal/router.ts
index cde3765e9..376c2328d 100644
--- a/src/modules/12_Evaluate/router.ts
+++ b/src/modules/12_evaluatePersonal/router.ts
@@ -1,6 +1,6 @@
-const mainPage = () => import("@/modules/12_evaluate/views/MainPage.vue");
+const mainPage = () => import("@/modules/12_evaluatePersonal/views/MainPage.vue");
 const detailPage = () =>
-  import("@/modules/12_evaluate/views/DetailPage.vue");
+  import("@/modules/12_evaluatePersonal/views/DetailPage.vue");
 
 export default [
   {
diff --git a/src/modules/12_evaluatePersonal/store/Evaluate.ts b/src/modules/12_evaluatePersonal/store/Evaluate.ts
new file mode 100644
index 000000000..f94e7d0f9
--- /dev/null
+++ b/src/modules/12_evaluatePersonal/store/Evaluate.ts
@@ -0,0 +1,426 @@
+import { defineStore } from "pinia";
+import { ref } from "vue";
+import type { QTableProps } from "quasar";
+import type { DataOption } from "@/modules/12_evaluatePersonal/interface/index/Main";
+import { useCounterMixin } from "@/stores/mixin";
+
+const mixin = useCounterMixin();
+const { date2Thai } = mixin;
+export const useEvalutuonStore = defineStore("EvalutuonStore", () => {
+  /** function สถานะ*/
+  function convertStatus(val: string) {
+    switch (val) {
+      case "CHECK_SPEC":
+        return "ตรวจสอบคุณสมบัติด้วยตนเอง";
+      case "PREPARE_DOC_V1":
+        return "จัดเตรียมเอกสารเล่ม";
+      case "CHECK_DOC_V1":
+        return "ตรวจสอบความถูกต้องของเอกสารเล่ม";
+      case "WAIT_CHECK_DOC_V1":
+        return "รอตรวจสอบคุณสมบัติ";
+      case "ANNOUNCE_WEB":
+        return "ประกาศบนเว็บไซต์";
+      case "PREPARE_DOC_V2":
+        return "จัดเตรียมเอกสารเล่ม";
+      case "WAIT_CHECK_DOC_V2":
+        return "รอพิจารณาผลการประเมิน";
+      case "CHECK_DOC_V2":
+        return "ตรวจสอบความถูกต้องของเอกสารเล่ม";
+      case "DONE":
+        return "เสร็จสิ้น";
+        
+    }
+  }
+
+  // ตรวจสอบคุณสมบัติด้วยตนเอง -> CHECK_SPEC
+  // จัดเตรียมเอกสารเล่ม 1-> PREPARE_DOC_V1
+  // ตรวจสอบความถูกต้องของเอกสารเล่ม 1 -> CHECK_DOC_V1
+  // รอตรวจสอบคุณสมบัติ -> WAIT_CHECK_DOC_V1
+  // ประกาศบนเว็บไซต์ -> ANNOUNCE_WEB
+  // จัดเตรียมเอกสารเล่ม 2 -> PREPARE_DOC_V2
+  // ตรวจสอบความถูกต้องของเอกสารเล่ม 2 -> CHECK_DOC_V2
+  // รอพิจารณาผลการประเมิน -> WAIT_CHECK_DOC_V2
+  // เสร็จสิ้น -> DONE
+
+  const visibleColumns = ref<String[]>([
+    "citizanId",
+    "fullName",
+    "position",
+    "level",
+    "positionNumber",
+    "agency",
+    "status",
+  ]);
+  const rows = ref<any[]>([]);
+  function fetchData(data: any[]) {
+    const dataList: any[] = data.map((data: any) => ({
+      citizanId: data.citizanId,
+      fullName: data.fullName,
+      position: data.position,
+      level: data.level,
+      positionNumber: data.positionNumber,
+      agency: data.agency,
+      status: convertStatus(data.status),
+    }));
+    rows.value = dataList;
+    console.log(dataList);
+  }
+
+  const columns = ref<QTableProps["columns"]>([
+    {
+      name: "citizanId",
+      align: "center",
+      label: "เลขประจำตัวประชาชน",
+      sortable: false,
+      field: "citizanId",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "fullName",
+      align: "left",
+      label: "ชื่อ-นามสกุล",
+      sortable: true,
+      field: "fullName",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "position",
+      align: "left",
+      label: "ตำแหน่ง",
+      sortable: true,
+      field: "position",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+      sort: (a: string, b: string) =>
+        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    },
+    {
+      name: "level",
+      align: "left",
+      label: "ระดับ",
+      sortable: true,
+      field: "level",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+      sort: (a: string, b: string) =>
+        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    },
+    {
+      name: "positionNumber",
+      align: "left",
+      label: "ตำแหน่งเลขที่",
+      sortable: true,
+      field: "positionNumber",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+      sort: (a: string, b: string) =>
+        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    },
+    {
+      name: "agency",
+      align: "left",
+      label: "สังกัด",
+      sortable: true,
+      field: "agency",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+      sort: (a: string, b: string) =>
+        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    },
+    {
+      name: "status",
+      align: "left",
+      label: "สถานะ(ตรวจสอบคุณสมบัติ)",
+      sortable: true,
+      field: "status",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+  ]);
+
+  const columnsLicense = ref<QTableProps["columns"]>([
+    {
+      name: "",
+      align: "center",
+      label: "ชื่อใบอนุณาต",
+      sortable: false,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "",
+      align: "left",
+      label: "หน่วยงานผู้ออกใบอนุญาต",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "",
+      align: "left",
+      label: "เลขที่ใบอนุญาต",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "",
+      align: "left",
+      label: "วันที่ออกใบอนุญาต",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+      sort: (a: string, b: string) =>
+        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    },
+    {
+      name: "",
+      align: "left",
+      label: "วันที่หมดอายุ",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+      sort: (a: string, b: string) =>
+        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    },
+  ]);
+
+  const columnPeriodhistory = ref<QTableProps["columns"]>([
+    {
+      name: "",
+      align: "center",
+      label: "วัน เดือน ปี",
+      sortable: false,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+      sort: (a: string, b: string) =>
+        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    },
+    {
+      name: "",
+      align: "left",
+      label: "สังกัด",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "",
+      align: "left",
+      label: "ตำแหน่ง",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "",
+      align: "left",
+      label: "ตำแหน่งเลขที่",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+      sort: (a: string, b: string) =>
+        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    },
+    {
+      name: "",
+      align: "left",
+      label: "สายงาน",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "",
+      align: "left",
+      label: "ด้าน/สาขา",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "",
+      align: "left",
+      label: "ตำแหน่งประเภท",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "",
+      align: "left",
+      label: "ระดับ",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "",
+      align: "left",
+      label: "ตำแหน่งทางการบริหาร",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "",
+      align: "left",
+      label: "ด้านทางการบริหาร",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+  ]);
+
+  const columnTrainingHistory = ref<QTableProps["columns"]>([
+    {
+      name: "",
+      align: "center",
+      label: "ชื่อโครงการ/หลักสูตรการฝึกอบรม",
+      sortable: false,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "",
+      align: "left",
+      label: "หัวข้อการฝึกอบรม/ดูงาน",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "",
+      align: "left",
+      label: "วันเริ่มต้นการฝึกอบรม/ดูงาน",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+      sort: (a: string, b: string) =>
+        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    },
+    {
+      name: "",
+      align: "left",
+      label: "วันสิ้นสุดการฝึกอบรม/ดูงาน",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+      sort: (a: string, b: string) =>
+        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    },
+    {
+      name: "",
+      align: "left",
+      label: "ปีที่อบรม/ดูงาน",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "",
+      align: "left",
+      label: "รวมระยะเวลาในการฝึกอบรม/ดูงาน",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "",
+      align: "left",
+      label: "หน่วยงานที่รับผิดชอบจัดการฝึกอบรม/ดูงาน",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+  ]);
+
+  const columnProjectsProposed = ref<QTableProps["columns"]>([
+    {
+      name: "",
+      align: "center",
+      label: "วันที่ได้รับ",
+      sortable: false,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+      sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    },
+    {
+      name: "",
+      align: "left",
+      label: "ผู้มีอำนาจลงนาม",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "",
+      align: "left",
+      label: "รายละเอียด",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+     
+    },
+    {
+      name: "",
+      align: "left",
+      label: "เลขที่คำสั่ง",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+      sort: (a: string, b: string) =>
+        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    },
+    {
+      name: "",
+      align: "left",
+      label: "เอกสารอ้างอิง",
+      sortable: true,
+      field: "",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+  ]);
+
+  return {
+    visibleColumns,
+    columns,
+    rows,
+    convertStatus,
+    fetchData,
+    columnsLicense,
+    columnPeriodhistory,
+    columnTrainingHistory,
+    columnProjectsProposed,
+  };
+});
diff --git a/src/modules/12_Evaluate/store/EvaluateDetail.ts b/src/modules/12_evaluatePersonal/store/EvaluateDetail.ts
similarity index 100%
rename from src/modules/12_Evaluate/store/EvaluateDetail.ts
rename to src/modules/12_evaluatePersonal/store/EvaluateDetail.ts
diff --git a/src/modules/12_Evaluate/views/DetailPage.vue b/src/modules/12_evaluatePersonal/views/DetailPage.vue
similarity index 73%
rename from src/modules/12_Evaluate/views/DetailPage.vue
rename to src/modules/12_evaluatePersonal/views/DetailPage.vue
index 035686b27..12d7ebf82 100644
--- a/src/modules/12_Evaluate/views/DetailPage.vue
+++ b/src/modules/12_evaluatePersonal/views/DetailPage.vue
@@ -5,10 +5,10 @@ import { useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-import Tab1 from "@/modules/12_evaluate/components/Detail/Tab1.vue"; // ชำนาญการ
-import Tab2 from "@/modules/12_evaluate/components/Detail/Tab2.vue"; // ชำนาญการพิเศษ
+import Tab1 from "@/modules/12_evaluatePersonal/components/Detail/Tab1.vue"; // ชำนาญการ
+import Tab2 from "@/modules/12_evaluatePersonal/components/Detail/Tab2.vue"; // ชำนาญการพิเศษ
 
-import { useEvaluateDetailStore } from "@/modules/12_evaluate/store/EvaluateDetail";
+import { useEvaluateDetailStore } from "@/modules/12_evaluatePersonal/store/EvaluateDetail";
 
 const store = useEvaluateDetailStore();
 const router = useRouter();
@@ -34,8 +34,8 @@ const $q = useQuasar();
               active-bg-color="teal-1"
               active-class="text-primary"
             >
-              <q-tab name="1" label="ชำนาญการ" />
-              <q-tab name="2" label="ชำนาญการพิเศษ" />
+              <q-tab name="1" label="รายละเอียดการประเมิน" />
+              <q-tab name="2" label="กรรมการและการประชุม" />
             </q-tabs>
             <q-separator />
             <q-tab-panels v-model="store.tabMenu" animated>
diff --git a/src/modules/12_evaluatePersonal/views/MainPage.vue b/src/modules/12_evaluatePersonal/views/MainPage.vue
new file mode 100644
index 000000000..830d51936
--- /dev/null
+++ b/src/modules/12_evaluatePersonal/views/MainPage.vue
@@ -0,0 +1,233 @@
+<script setup lang="ts">
+import { onMounted, ref } from "vue";
+import { useQuasar } from "quasar";
+import { useRouter } from "vue-router";
+import http from "@/plugins/http";
+import config from "@/app.config";
+
+import Table from "@/modules/12_evaluatePersonal/components/Table.vue";
+import { useCounterMixin } from "@/stores/mixin";
+import { useEvalutuonStore } from "@/modules/12_evaluatePersonal/store/Evaluate";
+import type { Pagination } from "@/modules/03_recruiting/interface/index/Main";
+
+const $q = useQuasar(); // show dialog
+const router = useRouter();
+//search data table
+const mixin = useCounterMixin();
+const store = useEvalutuonStore();
+const { showLoader, hideLoader, messageError } = mixin;
+
+const initialPagination = ref<Pagination>({
+  rowsPerPage: 0,
+});
+function Detailpage() {
+  router.push("/evaluate/detail");
+}
+
+const page = ref<number>(1);
+const pageSize = ref<number>(10);
+const maxPage = ref<number>(1);
+const filter = ref<string>("");
+
+/**เมื่อเริ่มโหลดหน้า
+ * ส่งข้อมูลจำลองไปยัง store
+ */
+onMounted(async () => {
+  store.fetchData([
+    {
+      citizanId: "1230030004001",
+      fullName: "นางวัศยา ศรีสร้อย",
+      position: "ผู้อำนวยการสถาบัน",
+      level: "ปฏิบัติการ",
+      positionNumber: "สก.ก412",
+      agency: "กลุ่มงานกฎหมาย",
+      status: "WAIT_CHECK_DOC_V1",
+    },
+    {
+      citizanId: "172223000401",
+      fullName: "นางธัญพร ปัทมเดชา",
+      position: "หัวหน้าสำนักงาน",
+      level: "ปฏิบัติการ",
+      positionNumber: "สก.ก412",
+      agency: "กลุ่มงานกฎหมาย",
+      status: "WAIT_CHECK_DOC_V1",
+    },
+    {
+      citizanId: "122222000401",
+      fullName: "นายสิริศักดิ์ พรมบุตร",
+      position: "นักบริหาร",
+      level: "ชำนาญการพิเศษ",
+      positionNumber: "สก.ก412",
+      agency: "กลุ่มงานกฎหมายอาคาร",
+      status: "WAIT_CHECK_DOC_V2",
+    },
+    {
+      citizanId: "111111100401",
+      fullName: "นายเอกฉัท วีระโชติ ",
+      position: "นักบริหาร",
+      level: "อำนวยการ",
+      positionNumber: "สก.ก412",
+      agency: "กลุ่มงานการคลัง",
+      status: "DONE",
+    },
+    {
+      citizanId: "122203000401",
+      fullName: "นางธนิดา มั่นคงประสิทธิ์",
+      position: "ผู้อำนวยการกอง",
+      level: "อาวุโส",
+      positionNumber: "สก.ก412",
+      agency: "กลุ่มกิจการสภา",
+      status: "WAIT_CHECK_DOC_V1",
+    },
+    {
+      citizanId: "123003111401",
+      fullName: "นางณิชมน ลือขำ ",
+      position: "ผู้อำนวยการสถาบัน",
+      level: "ชำนาญงาน",
+      positionNumber: "สก.ก412",
+      agency: "กลุ่มกิจการสภา",
+      status: "WAIT_CHECK_DOC_V2",
+    },
+    {
+      citizanId: "111111100401",
+      fullName: "นายเอกฉัท วีระโชติ ",
+      position: "นักบริหาร",
+      level: "อำนวยการ",
+      positionNumber: "สก.ก412",
+      agency: "กลุ่มงานการคลัง",
+      status: "ANNOUNCE_WEB",
+    },
+    {
+      citizanId: "111111100401",
+      fullName: "นายเอกฉัท วีระโชติ ",
+      position: "นักบริหาร",
+      level: "อำนวยการ",
+      positionNumber: "สก.ก412",
+      agency: "กลุ่มงานการคลัง",
+      status: "PREPARE_DOC_V2",
+    },
+    {
+      citizanId: "111111100401",
+      fullName: "นายเอกฉัท วีระโชติ ",
+      position: "นักบริหาร",
+      level: "อำนวยการ",
+      positionNumber: "สก.ก412",
+      agency: "กลุ่มงานการคลัง",
+      status: "CHECK_DOC_V2",
+    },
+  ]);
+});
+</script>
+
+<template>
+  <div class="toptitle text-dark col-12 row items-center">
+    รายการคำขอประเมิน
+  </div>
+  <q-card flat bordered class="col-12 q-mt-sm q-pt-sm q-pa-md">
+    <div>
+      <Table
+        style="max-height: 80vh"
+        :rows="store.rows"
+        :columns="store.columns"
+        :visible-columns="store.visibleColumns"
+        v-model:inputfilter="filter"
+        v-model:inputvisible="store.visibleColumns"
+        :pagination="initialPagination"
+        :nornmalData="true"
+        :paging="true"
+        :titleText="''"
+        :page="page"
+        :pageSize="pageSize"
+        :maxPage="maxPage"
+      >
+        <template #columns="props">
+          <q-tr :props="props" class="cursor-pointer">
+            <q-td v-for="col in props.cols" :key="col.name" :props="props">
+              <div v-if="col.name == 'no'">
+                {{ props.rowIndex + 1 }}
+              </div>
+              <div v-else>
+                {{ col.value }}
+              </div>
+            </q-td>
+            <q-td auto-width>
+              <q-btn
+                icon="mdi-dots-vertical"
+                size="12px"
+                color="grey-7"
+                flat
+                round
+                dense
+              >
+                <q-menu transition-show="jump-down" transition-hide="jump-up">
+                  {{ props.rows && props.rows.status }}
+                  <q-list dense style="min-width: 100px">
+                    <q-item
+                      clickable
+                      v-close-popup
+                      @click="Detailpage()"
+                      v-if="props.row.status === 'รอตรวจสอบคุณสมบัติ'"
+                    >
+                      <q-item-section
+                        style="min-width: 0px"
+                        avatar
+                        class="q-py-sm"
+                      >
+                        <q-icon
+                          color="primary"
+                          size="xs"
+                          name="mdi-bookmark-outline"
+                        />
+                      </q-item-section>
+                      <q-item-section>ตรวจสอบคุณสมบัติ</q-item-section>
+                    </q-item>
+
+                    <q-separator />
+
+                    <q-item clickable v-close-popup>
+                      <q-item-section
+                        style="min-width: 0px"
+                        avatar
+                        class="q-py-sm"
+                      >
+                        <q-icon
+                          color="blue"
+                          size="xs"
+                          name="mdi-account-details-outline"
+                        />
+                      </q-item-section>
+                      <q-item-section>ประวัติการเปลี่ยนสถานะ</q-item-section>
+                    </q-item>
+
+                    <q-separator />
+                    <q-item
+                      clickable
+                      v-close-popup
+                      @click="Detailpage()"
+                      v-if="props.row.status === 'รอพิจารณาผลการประเมิน'"
+                    >
+                      <q-item-section
+                        style="min-width: 0px"
+                        avatar
+                        class="q-py-sm"
+                      >
+                        <q-icon
+                          color="primary"
+                          size="xs"
+                          name="mdi-account-outline"
+                        />
+                      </q-item-section>
+                      <q-item-section>พิจารณาผลการประเมิน </q-item-section>
+                    </q-item>
+                  </q-list>
+                </q-menu>
+              </q-btn>
+            </q-td>
+          </q-tr>
+        </template>
+      </Table>
+    </div>
+  </q-card>
+</template>
+
+<style></style>
diff --git a/src/router/index.ts b/src/router/index.ts
index af85ba9a4..391977edd 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -14,8 +14,8 @@ import ModuleInsignia from "@/modules/07_insignia/router";
 import ModuleRegistryEmployee from "@/modules/08_registryEmployee/router";
 import ModuleOrder from "@/modules/10_order/router";
 import ModuleLeave from "@/modules/09_leave/router";
-import ModuleDiscipline from "@/modules/11_discipline/router"
-import ModuleEvaluate from "@/modules/12_evaluate/router"
+import ModuleDiscipline from "@/modules/11_discipline/router";
+import ModuleEvaluate from "@/modules/12_evaluatePersonal/router";
 
 // TODO: ใช้หรือไม่?
 import keycloak from "@/plugins/keycloak";
@@ -49,7 +49,7 @@ const router = createRouter({
         ...ModuleOrder,
         ...ModuleLeave,
         ...ModuleDiscipline,
-        ...ModuleEvaluate
+        ...ModuleEvaluate,
       ],
     },
     /**