diff --git a/src/modules/14_KPI/components/competency/01ListCompetency.vue b/src/modules/14_KPI/components/competency/01ListCompetency.vue
index 10fdfdad7..d0a3f563b 100644
--- a/src/modules/14_KPI/components/competency/01ListCompetency.vue
+++ b/src/modules/14_KPI/components/competency/01ListCompetency.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, onMounted, reactive,watch } from "vue";
+import { ref, onMounted, reactive, watch } from "vue";
 import type { QTableProps } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar } from "quasar";
@@ -14,11 +14,9 @@ import { useKPIDataStore } from "@/modules/14_KPI/store/KPIStore";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-import type {
-  NewPagination,
-} from "@/modules/14_KPI/interface/index/Main";
+import type { NewPagination } from "@/modules/14_KPI/interface/index/Main";
 
-const total = ref<number>()
+const total = ref<number>();
 const store = useKPIDataStore();
 const router = useRouter();
 const $q = useQuasar();
@@ -76,10 +74,10 @@ async function fetchList() {
   await http
     .get(
       config.API.kpiCapacity +
-        `?page=${formQuery.page}&pageSize=${formQuery.pageSize}&keyword=${formQuery.keyword}&type=${store.competencyType}`
+        `?page=${formQuery.page}&pageSize=${formQuery.pageSize}&keyword=${formQuery.keyword}&type=${store.competencyTypeVal}`
     )
     .then(async (res) => {
-      total.value = res.data.result.total
+      total.value = res.data.result.total;
       const data: ResDataCapacity[] = res.data.result.data;
       totalList.value = Math.ceil(res.data.result.total / formQuery.pageSize);
       rows.value = data;
@@ -127,7 +125,7 @@ function fetchNewList() {
  * function updatePagination
  * @param newPagination ข้อมูล Pagination ใหม่
  */
- function updatePagination(newPagination: NewPagination) {
+function updatePagination(newPagination: NewPagination) {
   formQuery.page = 1;
   formQuery.pageSize = newPagination.rowsPerPage;
 }
@@ -147,7 +145,7 @@ onMounted(() => {
 <template>
   <q-toolbar style="padding: 0">
     <q-select
-      v-model="store.competencyType"
+      v-model="store.competencyTypeVal"
       outlined
       label="ประเภทสมรรถนะ"
       dense
diff --git a/src/modules/14_KPI/components/competency/AddPage.vue b/src/modules/14_KPI/components/competency/AddPage.vue
index a618ecb82..73441dbb7 100644
--- a/src/modules/14_KPI/components/competency/AddPage.vue
+++ b/src/modules/14_KPI/components/competency/AddPage.vue
@@ -95,7 +95,7 @@ function onSubmit() {
       <div class="row q-col-gutter-sm">
         <div class="col-12">
           <q-select
-            v-model="store.competencyType"
+            v-model="store.competencyTypeVal"
             outlined
             label="เลือกประเภทสมรรถนะ"
             dense
diff --git a/src/modules/14_KPI/components/competency/Forms/01_FormMain.vue b/src/modules/14_KPI/components/competency/Forms/01_FormMain.vue
index 46ddf6a67..f3028e3dd 100644
--- a/src/modules/14_KPI/components/competency/Forms/01_FormMain.vue
+++ b/src/modules/14_KPI/components/competency/Forms/01_FormMain.vue
@@ -44,7 +44,7 @@ function ocClickAdd() {
 function onSubmit() {
   dialogConfirm($q, () => {
     const body = {
-      competencyType: store.competencyType,
+      competencyType: store.competencyTypeVal,
       competencyName: formData.competencyName,
       definition: formData.definition,
       levels: formData.levels,
diff --git a/src/modules/14_KPI/components/competency/Forms/02_FormGroup.vue b/src/modules/14_KPI/components/competency/Forms/02_FormGroup.vue
index 72b8a33cf..33cd1b83c 100644
--- a/src/modules/14_KPI/components/competency/Forms/02_FormGroup.vue
+++ b/src/modules/14_KPI/components/competency/Forms/02_FormGroup.vue
@@ -55,7 +55,7 @@ const formData = reactive<FormGroup>({
 function onSubmit() {
   dialogConfirm($q, () => {
     const body = {
-      competencyType: store.competencyType,
+      competencyType: store.competencyTypeVal,
       competencyName: formData.definition,
       definition: formData.definition,
       levels1: formScore.score1,
diff --git a/src/modules/14_KPI/components/competency/Forms/03_FormExecutive.vue b/src/modules/14_KPI/components/competency/Forms/03_FormExecutive.vue
index bb3d0f493..9c811f6eb 100644
--- a/src/modules/14_KPI/components/competency/Forms/03_FormExecutive.vue
+++ b/src/modules/14_KPI/components/competency/Forms/03_FormExecutive.vue
@@ -12,7 +12,7 @@ const $q = useQuasar();
 const { dialogConfirm, showLoader, success, hideLoader, messageError } =
   useCounterMixin();
 
-const router = useRouter
+const router = useRouter;
 const store = useKPIDataStore();
 const formData = reactive({
   competencyType: "",
@@ -80,30 +80,28 @@ function updateSelectType(val: string, index: number) {
   formData.form[index].posLevel = "";
 }
 
-
 function onSubmit() {
   dialogConfirm($q, () => {
     const body = {
-    competencyType:store.competencyType,
-    competencyName:formData.competencyName,
-    definition:formData.definition,
-    postype:formData.form,
-    evaluation:formData.evaluation,
-  }
-// showLoader()
-//   http
-//   .put(config.API.???,body)
-//   .then((res)=>{
-//     success($q,'บันทึกสำเร็จ')
-//     router.push(`/KPI-competency`)
-//   }).catch((e)=>{
-//     messageError($q,e)
-//   }).finally(()=>{
-//     hideLoader()
-//   })
-console.log(body)
-  })
-
+      competencyType: store.competencyTypeVal,
+      competencyName: formData.competencyName,
+      definition: formData.definition,
+      postype: formData.form,
+      evaluation: formData.evaluation,
+    };
+    // showLoader()
+    //   http
+    //   .put(config.API.???,body)
+    //   .then((res)=>{
+    //     success($q,'บันทึกสำเร็จ')
+    //     router.push(`/KPI-competency`)
+    //   }).catch((e)=>{
+    //     messageError($q,e)
+    //   }).finally(()=>{
+    //     hideLoader()
+    //   })
+    console.log(body);
+  });
 }
 
 onMounted(() => {
diff --git a/src/modules/14_KPI/components/competency/Forms/04_FormExecutivePosition.vue b/src/modules/14_KPI/components/competency/Forms/04_FormExecutivePosition.vue
index 66c7e31ed..a13905261 100644
--- a/src/modules/14_KPI/components/competency/Forms/04_FormExecutivePosition.vue
+++ b/src/modules/14_KPI/components/competency/Forms/04_FormExecutivePosition.vue
@@ -38,7 +38,7 @@ const formData = reactive({
 function onSubmit() {
   dialogConfirm($q, () => {
     const body = {
-      competencyType: store.competencyType,
+      competencyType: store.competencyTypeVal,
       competencyName: formData.competencyName,
       definition: formData.definition,
       levels1: formData.level1,
diff --git a/src/modules/14_KPI/components/competency/Forms/05_FormExecutiveLevel.vue b/src/modules/14_KPI/components/competency/Forms/05_FormExecutiveLevel.vue
index 059917972..69b537422 100644
--- a/src/modules/14_KPI/components/competency/Forms/05_FormExecutiveLevel.vue
+++ b/src/modules/14_KPI/components/competency/Forms/05_FormExecutiveLevel.vue
@@ -35,7 +35,7 @@ const formData = reactive({
 function onSubmit() {
   dialogConfirm($q, () => {
     const body = {
-      competencyType: store.competencyType,
+      competencyType: store.competencyTypeVal,
       competencyName: formData.competencyName,
       definition: formData.definition,
       levels1: formData.level1,
@@ -74,7 +74,7 @@ function onSubmit() {
       <q-card-section class="col-12 q-px-none">
         <div>
           <q-field
-          class="q_field_p_none"
+            class="q_field_p_none"
             ref="fieldRef"
             v-model="formData.definition"
             label-slot
diff --git a/src/modules/14_KPI/components/competency/Forms/Main.vue b/src/modules/14_KPI/components/competency/Forms/Main.vue
index 465b99e14..fc3e46f5e 100644
--- a/src/modules/14_KPI/components/competency/Forms/Main.vue
+++ b/src/modules/14_KPI/components/competency/Forms/Main.vue
@@ -57,7 +57,8 @@ function onClickAddLevels() {
   const levelName = formData.levels.length + 1;
   const data = {
     level:
-      (store.competencyType === "HEAD" || store.competencyType === "GROUP") &&
+      (store.competencyTypeVal === "HEAD" ||
+        store.competencyTypeVal === "GROUP") &&
       levelName <= 6
         ? levelName.toString()
         : "",
@@ -69,7 +70,7 @@ function onClickAddLevels() {
 function onSubmit() {
   dialogConfirm($q, async () => {
     const formBody = {
-      type: store.competencyType,
+      type: store.competencyTypeVal,
       name: formData.competencyName,
       description: formData.definition,
       capacityDetails: formData.levels,
@@ -201,8 +202,8 @@ onMounted(() => {
               <div class="col-3 align-center q-pr-lg">
                 <q-input
                   :readonly="
-                    store.competencyType === 'HEAD' ||
-                    store.competencyType === 'GROUP'
+                    store.competencyTypeVal === 'HEAD' ||
+                    store.competencyTypeVal === 'GROUP'
                   "
                   v-model="formData.levels[index].level"
                   dense
@@ -257,11 +258,11 @@ onMounted(() => {
                       icon="delete"
                       @click="onDeleteLevels(index)"
                       v-if="
-                        (store.competencyType === 'HEAD' && index > 4) ||
-                        (store.competencyType === 'GROUP' && index > 4) ||
-                        ((store.competencyType === 'EXECUTIVE' ||
-                          store.competencyType === 'DIRECTOR' ||
-                          store.competencyType === 'INSPECTOR') &&
+                        (store.competencyTypeVal === 'HEAD' && index > 4) ||
+                        (store.competencyTypeVal === 'GROUP' && index > 4) ||
+                        ((store.competencyTypeVal === 'EXECUTIVE' ||
+                          store.competencyTypeVal === 'DIRECTOR' ||
+                          store.competencyTypeVal === 'INSPECTOR') &&
                           index > 0)
                       "
                     >
diff --git a/src/modules/14_KPI/components/detailList/Dialog/04_FormCompetency.vue b/src/modules/14_KPI/components/detailList/Dialog/04_FormCompetency.vue
index 8fcd6077e..693f069d9 100644
--- a/src/modules/14_KPI/components/detailList/Dialog/04_FormCompetency.vue
+++ b/src/modules/14_KPI/components/detailList/Dialog/04_FormCompetency.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<!-- <script setup lang="ts">
 import { ref, reactive, onMounted, watch } from "vue";
 import DialogHeader from "@/components/DialogHeader.vue";
 import type { DataOptions } from "@/modules/08_KPI/interface/index/Main";
@@ -169,7 +169,7 @@ function onSubmit() {
 function getData() {
   showLoader();
   http
-    .get(config.API.KpiCapacity + `?type=${type.value}`)
+    .get(config.API.kpiCapacity + `?type=${type.value}`)
     .then((res) => {
       const data = res.data.result.data;
       listTarget.value = data;
@@ -428,8 +428,8 @@ watch(
                     </div>
                     <div
                       v-if="dataListCapacityDetails.length == 0"
-                      class="q-pa-md text-weight-bold col-12 text-center "
-                      style="border: 2px solid #f5f5f5;"
+                      class="q-pa-md text-weight-bold col-12 text-center"
+                      style="border: 2px solid #f5f5f5"
                     >
                       <span>ไม่พบข้อมูลสมรรถนะ</span>
                     </div>
@@ -483,4 +483,4 @@ watch(
   border: 1px solid #ededed !important;
   border-radius: 8px;
 }
-</style>
+</style> -->
diff --git a/src/modules/14_KPI/store/KPIStore.ts b/src/modules/14_KPI/store/KPIStore.ts
index 2cdd7f3dd..b53e5cbfd 100644
--- a/src/modules/14_KPI/store/KPIStore.ts
+++ b/src/modules/14_KPI/store/KPIStore.ts
@@ -4,7 +4,7 @@ import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
 
 // store
 export const useKPIDataStore = defineStore("KPIDataStore", () => {
-  // const competencyType = ref<string>("HEAD");
+  const competencyTypeVal = ref<string>("HEAD");
 
   const tabMain = ref<string>("1");
   const dataProfile = ref<any>();
@@ -175,6 +175,7 @@ export const useKPIDataStore = defineStore("KPIDataStore", () => {
   }
 
   return {
+    competencyTypeVal,
     competencyType,
     convertStatus,
     convertResults,