diff --git a/src/api/14_KPI/api.KPI.ts b/src/api/14_KPI/api.KPI.ts
index 97e20ae68..732ecd14d 100644
--- a/src/api/14_KPI/api.KPI.ts
+++ b/src/api/14_KPI/api.KPI.ts
@@ -2,6 +2,7 @@ import env from "../index";
 const KPI = `${env.API_URI}/kpi`;
 const kpiPeriod = `${env.API_URI}/kpi/period`;
 const kpiEvaluation = `${env.API_URI}/kpi/evaluation`;
+const kpiEvaluationUser = `${env.API_URI}/kpi/user/evaluation`;
 const kpiUserEvaluation = `${env.API_URI}/kpi/user/evaluation`;
 const kpiPlan = `${env.API_URI}/kpi/plan`;
 const kpiRole = `${env.API_URI}/kpi/role`;
@@ -28,6 +29,7 @@ export default {
   kpiPeriodById: (id: string) => `${kpiPeriod}/${id}`,
 
   kpiEvaluation,
+  kpiEvaluationUser,
   kpiPlan,
   kpiPlanById: (id: string) => `${kpiPlan}/${id}`,
 
diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
index 34d0a914b..9c1d7c139 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
@@ -459,7 +459,7 @@ watch(props.data, async () => {
           color="secondary"
           label="บันทึก"
           type="submit"
-          ><q-tooltip>บับทึกข้อมูล</q-tooltip></q-btn
+          ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
         >
       </div>
     </q-card>
diff --git a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
new file mode 100644
index 000000000..19557760b
--- /dev/null
+++ b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
@@ -0,0 +1,633 @@
+<script setup lang="ts">
+import { useCounterMixin } from "@/stores/mixin";
+import { useQuasar } from "quasar";
+import type { QTableProps } from "quasar";
+import config from "@/app.config";
+import http from "@/plugins/http";
+import { reactive, ref, onMounted, watch } from "vue";
+import DialogHeader from "@/components/DialogHeader.vue";
+import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
+import type {
+  DataOption,
+  typeOp,
+  ResponsePreson,
+  tableType,
+  FormData,
+} from "@/modules/14_KPI/interface/index/Main";
+import { useRouter } from "vue-router";
+
+const selected = ref<any[]>([]);
+const personId = ref<string>("");
+const modalPersonal = ref<boolean>(false);
+const searchRef = ref<any>(null);
+const rows = ref<tableType[]>([]);
+const type = ref<string>("idcard");
+const search = ref<string>("");
+const typeOps = ref<typeOp[]>([
+  { id: "idcard", name: "เลขประจำตัวประชาชน" },
+  { id: "firstname", name: "ชื่อ" },
+  { id: "lastname", name: "นามสกุล" },
+]);
+const $q = useQuasar();
+const mixin = useCounterMixin();
+const { showLoader, hideLoader, messageError, date2Thai, dialogConfirm,dialogMessageNotify } =
+  mixin;
+
+const router = useRouter();
+
+const modalDialog = defineModel<boolean>("modal", { required: true });
+const yearDialog = ref<number | any>(new Date().getFullYear());
+const roundDialgOp = ref<DataOption[]>([]);
+const isRoundClose = ref<boolean>(false);
+
+const formRound = reactive({
+  kpiPeriodId: { id: "", name: "", isClosed: false },
+  profileId: "",
+  prefix: "",
+  firstName: "",
+  lastName: "",
+  evaluatorId: "",
+  commanderId: "",
+  commanderHighId: "",
+  position: "",
+  posLevelName: "",
+  posTypeName: "",
+  posExecutiveName: "",
+});
+
+const evaluatorIdOp = ref<DataOption[]>([]);
+const commanderIdOp = ref<DataOption[]>([]);
+const commanderHighOp = ref<DataOption[]>([]);
+
+const evaluatorIdMainOp = ref<DataOption[]>([]);
+const commanderIdMainOp = ref<DataOption[]>([]);
+const commanderHighMainOp = ref<DataOption[]>([]);
+
+/**
+ * ข้อมูลทั้งก้อน form
+ */
+const formData = reactive<FormData>({
+  personalId: "",
+  prefix: "",
+  firstname: "",
+  lastname: "",
+  position: "",
+  phone: "",
+  email: "",
+  qualification: "",
+});
+
+function onCloseDialog() {
+  modalDialog.value = false;
+  formRound.kpiPeriodId = { id: "", name: "", isClosed: false };
+  yearDialog.value = new Date().getFullYear();
+}
+
+/** หัวข้อที่เเสดงในตารางผู้ถูกร้องเรียน */
+const visibleColumnsRespondent = ref<string[]>([
+  "info",
+  "no",
+  // "idcard",
+  "name",
+  // "posNo",
+  "position",
+  // "positionLevel",
+  // "salary",
+  "organization",
+]);
+
+const columnsRespondent = ref<QTableProps["columns"]>([
+  {
+    name: "info",
+    align: "center",
+    label: "",
+    sortable: false,
+    field: "info",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: false,
+    field: "no",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "name",
+    align: "left",
+    label: "ชื่อ - นามสกุล",
+    sortable: true,
+    field: "name",
+    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",
+  },
+  {
+    name: "organization",
+    align: "left",
+    label: "หน่วยงาน",
+    sortable: true,
+    field: "organization",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+
+function fetchRoundOption() {
+  showLoader();
+  http
+    .get(
+      config.API.kpiPeriod +
+        `?page=${1}&pageSize=${10}&keyword=${""}&year=${yearDialog.value}`
+    )
+    .then((res) => {
+      const data = res.data.result.data;
+      const list = data.map((e: any) => ({
+        id: e.id,
+        name:
+          e.durationKPI === "OCT"
+            ? "รอบตุลาคม"
+            : e.durationKPI === "APR"
+            ? "รอบเมษายน"
+            : "",
+        isClosed: !e.isActive,
+      }));
+
+      roundDialgOp.value = list;
+      formRound.kpiPeriodId = { id: "", name: "", isClosed: false };
+    })
+    .catch((err) => {
+      messageError($q, err);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+function filterOption(val: any, update: Function, refData: string) {
+  switch (refData) {
+    case "evaluatorIdOp":
+      update(() => {
+        evaluatorIdOp.value = evaluatorIdMainOp.value.filter(
+          (v: any) => v.name.indexOf(val) > -1
+        );
+      });
+      break;
+    case "commanderIdOp":
+      update(() => {
+        commanderIdOp.value = commanderIdMainOp.value.filter(
+          (v: any) => v.name.indexOf(val) > -1
+        );
+      });
+      break;
+    case "commanderHighOp":
+      update(() => {
+        commanderHighOp.value = commanderHighMainOp.value.filter(
+          (v: any) => v.name.indexOf(val) > -1
+        );
+      });
+      break;
+    default:
+      break;
+  }
+}
+
+function checkClosed() {
+  isRoundClose.value = formRound.kpiPeriodId.isClosed;
+}
+
+async function searchInput() {
+  searchRef.value.validate();
+  if (!searchRef.value.hasError) {
+    showLoader();
+    const body = {
+      fieldName: type.value,
+      keyword: search.value,
+    };
+    await http
+      .post(config.API.orgSearchPersonal(), body)
+      .then((res) => {
+        const data = res.data.result;
+
+        rows.value = data;
+      })
+      .catch((err) => {})
+      .finally(() => {
+        hideLoader();
+      });
+  }
+}
+
+/** update เมื่อเปลี่ยน option */
+function updateSelect() {
+  search.value = "";
+}
+
+/**
+ * function ดูประวัติแบบย่อย
+ * @param id  personId
+ */
+function onclickViewinfo(id: string) {
+  modalPersonal.value = true;
+  personId.value = id;
+}
+
+function getOrgOp() {
+  http
+    .get(config.API.Kpiorg)
+    .then((res) => {
+      const data = res.data.result;
+      evaluatorIdMainOp.value = data.caregiver.map((i: any) => ({
+        id: i.id,
+        name: `${i.prefix}${i.firstName} ${i.lastName}`,
+      }));
+      commanderIdMainOp.value = data.commander.map((i: any) => ({
+        id: i.id,
+        name: `${i.prefix}${i.firstName} ${i.lastName}`,
+      }));
+      commanderHighMainOp.value = data.chairman.map((i: any) => ({
+        id: i.id,
+        name: `${i.prefix}${i.firstName} ${i.lastName}`,
+      }));
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {});
+}
+
+
+function onSubmit() {
+  if(selected.value.length == 0){
+    dialogMessageNotify($q,'กรุณาเลือกรายการ ข้าราชการ 1 บุคคล')
+  }else{
+const dataProfile = selected.value[0]
+    dialogConfirm($q, () => {
+      showLoader();
+      http
+        .post(config.API.kpiEvaluationUser, {
+          kpiPeriodId: formRound.kpiPeriodId.id,
+          profileId: dataProfile.id,
+          evaluatorId: formRound.evaluatorId,
+          commanderId: formRound.commanderId == "" ? null : formRound.commanderId,
+          commanderHighId:
+            formRound.commanderHighId == "" ? null : formRound.commanderHighId,
+        })
+        .then((res) => {
+          const id = res.data.result;
+          redirectViewDetail(id);
+          onCloseDialog();
+        })
+        .catch((err) => {
+          messageError($q, err);
+        })
+        .finally(() => {
+          hideLoader();
+        });
+    });
+  }
+}
+
+function updatemodalPersonal(modal: boolean) {
+  modalPersonal.value = modal;
+}
+
+function redirectViewDetail(id: string) {
+  router.push(`/KPI-list/${id}`);
+}
+
+watch(
+  () => modalDialog.value,
+  (n) => {
+    if (n == true) {
+      fetchRoundOption();
+      getOrgOp();
+    }
+  }
+);
+</script>
+<template>
+  <q-dialog v-model="modalDialog" persistent>
+    <q-card :style="$q.screen.gt.xs ? 'min-width: 90vw' : 'width: 100vw'">
+      <q-form greedy @submit.prevent @validation-success="onSubmit">
+        <DialogHeader :tittle="'สร้างแบบประเมินผลฯ'" :close="onCloseDialog" />
+        <q-separator />
+        <q-card-section class="q-pa-none scroll" style="max-height: 80vh">
+          <div class="row q-col-gutter-sm">
+            <div class="col-12 col-md-3 bg-grey-2">
+              <div class="row q-pa-md q-col-gutter-sm">
+                <div class="col-12">
+                  <datepicker
+                    menu-class-name="modalfix"
+                    v-model="yearDialog"
+                    :locale="'th'"
+                    autoApply
+                    year-picker
+                    :enableTimePicker="false"
+                    @update:model-value="fetchRoundOption()"
+                  >
+                    <template #year="{ year }">{{ year + 543 }}</template>
+                    <template #year-overlay-value="{ value }">{{
+                      parseInt(value + 543)
+                    }}</template>
+                    <template #trigger>
+                      <q-input
+                        dense
+                        lazy-rules
+                        outlined
+                        bg-color="white"
+                        hide-bottom-space
+                        :model-value="!!yearDialog ? yearDialog + 543 : null"
+                        :label="`${'ปีงบประมาณ'}`"
+                        :rules="[
+                      (val:string) =>
+                        !!val || `${'กรุณาเลือกปีงบประมาณ'}`,
+                    ]"
+                      >
+                        <template v-slot:prepend>
+                          <q-icon
+                            name="event"
+                            class="cursor-pointer"
+                            style="color: var(--q-primary)"
+                          >
+                          </q-icon>
+                        </template>
+                      </q-input>
+                    </template>
+                  </datepicker>
+                </div>
+
+                <div class="col-12">
+                  <q-select
+                    :readonly="yearDialog === null"
+                    v-model="formRound.kpiPeriodId"
+                    outlined
+                    label="รอบการประเมิน"
+                    dense
+                    option-label="name"
+                    option-value="id"
+                    bg-color="white"
+                    :options="roundDialgOp"
+                    hide-bottom-space
+                    lazy-rules
+                    :rules="[
+                      (val) => !!val.id || `${'กรุณาเลือกรอบการประเมิน'}`,
+                    ]"
+                    @update:model-value="checkClosed"
+                  />
+                </div>
+
+                <div class="col-12">
+                  <q-select
+                    v-model="formRound.evaluatorId"
+                    outlined
+                    label="ผู้ประเมิน"
+                    dense
+                    option-label="name"
+                    option-value="id"
+                    :options="evaluatorIdOp"
+                    bg-color="white"
+                    emit-value
+                    map-options
+                    hide-bottom-space
+                    lazy-rules
+                    :rules="[
+                  (val:string) =>
+                    !!val || `${'กรุณาเลือกผู้ประเมิน'}`,
+                ]"
+                    use-input
+                    @filter="(inputValue:any,
+                    doneFn:Function) => filterOption(inputValue, doneFn,'evaluatorIdOp'
+                    ) "
+                  >
+                    <template v-slot:no-option>
+                      <q-item>
+                        <q-item-section class="text-grey">
+                          ไม่มีข้อมูล
+                        </q-item-section>
+                      </q-item>
+                    </template>
+                  </q-select>
+                </div>
+                <div class="col-12">
+                  <q-select
+                    v-model="formRound.commanderId"
+                    outlined
+                    label="ผู้บังคับบัญชาเหนือขึ้นไป"
+                    dense
+                    option-label="name"
+                    bg-color="white"
+                    option-value="id"
+                    :options="commanderIdOp"
+                    emit-value
+                    map-options
+                    use-input
+                    @filter="(inputValue:any,
+                    doneFn:Function) => filterOption(inputValue, doneFn,'commanderIdOp'
+                    ) "
+                  >
+                    <template v-if="formRound.commanderId" v-slot:append>
+                      <q-icon
+                        name="cancel"
+                        @click.stop.prevent="formRound.commanderId = ''"
+                        class="cursor-pointer"
+                      />
+                    </template>
+                    <template v-slot:no-option>
+                      <q-item>
+                        <q-item-section class="text-grey">
+                          ไม่มีข้อมูล
+                        </q-item-section>
+                      </q-item>
+                    </template>
+                  </q-select>
+                </div>
+                <div class="col-12">
+                  <q-select
+                    v-model="formRound.commanderHighId"
+                    outlined
+                    label="ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง"
+                    dense
+                    bg-color="white"
+                    option-label="name"
+                    option-value="id"
+                    :options="commanderHighOp"
+                    emit-value
+                    map-options
+                    use-input
+                    @filter="(inputValue:any,
+                    doneFn:Function) => filterOption(inputValue, doneFn,'commanderHighOp'
+                    ) "
+                  >
+                    <template v-if="formRound.commanderHighId" v-slot:append>
+                      <q-icon
+                        name="cancel"
+                        @click.stop.prevent="formRound.commanderHighId = ''"
+                        class="cursor-pointer"
+                      />
+                    </template>
+                    <template v-slot:no-option>
+                      <q-item>
+                        <q-item-section class="text-grey">
+                          ไม่มีข้อมูล
+                        </q-item-section>
+                      </q-item>
+                    </template>
+                  </q-select>
+                </div>
+              </div>
+            </div>
+
+            <div class="col-12 col-md-9">
+              <div class="row q-pa-md q-col-gutter-sm">
+                <div class="col-12 col-sm-6 col-md-3">
+                  <q-select
+                    label="ค้นหาจาก"
+                    v-model="type"
+                    :options="typeOps"
+                    emit-value
+                    dense
+                    @update:model-value="updateSelect"
+                    map-options
+                    outlined
+                    option-label="name"
+                    option-value="id"
+                  />
+                </div>
+
+                <div class="col-12 col-sm-6 col-md-9">
+                  <q-input
+                    ref="searchRef"
+                    v-model="search"
+                    outlined
+                    clearable
+                    hide-bottom-space
+                    dense
+                    label="คำค้น"
+                    :rules="[(val) => !!val || `กรุณากรอกคำค้น`]"
+                  >
+                    <template v-slot:after>
+                      <q-btn
+                        color="primary"
+                        icon="search"
+                        label="ค้นหา"
+                        class="full-width q-py-sm q-px-md"
+                        @click="searchInput()"
+                      >
+                      </q-btn>
+                    </template>
+                  </q-input>
+                </div>
+                <div class="col-12 q-pt-sm">
+                  <d-table
+                    ref="table"
+                    :columns="columnsRespondent"
+                    :rows="rows"
+                    row-key="id"
+                    flat
+                    bordered
+                    selection="single"
+                    v-model:selected="selected"
+                    :paging="true"
+                    dense
+                    class="custom-header-table"
+                    :visible-columns="visibleColumnsRespondent"
+                  >
+                    <template v-slot:header="props">
+                      <q-tr :props="props">
+                        <q-th auto-width></q-th>
+                        <q-th
+                          v-for="col in props.cols"
+                          :key="col.name"
+                          :props="props"
+                          style="color: #000000; font-weight: 500"
+                        >
+                          <span class="text-weight-medium">{{
+                            col.label
+                          }}</span>
+                        </q-th>
+                      </q-tr>
+                    </template>
+                    <template v-slot:body="props">
+                      <q-tr :props="props" class="cursor-pointer">
+                        <q-td>
+                          <q-checkbox
+                            keep-color
+                            color="primary"
+                            dense
+                            v-model="props.selected"
+                          />
+                        </q-td>
+                        <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-if="col.name == 'info'">
+                            <!-- <router-link
+                          target="_blank"
+                          :to="`/registry/${props.row.personId}`"
+                          > -->
+                            <q-btn
+                              dense
+                              flat
+                              round
+                              color="info"
+                              icon="info"
+                              @click="onclickViewinfo(props.row.personId)"
+                            >
+                              <q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
+                            </q-btn>
+                          </div>
+
+                          <div v-else>
+                            {{ col.value }}
+                          </div>
+                        </q-td>
+                      </q-tr>
+                    </template>
+                  </d-table>
+                </div>
+              </div>
+            </div>
+          </div>
+        </q-card-section>
+        <q-separator />
+        <q-card-actions align="right" class="bg-white text-teal">
+          <div v-if="isRoundClose" class="text-red q-px-sm">
+            รอบการประเมินนี้ปิดแล้ว
+          </div>
+
+          <q-space />
+          <q-btn
+            :disable="isRoundClose"
+            label="บันทึก"
+            color="secondary"
+            type="submit"
+            ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
+          >
+        </q-card-actions>
+      </q-form>
+    </q-card>
+  </q-dialog>
+
+  <PopupPersonal
+    :modal="modalPersonal"
+    :id="personId"
+    @update:modal="updatemodalPersonal"
+  />
+</template>
diff --git a/src/modules/14_KPI/interface/index/Main.ts b/src/modules/14_KPI/interface/index/Main.ts
index 663e03ecd..e0114d8f9 100644
--- a/src/modules/14_KPI/interface/index/Main.ts
+++ b/src/modules/14_KPI/interface/index/Main.ts
@@ -17,4 +17,48 @@ interface NewPagination {
   sortBy: string;
 }
 
-export type { DataOption, ItemsMenu,NewPagination };
+interface typeOp {
+  id: string;
+  name: string;
+}
+
+interface ResponsePreson {
+  id: string; //id อ้างอิง profile
+  idcard: string; //เลขประจำตัวประชาชน
+  prefix: string; //คำนำหน้า
+  firstName: string; //ชื่อ
+  lastName: string; //นามสกุล
+  posNo: string; //เลขที่ตำแหน่ง
+  position: string; //ตำแหน่ง
+  positionLevel: string; //ระดับ
+  salaries: number; //เงินเดือน
+  organization: string; //สังกัด
+  email: string; //อีเมล
+  phone: string; //เบอร์โทรศัพท์
+}
+
+interface tableType {
+  personId: string;
+  idcard: string;
+  prefix: string;
+  firstName: string;
+  lastName: string;
+  position: string;
+  positionLevel: string;
+  organization: string;
+  salary: string;
+  name: string;
+}
+
+interface FormData {
+  personalId: string;
+  prefix: string;
+  firstname: string;
+  lastname: string;
+  position: string;
+  phone: string;
+  email: string;
+  qualification: string;
+}
+
+export type { DataOption, ItemsMenu,NewPagination,typeOp,ResponsePreson,tableType,FormData };
diff --git a/src/modules/14_KPI/views/list.vue b/src/modules/14_KPI/views/list.vue
index 804974416..c212d2d03 100644
--- a/src/modules/14_KPI/views/list.vue
+++ b/src/modules/14_KPI/views/list.vue
@@ -11,6 +11,7 @@ import type { QTableProps } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import { useKpiDataStore } from "@/modules/14_KPI/store";
 
+import DialogEvalute from '@/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue'
 const $q = useQuasar();
 const router = useRouter();
 const store = useKpiDataStore();
@@ -24,6 +25,7 @@ const rows = ref<any[]>([]);
 
 const year = ref<number | null>(new Date().getFullYear());
 
+const modalDialog = ref<boolean>(false)
 const round = ref<string>("");
 const roundOp = ref<DataOption[]>([]);
 
@@ -193,6 +195,9 @@ watch(
   }
 );
 
+function onDialog(){
+  modalDialog.value = true
+}
 onMounted(async () => {
   fetchRoundOption();
 });
@@ -256,7 +261,9 @@ onMounted(async () => {
               map-options
               @update:model-value="changRound"
             />
-
+            <q-btn round color="primary" flat icon="add" @click="onDialog()">
+              <q-tooltip>เพิ่มผู้ประเมิน</q-tooltip>
+            </q-btn>
             <!-- <q-select
               v-model="status"
               outlined
@@ -366,7 +373,13 @@ onMounted(async () => {
       </q-card>
     </div>
   </div>
+
+
+  <DialogEvalute 
+  v-model:modal="modalDialog"/>
 </template>
+
+
 <style scoped lang="scss">
 .icon-color {
   color: #4154b3;