diff --git a/src/api/KPI/api.kpis.ts b/src/api/KPI/api.kpis.ts
index 6d701d1..1c3bc01 100644
--- a/src/api/KPI/api.kpis.ts
+++ b/src/api/KPI/api.kpis.ts
@@ -15,7 +15,7 @@ const Kpi = `${env.API_URI}/kpi`;
 const KpiUser = `${env.API_URI}/kpi/user`;
 const kpiAchievement = `${env.API_URI}/kpi/user/achievement`;
 const kpiReason = `${env.API_URI}/kpi/reason`;
-
+const development = `${env.API_URI}/development`;
 // const placementKeycloak = `${env.API_URI}/placement/officer/keycloak`;
 const placementKeycloak = `${env.API_URI}/placement/officer/profileId`;
 // const orgPosition  = `${env.API_URI}/org/profile/keycloak/position `;
@@ -62,4 +62,6 @@ export default {
   updatePoint: (id: string) => `${kpiEvaluation}/point/${id}`,
   openPoint: (id: string) => `${kpiEvaluation}/open/${id}`,
   kpiReport: (id: string) => `${Kpi}/report/kpi-user/${id}`,
+
+  developmentMain: `${development}/main`,
 };
diff --git a/src/modules/08_KPI/components/Tab/Dialog/DialogDevelop.vue b/src/modules/08_KPI/components/Tab/Dialog/DialogDevelop.vue
index a980da7..cfd25ee 100644
--- a/src/modules/08_KPI/components/Tab/Dialog/DialogDevelop.vue
+++ b/src/modules/08_KPI/components/Tab/Dialog/DialogDevelop.vue
@@ -8,7 +8,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useRoute } from "vue-router";
 
-import type { DataOptionTechnique } from "@/modules/08_KPI/interface/index/Main";
+import type { DataOptionTechnique,ProjectYearOp } from "@/modules/08_KPI/interface/index/Main";
 
 const props = defineProps({
   getAll: Function,
@@ -20,6 +20,15 @@ const reasonDevelopment70 = ref<string>("");
 const reasonDevelopment20 = ref<string>("");
 const reasonDevelopment10 = ref<string>("");
 
+const choice = ref<string>("MANUAL");
+const projectName = ref<any>("");
+const projectOp = ref<ProjectYearOp[]>([]);
+const projectOpMain = ref<ProjectYearOp[]>([]);
+const choiceOp = ref<DataOptionTechnique[]>([
+  { value: "PROJECT", label: "เลือกจากโครงการ/หลักสูตรการฝึกอบรม" },
+  { value: "MANUAL", label: "กรอกเอง" },
+]);
+
 const checkOtherBox11 = computed<boolean>(() => {
   return development.value.includes("other1");
 });
@@ -60,7 +69,19 @@ const {
 const modal = defineModel<boolean>("modal", { required: true });
 const id = defineModel<string>("id", { required: true });
 
-const formData = reactive({
+const formData = reactive<{
+  year: number | null;
+  name: string;
+  group: any[];
+  target: string;
+  isDevelopment70: boolean;
+  isDevelopment20: boolean;
+  isDevelopment10: boolean;
+  achievement10: string;
+  achievement5: string;
+  achievement0: string;
+}>({
+  year: null,
   name: "",
   group: [],
   target: "",
@@ -152,6 +173,15 @@ function close() {
     "มีผลการพัฒนาแต่ยังไม่ได้ดำเนินการตามเป้าหมายการนำไปพัฒนางาน";
   formData.achievement0 = "ไม่ได้ดำเนินการพัฒนา";
 
+  choice.value = "MANUAL";
+  formData.year = null;
+  projectName.value = "";
+  reasonDevelopment70.value = "";
+  reasonDevelopment20.value = "";
+  reasonDevelopment10.value = "";
+  development.value = [];
+
+
   props.getAll?.();
 }
 
@@ -181,6 +211,9 @@ function onSubmit() {
         reasonDevelopment70: checkOtherBox11 ? reasonDevelopment70.value : "",
         reasonDevelopment20: checkOtherBox12 ? reasonDevelopment20.value : "",
         reasonDevelopment10: checkOtherBox13 ? reasonDevelopment10.value : "",
+        selectType: choice.value,
+        selectTypeYear: formData.year ? formData.year.toString() : null,
+        selectTypeId: projectName.value.id ? projectName.value.id : null,
       };
       showLoader();
       http[id.value ? "put" : "post"](url, body)
@@ -206,19 +239,39 @@ watch(
         .get(config.API.kpiAchievementDevelop + `/${id.value}`)
         .then(async(res) => {
           const data = res.data.result;
-          formData.name = data.name;
-          formData.group = data.group;
-          formData.target = data.target;
-          formData.isDevelopment70 = data.isDevelopment70;
-          formData.isDevelopment20 = data.isDevelopment20;
-          formData.isDevelopment10 = data.isDevelopment10;
-          formData.achievement10 = data.achievement10;
-          formData.achievement5 = data.achievement5;
-          formData.achievement0 = data.achievement0;
-          development.value = data.developmentProjects;
-          reasonDevelopment70.value = data.developmentProjects.includes("other1") ? data.reasonDevelopment70:'';
-          reasonDevelopment20.value = data.developmentProjects.includes("other2") ? data.reasonDevelopment20:'';
-          reasonDevelopment10.value = data.developmentProjects.includes("other3") ? data.reasonDevelopment10:'';
+          formData.year = data.selectTypeYear;
+          await getDataByYear();
+          setTimeout(() => {
+            choice.value = data.selectType;
+            projectName.value = projectOpMain.value.find(
+              (i: any) => i.id == data.selectTypeId
+            );
+            formData.name = data.name;
+            formData.group = data.group;
+            formData.target = data.target;
+            formData.isDevelopment70 = data.isDevelopment70;
+            formData.isDevelopment20 = data.isDevelopment20;
+            formData.isDevelopment10 = data.isDevelopment10;
+            formData.achievement10 = data.achievement10;
+            formData.achievement5 = data.achievement5;
+            formData.achievement0 = data.achievement0;
+            development.value = data.developmentProjects;
+            reasonDevelopment70.value = data.developmentProjects.includes(
+              "other1"
+            )
+              ? data.reasonDevelopment70
+              : "";
+            reasonDevelopment20.value = data.developmentProjects.includes(
+              "other2"
+            )
+              ? data.reasonDevelopment20
+              : "";
+            reasonDevelopment10.value = data.developmentProjects.includes(
+              "other3"
+            )
+              ? data.reasonDevelopment10
+              : "";
+          }, 500);
         })
         .catch((e) => {
           messageError($q, e);
@@ -229,6 +282,77 @@ watch(
     }
   }
 );
+
+const customPosition = () => ({ top: "490px", left: "410px" });
+async function getDataByYear() {
+  if (formData.year) {
+    showLoader();
+    http
+      .get(config.API.developmentMain + `/done?year=${formData.year}`)
+      .then(async(res) => {
+        const data = await res.data.result.data;
+        projectOpMain.value = data;
+      })
+      .catch((e) => {
+        messageError($q, e);
+      })
+      .finally(() => {
+        hideLoader();
+      });
+  }
+}
+
+function getProjectDetail(val: any) {
+  showLoader();
+  http
+    .get(config.API.developmentMain + `/tab3_1/${val.id}`)
+    .then((res) => {
+      const data = res.data.result;
+      formData.name = val.projectName;
+      formData.group = data.group;
+      formData.target = data.target;
+      formData.isDevelopment70 = data.isDevelopment70;
+      formData.isDevelopment20 = data.isDevelopment20;
+      formData.isDevelopment10 = data.isDevelopment10;
+      formData.achievement10 = data.achievement10;
+      formData.achievement5 = data.achievement5;
+      formData.achievement0 = data.achievement0;
+      development.value = data.developmentProjectTechniqueActuals;
+      reasonDevelopment70.value =
+        data.developmentProjectTechniqueActuals.includes("other1")
+          ? data.reasonDevelopment70
+          : "";
+      reasonDevelopment20.value =
+        data.developmentProjectTechniqueActuals.includes("other2")
+          ? data.reasonDevelopment20
+          : "";
+      reasonDevelopment10.value =
+        data.developmentProjectTechniqueActuals.includes("other3")
+          ? data.reasonDevelopment10
+          : "";
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+/**
+ * function ค้นหาข้อมูลใน option
+ * @param val คำค้นหา
+ * @param update function
+ */
+ function filterOptionFn(val: string, update: Function) {
+  projectName.value = "";
+  update(() => {
+    projectOp.value = projectOpMain.value.filter(
+      (e: any) => e.projectName.search(val) !== -1
+    );
+  });
+}
+
 </script>
 <template>
   <q-dialog persistent v-model="modal">
@@ -241,6 +365,90 @@ watch(
         <q-separator />
         <q-card-section>
           <div class="row q-col-gutter-sm">
+            <div class="col-3">
+              <q-select
+                class="inputgreen"
+                outlined
+                dense
+                label="ตัวเลือก"
+                :options="choiceOp"
+                emit-value
+                map-options
+                option-label="label"
+                option-value="value"
+                v-model="choice"
+              >
+              </q-select>
+            </div>
+            <div class="col-3" v-if="choice == 'PROJECT'">
+              <datepicker
+                menu-class-name="modalfix"
+                v-model="formData.year"
+                :locale="'th'"
+                autoApply
+                position="center"
+                year-picker
+                :alt-position="customPosition"
+                :enableTimePicker="false"
+                @update:model-value="getDataByYear(),projectName = ''"
+              >
+                <template #year="{ year }">{{ year + 543 }}</template>
+                <template #year-overlay-value="{ value }">{{
+                  parseInt(value + 543)
+                }}</template>
+                <template #trigger>
+                  <q-input
+                    dense
+                    outlined
+                    hide-bottom-space
+                    :rules="[(val:string) => !!val || `${'กรุณาเลือกปีงบประมาณ'}`,]"
+                    class="inputgreen"
+                    :model-value="
+                      formData.year === null
+                        ? null
+                        : Number(formData.year) + 543
+                    "
+                    :label="`${'ปีงบประมาณ'}`"
+                  >
+                    <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-3" v-if="choice == 'PROJECT'">
+              <q-select
+                outlined
+                dense
+                :rules="[(val:string) => !!val || `${'กรุณาเลือกโครงการ/หลักสูตรการฝึกอบรม'}`,]"
+                class="inputgreen"
+                label="โครงการ/หลักสูตรการฝึกอบรม"
+                :options="projectOp"
+                option-label="projectName"
+                option-value="id"
+                map-options
+                hide-bottom-space
+                use-input
+                :readonly="!formData.year"
+                v-model="projectName"
+                @update:model-value="getProjectDetail(projectName)"
+                @filter="filterOptionFn"
+              >
+                <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-input
                 v-model="formData.name"
diff --git a/src/modules/08_KPI/interface/index/Main.ts b/src/modules/08_KPI/interface/index/Main.ts
index 08c9795..d14d5c4 100644
--- a/src/modules/08_KPI/interface/index/Main.ts
+++ b/src/modules/08_KPI/interface/index/Main.ts
@@ -14,4 +14,10 @@ interface DataOptionTechnique {
   value: string;
 }
 
-export type { DataOptions, Pagination, DataOptionTechnique };
+interface ProjectYearOp {
+  id: string;
+  year: number;
+  projectName: string;
+}
+
+export type { DataOptions, Pagination, DataOptionTechnique,ProjectYearOp };