diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index d8424ad5a..c4ccd71d7 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -99,6 +99,11 @@ const menuList = readonly<any[]>([
             path: "KPIIndicatorByRole",
             role: "evaluateKPI",
           },
+          {
+            label: "งานที่ได้รับมอบหมาย",
+            path: "KPIAssignment",
+            role: "evaluateKPI",
+          },
         ],
       },
       {
@@ -110,7 +115,7 @@ const menuList = readonly<any[]>([
       {
         key: 2.0,
         label: "ยุทธศาสตร์",
-        path: "developmentStrategic",
+        path: "strategic",
         role: "development",
       },
     ],
diff --git a/src/modules/01_metadataNew/components/Indicators/Assignment/DetailView.vue b/src/modules/01_metadataNew/components/Indicators/Assignment/DetailView.vue
new file mode 100644
index 000000000..bd5d8ff1a
--- /dev/null
+++ b/src/modules/01_metadataNew/components/Indicators/Assignment/DetailView.vue
@@ -0,0 +1,645 @@
+<script setup lang="ts">
+import { ref, reactive, onMounted } from "vue";
+import { useQuasar } from "quasar";
+import { useRouter, useRoute } from "vue-router";
+import http from "@/plugins/http";
+import config from "@/app.config";
+
+import { useCounterMixin } from "@/stores/mixin";
+
+import type { FormDataRole } from "@/modules/01_metadataNew/interface/request/Main";
+import type { DataOption } from "@/modules/01_metadataNew/interface/index/Main";
+
+const $q = useQuasar();
+const route = useRoute();
+const router = useRouter();
+
+const heightSize = ref<string>("224");
+const filter = ref<string>("");
+const node = ref<any>([]);
+const expanded = ref<string[]>([]);
+const orgName = ref<string>("");
+const nodeId = ref<string>("");
+
+const id = ref<string>(route.params.id ? route.params.id.toLocaleString() : "");
+const {
+  showLoader,
+  hideLoader,
+  messageError,
+  success,
+  dialogConfirm,
+  dialogMessageNotify,
+} = useCounterMixin();
+const title = ref<string>(route.params.id ? "แก้ไข" : "เพิ่ม");
+
+const modalDialogSelect = ref<boolean>(false);
+const form = reactive<FormDataRole>({
+  position: "", //ตำแหน่งในสายงาน
+  year: new Date().getFullYear(), //ปีงบประมาณ
+  round: "", //รอบการประเมิน
+  org: "", //หน่วยงาน/ส่วนราชการ
+  including: "", //รหัสตัวชี้วัด
+  includingName: "", //ชื่อตัวชี้วัด
+  target: "", //ค่าเป้าหมาย
+  unit: "", //หน่วยนับ
+  weight: "", //น้ำหนัก
+  meaning: "", //นิยามหรือความหมาย
+  formula: "", //สูตรคำนวณ
+  documentInfoEvidence: "", //ข้อมูลเอกสารหลักฐาน
+
+  node: null,
+  nodeId: null,
+  orgRevisionId: null,
+});
+
+const fieldLabels = {
+  score5: "5",
+  score4: "4",
+  score3: "3",
+  score2: "2",
+  score1: "1",
+};
+
+const formScore = reactive<any>({
+  score5: "",
+  score4: "",
+  score3: "",
+  score2: "",
+  score1: "",
+});
+
+const positionOp = ref<DataOption[]>([]);
+const positionMainOp = ref<DataOption[]>([]);
+
+/** Option  รอบการประเมิน*/
+const roundOp = ref<DataOption[]>([
+  { id: "APR", name: "รอบเมษายน" },
+  { id: "OCT", name: "รอบตุลาคม" },
+]);
+
+/**
+ * function ต้นหาข้อมูลของ Option
+ * @param val ค่าที่ต้องการฟิลเตอร์
+ * @param update  อัพเดทค่า
+ * @param refData ดาต้าที่ต้องการฟิลเตอร์
+ */
+function filterOption(val: any, update: Function) {
+  update(() => {
+    positionOp.value = positionMainOp.value.filter(
+      (v: any) => v.name.indexOf(val) > -1
+    );
+  });
+}
+
+/** ดึงข้อมูลตำแหน่ง */
+function getOptions() {
+  http.get(config.API.orgSalaryPosition).then((res) => {
+    const dataOp = res.data.result;
+    const uniqueNames = new Set();
+    const filteredData = dataOp
+      .filter((item: any) => {
+        if (!uniqueNames.has(item.positionName)) {
+          uniqueNames.add(item.positionName);
+          return true;
+        }
+        return false;
+      })
+      .map((item: any) => ({
+        id: item.positionName,
+        name: item.positionName,
+      }));
+
+    positionMainOp.value = filteredData;
+  });
+}
+
+/** เปิด Dialog หน่วยงาน */
+function selectAgency() {
+  modalDialogSelect.value = true;
+}
+
+/** บันทึกข้อมูล */
+function onSubmit() {
+  const url = id.value
+    ? config.API.kpiRoleMainList + `/${id.value}`
+    : config.API.kpiRoleMainList;
+
+  const body = {
+    year: form.year == 0 ? null : form.year,
+    position: form.position, //ตำแหน่ง
+    period: form.round, //รอบการประเมิน(เมษา->APR, ตุลา->OCT)
+    includingName: form.includingName, //ชื่อตัวชี้วัด
+    target: form.target, //ค่าเป้าหมาย
+    unit: form.unit, //หน่วยนับ
+    weight: form.weight, //น้ำหนัก
+    achievement1: formScore.score1, //ผลสำเร็จของงาน 1
+    achievement2: formScore.score2, //ผลสำเร็จของงาน 2
+    achievement3: formScore.score3, //ผลสำเร็จของงาน 3
+    achievement4: formScore.score4, //ผลสำเร็จของงาน 4
+    achievement5: formScore.score5, //ผลสำเร็จของงาน 5
+    meaning: form.meaning, //นิยามหรือความหมาย
+    formula: form.formula, //สูตรคำนวณ
+    documentInfoEvidence: form.documentInfoEvidence, //ข้อมูลเอกสารหลักฐาน
+
+    node: form.node, //ระดับหน่วยงาน
+    nodeId: form.nodeId, //id หน่วยงาน
+    orgRevisionId: form.orgRevisionId, //RevisionId หน่วยงาน
+  };
+
+  if (form.nodeId == null) {
+    dialogMessageNotify($q, "กรุณาเลือกหน่วยงาน/ส่วนราชการ");
+  } else {
+    dialogConfirm($q, () => {
+      showLoader();
+      http[id.value ? "put" : "post"](url, body)
+        .then(() => {
+          success($q, "บันทึกสำเร็จ");
+          id.value ? getDetail() : router.push(`/KPI-indicator-role`);
+        })
+        .catch((err) => {
+          messageError($q, err);
+        })
+        .finally(() => {
+          hideLoader();
+        });
+    });
+  }
+}
+
+//
+//
+function getDetail() {
+  showLoader();
+  http
+    .get(config.API.kpiRoleMainList + `/${id.value}`)
+    .then((res) => {
+      const data = res.data.result;
+      form.position = data.position;
+      form.year = data.year == null ? 0 : data.year;
+      form.round = data.round;
+      form.including = data.including;
+      form.includingName = data.includingName;
+      form.target = data.target;
+      form.unit = data.unit;
+      form.weight = data.weight;
+      form.meaning = data.meaning;
+      form.formula = data.formula;
+
+      formScore.score1 = data.achievement1;
+      formScore.score2 = data.achievement2;
+      formScore.score3 = data.achievement3;
+      formScore.score4 = data.achievement4;
+      formScore.score5 = data.achievement5;
+
+      form.node = data.node;
+      form.nodeId = data.nodeId;
+      form.orgRevisionId = data.orgRevisionId;
+      const arrayExpanded = [
+        data.root,
+        data.child1,
+        data.child2,
+        data.child3,
+        data.child4,
+      ];
+      expanded.value = arrayExpanded.filter((e) => e !== null).slice(0, -1);
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+function fetchActive() {
+  showLoader();
+  http
+    .get(config.API.activeOrganization)
+    .then((res) => {
+      const data = res.data.result;
+      fetchTree(data.activeId);
+    })
+    .catch((err) => {
+      messageError($q, err);
+      hideLoader();
+    });
+}
+
+async function fetchTree(id: string) {
+  showLoader();
+  http
+    .get(config.API.orgByid(id.toString()))
+    .then((res) => {
+      const data = res.data.result;
+      node.value = data;
+    })
+    .catch((err) => {
+      messageError($q, err);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+function updateSelected(data: any) {
+  nodeId.value = data.orgTreeId;
+  orgName.value = data.orgTreeName;
+  form.node = data.orgLevel;
+  form.nodeId = data.orgTreeId;
+  form.orgRevisionId = data.orgRevisionId;
+}
+
+function onResize(size: any) {
+  heightSize.value = `${size.height - 99}`;
+}
+
+function setModel(val: string) {
+  form.position = val;
+}
+
+onMounted(() => {
+  fetchActive();
+//   getOptions();
+//   if (id.value !== "") {
+//     getDetail();
+//   }
+});
+</script>
+<template>
+  <div class="toptitle text-dark col-12 row items-center">
+    <q-btn
+      flat
+      round
+      dense
+      class="q-mr-sm"
+      icon="mdi-arrow-left"
+      color="primary"
+      @click="router.go(-1)"
+    />
+    {{ `${title}งานที่ได้รับมอบหมาย` }}
+  </div>
+  <q-card flat>
+    <q-form greedy @submit.prevent @validation-success="onSubmit">
+      <q-card-section>
+        <div class="row q-col-gutter-sm">
+          <div class="col-8">
+            <q-select
+              dense
+              :model-value="form.position"
+              label="ตำแหน่งในสายงาน"
+              outlined
+              emit-value
+              map-options
+              fill-input
+              hide-selected
+              lazy-rules
+              :rules="[(val:string) => !!val || `${'กรุณาเลือกตำแหน่งในสายงาน'}`,]"
+              hide-bottom-space
+              option-label="name"
+              option-value="id"
+              class="inputgreen"
+              :options="positionOp"
+              use-input
+              @input-value="setModel"
+              @filter="(inputValue:any,doneFn:Function) => filterOption(inputValue, doneFn) "
+            >
+              <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-2">
+            <datepicker
+              menu-class-name="modalfix"
+              v-model="form.year"
+              :locale="'th'"
+              autoApply
+              year-picker
+              :enableTimePicker="false"
+              @update:model-value="form.round = ''"
+            >
+              <template #year="{ year }">{{ year + 543 }}</template>
+              <template #year-overlay-value="{ value }">{{
+                parseInt(value + 543)
+              }}</template>
+              <template #trigger>
+                <q-input
+                  dense
+                  class="inputgreen"
+                  outlined
+                  :model-value="
+                    form.year === 0 ? null : Number(form.year) + 543
+                  "
+                  :label="`${'ปีงบประมาณ'}`"
+                >
+                  <template v-slot:prepend>
+                    <q-icon
+                      name="event"
+                      class="cursor-pointer"
+                      style="color: var(--q-primary)"
+                    >
+                    </q-icon>
+                  </template>
+                  <template v-slot:append>
+                    <q-icon
+                      v-if="form.year"
+                      name="cancel"
+                      class="cursor-pointer"
+                      @click.stop.prevent="
+                        form.year = 0;
+                        form.round = '';
+                      "
+                    />
+                  </template>
+                </q-input>
+              </template>
+            </datepicker>
+          </div>
+          <div class="col-2">
+            <q-select
+              :readonly="form.year == 0"
+              dense
+              outlined
+              v-model="form.round"
+              :options="roundOp"
+              option-label="name"
+              option-value="id"
+              emit-value
+              map-options
+              input-class="text-red"
+              label="รอบการประเมิน"
+              class="inputgreen"
+            />
+          </div>
+          <div class="col-2" v-if="id">
+            <q-input
+              label="ลำดับ/รหัสตัวชี้วัด"
+              v-model="form.including"
+              outlined
+              readonly
+              dense
+              class="inputgreen"
+            />
+          </div>
+          <div class="col-4">
+            <q-input
+              label="ชื่อตัวชี้วัด"
+              v-model="form.includingName"
+              outlined
+              dense
+              class="inputgreen"
+              lazy-rules
+              :rules="[(val:string) => !!val || `${'กรุณากรอกชื่อตัวชี้วัด'}`,]"
+              hide-bottom-space
+            />
+          </div>
+          <div class="col-2">
+            <q-input
+              label="ค่าเป้าหมาย"
+              v-model="form.target"
+              outlined
+              dense
+              class="inputgreen"
+              lazy-rules
+              :rules="[(val:string) => !!val || `${'กรุณากรอกค่าเป้าหมาย'}`,]"
+              hide-bottom-space
+            />
+          </div>
+          <div class="col-2">
+            <q-input
+              label="หน่วยนับ"
+              v-model="form.unit"
+              outlined
+              dense
+              class="inputgreen"
+              lazy-rules
+              :rules="[(val:string) => !!val || `${'กรุณากรอกหน่วยนับ'}`,]"
+              hide-bottom-space
+            />
+          </div>
+          <div class="col-2">
+            <q-input
+              label="น้ำหนัก"
+              v-model="form.weight"
+              outlined
+              dense
+              class="inputgreen"
+              lazy-rules
+              :rules="[(val:string) => !!val || `${'กรุณากรอกน้ำหนัก'}`,]"
+              hide-bottom-space
+            />
+          </div>
+          <div class="col-4">
+            <q-card flat bordered class="full-height">
+              <q-card-section class="bg-grey-3 q-pa-sm">
+                <div class="text-dark text-body2 text-weight-medium">
+                  หน่วยงาน/ส่วนราชการ
+                </div>
+              </q-card-section>
+              <q-card-section class="q-pa-sm">
+                <q-input
+                  dense
+                  outlined
+                  v-model="filter"
+                  label="ค้นหา"
+                  class="inputgreen"
+                >
+                  <template v-slot:append>
+                    <q-icon
+                      v-if="filter !== ''"
+                      name="clear"
+                      class="cursor-pointer"
+                      @click="filter = ''"
+                    />
+                    <q-icon v-else name="search" color="grey-5" />
+                  </template>
+                </q-input>
+                <q-scroll-area
+                  visible
+                  :style="{ height: `${heightSize}px`, marginTop: '5px' }"
+                >
+                  <q-tree
+                    dense
+                    :nodes="node"
+                    node-key="orgTreeId"
+                    label-key="orgTreeName"
+                    v-model:expanded="expanded"
+                    :filter="filter"
+                    no-results-label="ไม่พบข้อมูลที่ค้นหา"
+                    no-nodes-label="ไม่มีข้อมูล"
+                  >
+                    <template v-slot:default-header="prop">
+                      <q-item
+                        clickable
+                        @click.stop="updateSelected(prop.node)"
+                        :active="form.nodeId === prop.node.orgTreeId"
+                        active-class="my-list-link text-primary text-weight-medium"
+                        class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
+                      >
+                        <div>
+                          <div class="text-weight-medium">
+                            {{ prop.node.orgTreeName }}
+                          </div>
+                          <div class="text-weight-light text-grey-8">
+                            {{
+                              prop.node.orgCode == null
+                                ? null
+                                : prop.node.orgCode
+                            }}
+                            {{
+                              prop.node.orgTreeShortName == null
+                                ? null
+                                : prop.node.orgTreeShortName
+                            }}
+                          </div>
+                        </div>
+                      </q-item>
+                    </template>
+                  </q-tree>
+                </q-scroll-area>
+              </q-card-section>
+            </q-card>
+          </div>
+          <div class="col-8">
+            <q-card flat bordered>
+              <q-resize-observer @resize="onResize" />
+              <q-card-section class="bg-grey-3 q-pa-sm">
+                <div class="row text-dark text-body2 text-weight-medium">
+                  <div class="text-center col-4">ระดับคะแนน</div>
+                  <div class="col-8">ผลสำเร็จของงาน</div>
+                </div>
+              </q-card-section>
+              <q-card-section class="q-pa-none">
+                <div
+                  v-for="(field, index) in Object.keys(fieldLabels)"
+                  :key="index + 1"
+                >
+                  <div class="row q-pa-sm">
+                    <div
+                      class="col-4 text-center text-body1 text-weight-bold self-center"
+                    >
+                      {{ fieldLabels[field as keyof typeof fieldLabels] }}
+                    </div>
+                    <div class="col-8 text-left">
+                      <!-- <q-field
+                    class="q_field_p_none"
+                    ref="fieldRef"
+                    v-model="formScore[field]"
+                    label-slot
+                    borderless
+                    :rules="[(val) => !!val || 'กรุณากรอกมาตรฐานพฤติกรรม']"
+                    hide-bottom-space
+                  >
+                    <template #control>
+                      <q-editor
+                        class="full-width"
+                        v-model="formScore[field]"
+                        :dense="$q.screen.lt.md"
+                        min-height="5rem"
+                        :toolbar="[
+                          [
+                            'bold',
+                            'italic',
+                            'strike',
+                            'underline',
+                            'subscript',
+                            'superscript',
+                          ],
+
+                          ['unordered', 'ordered'],
+                        ]"
+                        :fonts="{
+                          arial: 'Arial',
+                          arial_black: 'Arial Black',
+                          comic_sans: 'Comic Sans MS',
+                          courier_new: 'Courier New',
+                          impact: 'Impact',
+                          lucida_grande: 'Lucida Grande',
+                          times_new_roman: 'Times New Roman',
+                          verdana: 'Verdana',
+                        }"
+                      />
+                    </template>
+                  </q-field> -->
+                      <q-input
+                        v-model="formScore[field]"
+                        dense
+                        outlined
+                        class="inputgreen"
+                        label="กรอกผลสำเร็จของงาน"
+                        :rules="[(val:string) => !!val || `${'กรุณากรอกผลสำเร็จของงาน'}`,]"
+                        hide-bottom-space
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="col-12"
+                    v-if="index !== Object.keys(fieldLabels).length - 1"
+                  >
+                    <q-separator />
+                  </div>
+                </div>
+              </q-card-section>
+            </q-card>
+          </div>
+          <div class="col-12">
+            <q-input
+              v-model="form.meaning"
+              label="นิยามหรือความหมาย"
+              dense
+              outlined
+              lazy-rules
+              class="inputgreen"
+              :rules="[(val:string) => !!val || `${'กรุณากรอกนิยามหรือความหมาย'}`,]"
+              hide-bottom-space
+              type="textarea"
+            />
+          </div>
+          <div class="col-12">
+            <q-input
+              v-model="form.formula"
+              label="สูตรคำนวณ"
+              dense
+              outlined
+              lazy-rules
+              class="inputgreen"
+              :rules="[(val:string) => !!val || `${'กรุณากรอกสูตรคำนวณ'}`,]"
+              hide-bottom-space
+              type="textarea"
+            />
+          </div>
+          <div class="col-12">
+            <q-input
+              class="inputgreen"
+              v-model="form.documentInfoEvidence"
+              label="ข้อมูลเอกสารหลักฐาน"
+              outlined
+              dense
+              type="textarea"
+            ></q-input>
+          </div>
+        </div>
+      </q-card-section>
+      <q-separator />
+      <q-card-actions align="right">
+        <q-btn color="public" label="บันทึก" type="submit" unelevated>
+          <q-tooltip>บันทึกข้อมูล</q-tooltip>
+        </q-btn>
+      </q-card-actions>
+    </q-form>
+  </q-card>
+</template>
+
+<style scoped>
+.my-list-link {
+  color: rgb(118, 168, 222);
+  border-radius: 5px;
+  background: #a3d3fb48 !important;
+  font-weight: 600;
+  border: 1px solid rgba(175, 185, 196, 0.217);
+}
+</style>
diff --git a/src/modules/01_metadataNew/components/Indicators/DialogHistory.vue b/src/modules/01_metadataNew/components/Indicators/DialogHistory.vue
new file mode 100644
index 000000000..91d34c4dc
--- /dev/null
+++ b/src/modules/01_metadataNew/components/Indicators/DialogHistory.vue
@@ -0,0 +1,65 @@
+<script setup lang="ts">
+import { ref } from "vue";
+import type { QTableProps } from "quasar";
+
+import DialogHeader from "@/components/DialogHeader.vue";
+
+const modal = defineModel<boolean>("modal", { required: true });
+const rows = ref<any[]>([]);
+const visibleColumns = ref<string[]>(["fullName"]);
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "fullName",
+    align: "left",
+    label: "ชื่อ",
+    sortable: true,
+    field: "fullName",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+function close() {
+  modal.value = false;
+}
+</script>
+<template>
+  <q-dialog persistent v-model="modal">
+    <q-card style="min-width: 50vw">
+      <DialogHeader tittle="ประวัติการแก้ไข" :close="close" />
+      <q-separator />
+      <q-card-section>
+        <d-table
+          for="table"
+          ref="table"
+          :columns="columns"
+          :rows="rows"
+          row-key="id"
+          flat
+          bordered
+          dense
+          class="custom-header-table"
+          :rows-per-page-options="[10, 25, 50, 100]"
+          :visible-columns="visibleColumns"
+        >
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                <span class="text-weight-medium">{{ col.label }}</span>
+              </q-th>
+              <q-th auto-width />
+            </q-tr>
+          </template>
+          <template v-slot:body="props">
+            <q-tr :props="props" class="cursor-pointer">
+              <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                <div class="table_ellipsis">
+                  {{ col.value ? col.value : "-" }}
+                </div>
+              </q-td>
+            </q-tr>
+          </template>
+        </d-table>
+      </q-card-section>
+    </q-card>
+  </q-dialog>
+</template>
diff --git a/src/modules/14_KPI/components/indicatorByPlan/DetailView.vue b/src/modules/01_metadataNew/components/Indicators/indicatorByPlan/DetailView.vue
similarity index 85%
rename from src/modules/14_KPI/components/indicatorByPlan/DetailView.vue
rename to src/modules/01_metadataNew/components/Indicators/indicatorByPlan/DetailView.vue
index 2bb6444c8..d474dab10 100644
--- a/src/modules/14_KPI/components/indicatorByPlan/DetailView.vue
+++ b/src/modules/01_metadataNew/components/Indicators/indicatorByPlan/DetailView.vue
@@ -3,7 +3,7 @@ import { ref } from "vue";
 
 import { useRouter, useRoute } from "vue-router";
 
-import IndicatorByPlan from "@/modules/14_KPI/components/indicatorByPlan/IndicatorByPlan.vue";
+import IndicatorByPlan from "@/modules/01_metadataNew/components/Indicators/indicatorByPlan/IndicatorByPlan.vue";
 
 const router = useRouter();
 const route = useRoute();
diff --git a/src/modules/14_KPI/components/indicatorByPlan/IndicatorByPlan.vue b/src/modules/01_metadataNew/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
similarity index 99%
rename from src/modules/14_KPI/components/indicatorByPlan/IndicatorByPlan.vue
rename to src/modules/01_metadataNew/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
index eff09a1f2..17085061c 100644
--- a/src/modules/14_KPI/components/indicatorByPlan/IndicatorByPlan.vue
+++ b/src/modules/01_metadataNew/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
@@ -6,7 +6,7 @@ import config from "@/app.config";
 import http from "@/plugins/http";
 
 /** importType*/
-import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
+import type { DataOption } from "@/modules/01_metadataNew/interface/index/Main";
 
 /** importStore*/
 import { usePositionEmp } from "@/modules/16_positionEmployee/store/organizational";
diff --git a/src/modules/14_KPI/components/indicatorByRole/DetailView.vue b/src/modules/01_metadataNew/components/Indicators/indicatorByRole/DetailView.vue
similarity index 96%
rename from src/modules/14_KPI/components/indicatorByRole/DetailView.vue
rename to src/modules/01_metadataNew/components/Indicators/indicatorByRole/DetailView.vue
index fc8998cf7..478d7e32d 100644
--- a/src/modules/14_KPI/components/indicatorByRole/DetailView.vue
+++ b/src/modules/01_metadataNew/components/Indicators/indicatorByRole/DetailView.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, reactive, onMounted, watch } from "vue";
+import { ref, reactive, onMounted } from "vue";
 import { useQuasar } from "quasar";
 import { useRouter, useRoute } from "vue-router";
 import http from "@/plugins/http";
@@ -7,8 +7,8 @@ import config from "@/app.config";
 
 import { useCounterMixin } from "@/stores/mixin";
 
-import type { FormDataRole } from "@/modules/14_KPI/interface/request/Main";
-import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
+import type { FormDataRole } from "@/modules/01_metadataNew/interface/request/Main";
+import type { DataOption } from "@/modules/01_metadataNew/interface/index/Main";
 
 const $q = useQuasar();
 const route = useRoute();
@@ -125,7 +125,7 @@ function onSubmit() {
     : config.API.kpiRoleMainList;
 
   const body = {
-    year: form.year == 0 ? null:form.year.toString(),
+    year: form.year == 0 ? null:form.year?.toString(),
     position: form.position, //ตำแหน่ง
     period: form.round, //รอบการประเมิน(เมษา->APR, ตุลา->OCT)
     includingName: form.includingName, //ชื่อตัวชี้วัด
@@ -249,20 +249,6 @@ function updateSelected(data: any) {
   form.orgRevisionId = data.orgRevisionId;
 }
 
-
-function statusTothai(val: string) {
-  switch (val) {
-    case "SPECIAL":
-      return "รอบพิเศษ";
-    case "APR":
-      return "รอบเมษายน";
-    case "OCT":
-      return "รอบตุลาคม";
-    default:
-      return "-";
-  }
-}
-
 function onResize(size: any) {
   heightSize.value = `${size.height - 99}`;
 }
@@ -627,15 +613,15 @@ onMounted(() => {
             />
           </div>
           <div class="col-12">
-          <q-input
-            class="inputgreen"
-            v-model="form.documentInfoEvidence"
-            label="ข้อมูลเอกสารหลักฐาน"
-            outlined
-            dense
-            type="textarea"
-          ></q-input>
-        </div>
+            <q-input
+              class="inputgreen"
+              v-model="form.documentInfoEvidence"
+              label="ข้อมูลเอกสารหลักฐาน"
+              outlined
+              dense
+              type="textarea"
+            ></q-input>
+          </div>
         </div>
       </q-card-section>
       <q-separator />
diff --git a/src/modules/14_KPI/components/competency/01ListCompetency.vue b/src/modules/01_metadataNew/components/competency/01ListCompetency.vue
similarity index 94%
rename from src/modules/14_KPI/components/competency/01ListCompetency.vue
rename to src/modules/01_metadataNew/components/competency/01ListCompetency.vue
index d0a3f563b..bd81c578b 100644
--- a/src/modules/14_KPI/components/competency/01ListCompetency.vue
+++ b/src/modules/01_metadataNew/components/competency/01ListCompetency.vue
@@ -4,17 +4,17 @@ import type { QTableProps } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar } from "quasar";
 import { useRouter } from "vue-router";
-
-import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
-import type { FormQueryCapacity } from "@/modules/14_KPI/interface/request/Main";
-import type { ResDataCapacity } from "@/modules/14_KPI/interface/response/Main";
-
-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 {
+  DataOption,
+  NewPagination,
+} from "@/modules/01_metadataNew/interface/index/Main";
+import type { FormQueryCapacity } from "@/modules/01_metadataNew/interface/request/Main";
+import type { ResDataCapacity } from "@/modules/01_metadataNew/interface/response/Main";
+
+import { useKPIDataStore } from "@/modules/01_metadataNew/stores/KPIStore";
 
 const total = ref<number>();
 const store = useKPIDataStore();
diff --git a/src/modules/14_KPI/components/competency/02ListLinkPosition.vue b/src/modules/01_metadataNew/components/competency/02ListLinkPosition.vue
similarity index 97%
rename from src/modules/14_KPI/components/competency/02ListLinkPosition.vue
rename to src/modules/01_metadataNew/components/competency/02ListLinkPosition.vue
index 662c0ff05..86d8a93b9 100644
--- a/src/modules/14_KPI/components/competency/02ListLinkPosition.vue
+++ b/src/modules/01_metadataNew/components/competency/02ListLinkPosition.vue
@@ -9,13 +9,13 @@ import type {
   DataOption,
   NewPagination,
 } from "@/modules/14_KPI/interface/index/Main";
-import type { ResponseObject } from "@/modules/14_KPI/interface/response/KpiGroup";
+
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-const total = ref<number>()
+const total = ref<number>();
 const modal = ref<boolean>(false);
-const rows = ref<ResponseObject[]>([]);
+const rows = ref<any[]>([]);
 const groupName = ref<string>("");
 
 const editStatus = ref<boolean>(false);
@@ -85,7 +85,7 @@ async function fetchData() {
         `?page=${formQuery.page}&pageSize=${formQuery.pageSize}&keyword=${formQuery.keyword}`
     )
     .then(async (res) => {
-      total.value = res.data.result.total
+      total.value = res.data.result.total;
       const data = res.data.result;
       totalList.value = Math.ceil(res.data.result.total / formQuery.pageSize);
       rows.value = data.data;
diff --git a/src/modules/14_KPI/components/competency/03ListLinkGroup.vue b/src/modules/01_metadataNew/components/competency/03ListLinkGroup.vue
similarity index 97%
rename from src/modules/14_KPI/components/competency/03ListLinkGroup.vue
rename to src/modules/01_metadataNew/components/competency/03ListLinkGroup.vue
index 606ccd69a..bfe5bba59 100644
--- a/src/modules/14_KPI/components/competency/03ListLinkGroup.vue
+++ b/src/modules/01_metadataNew/components/competency/03ListLinkGroup.vue
@@ -10,12 +10,11 @@ import Header from "@/components/DialogHeader.vue";
 import type {
   DataOption,
   NewPagination,
-} from "@/modules/14_KPI/interface/index/Main";
-import type { ListGroup } from "@/modules/14_KPI/interface/request/Main";
+} from "@/modules/01_metadataNew/interface/index/Main";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-const total = ref<number>()
+const total = ref<number>();
 const id = ref<string>("");
 const modal = ref<boolean>(false);
 const rows = ref<any>([]);
@@ -99,7 +98,7 @@ async function getData() {
         `?page=${formQuery.page}&pageSize=${formQuery.pageSize}&keyword=${formQuery.keyword}`
     )
     .then((res) => {
-      total.value = res.data.result.total
+      total.value = res.data.result.total;
       const data = res.data.result;
       totalList.value = Math.ceil(res.data.result.total / formQuery.pageSize);
       rows.value = data.data;
@@ -129,7 +128,7 @@ async function deleteData(id: string) {
 async function getListGroup() {
   showLoader();
   await http
-    .get(config.API.kpiGroup+`?pageSize=50`)
+    .get(config.API.kpiGroup + `?pageSize=50`)
     .then(async (res) => {
       const dataOp = res.data.result.data;
       const uniqueNames = new Set();
@@ -217,8 +216,8 @@ function getDataEdit(id: string) {
       };
       position.value = data.positions.map((i: any) => i.name);
       competency.value = data.capacitys.map((i: any) => ({
-        id:i.id,
-        name:i.name
+        id: i.id,
+        name: i.name,
       }));
     })
     .finally(() => {
@@ -233,7 +232,7 @@ function onSubmit() {
   const body = {
     kpiGroupId: groupName.value.id,
     positions: position.value,
-    kpiCapacityIds: competency.value.map((i:any)=> i.id)
+    kpiCapacityIds: competency.value.map((i: any) => i.id),
   };
   dialogConfirm($q, () => {
     http[editStatus.value ? "put" : "post"](url, body)
@@ -246,7 +245,6 @@ function onSubmit() {
   });
 }
 
-
 function close() {
   modal.value = false;
   editStatus.value = false;
@@ -505,7 +503,7 @@ onMounted(async () => {
                 hide-bottom-space
                 lazy-rules
                 :rules="[(val:string) => !!val || `${'กรุณาเลือกกลุ่มงาน'}`,]"
-                >
+              >
                 <template v-slot:no-option>
                   <q-item>
                     <q-item-section class="text-grey">
diff --git a/src/modules/14_KPI/components/competency/04ListCriteria.vue b/src/modules/01_metadataNew/components/competency/04ListCriteria.vue
similarity index 100%
rename from src/modules/14_KPI/components/competency/04ListCriteria.vue
rename to src/modules/01_metadataNew/components/competency/04ListCriteria.vue
diff --git a/src/modules/14_KPI/components/competency/05ListDetail.vue b/src/modules/01_metadataNew/components/competency/05ListDetail.vue
similarity index 100%
rename from src/modules/14_KPI/components/competency/05ListDetail.vue
rename to src/modules/01_metadataNew/components/competency/05ListDetail.vue
diff --git a/src/modules/14_KPI/components/competency/AddPage.vue b/src/modules/01_metadataNew/components/competency/AddPage.vue
similarity index 91%
rename from src/modules/14_KPI/components/competency/AddPage.vue
rename to src/modules/01_metadataNew/components/competency/AddPage.vue
index 73441dbb7..08cf1c1a2 100644
--- a/src/modules/14_KPI/components/competency/AddPage.vue
+++ b/src/modules/01_metadataNew/components/competency/AddPage.vue
@@ -2,16 +2,16 @@
 import { ref, reactive } from "vue";
 import { useRouter } from "vue-router";
 
-import Main from "@/modules/14_KPI/components/competency/Forms/Main.vue";
+import Main from "@/modules/01_metadataNew/components/competency/Forms/Main.vue";
 // 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 { useKPIDataStore } from "@/modules/14_KPI/store/KPIStore";
+import { useKPIDataStore } from "@/modules/01_metadataNew/stores/KPIStore";
 
-import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
-import type { FormCompetency } from "@/modules/14_KPI/interface/request/Main";
+import type { DataOption } from "@/modules/01_metadataNew/interface/index/Main";
+import type { FormCompetency } from "@/modules/01_metadataNew/interface/request/Main";
 
 const router = useRouter();
 const store = useKPIDataStore();
diff --git a/src/modules/14_KPI/components/competency/Forms/01_FormMain.vue b/src/modules/01_metadataNew/components/competency/Forms/01_FormMain.vue
similarity index 98%
rename from src/modules/14_KPI/components/competency/Forms/01_FormMain.vue
rename to src/modules/01_metadataNew/components/competency/Forms/01_FormMain.vue
index f3028e3dd..a16cb2c74 100644
--- a/src/modules/14_KPI/components/competency/Forms/01_FormMain.vue
+++ b/src/modules/01_metadataNew/components/competency/Forms/01_FormMain.vue
@@ -1,9 +1,8 @@
-div
 <script setup lang="ts">
-import { ref, reactive } from "vue";
+import { reactive } from "vue";
 
 import { useCounterMixin } from "@/stores/mixin";
-import { useKPIDataStore } from "@/modules/14_KPI/store/KPIStore";
+import { useKPIDataStore } from "@/modules/01_metadataNew/stores/KPIStore";
 import { useRouter } from "vue-router";
 import { useQuasar } from "quasar";
 
diff --git a/src/modules/14_KPI/components/competency/Forms/02_FormGroup.vue b/src/modules/01_metadataNew/components/competency/Forms/02_FormGroup.vue
similarity index 98%
rename from src/modules/14_KPI/components/competency/Forms/02_FormGroup.vue
rename to src/modules/01_metadataNew/components/competency/Forms/02_FormGroup.vue
index 33cd1b83c..44575ab01 100644
--- a/src/modules/14_KPI/components/competency/Forms/02_FormGroup.vue
+++ b/src/modules/01_metadataNew/components/competency/Forms/02_FormGroup.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, reactive } from "vue";
 import { useCounterMixin } from "@/stores/mixin";
-import { useKPIDataStore } from "@/modules/14_KPI/store/KPIStore";
+import { useKPIDataStore } from "@/modules/01_metadataNew/stores/KPIStore";
 import { useRouter } from "vue-router";
 import { useQuasar } from "quasar";
 
diff --git a/src/modules/14_KPI/components/competency/Forms/03_FormExecutive.vue b/src/modules/01_metadataNew/components/competency/Forms/03_FormExecutive.vue
similarity index 99%
rename from src/modules/14_KPI/components/competency/Forms/03_FormExecutive.vue
rename to src/modules/01_metadataNew/components/competency/Forms/03_FormExecutive.vue
index 9c811f6eb..71aa77abf 100644
--- a/src/modules/14_KPI/components/competency/Forms/03_FormExecutive.vue
+++ b/src/modules/01_metadataNew/components/competency/Forms/03_FormExecutive.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted } from "vue";
 import { useCounterMixin } from "@/stores/mixin";
-import { useKPIDataStore } from "@/modules/14_KPI/store/KPIStore";
+import { useKPIDataStore } from "@/modules/01_metadataNew/stores/KPIStore";
 import { useRouter } from "vue-router";
 import { useQuasar } from "quasar";
 
diff --git a/src/modules/14_KPI/components/competency/Forms/04_FormExecutivePosition.vue b/src/modules/01_metadataNew/components/competency/Forms/04_FormExecutivePosition.vue
similarity index 99%
rename from src/modules/14_KPI/components/competency/Forms/04_FormExecutivePosition.vue
rename to src/modules/01_metadataNew/components/competency/Forms/04_FormExecutivePosition.vue
index a13905261..4f7a7aed5 100644
--- a/src/modules/14_KPI/components/competency/Forms/04_FormExecutivePosition.vue
+++ b/src/modules/01_metadataNew/components/competency/Forms/04_FormExecutivePosition.vue
@@ -3,7 +3,7 @@ import { ref, reactive } from "vue";
 import type { QTableProps } from "quasar";
 
 import { useCounterMixin } from "@/stores/mixin";
-import { useKPIDataStore } from "@/modules/14_KPI/store/KPIStore";
+import { useKPIDataStore } from "@/modules/01_metadataNew/stores/KPIStore";
 import { useRouter } from "vue-router";
 import { useQuasar } from "quasar";
 
diff --git a/src/modules/14_KPI/components/competency/Forms/05_FormExecutiveLevel.vue b/src/modules/01_metadataNew/components/competency/Forms/05_FormExecutiveLevel.vue
similarity index 99%
rename from src/modules/14_KPI/components/competency/Forms/05_FormExecutiveLevel.vue
rename to src/modules/01_metadataNew/components/competency/Forms/05_FormExecutiveLevel.vue
index 69b537422..7b7383c75 100644
--- a/src/modules/14_KPI/components/competency/Forms/05_FormExecutiveLevel.vue
+++ b/src/modules/01_metadataNew/components/competency/Forms/05_FormExecutiveLevel.vue
@@ -2,7 +2,7 @@
 import { ref, reactive } from "vue";
 import type { QTableProps } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
-import { useKPIDataStore } from "@/modules/14_KPI/store/KPIStore";
+import { useKPIDataStore } from "@/modules/01_metadataNew/stores/KPIStore";
 import { useRouter } from "vue-router";
 import { useQuasar } from "quasar";
 
diff --git a/src/modules/14_KPI/components/competency/Forms/Main.vue b/src/modules/01_metadataNew/components/competency/Forms/Main.vue
similarity index 99%
rename from src/modules/14_KPI/components/competency/Forms/Main.vue
rename to src/modules/01_metadataNew/components/competency/Forms/Main.vue
index fc3e46f5e..1b79574ad 100644
--- a/src/modules/14_KPI/components/competency/Forms/Main.vue
+++ b/src/modules/01_metadataNew/components/competency/Forms/Main.vue
@@ -8,7 +8,7 @@ import config from "@/app.config";
 
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
-import { useKPIDataStore } from "@/modules/14_KPI/store/KPIStore";
+import { useKPIDataStore } from "@/modules/01_metadataNew/stores/KPIStore";
 
 /**use*/
 const $q = useQuasar();
diff --git a/src/modules/01_metadataNew/interface/index/Main.ts b/src/modules/01_metadataNew/interface/index/Main.ts
index 46133c9b9..5c185ec88 100644
--- a/src/modules/01_metadataNew/interface/index/Main.ts
+++ b/src/modules/01_metadataNew/interface/index/Main.ts
@@ -6,5 +6,17 @@ interface DataOption {
   id: string;
   name: string;
 }
+interface NewPagination {
+  descending: boolean;
+  page: number;
+  rowsPerPage: number;
+  sortBy: string;
+}
+interface ItemsMenu {
+  label: string;
+  value: string;
+  icon: string;
+  color: string;
+}
 
-export type { Pagination, DataOption };
+export type { Pagination, DataOption, NewPagination, ItemsMenu };
diff --git a/src/modules/01_metadataNew/interface/request/Main.ts b/src/modules/01_metadataNew/interface/request/Main.ts
index b5eb23bd3..a2448b81a 100644
--- a/src/modules/01_metadataNew/interface/request/Main.ts
+++ b/src/modules/01_metadataNew/interface/request/Main.ts
@@ -11,4 +11,55 @@ interface DataListsObject {
   name: string;
 }
 
-export type { DataSumCalendarObject, DataListsObject };
+interface FormListMainByRole {
+  page: number;
+  pageSize: number;
+  position: string;
+  round: string;
+  keyword: string;
+  year: number | null;
+}
+interface FormDataRole {
+  position: string;
+  year: number | null;
+  round: string;
+  org: string;
+  including: string;
+  includingName: string;
+  target: string;
+  unit: string;
+  weight: string;
+  meaning: string;
+  formula: string;
+  documentInfoEvidence: string;
+  node: number | null;
+  nodeId: string | null;
+  orgRevisionId: string | null;
+}
+
+interface FormCompetency {
+  competencyType: string;
+  competencyName: string;
+  definition: string;
+  level_1: any;
+  level_2: string;
+  level_3: string;
+  level_4: string;
+  level_5: string;
+  evaluation: string;
+}
+
+interface FormQueryCapacity {
+  page: number;
+  pageSize: number;
+  keyword: string;
+}
+
+export type {
+  DataSumCalendarObject,
+  DataListsObject,
+  FormListMainByRole,
+  FormDataRole,
+  FormCompetency,
+  FormQueryCapacity,
+};
diff --git a/src/modules/01_metadataNew/interface/response/Main.ts b/src/modules/01_metadataNew/interface/response/Main.ts
new file mode 100644
index 000000000..2d8cea4d2
--- /dev/null
+++ b/src/modules/01_metadataNew/interface/response/Main.ts
@@ -0,0 +1,43 @@
+interface ResRound {
+  createdAt: Date;
+  createdFullName: string;
+  createdUserId: Date;
+  durationKPI: string;
+  endDate: Date;
+  id: Date;
+  lastUpdateFullName: string;
+  lastUpdateUserId: Date;
+  lastUpdatedAt: Date;
+  startDate: Date;
+}
+
+interface ResDataCapacity {
+  description: string;
+  id: string;
+  name: string;
+  type: string;
+  capacityDetails: capacityDetails;
+}
+
+interface capacityDetails {
+  capacityId: string;
+  description: string;
+  id: string;
+  level: string;
+}
+
+interface ResEvaluator {
+  createdAt: string;
+  createdFullName: string;
+  createdUserId: string;
+  id: string;
+  kpiUserEvaluationId: string;
+  lastUpdateFullName: string;
+  lastUpdateUserId: string;
+  lastUpdatedAt: string;
+  reason: string;
+  topic: string;
+  type: string;
+}
+
+export type { ResRound, ResDataCapacity, ResEvaluator };
diff --git a/src/modules/01_metadataNew/interface/response/Strategic.ts b/src/modules/01_metadataNew/interface/response/Strategic.ts
new file mode 100644
index 000000000..f2aa563cb
--- /dev/null
+++ b/src/modules/01_metadataNew/interface/response/Strategic.ts
@@ -0,0 +1,8 @@
+interface DataStrategic {
+  id: string;
+  name: string;
+  level: number;
+  children: DataStrategic;
+}
+
+export type { DataStrategic };
diff --git a/src/modules/01_metadataNew/router.ts b/src/modules/01_metadataNew/router.ts
index a3a31310f..f716f1775 100644
--- a/src/modules/01_metadataNew/router.ts
+++ b/src/modules/01_metadataNew/router.ts
@@ -17,6 +17,31 @@ const positionEmployeeLevelPage = () =>
     "@/modules/01_metadataNew/components/position-employee/03ListLevel.vue"
   );
 
+const IndicatorByPlan = () =>
+  import("@/modules/01_metadataNew/views/indicatorByPlan.vue");
+const IndicatorByPlanDetail = () =>
+  import(
+    "@/modules/01_metadataNew/components/Indicators/indicatorByPlan/DetailView.vue"
+  );
+const IndicatorByRole = () =>
+  import("@/modules/01_metadataNew/views/indicatorByRole.vue");
+const IndicatorByRoleDetail = () =>
+  import(
+    "@/modules/01_metadataNew/components/Indicators/indicatorByRole/DetailView.vue"
+  );
+const competencyPage = () =>
+  import("@/modules/01_metadataNew/views/competency.vue");
+const competencyAddPage = () =>
+  import("@/modules/01_metadataNew/components/competency/AddPage.vue");
+const StrategicView = () =>
+  import("@/modules/01_metadataNew/views/Strategic.vue");
+const AssignmentView = () =>
+  import("@/modules/01_metadataNew/views/Assignment.vue");
+const AssignmentDetailView = () =>
+  import(
+    "@/modules/01_metadataNew/components/Indicators/Assignment/DetailView.vue"
+  );
+
 export default [
   {
     path: "/master-data/calendar",
@@ -98,4 +123,127 @@ export default [
       Role: "metadata",
     },
   },
+
+  {
+    path: "/KPI-indicator-plan",
+    name: "KPIIndicatorByPlan",
+    component: IndicatorByPlan,
+    meta: {
+      Auth: true,
+      Key: [1.1],
+      Role: "evaluateKPI",
+    },
+  },
+
+  {
+    path: "/KPI-indicator-plan/add",
+    name: "KPIIndicatorByPlan/Add",
+    component: IndicatorByPlanDetail,
+    meta: {
+      Auth: true,
+      Key: [1.1],
+      Role: "evaluateKPI",
+    },
+  },
+  {
+    path: "/KPI-indicator-plan/:id",
+    name: "KPIIndicatorByPlanByid",
+    component: IndicatorByPlanDetail,
+    meta: {
+      Auth: true,
+      Key: [1.1],
+      Role: "evaluateKPI",
+    },
+  },
+  {
+    path: "/KPI-indicator-role",
+    name: "KPIIndicatorByRole",
+    component: IndicatorByRole,
+    meta: {
+      Auth: true,
+      Key: [1.1],
+      Role: "evaluateKPI",
+    },
+  },
+  {
+    path: "/KPI-indicator-role/add",
+    name: "KPIIndicatorByRoleAdd",
+    component: IndicatorByRoleDetail,
+    meta: {
+      Auth: true,
+      Key: [1.1],
+      Role: "evaluateKPI",
+    },
+  },
+  {
+    path: "/KPI-indicator-role/:id",
+    name: "KPIIndicatorByRoleByid",
+    component: IndicatorByRoleDetail,
+    meta: {
+      Auth: true,
+      Key: [1.1],
+      Role: "evaluateKPI",
+    },
+  },
+  {
+    path: "/KPI-competency",
+    name: "KPICompetency",
+    component: competencyPage,
+    meta: {
+      Auth: true,
+      Key: [1.1],
+      Role: "evaluateKPI",
+    },
+  },
+  {
+    path: "/KPI-competency/add",
+    name: "KPICompetencyAdd",
+    component: competencyAddPage,
+    meta: {
+      Auth: true,
+      Key: [1.1],
+      Role: "evaluateKPI",
+    },
+  },
+  {
+    path: "/KPI-competency/:id",
+    name: "KPICompetencyByid",
+    component: competencyAddPage,
+    meta: {
+      Auth: true,
+      Key: [1.1],
+      Role: "evaluateKPI",
+    },
+  },
+
+  {
+    path: "/strategic",
+    name: "strategic",
+    component: StrategicView,
+    meta: {
+      Auth: true,
+      Key: [1.6],
+      Role: "development",
+    },
+  },
+  {
+    path: "/assignment",
+    name: "KPIAssignment",
+    component: AssignmentView,
+    meta: {
+      Auth: true,
+      Key: [1.6],
+      Role: "development",
+    },
+  },
+  {
+    path: "/assignment/:id",
+    name: "KPIAssignmentById",
+    component: AssignmentDetailView,
+    meta: {
+      Auth: true,
+      Key: [1.1],
+      Role: "evaluateKPI",
+    },
+  },
 ];
diff --git a/src/modules/01_metadataNew/stores/KPIStore.ts b/src/modules/01_metadataNew/stores/KPIStore.ts
new file mode 100644
index 000000000..18533052d
--- /dev/null
+++ b/src/modules/01_metadataNew/stores/KPIStore.ts
@@ -0,0 +1,194 @@
+import { defineStore } from "pinia";
+import { ref } from "vue";
+import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
+
+// store
+export const useKPIDataStore = defineStore("KPIDataStore", () => {
+  const competencyTypeVal = ref<string>("HEAD");
+
+  const tabMain = ref<string>("1");
+  const dataProfile = ref<any>();
+  const dataEvaluation = ref<any>({
+    plannedPoint: 0,
+    rolePoint: 0,
+    specialPoint: 0,
+    capacityPoint: 0,
+  });
+
+  const competencyType = ref<DataOption[]>([
+    {
+      id: "HEAD",
+      name: "สมรรถนะหลัก",
+    },
+    {
+      id: "GROUP",
+      name: "สมรรถนะประจำกลุ่มงาน",
+    },
+    {
+      id: "EXECUTIVE",
+      name: "สมรรถนะประจำผู้บริหารกรุงเทพมหานคร",
+    },
+    {
+      id: "DIRECTOR",
+      name: "สมรรถนะเฉพาะสำหรับตำแหน่ง ผอ.เขต ผช.ผอ.เขต และหัวหน้าฝ่ายในสังกัด สนง.เขต",
+    },
+    {
+      id: "INSPECTOR",
+      name: "สมรรถนะเฉพาะสำหรับตำแหน่งผู้ตรวจราชการ กทม. และผู้ตรวจราชการ",
+    },
+  ]);
+
+  function convertStatus(val: string) {
+    switch (val) {
+      case "PENDING":
+        return "รอดำเนินการ";
+      case "INPROGRESS":
+        return "กําลังดำเนินการ";
+      case "DONE":
+        return "ประเมินเสร็จสิ้น";
+      default:
+        break;
+    }
+  }
+
+  function convertResults(val: string) {
+    switch (val) {
+      case "PENDING":
+        return "รอดำเนินการ";
+      case "PASSED":
+        return "ผ่านการประเมิน";
+      case "NOTPASSED":
+        return "ไม่ผ่านการประเมิน";
+      default:
+        break;
+    }
+  }
+
+  const ratingColors = ref<string[]>([
+    "light-blue-3",
+    "light-blue-6",
+    "blue",
+    "blue-9",
+    "blue-10",
+  ]);
+
+  function checkCompetency() {
+    const position = dataProfile.value.position;
+    const posTypeName = dataProfile.value.posTypeName;
+    const posLevelName = dataProfile.value.posLevelName;
+
+    if (
+      position == "ผู้ตรวจราชการกรุงเทพมหานคร" ||
+      position == "ผู้ตรวจราชการ"
+    ) {
+      competencyType.value = competencyType.value.filter(
+        (x: DataOption) => x.id == "HEAD" || x.id == "INSPECTOR"
+      );
+    } else if (position == "ผู้อำนวยการเขต") {
+      competencyType.value = competencyType.value.filter(
+        (x: DataOption) => x.id == "HEAD" || x.id == "DIRECTOR"
+      );
+    } else {
+      switch (posTypeName + " " + posLevelName) {
+        // case "ทั่วไป ปฏิบัติงาน":
+        // case "ทั่วไป ชำนาญงาน":
+        // case "ทั่วไป อาวุโส":
+        // case "วิชาการ ปฏิบัติการ":
+        // case "วิชาการ ชำนาญการ":
+        // case "วิชาการ ชำนาญการพิเศษ":
+        // case "วิชาการ เชี่ยวชาญ":
+        // case "วิชาการ ทรงคุณวุฒิ":
+        //   competencyType.value = competencyType.value.filter(
+        //     (x: DataOptions) => x.id == "HEAD" || x.id == "GROUP"
+        //   );
+        //   break;
+        case "อำนวยการ ต้น":
+        case "อำนวยการ สูง":
+        case "บริหาร ต้น":
+        case "บริหาร สูง":
+          competencyType.value = competencyType.value.filter(
+            (x: DataOption) => x.id == "HEAD" || x.id == "EXECUTIVE"
+          );
+          break;
+        default:
+          competencyType.value = competencyType.value.filter(
+            (x: DataOption) => x.id == "HEAD" || x.id == "GROUP"
+          );
+          break;
+      }
+    }
+  }
+
+  const defaultCompetencyCoreLevel = ref<number>();
+  const defaultCompetencyGroupLevel = ref<number | null>(null);
+  function checkCompetencyDefaultCompetencyLevel() {
+    const posTypeName = dataProfile.value.posTypeName;
+    const posLevelName = dataProfile.value.posLevelName;
+
+    switch (posTypeName + " " + posLevelName) {
+      case "บริหาร สูง":
+        defaultCompetencyCoreLevel.value = 5;
+        break;
+      case "บริหาร ต้น":
+        defaultCompetencyCoreLevel.value = 4;
+        break;
+      case "อำนวยการ สูง":
+        defaultCompetencyCoreLevel.value = 4;
+        break;
+      case "อำนวยการ ต้น":
+        defaultCompetencyCoreLevel.value = 3;
+        break;
+      case "วิชาการ ทรงคุณวุฒิ":
+        defaultCompetencyCoreLevel.value = 5;
+        defaultCompetencyGroupLevel.value = 5;
+        break;
+      case "วิชาการ เชี่ยวชาญ":
+        defaultCompetencyCoreLevel.value = 4;
+        defaultCompetencyGroupLevel.value = 4;
+        break;
+      case "วิชาการ ชำนาญการพิเศษ":
+        defaultCompetencyCoreLevel.value = 3;
+        defaultCompetencyGroupLevel.value = 4;
+        break;
+      case "วิชาการ ชำนาญการ":
+        defaultCompetencyCoreLevel.value = 2;
+        defaultCompetencyGroupLevel.value = 3;
+        break;
+      case "วิชาการ ปฏิบัติการ":
+        defaultCompetencyCoreLevel.value = 1;
+        defaultCompetencyGroupLevel.value = 2;
+        break;
+      case "ทั่วไป ทักษะพิเศษ":
+        defaultCompetencyCoreLevel.value = 4;
+        defaultCompetencyGroupLevel.value = 4;
+        break;
+      case "ทั่วไป อาวุโส":
+        defaultCompetencyCoreLevel.value = 3;
+        defaultCompetencyGroupLevel.value = 3;
+        break;
+      case "ทั่วไป ชำนาญงาน":
+        defaultCompetencyCoreLevel.value = 2;
+        defaultCompetencyGroupLevel.value = 2;
+        break;
+      case "ทั่วไป ปฏิบัติงาน":
+        defaultCompetencyCoreLevel.value = 1;
+        defaultCompetencyGroupLevel.value = 1;
+        break;
+      default:
+        break;
+    }
+  }
+
+  return {
+    competencyTypeVal,
+    competencyType,
+    convertStatus,
+    convertResults,
+    tabMain,
+    dataProfile,
+    dataEvaluation,
+    ratingColors,
+    checkCompetency,
+    checkCompetencyDefaultCompetencyLevel,
+  };
+});
diff --git a/src/modules/01_metadataNew/views/Assignment.vue b/src/modules/01_metadataNew/views/Assignment.vue
new file mode 100644
index 000000000..d38186ddb
--- /dev/null
+++ b/src/modules/01_metadataNew/views/Assignment.vue
@@ -0,0 +1,205 @@
+<script setup lang="ts">
+import { ref, onMounted } from "vue";
+import { useRouter } from "vue-router";
+import { useQuasar, type QTableProps } from "quasar";
+
+/** importStore*/
+import { useCounterMixin } from "@/stores/mixin";
+
+const $q = useQuasar();
+const router = useRouter();
+const { showLoader, hideLoader, dialogRemove, success, messageError } =
+  useCounterMixin();
+
+/** table*/
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "including",
+    align: "left",
+    label: "รหัสตัวชี้วัด",
+    sortable: true,
+    field: "including",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "includingName",
+    align: "left",
+    label: "ชื่อตัวชี้วัด",
+    sortable: true,
+    field: "includingName",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+const visibleColumns = ref<string[]>(["including", "includingName"]);
+const rows = ref<any[]>([]);
+const filter = ref<string>("");
+
+function onClickView(id: string = "") {
+  router.push(`/assignment/${id}`);
+}
+
+function onClickHistory(id: string) {}
+
+function onClickDelete(id: string) {
+  dialogRemove($q, () => {
+    console.log(id);
+  });
+}
+
+onMounted(() => {
+  showLoader();
+  const list = [
+    {
+      id: "1",
+      including: "12",
+      includingName: "name",
+    },
+  ];
+
+  setTimeout(() => {
+    rows.value = list;
+    hideLoader();
+  }, 100);
+});
+</script>
+
+<template>
+  <div class="toptitle text-dark col-12 row items-center">
+    รายการงานที่ได้รับมอบหมาย
+  </div>
+  <q-card flat bordered class="q-pa-md">
+    <div class="row q-col-gutter-sm q-pl-sm">
+      <q-toolbar style="padding: 0">
+        <q-space />
+        <div class="row q-gutter-sm">
+          <q-input dense outlined v-model="filter" label="ค้นหา">
+            <template v-slot:append>
+              <q-icon
+                v-if="filter !== ''"
+                name="clear"
+                class="cursor-pointer"
+                @click="filter = ''"
+              />
+              <q-icon v-else name="search" color="grey-5" />
+            </template>
+          </q-input>
+          <q-select
+            v-model="visibleColumns"
+            multiple
+            outlined
+            dense
+            options-dense
+            :display-value="$q.lang.table.columns"
+            emit-value
+            map-options
+            :options="columns"
+            option-value="name"
+            options-cover
+            style="min-width: 150px"
+          />
+        </div>
+      </q-toolbar>
+    </div>
+    <div class="col-12">
+      <d-table
+        for="table"
+        ref="table"
+        :columns="columns"
+        :rows="rows"
+        row-key="id"
+        flat
+        bordered
+        dense
+        class="custom-header-table"
+        :rows-per-page-options="[10, 25, 50, 100]"
+        :visible-columns="visibleColumns"
+      >
+        <template v-slot:header="props">
+          <q-tr :props="props">
+            <q-th v-for="col in props.cols" :key="col.name" :props="props">
+              <span class="text-weight-medium">{{ col.label }}</span>
+            </q-th>
+            <q-th auto-width />
+          </q-tr>
+        </template>
+        <template v-slot:body="props">
+          <q-tr :props="props" class="cursor-pointer">
+            <q-td v-for="col in props.cols" :key="col.name" :props="props">
+              <div class="table_ellipsis">
+                {{ col.value ? col.value : "-" }}
+              </div>
+            </q-td>
+            <q-td auto-width>
+              <q-btn
+                flat
+                round
+                color="grey"
+                @click.stop
+                size="14px"
+                icon="more_vert"
+              >
+                <q-menu>
+                  <q-list style="min-width: 180px">
+                    <q-item
+                      clickable
+                      v-close-popup
+                      @click="onClickView(props.row.id)"
+                    >
+                      <q-item-section
+                        style="min-width: 0px"
+                        avatar
+                        class="q-py-sm"
+                      >
+                        <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+                        <q-icon
+                          color="primary"
+                          size="xs"
+                          name="mdi-pencil-outline"
+                        />
+                      </q-item-section>
+                      <q-item-section>แก้ไขข้อมูล</q-item-section>
+                    </q-item>
+                    <q-item
+                      clickable
+                      v-close-popup
+                      @click="onClickHistory(props.row.id)"
+                    >
+                      <q-item-section
+                        style="min-width: 0px"
+                        avatar
+                        class="q-py-sm"
+                      >
+                        <q-tooltip>ประวัติการแก้ไข</q-tooltip>
+                        <q-icon color="info" size="xs" name="mdi-history" />
+                      </q-item-section>
+                      <q-item-section>ประวัติการแก้ไข</q-item-section>
+                    </q-item>
+                    <q-item
+                      clickable
+                      v-close-popup
+                      @click.stop.pervent="onClickDelete(props.row.id)"
+                    >
+                      <q-item-section
+                        style="min-width: 0px"
+                        avatar
+                        class="q-py-sm"
+                      >
+                        <q-tooltip>ลบข้อมูล</q-tooltip>
+                        <q-icon color="red" size="xs" name="mdi-delete" />
+                      </q-item-section>
+                      <q-item-section>ลบข้อมูล</q-item-section>
+                    </q-item>
+                  </q-list>
+                </q-menu>
+              </q-btn>
+            </q-td>
+          </q-tr>
+        </template>
+      </d-table>
+    </div>
+  </q-card>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/15_development/views/Strategic.vue b/src/modules/01_metadataNew/views/Strategic.vue
similarity index 98%
rename from src/modules/15_development/views/Strategic.vue
rename to src/modules/01_metadataNew/views/Strategic.vue
index 748853c25..80a52d532 100644
--- a/src/modules/15_development/views/Strategic.vue
+++ b/src/modules/01_metadataNew/views/Strategic.vue
@@ -4,8 +4,8 @@ import { useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-import type { ItemsMenu } from "@/modules/15_development/interface/index/Main";
-import type { DataStrategic } from "@/modules/15_development/interface/response/Strategic";
+import type { ItemsMenu } from "@/modules/01_metadataNew/interface/index/Main";
+import type { DataStrategic } from "@/modules/01_metadataNew/interface/response/Strategic";
 
 import DialogHeader from "@/components/DialogHeader.vue";
 
diff --git a/src/modules/14_KPI/views/competency.vue b/src/modules/01_metadataNew/views/competency.vue
similarity index 82%
rename from src/modules/14_KPI/views/competency.vue
rename to src/modules/01_metadataNew/views/competency.vue
index 316fba572..39a4d7430 100644
--- a/src/modules/14_KPI/views/competency.vue
+++ b/src/modules/01_metadataNew/views/competency.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
 import { ref, onMounted } from "vue";
-import ListCompetency from "@/modules/14_KPI/components/competency/01ListCompetency.vue";
-import ListLinkPosition from "@/modules/14_KPI/components/competency/02ListLinkPosition.vue";
-import ListLinkGroup from "@/modules/14_KPI/components/competency/03ListLinkGroup.vue";
-import ListCriteria from "@/modules/14_KPI/components/competency/04ListCriteria.vue";
-import ListDetail from "@/modules/14_KPI/components/competency/05ListDetail.vue";
+
+import ListCompetency from "@/modules/01_metadataNew/components/competency/01ListCompetency.vue";
+import ListLinkPosition from "@/modules/01_metadataNew/components/competency/02ListLinkPosition.vue";
+import ListLinkGroup from "@/modules/01_metadataNew/components/competency/03ListLinkGroup.vue";
+import ListCriteria from "@/modules/01_metadataNew/components/competency/04ListCriteria.vue";
+import ListDetail from "@/modules/01_metadataNew/components/competency/05ListDetail.vue";
 
 const currentTab = ref<string>("list_competency");
 const tabs = ref<Array<any>>([]);
diff --git a/src/modules/14_KPI/views/indicatorByPlan.vue b/src/modules/01_metadataNew/views/indicatorByPlan.vue
similarity index 98%
rename from src/modules/14_KPI/views/indicatorByPlan.vue
rename to src/modules/01_metadataNew/views/indicatorByPlan.vue
index 5041d8666..e9029830f 100644
--- a/src/modules/14_KPI/views/indicatorByPlan.vue
+++ b/src/modules/01_metadataNew/views/indicatorByPlan.vue
@@ -11,6 +11,12 @@ import { useCounterMixin } from "@/stores/mixin";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
+import type { DataOption } from "@/modules/01_metadataNew/interface/index/Main";
+import DialogHistory from "@/modules/01_metadataNew/components/Indicators/DialogHistory.vue";
+
+/** importStore*/
+import { useCounterMixin } from "@/stores/mixin";
+
 /** use*/
 const modalHistory = ref<boolean>(false);
 const isAll = ref<boolean>(false);
@@ -372,7 +378,6 @@ onMounted(async () => {
             </q-checkbox>
             <q-space v-if="!$q.screen.gt.md" />
             <q-input
-              class="inputgreen"
               standout
               dense
               v-model="nodeData.keyword"
@@ -393,7 +398,6 @@ onMounted(async () => {
               </template>
             </q-input>
             <q-select
-              class="inputgreen"
               v-model="visibleColumns"
               multiple
               outlined
diff --git a/src/modules/14_KPI/views/indicatorByRole.vue b/src/modules/01_metadataNew/views/indicatorByRole.vue
similarity index 98%
rename from src/modules/14_KPI/views/indicatorByRole.vue
rename to src/modules/01_metadataNew/views/indicatorByRole.vue
index 8f85e14ba..c05e97ed2 100644
--- a/src/modules/14_KPI/views/indicatorByRole.vue
+++ b/src/modules/01_metadataNew/views/indicatorByRole.vue
@@ -2,17 +2,20 @@
 import { ref, reactive, onMounted, watch } from "vue";
 import { useQuasar, type QTableProps } from "quasar";
 import { useRouter } from "vue-router";
+import http from "@/plugins/http";
+import config from "@/app.config";
+
+import type { FormListMainByRole } from "@/modules/01_metadataNew/interface/request/Main";
+import type {
+  DataOption,
+  NewPagination,
+} from "@/modules/01_metadataNew/interface/index/Main";
+
+import DialogHistory from "@/modules/01_metadataNew/components/Indicators/DialogHistory.vue";
 
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
-import http from "@/plugins/http";
-import config from "@/app.config";
-import type {
-  NewPagination,
-  FormListMainByRole,
-} from "@/modules/14_KPI/interface/request/Main";
-import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
-import DialogHistory from "@/modules/14_KPI/components/DialogHistory.vue";
+
 /** use*/
 const modalHistory = ref<boolean>(false);
 const total = ref<number>();
diff --git a/src/modules/14_KPI/router.ts b/src/modules/14_KPI/router.ts
index d7d3b8f09..1b173443f 100644
--- a/src/modules/14_KPI/router.ts
+++ b/src/modules/14_KPI/router.ts
@@ -1,15 +1,15 @@
 const roundPage = () => import("@/modules/14_KPI/views/round.vue");
-const IndicatorByPlan = () =>
-  import("@/modules/14_KPI/views/indicatorByPlan.vue");
-const IndicatorByPlanDetail = () =>
-  import("@/modules/14_KPI/components/indicatorByPlan/DetailView.vue");
-const IndicatorByRole = () =>
-  import("@/modules/14_KPI/views/indicatorByRole.vue");
-const IndicatorByRoleDetail = () =>
-  import("@/modules/14_KPI/components/indicatorByRole/DetailView.vue");
-const competencyPage = () => import("@/modules/14_KPI/views/competency.vue");
-const competencyAddPage = () =>
-  import("@/modules/14_KPI/components/competency/AddPage.vue");
+// const IndicatorByPlan = () =>
+//   import("@/modules/14_KPI/views/indicatorByPlan.vue");
+// const IndicatorByPlanDetail = () =>
+//   import("@/modules/14_KPI/components/indicatorByPlan/DetailView.vue");
+// const IndicatorByRole = () =>
+//   import("@/modules/14_KPI/views/indicatorByRole.vue");
+// const IndicatorByRoleDetail = () =>
+//   import("@/modules/14_KPI/components/indicatorByRole/DetailView.vue");
+// const competencyPage = () => import("@/modules/14_KPI/views/competency.vue");
+// const competencyAddPage = () =>
+//   import("@/modules/14_KPI/components/competency/AddPage.vue");
 const listPage = () => import("@/modules/14_KPI/views/list.vue");
 const detailPage = () => import("@/modules/14_KPI/views/detail.vue");
 
@@ -24,97 +24,97 @@ export default [
       Role: "evaluateKPI",
     },
   },
-  {
-    path: "/KPI-indicator-plan",
-    name: "KPIIndicatorByPlan",
-    component: IndicatorByPlan,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "evaluateKPI",
-    },
-  },
-  {
-    path: "/KPI-indicator-plan/add",
-    name: "KPIIndicatorByPlan/Add",
-    component: IndicatorByPlanDetail,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "evaluateKPI",
-    },
-  },
-  {
-    path: "/KPI-indicator-plan/:id",
-    name: "KPIIndicatorByPlanByid",
-    component: IndicatorByPlanDetail,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "evaluateKPI",
-    },
-  },
-  {
-    path: "/KPI-indicator-role",
-    name: "KPIIndicatorByRole",
-    component: IndicatorByRole,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "evaluateKPI",
-    },
-  },
-  {
-    path: "/KPI-indicator-role/add",
-    name: "KPIIndicatorByRoleAdd",
-    component: IndicatorByRoleDetail,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "evaluateKPI",
-    },
-  },
-  {
-    path: "/KPI-indicator-role/:id",
-    name: "KPIIndicatorByRoleByid",
-    component: IndicatorByRoleDetail,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "evaluateKPI",
-    },
-  },
-  {
-    path: "/KPI-competency",
-    name: "KPICompetency",
-    component: competencyPage,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "evaluateKPI",
-    },
-  },
-  {
-    path: "/KPI-competency/add",
-    name: "KPICompetencyAdd",
-    component: competencyAddPage,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "evaluateKPI",
-    },
-  },
+  // {
+  //   path: "/KPI-indicator-plan",
+  //   name: "KPIIndicatorByPlan",
+  //   component: IndicatorByPlan,
+  //   meta: {
+  //     Auth: true,
+  //     Key: [1.1],
+  //     Role: "evaluateKPI",
+  //   },
+  // },
+  // {
+  //   path: "/KPI-indicator-plan/add",
+  //   name: "KPIIndicatorByPlan/Add",
+  //   component: IndicatorByPlanDetail,
+  //   meta: {
+  //     Auth: true,
+  //     Key: [1.1],
+  //     Role: "evaluateKPI",
+  //   },
+  // },
+  // {
+  //   path: "/KPI-indicator-plan/:id",
+  //   name: "KPIIndicatorByPlanByid",
+  //   component: IndicatorByPlanDetail,
+  //   meta: {
+  //     Auth: true,
+  //     Key: [1.1],
+  //     Role: "evaluateKPI",
+  //   },
+  // },
+  // {
+  //   path: "/KPI-indicator-role",
+  //   name: "KPIIndicatorByRole",
+  //   component: IndicatorByRole,
+  //   meta: {
+  //     Auth: true,
+  //     Key: [1.1],
+  //     Role: "evaluateKPI",
+  //   },
+  // },
+  // {
+  //   path: "/KPI-indicator-role/add",
+  //   name: "KPIIndicatorByRoleAdd",
+  //   component: IndicatorByRoleDetail,
+  //   meta: {
+  //     Auth: true,
+  //     Key: [1.1],
+  //     Role: "evaluateKPI",
+  //   },
+  // },
+  // {
+  //   path: "/KPI-indicator-role/:id",
+  //   name: "KPIIndicatorByRoleByid",
+  //   component: IndicatorByRoleDetail,
+  //   meta: {
+  //     Auth: true,
+  //     Key: [1.1],
+  //     Role: "evaluateKPI",
+  //   },
+  // },
+  // {
+  //   path: "/KPI-competency",
+  //   name: "KPICompetency",
+  //   component: competencyPage,
+  //   meta: {
+  //     Auth: true,
+  //     Key: [1.1],
+  //     Role: "evaluateKPI",
+  //   },
+  // },
+  // {
+  //   path: "/KPI-competency/add",
+  //   name: "KPICompetencyAdd",
+  //   component: competencyAddPage,
+  //   meta: {
+  //     Auth: true,
+  //     Key: [1.1],
+  //     Role: "evaluateKPI",
+  //   },
+  // },
 
-  {
-    path: "/KPI-competency/:id",
-    name: "KPICompetencyByid",
-    component: competencyAddPage,
-    meta: {
-      Auth: true,
-      Key: [1.1],
-      Role: "evaluateKPI",
-    },
-  },
+  // {
+  //   path: "/KPI-competency/:id",
+  //   name: "KPICompetencyByid",
+  //   component: competencyAddPage,
+  //   meta: {
+  //     Auth: true,
+  //     Key: [1.1],
+  //     Role: "evaluateKPI",
+  //   },
+  // },
   {
     path: "/KPI-list",
     name: "KPI​List",
diff --git a/src/modules/15_development/router.ts b/src/modules/15_development/router.ts
index a3390bcbd..2c8e27f10 100644
--- a/src/modules/15_development/router.ts
+++ b/src/modules/15_development/router.ts
@@ -19,8 +19,8 @@ const ScholarshipDetail = () =>
   import("@/modules/15_development/components/scholarship/DetailView.vue");
 // const historyAdd = () =>
 //   import("@/modules/15_development/components/history/AddPage.vue");
-const StrategicView = () =>
-  import("@/modules/15_development/views/Strategic.vue");
+// const StrategicView = () =>
+//   import("@/modules/15_development/views/Strategic.vue");
 export default [
   {
     path: "/development",
@@ -143,14 +143,14 @@ export default [
     },
   },
 
-  {
-    path: "/development/strategic",
-    name: "developmentStrategic",
-    component: StrategicView,
-    meta: {
-      Auth: true,
-      Key: [1.6],
-      Role: "development",
-    },
-  },
+  // {
+  //   path: "/development/strategic",
+  //   name: "developmentStrategic",
+  //   component: StrategicView,
+  //   meta: {
+  //     Auth: true,
+  //     Key: [1.6],
+  //     Role: "development",
+  //   },
+  // },
 ];