diff --git a/src/modules/14_KPI/components/competency/AddPage.vue b/src/modules/14_KPI/components/competency/AddPage.vue
index ff9a83940..bb02d44a5 100644
--- a/src/modules/14_KPI/components/competency/AddPage.vue
+++ b/src/modules/14_KPI/components/competency/AddPage.vue
@@ -2,6 +2,12 @@
 import { ref, reactive } from "vue";
 import { useRouter } from "vue-router";
 
+import FormMain from "@/modules/14_KPI/components/competency/Forms/01_FormMain.vue";
+import FormGroup from "@/modules/14_KPI/components/competency/Forms/02_FormGroup.vue";
+import FormExecutive from "@/modules/14_KPI/components/competency/Forms/03_FormExecutive.vue";
+import FormExecutivePosition from "@/modules/14_KPI/components/competency/Forms/04_FormExecutivePosition.vue";
+import FormExecutiveLevel from "@/modules/14_KPI/components/competency/Forms/05_FormExecutiveLevel.vue";
+
 import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
 import type { FormCompetency } from "@/modules/14_KPI/interface/request/Main";
 
@@ -98,7 +104,15 @@ function onSubmit() {
               hide-bottom-space
             />
           </div>
-          <div class="col-12">
+          <FormMain v-if="formData.competencyType === 'ID1'" />
+          <FormGroup v-else-if="formData.competencyType === 'ID2'" />
+          <FormExecutive v-else-if="formData.competencyType === 'ID3'" />
+          <FormExecutivePosition
+            v-else-if="formData.competencyType === 'ID4'"
+          />
+          <FormExecutiveLevel v-else-if="formData.competencyType === 'ID5'" />
+
+          <!-- <div class="col-12">
             <q-input
               v-model="formData.competencyName"
               dense
@@ -161,31 +175,11 @@ function onSubmit() {
                     <span>{{ index + 1 }}</span>
                   </div>
                   <div class="col-9">
-                    <!-- <q-input
-                      v-model="formData.level_1"
-                      label="คำอธิบาย"
-                      dense
-                      outlined
-                    /> -->
                     <q-editor
                       v-model="formData.level_1[index]"
                       :dense="$q.screen.lt.md"
+                      min-height="5rem"
                       :toolbar="[
-                        [
-                          {
-                            label: $q.lang.editor.align,
-                            icon: $q.iconSet.editor.align,
-                            fixedLabel: true,
-                            list: 'only-icons',
-                            options: ['left', 'center', 'right', 'justify'],
-                          },
-                          {
-                            label: $q.lang.editor.align,
-                            icon: $q.iconSet.editor.align,
-                            fixedLabel: true,
-                            options: ['left', 'center', 'right', 'justify'],
-                          },
-                        ],
                         [
                           'bold',
                           'italic',
@@ -194,63 +188,8 @@ function onSubmit() {
                           'subscript',
                           'superscript',
                         ],
-                        ['token', 'hr', 'link', 'custom_btn'],
-                        ['print', 'fullscreen'],
-                        [
-                          {
-                            label: $q.lang.editor.formatting,
-                            icon: $q.iconSet.editor.formatting,
-                            list: 'no-icons',
-                            options: [
-                              'p',
-                              'h1',
-                              'h2',
-                              'h3',
-                              'h4',
-                              'h5',
-                              'h6',
-                              'code',
-                            ],
-                          },
-                          {
-                            label: $q.lang.editor.fontSize,
-                            icon: $q.iconSet.editor.fontSize,
-                            fixedLabel: true,
-                            fixedIcon: true,
-                            list: 'no-icons',
-                            options: [
-                              'size-1',
-                              'size-2',
-                              'size-3',
-                              'size-4',
-                              'size-5',
-                              'size-6',
-                              'size-7',
-                            ],
-                          },
-                          {
-                            label: $q.lang.editor.defaultFont,
-                            icon: $q.iconSet.editor.font,
-                            fixedIcon: true,
-                            list: 'no-icons',
-                            options: [
-                              'default_font',
-                              'arial',
-                              'arial_black',
-                              'comic_sans',
-                              'courier_new',
-                              'impact',
-                              'lucida_grande',
-                              'times_new_roman',
-                              'verdana',
-                            ],
-                          },
-                          'removeFormat',
-                        ],
-                        ['quote', 'unordered', 'ordered', 'outdent', 'indent'],
 
-                        ['undo', 'redo'],
-                        ['viewsource'],
+                        ['unordered', 'ordered'],
                       ]"
                       :fonts="{
                         arial: 'Arial',
@@ -267,9 +206,9 @@ function onSubmit() {
                 </div>
               </q-card-section>
             </q-card>
-          </div>
+          </div> -->
 
-          <div class="col-12">
+          <!-- <div class="col-12">
             <q-input
               v-model="formData.definition"
               label="กำหนดเกณฑ์การประเมิน"
@@ -279,11 +218,11 @@ function onSubmit() {
               :rules="[(val:string) => !!val || `${'กรุณากรอกกำหนดเกณฑ์การประเมิน'}`,]"
               hide-bottom-space
             />
-          </div>
+          </div> -->
         </div>
       </q-card-section>
       <q-separator />
-      <div class="text-right q-pa-sm">
+      <!-- <div class="text-right q-pa-sm">
         <q-btn
           dense
           unelevated
@@ -295,7 +234,7 @@ function onSubmit() {
         >
           <q-tooltip>บันทึกข้อมูล</q-tooltip>
         </q-btn>
-      </div>
+      </div> -->
     </q-form>
   </q-card>
 </template>
diff --git a/src/modules/15_development/interface/request/Main.ts b/src/modules/15_development/interface/request/Main.ts
index fc7e6bf69..b8d3a7e23 100644
--- a/src/modules/15_development/interface/request/Main.ts
+++ b/src/modules/15_development/interface/request/Main.ts
@@ -25,14 +25,13 @@ interface FormGroupTarget {
 }
 
 interface FormGroupTargetPlannedGoal {
-  positions:[
+  positions: [
     {
-      position: string,
-      posTypePlannedId: string,
-      posLevelPlannedId: string,
+      position: string;
+      posTypePlannedId: string;
+      posLevelPlannedId: string;
     }
-  ] 
-  ;
+  ];
   groupTarget: string;
   groupTargetSub: string;
   position: string;
@@ -203,13 +202,13 @@ interface actualGoals {
 interface PlannedGoals {
   groupTarget: string;
   groupTargetSub: string;
-  positions:[
+  positions: [
     {
-      position: string,
-      posTypePlannedId: string,
-      posLevelPlannedId: string,
+      position: string;
+      posTypePlannedId: string;
+      posLevelPlannedId: string;
     }
-  ] 
+  ];
   type: string | null;
   amount: number | null;
 }
@@ -225,5 +224,5 @@ export type {
   FormAddHistory,
   FormAddHistoryProject,
   FormAddHistoryEmployee,
-  FormGroupTargetPlannedGoal
+  FormGroupTargetPlannedGoal,
 };
diff --git a/src/modules/15_development/interface/response/Main.ts b/src/modules/15_development/interface/response/Main.ts
index 05379d249..55346e830 100644
--- a/src/modules/15_development/interface/response/Main.ts
+++ b/src/modules/15_development/interface/response/Main.ts
@@ -88,14 +88,15 @@ interface ResActualGoals {
 interface ResPlannedGoals {
   groupTarget: string;
   groupTargetSub: string;
-  positions:[
+  position: [
     {
-      position: string,
-      posTypePlannedId: string,
-      posLevelPlannedId: string,
+      position: string;
+      posTypePlannedId: string;
+      posLevelPlannedId: string;
     }
-  ] 
-  ;
+  ];
+  posTypePlannedId: string;
+  posLevelPlannedId: string;
   type: string | null;
   amount: number | null;
 }