From 3354bd3583601e6bab7da60fbc46f73315f38e2e Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Wed, 28 Aug 2024 15:32:10 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9E=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=92=E0=B8=99=E0=B8=B2=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B8=E0=B8=84=E0=B8=84=E0=B8=A5=20(Individual=20Developmen?=
 =?UTF-8?q?t=20Plan)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/registry/api.registry.ts              |   2 +
 .../components/DialogDevelopmant.vue          | 624 +++++++++++++
 .../Achievement/05_ResultsPerformance.vue     | 873 ++++++++++--------
 src/modules/14_KPI/interface/request/index.ts |   8 +-
 4 files changed, 1126 insertions(+), 381 deletions(-)
 create mode 100644 src/modules/04_registryPerson/components/DialogDevelopmant.vue

diff --git a/src/api/registry/api.registry.ts b/src/api/registry/api.registry.ts
index 982cc48e9..93ce13e62 100644
--- a/src/api/registry/api.registry.ts
+++ b/src/api/registry/api.registry.ts
@@ -190,4 +190,6 @@ export default {
     `${registryNew}-employee/employment/id/${id}`,
   employmentHistoryEmployee: (id: string) =>
     `${registryNew}-employee/employment/history/${id}`,
+
+  developMentPlan: `${registryNew}/development`,
 };
diff --git a/src/modules/04_registryPerson/components/DialogDevelopmant.vue b/src/modules/04_registryPerson/components/DialogDevelopmant.vue
new file mode 100644
index 000000000..079373e6c
--- /dev/null
+++ b/src/modules/04_registryPerson/components/DialogDevelopmant.vue
@@ -0,0 +1,624 @@
+<script setup lang="ts">
+import DialogHeader from "@/components/DialogHeader.vue";
+import { ref, reactive, watch, computed } from "vue";
+import { useCounterMixin } from "@/stores/mixin";
+import { useQuasar } from "quasar";
+
+import http from "@/plugins/http";
+import config from "@/app.config";
+import { useRoute } from "vue-router";
+import type {
+  DataOptionTechnique,
+  ProjectYearOp,
+} from "@/modules/14_KPI/interface/index/Main";
+const props = defineProps({
+  getAll: Function,
+});
+const route = useRoute();
+const idKpi = ref<string>(route.params.id.toLocaleString());
+const development = ref<any[]>([]);
+const reasonDevelopment70 = ref<string>("");
+const reasonDevelopment20 = ref<string>("");
+const reasonDevelopment10 = ref<string>("");
+const checkOtherBox11 = computed<boolean>(() => {
+  return development.value.includes("other1");
+});
+const checkOtherBox12 = computed<boolean>(() => {
+  return development.value.includes("other2");
+});
+const checkOtherBox13 = computed<boolean>(() => {
+  return development.value.includes("other3");
+});
+
+const isDevelopment70 = computed(() => {
+  return projectTechniquesOp1.value.some((txt) =>
+    development.value.includes(txt.value)
+  );
+});
+const isDevelopment20 = computed(() => {
+  return projectTechniquesOp2.value.some((txt) =>
+    development.value.includes(txt.value)
+  );
+});
+const isDevelopment10 = computed(() => {
+  return projectTechniquesOp3.value.some((txt) =>
+    development.value.includes(txt.value)
+  );
+});
+
+const projectTechniquesOp1 = ref<DataOptionTechnique[]>([
+  {
+    value: "on_the_job_training",
+    label: "การฝึกปฏิบัติในงาน (On the job training)",
+  },
+  {
+    value: "job_project_assignment",
+    label: "การมอบหมายงาน/โครงการ (Job/Project assignment)",
+  },
+  {
+    value: "job_shadowing",
+    label: "การติดตามเรียนรู้รูปแบบการทำงานของผู้บริหาร (Job shadowing)",
+  },
+  {
+    value: "job_enlargement",
+    label: "การมอบหมายงานเพิ่มขึ้น (Job enlargement)",
+  },
+  {
+    value: "internal_trainer",
+    label: "การเป็นวิทยากรภายในหน่วยงาน (Internal trainer)",
+  },
+  { value: "rotation", label: "การหมุนเวียนงาน (Rotation)" },
+  { value: "activity", label: "การทำกิจกรรม (Activity)" },
+  { value: "site_visit", label: "การศึกษาดูงานนอกสถานที่ (Site visit)" },
+  {
+    value: "benchmarking",
+    label: "การแลกเปลี่ยน เทียบเคียงความรู้ ประสมการณ์ (Benchmarking)",
+  },
+  { value: "problem_solving", label: "การแก้ปัญหา (Problem-solving)" },
+  { value: "team_working", label: "การทำงานเป็นทีม (Team working)" },
+  { value: "other1", label: "อื่น ๆ (ระบุ)" },
+]);
+const projectTechniquesOp2 = ref<DataOptionTechnique[]>([
+  { value: "coaching", label: "การสอนงาน (Coaching)" },
+  { value: "mentoring", label: "การเป็นพี่เลี้ยง (Mentoring)" },
+  { value: "team_meeting", label: "การประชุมทีม (Team meeting)" },
+  { value: "consulting", label: "การให้คำปรึกษา (Consulting)" },
+  { value: "feedback", label: "การให้ข้อคิดเห็น/เสนอแนะ (Feedback)" },
+  { value: "other2", label: "อื่น ๆ (ระบุ)" },
+]);
+
+const projectTechniquesOp3 = ref<DataOptionTechnique[]>([
+  {
+    value: "self_learning",
+    label: "การเรียนรู้ด้วยตนเอง แบบ online/offline (Self – learning)",
+  },
+  { value: "classroom_training", label: "การฝึกอบรม (Classroom training)" },
+  {
+    value: "in_house_training",
+    label: "การฝึกอบรมภายในองค์กร (In – house training)",
+  },
+  {
+    value: "public_training",
+    label: "การฝึกอบรมจากองค์กรภายนอก (Public training)",
+  },
+  {
+    value: "e_training",
+    label: "การฝึกอบรมผ่าน online (e – training / e – learning)",
+  },
+  { value: "meeting", label: "การประชุม (Meeting)" },
+  { value: "seminar", label: "การสัมมนา (Seminar)" },
+  { value: "other3", label: "อื่น ๆ (ระบุ)" },
+]);
+
+const choice = ref<string>("MANUAL");
+const projectName = ref<any>("");
+const projectOp = ref<ProjectYearOp[]>([]);
+const projectOpMain = ref<ProjectYearOp[]>([]);
+const choiceOp = ref<DataOptionTechnique[]>([
+  { value: "PROJECT", label: "เลือกจากโครงการ/หลักสูตรการฝึกอบรม" },
+  { value: "MANUAL", label: "กรอกเอง" },
+]);
+const $q = useQuasar();
+const mixin = useCounterMixin();
+const {
+  showLoader,
+  hideLoader,
+  dialogConfirm,
+  messageError,
+  success,
+  dialogMessageNotify,
+} = mixin;
+
+const modal = defineModel<boolean>("modal", { required: true });
+const id = defineModel<string>("id", { required: true });
+const emType = computed(() => {
+  return route.name
+    ? route.name === "registryNewByid"
+      ? "officer"
+      : route.name === "registry-employeeId"
+      ? "temp"
+      : "employee"
+    : "";
+});
+const formData = reactive<{
+  year: number | null;
+  name: string;
+  group: any[];
+  target: string;
+  isDevelopment70: boolean;
+  isDevelopment20: boolean;
+  isDevelopment10: boolean;
+  achievement10: string;
+  achievement5: string;
+  achievement0: string;
+}>({
+  year: null,
+  name: "",
+  group: [],
+  target: "",
+  isDevelopment70: false,
+  isDevelopment20: false,
+  isDevelopment10: false,
+  achievement10: "มีผลการพัฒนาและมีการดำเนินการตามเป้าหมายการนำไปพัฒนางาน",
+  achievement5: "มีผลการพัฒนาแต่ยังไม่ได้ดำเนินการตามเป้าหมายการนำไปพัฒนางาน",
+  achievement0: "ไม่ได้ดำเนินการพัฒนา",
+});
+function close() {
+  modal.value = false;
+  id.value = "";
+
+  formData.name = "";
+  formData.group = [];
+  formData.target = "";
+  formData.isDevelopment70 = false;
+  formData.isDevelopment20 = false;
+  formData.isDevelopment10 = false;
+  formData.achievement10 =
+    "มีผลการพัฒนาและมีการดำเนินการตามเป้าหมายการนำไปพัฒนางาน";
+  formData.achievement5 =
+    "มีผลการพัฒนาแต่ยังไม่ได้ดำเนินการตามเป้าหมายการนำไปพัฒนางาน";
+  formData.achievement0 = "ไม่ได้ดำเนินการพัฒนา";
+  choice.value = "MANUAL";
+  formData.year = null;
+  projectName.value = "";
+  reasonDevelopment70.value = "";
+  reasonDevelopment20.value = "";
+  reasonDevelopment10.value = "";
+  development.value = [];
+
+  props.getAll?.();
+
+  id.value = "";
+}
+
+watch(
+  () => id.value,
+  (i) => {
+    if (i) {
+      showLoader();
+      http
+        .get(config.API.kpiAchievementDevelop + `/registry/${emType.value}/${id.value}`)
+        .then(async (res) => {
+          const data = res.data.result;
+          formData.year = data.selectTypeYear;
+          await getDataByYear();
+          setTimeout(() => {
+            choice.value = data.selectType;
+            projectName.value = projectOpMain.value.find(
+              (i: any) => i.id == data.selectTypeId
+            );
+            formData.name = data.name;
+            formData.group = data.group;
+            formData.target = data.target;
+            formData.isDevelopment70 = data.isDevelopment70;
+            formData.isDevelopment20 = data.isDevelopment20;
+            formData.isDevelopment10 = data.isDevelopment10;
+            formData.achievement10 = data.achievement10;
+            formData.achievement5 = data.achievement5;
+            formData.achievement0 = data.achievement0;
+            development.value = data.developmentProjects;
+            reasonDevelopment70.value = data.developmentProjects.includes(
+              "other1"
+            )
+              ? data.reasonDevelopment70
+              : "";
+            reasonDevelopment20.value = data.developmentProjects.includes(
+              "other2"
+            )
+              ? data.reasonDevelopment20
+              : "";
+            reasonDevelopment10.value = data.developmentProjects.includes(
+              "other3"
+            )
+              ? data.reasonDevelopment10
+              : "";
+          }, 500);
+        })
+        .catch((e) => {
+          messageError($q, e);
+        })
+        .finally(() => {
+          hideLoader();
+        });
+    }
+  }
+);
+
+const customPosition = () => ({ top: "385px", left: "410px" });
+async function getDataByYear() {
+  if (formData.year) {
+    showLoader();
+    http
+      .get(config.API.developmentMain + `/done?year=${formData.year}`)
+      .then(async (res) => {
+        const data = await res.data.result.data;
+        projectOpMain.value = data;
+      })
+      .catch((e) => {
+        messageError($q, e);
+      })
+      .finally(() => {
+        hideLoader();
+      });
+  }
+}
+
+function getProjectDetail(val: any) {
+  showLoader();
+  http
+    .get(config.API.developmentMain + `/tab3_1/${val.id}`)
+    .then((res) => {
+      const data = res.data.result;
+      formData.name = val.projectName;
+      formData.group = data.group;
+      formData.isDevelopment70 = data.isDevelopment70;
+      formData.isDevelopment20 = data.isDevelopment20;
+      formData.isDevelopment10 = data.isDevelopment10;
+
+      development.value = data.developmentProjectTechniqueActuals;
+      reasonDevelopment70.value =
+        data.developmentProjectTechniqueActuals.includes("other1")
+          ? data.reasonDevelopment70
+          : "";
+      reasonDevelopment20.value =
+        data.developmentProjectTechniqueActuals.includes("other2")
+          ? data.reasonDevelopment20
+          : "";
+      reasonDevelopment10.value =
+        data.developmentProjectTechniqueActuals.includes("other3")
+          ? data.reasonDevelopment10
+          : "";
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+/**
+ * function ค้นหาข้อมูลใน option
+ * @param val คำค้นหา
+ * @param update function
+ */
+function filterOptionFn(val: string, update: Function) {
+  projectName.value = "";
+  update(() => {
+    projectOp.value = projectOpMain.value.filter(
+      (e: any) => e.projectName.search(val) !== -1
+    );
+  });
+}
+</script>
+<template>
+  <q-dialog persistent v-model="modal">
+    <q-card style="min-width: 90vw">
+      <DialogHeader
+        tittle="การพัฒนารายบุคคล (Individual Development Plan)"
+        :close="close"
+      />
+      <q-separator />
+      <q-card-section>
+        <div class="row q-col-gutter-sm">
+          <div class="col-3">
+            <q-select
+              class="inputgreen"
+              outlined
+              dense
+              label="ตัวเลือก"
+              :options="choiceOp"
+              emit-value
+              readonly
+              map-options
+              option-label="label"
+              option-value="value"
+              v-model="choice"
+            >
+            </q-select>
+          </div>
+          <div class="col-3" v-if="choice == 'PROJECT'">
+            <datepicker
+              menu-class-name="modalfix"
+              v-model="formData.year"
+              readonly
+              :locale="'th'"
+              autoApply
+              position="center"
+              year-picker
+              :alt-position="customPosition"
+              :enableTimePicker="false"
+              @update:model-value="getDataByYear(), (projectName = '')"
+            >
+              <template #year="{ year }">{{ year + 543 }}</template>
+              <template #year-overlay-value="{ value }">{{
+                parseInt(value + 543)
+              }}</template>
+              <template #trigger>
+                <q-input
+                  dense
+                  readonly
+                  outlined
+                  hide-bottom-space
+                  :rules="[(val:string) => !!val || `${'กรุณาเลือกปีงบประมาณ'}`,]"
+                  class="inputgreen"
+                  :model-value="
+                    formData.year === null ? null : Number(formData.year) + 543
+                  "
+                  :label="`${'ปีงบประมาณ'}`"
+                >
+                  <template v-slot:prepend>
+                    <q-icon
+                      name="event"
+                      class="cursor-pointer"
+                      style="color: var(--q-primary)"
+                    >
+                    </q-icon>
+                  </template>
+                </q-input>
+              </template>
+            </datepicker>
+          </div>
+          <div class="col-3" v-if="choice == 'PROJECT'">
+            <q-select
+              outlined
+              dense
+              readonly
+              :rules="[(val:string) => !!val || `${'กรุณาเลือกโครงการ/หลักสูตรการฝึกอบรม'}`,]"
+              class="inputgreen"
+              label="โครงการ/หลักสูตรการฝึกอบรม"
+              :options="projectOp"
+              option-label="projectName"
+              option-value="id"
+              map-options
+              hide-bottom-space
+              use-input
+              :readonly="!formData.year"
+              v-model="projectName"
+              @update:model-value="getProjectDetail(projectName)"
+              @filter="filterOptionFn"
+            >
+              <template v-slot:no-option>
+                <q-item>
+                  <q-item-section class="text-grey">
+                    ไม่มีข้อมูล
+                  </q-item-section>
+                </q-item>
+              </template>
+            </q-select>
+          </div>
+          <div class="col-12">
+            <q-input
+              v-model="formData.name"
+              readonly
+              outlined
+              dense
+              :rules="[(val:string) => !!val || `${'กรุณากรอกชื่อเรื่อง / เนื้อเรื่อง / หัวข้อการพัฒนา'}`,]"
+              lazy-rules
+              hide-bottom-space
+              class="inputgreen"
+              label="ชื่อเรื่อง / เนื้อเรื่อง / หัวข้อการพัฒนา"
+            >
+            </q-input>
+          </div>
+          <div class="col-12">
+            <span class="text-weight-medium">วิธีการพัฒนา</span>
+          </div>
+          <div class="row q-col-gutter-md full-width">
+            <div class="col-12 col-sm-6 col-md-6 col-lg-4">
+              <span class="text-weight-medium"
+                >70 การลงมือปฏิบัติ (โดยผู้บังคับบัญชามอบหมาย)</span
+              >
+              <q-option-group
+                class="check_box q-mt-sm"
+                keep-color
+                color="primary"
+                dense
+                disable
+                v-model="development"
+                :options="projectTechniquesOp1"
+                type="checkbox"
+              />
+              <div class="row q-pb-md" v-if="checkOtherBox11">
+                <div class="offset-4 col-8 q-mt-sm relative-position">
+                  <div class="other_custom_input">
+                    <q-input
+                      v-model="reasonDevelopment70"
+                      dense
+                      readonly
+                      outlined
+                      class="inputgreen"
+                      label="กรุณาระบุ"
+                    ></q-input>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="col-12 col-sm-6 col-md-6 col-lg-4">
+              <span class="text-weight-medium"
+                >20 การเรียนรู้จากผู้อื่น (Coach/Mentor/Consulting)</span
+              >
+              <q-option-group
+                class="check_box q-mt-sm"
+                keep-color
+                color="primary"
+                dense
+                v-model="development"
+                disable
+                :options="projectTechniquesOp2"
+                type="checkbox"
+              />
+              <div class="row q-pb-md" v-if="checkOtherBox12">
+                <div class="offset-4 col-8 q-mt-sm relative-position">
+                  <div class="other_custom_input">
+                    <q-input
+                      v-model="reasonDevelopment20"
+                      dense
+                      readonly
+                      outlined
+                      class="inputgreen"
+                      label="กรุณาระบุ"
+                    ></q-input>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="col-12 col-sm-6 col-md-6 col-lg-4">
+              <span class="text-weight-medium">10 การฝึกอบรมอื่นๆ</span>
+              <q-option-group
+                class="check_box q-mt-sm"
+                keep-color
+                color="primary"
+                disable
+                dense
+                v-model="development"
+                :options="projectTechniquesOp3"
+                type="checkbox"
+              />
+              <div class="row q-pb-md" v-if="checkOtherBox13">
+                <div class="offset-4 col-8 q-mt-sm relative-position">
+                  <div class="other_custom_input">
+                    <q-input
+                      v-model="reasonDevelopment10"
+                      dense
+                      outlined
+                      readonly
+                      class="inputgreen"
+                      label="กรุณาระบุ"
+                    ></q-input>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <!-- <q-checkbox
+                v-model="formData.isDevelopment70"
+                label="70 การลงมือปฏิบัติ (โดยผู้บังคับบัญชามอบหมาย)"
+              />
+              <q-checkbox
+                v-model="formData.isDevelopment20"
+                label="20 การเรียนรู้จากผู้อื่น (Coach/Mentor/Consulting)"
+              />
+              <q-checkbox
+                v-model="formData.isDevelopment10"
+                label="10 การฝึกอบรมอื่นๆ"
+              /> -->
+          </div>
+          <div class="col-12">
+            <q-input
+              label="เป้าหมายการนำไปพัฒนางาน"
+              v-model="formData.target"
+              outlined
+              readonly
+              type="textarea"
+              dense
+              class="inputgreen"
+              :rules="[(val:string) => !!val || `${'กรุณากรอกเป้าหมายการนำไปพัฒนางาน'}`,]"
+              lazy-rules
+              hide-bottom-space
+            ></q-input>
+          </div>
+          <div class="col-12">
+            <q-card bordered>
+              <div class="bg-grey-2 row q-py-sm text-weight-bold col-12">
+                <div class="col-4 text-center">
+                  <span>ระดับคะแนน</span>
+                </div>
+                <div class="col-8 text-start">
+                  <span>เกณฑ์การประเมิน</span>
+                </div>
+              </div>
+              <div class="row q-pa-sm">
+                <div class="col-4 text-center self-start text-body1">
+                  <span>10</span>
+                </div>
+                <div class="col-8">
+                  <q-input
+                    class="inputgreen"
+                    v-model="formData.achievement10"
+                    outlined
+                    readonly
+                    dense
+                    label="เกณฑ์การประเมิน"
+                    :rules="[(val:string) => !!val || `${'กรุณากรอกเกณฑ์การประเมิน'}`,]"
+                    lazy-rules
+                    hide-bottom-space
+                  ></q-input>
+                </div>
+              </div>
+              <q-separator />
+              <div class="row q-pa-sm bg-grey-2">
+                <div class="col-4 text-center self-start text-body1">
+                  <span>5</span>
+                </div>
+                <div class="col-8">
+                  <q-input
+                    class="inputgreen"
+                    v-model="formData.achievement5"
+                    outlined
+                    readonly
+                    dense
+                    label="เกณฑ์การประเมิน"
+                    :rules="[(val:string) => !!val || `${'กรุณากรอกเกณฑ์การประเมิน'}`,]"
+                    lazy-rules
+                    hide-bottom-space
+                  ></q-input>
+                </div>
+              </div>
+              <q-separator />
+              <div class="row q-pa-sm">
+                <div class="col-4 text-center self-start text-body1">
+                  <span>0</span>
+                </div>
+                <div class="col-8">
+                  <q-input
+                    class="inputgreen"
+                    v-model="formData.achievement0"
+                    outlined
+                    readonly
+                    dense
+                    label="เกณฑ์การประเมิน"
+                    :rules="[(val:string) => !!val || `${'กรุณากรอกเกณฑ์การประเมิน'}`,]"
+                    lazy-rules
+                    hide-bottom-space
+                  ></q-input>
+                </div>
+              </div>
+            </q-card>
+          </div>
+        </div>
+      </q-card-section>
+    </q-card>
+  </q-dialog>
+</template>
+<style scoped>
+:deep(.check_box .q-checkbox) {
+  align-items: start;
+}
+
+.other_custom_input {
+  position: absolute;
+  top: -25px;
+  width: 100%;
+}
+</style>
diff --git a/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue b/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
index 5fe2fb02f..4c640af07 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
@@ -10,6 +10,7 @@ import type { QTableProps, QForm } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import { useResultsPerformDataStore } from "@/modules/04_registryPerson/stores/ResultsPerformance";
 import DialogHeader from "@/components/DialogHeader.vue";
+import DialogDevelop from "@/modules/04_registryPerson/components/DialogDevelopmant.vue";
 
 import type { RequestItemsObject } from "@/modules/04_registryPerson/interface/request/ResultsPerformance";
 import type { ResponseObject } from "@/modules/04_registryPerson/interface/response/ResultsPerformance";
@@ -46,9 +47,11 @@ const resPerformForm = reactive<RequestItemsObject>({
 });
 const isEdit = ref<boolean>(false);
 const modal = ref<boolean>(false);
+const modalDevelop = ref<boolean>(false);
 const modeView = ref<string>("table");
 const modeViewPlan = ref<string>("table");
 const filterSearch = ref("");
+const kpiDevelopmentId = ref<string>("");
 
 const filterHistory = ref<string>("");
 const modalHistory = ref<boolean>(false);
@@ -283,11 +286,11 @@ const visibleColumns = ref<String[]>([
 
 const visibleColumnsPlan = ref<String[]>([
   "no",
-  "Knowledge",
-  "develop",
+  "name",
+  "developmentProjects",
   "target",
   "developmentResults",
-  "developmentReport",
+  "point",
 ]);
 const columnsPlan = ref<QTableProps["columns"]>([
   {
@@ -301,22 +304,22 @@ const columnsPlan = ref<QTableProps["columns"]>([
     format: (v) => date2Thai(v),
   },
   {
-    name: "Knowledge",
+    name: "name",
     align: "left",
     label: "ความรู้ / ทักษะ / สมรรถนะที่ต้องได้รับการพัฒนา",
     sortable: true,
-    field: "Knowledge",
+    field: "name",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
-    name: "develop",
+    name: "developmentProjects",
     align: "left",
     label: "วิธีการพัฒนา",
     sortable: true,
-    field: "develop",
+    field: "developmentProjects",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
@@ -345,11 +348,11 @@ const columnsPlan = ref<QTableProps["columns"]>([
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
-    name: "developmentReport",
+    name: "point",
     align: "left",
     label: "รายงานผลการพัฒนา",
     sortable: true,
-    field: "developmentReport",
+    field: "point",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
@@ -388,11 +391,27 @@ async function fetchData() {
     rows.value = res.data.result;
   } catch (error) {
     messageError($q, error);
-  } finally {
     hideLoader();
+  } finally {
   }
 }
 
+async function getDevelop() {
+  if (!profileId.value) return;
+  await http
+    .get(config.API.developMentPlan + `/${profileId.value}`)
+    .then((res) => {
+      console.log(res.data.result);
+      const data = res.data.result;
+      rowsPlan.value = data;
+    })
+    .catch((e) => {
+      messageError($q, e);
+      hideLoader();
+    })
+    .finally(() => {});
+}
+
 /**
  * บันทึกข้อมูลผลการประเมินการปฏิบัติราชการ
  * @param editStatus แก่ไข,เพิ่ม
@@ -505,403 +524,495 @@ function clearData() {
     (resPerformForm.date = null);
 }
 
-onMounted(() => {
-  fetchData();
+/**
+ * เปิด Dialog การพัฒนารายบุคคล
+ * @param data ข้อมูลตาม row
+ */
+function openDialogDevelop(data: any) {
+  modalDevelop.value = true;
+  kpiDevelopmentId.value = data.kpiDevelopmentId;
+}
+
+onMounted(async () => {
+  await fetchData();
+  await getDevelop();
+  hideLoader();
 });
 </script>
 <template>
   <div class="row q-col-gutter-sm">
     <div class="col-12">
-      <span class="text-blue-6 text-weight-bold text-body1"
+      <span class="text-weight-bold text-body1"
         >ผลการประเมินการปฏิบัติราชการ</span
       >
     </div>
-
     <div class="col-12">
-      <div class="row items-center q-gutter-x-sm q-pb-sm">
-        <q-btn
-          v-if="checkPermission($route)?.attrIsUpdate"
-          dense
-          color="primary"
-          icon="add"
-          flat
-          round
-          @click="onClickOpenDialog()"
-          ><q-tooltip>เพิ่มข้อมูล</q-tooltip></q-btn
-        >
+      <q-card bordered class="q-pa-sm">
+        <div class="col-12">
+          <div class="row items-center q-gutter-x-sm q-pb-sm">
+            <q-btn
+              v-if="checkPermission($route)?.attrIsUpdate"
+              dense
+              color="primary"
+              icon="add"
+              flat
+              round
+              @click="onClickOpenDialog()"
+              ><q-tooltip>เพิ่มข้อมูล</q-tooltip></q-btn
+            >
 
-        <q-space />
-        <q-input
-          standout
-          dense
-          v-model="filterSearch"
-          ref="filterRef"
-          outlined
-          placeholder="ค้นหา"
-          debounce="300"
-        >
-          <template v-slot:append>
-            <q-icon
-              v-if="filterSearch == ''"
-              name="search"
-              @click.stop.prevent="filterSearch = ''"
-              class="cursor-pointer"
+            <q-space />
+            <q-input
+              standout
+              dense
+              v-model="filterSearch"
+              ref="filterRef"
+              outlined
+              placeholder="ค้นหา"
+              debounce="300"
+            >
+              <template v-slot:append>
+                <q-icon
+                  v-if="filterSearch == ''"
+                  name="search"
+                  @click.stop.prevent="filterSearch = ''"
+                  class="cursor-pointer"
+                />
+                <q-icon
+                  v-if="filterSearch"
+                  name="cancel"
+                  @click.stop.prevent="filterSearch = ''"
+                  class="cursor-pointer"
+                />
+              </template>
+            </q-input>
+            <q-select
+              v-if="modeView == 'table'"
+              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"
             />
-            <q-icon
-              v-if="filterSearch"
-              name="cancel"
-              @click.stop.prevent="filterSearch = ''"
-              class="cursor-pointer"
-            />
-          </template>
-        </q-input>
-        <q-select
-          v-if="modeView == 'table'"
-          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"
-        />
-        <q-btn-toggle
-          v-model="modeView"
-          dense
-          class="no-shadow toggle-borderd"
-          toggle-color="grey-4"
-          :options="[
-            { value: 'table', slot: 'table' },
-            { value: 'card', slot: 'card' },
-          ]"
-        >
-          <template v-slot:table>
-            <q-icon
-              name="format_list_bulleted"
-              size="24px"
-              :style="{
-                color: modeView === 'table' ? '#787B7C' : '#C9D3DB',
-              }"
-            />
-          </template>
+            <q-btn-toggle
+              v-model="modeView"
+              dense
+              class="no-shadow toggle-borderd"
+              toggle-color="grey-4"
+              :options="[
+                { value: 'table', slot: 'table' },
+                { value: 'card', slot: 'card' },
+              ]"
+            >
+              <template v-slot:table>
+                <q-icon
+                  name="format_list_bulleted"
+                  size="24px"
+                  :style="{
+                    color: modeView === 'table' ? '#787B7C' : '#C9D3DB',
+                  }"
+                />
+              </template>
 
-          <template v-slot:card>
-            <q-icon
-              name="mdi-view-grid-outline"
-              size="24px"
-              :style="{
-                color: modeView === 'card' ? '#787B7C' : '#C9D3DB',
-              }"
-            />
-          </template>
-        </q-btn-toggle>
-      </div>
-    </div>
-
-    <div class="col-12">
-      <d-table
-        flat
-        dense
-        bordered
-        :rows="rows"
-        :paging="true"
-        :columns="columns"
-        :filter="filterSearch"
-        v-model:pagination="pagination"
-        :grid="modeView === 'card'"
-        :visible-columns="visibleColumns"
-        :rows-per-page-options="[20, 50, 100]"
-        :card-container-class="modeView === 'card' ? 'q-col-gutter-md' : ''"
-      >
-        <template v-slot:header="props">
-          <q-tr :props="props">
-            <q-th auto-width />
-            <q-th v-for="col in props.cols" :key="col.name" :props="props">
-              <span class="text-weight-medium">{{ col.label }}</span>
-            </q-th>
-          </q-tr>
-        </template>
-
-        <template v-slot:body="props" v-if="modeView === 'table'">
-          <q-tr :props="props">
-            <q-td auto-width>
-              <q-btn
-                flat
-                dense
-                round
-                color="deep-purple"
-                icon="mdi-history"
-                @click="clickHistory(props.row)"
-              >
-                <q-tooltip>ประวัติแก้ไขผลการประเมินการปฏิบัติราชการ</q-tooltip>
-              </q-btn>
-              <q-btn
-                v-if="checkPermission($route)?.attrIsUpdate"
-                flat
-                dense
-                round
-                color="edit"
-                icon="edit"
-                @click="onClickOpenDialog(true, props.row)"
-              >
-                <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-              </q-btn>
-            </q-td>
-            <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>
-
-        <template v-slot:item="props" v-else>
-          <div class="col-xs-12 col-sm-6 col-md-6">
-            <q-card bordered>
-              <q-card-actions class="bg-grey-3" align="right">
-                <q-btn
-                  flat
-                  round
-                  color="deep-purple"
-                  icon="mdi-history"
-                  @click="clickHistory(props.row)"
-                >
-                  <q-tooltip>ประวัติแก้ไขเครื่องราชอิสริยาภรณ์</q-tooltip>
-                </q-btn>
-                <q-btn
-                  v-if="checkPermission($route)?.attrIsUpdate"
-                  flat
-                  round
-                  color="edit"
-                  icon="edit"
-                  @click.stop.prevent="onClickOpenDialog(true, props.row)"
-                >
-                  <q-tooltip>แก่ไขข้อมุล</q-tooltip>
-                </q-btn>
-              </q-card-actions>
-              <q-separator />
-              <div>
-                <q-item
-                  v-for="(col, index) in props.cols.filter(
-                  (col:any) => col.name !== 'desc'
-                )"
-                  :key="col.name"
-                  :class="index % 2 !== 0 ? 'bg-grey-1' : ''"
-                >
-                  <q-item-section class="text-grey-6">
-                    <q-item-label>{{ col.label }}</q-item-label>
-                  </q-item-section>
-
-                  <q-item-section class="text-dark">
-                    <q-item-label>
-                      {{ col.value ? col.value : "-" }}
-                    </q-item-label>
-                  </q-item-section>
-                </q-item>
-              </div>
-            </q-card>
+              <template v-slot:card>
+                <q-icon
+                  name="mdi-view-grid-outline"
+                  size="24px"
+                  :style="{
+                    color: modeView === 'card' ? '#787B7C' : '#C9D3DB',
+                  }"
+                />
+              </template>
+            </q-btn-toggle>
           </div>
-        </template>
-      </d-table>
+        </div>
+
+        <div class="col-12">
+          <d-table
+            flat
+            dense
+            bordered
+            :rows="rows"
+            :paging="true"
+            :columns="columns"
+            :filter="filterSearch"
+            v-model:pagination="pagination"
+            :grid="modeView === 'card'"
+            :visible-columns="visibleColumns"
+            :rows-per-page-options="[20, 50, 100]"
+            :card-container-class="modeView === 'card' ? 'q-col-gutter-md' : ''"
+          >
+            <template v-slot:header="props">
+              <q-tr :props="props">
+                <q-th auto-width />
+                <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                  <span class="text-weight-medium">{{ col.label }}</span>
+                </q-th>
+              </q-tr>
+            </template>
+
+            <template v-slot:body="props" v-if="modeView === 'table'">
+              <q-tr :props="props">
+                <q-td auto-width>
+                  <q-btn
+                    flat
+                    dense
+                    round
+                    color="deep-purple"
+                    icon="mdi-history"
+                    @click="clickHistory(props.row)"
+                  >
+                    <q-tooltip
+                      >ประวัติแก้ไขผลการประเมินการปฏิบัติราชการ</q-tooltip
+                    >
+                  </q-btn>
+                  <q-btn
+                    v-if="checkPermission($route)?.attrIsUpdate"
+                    flat
+                    dense
+                    round
+                    color="edit"
+                    icon="edit"
+                    @click="onClickOpenDialog(true, props.row)"
+                  >
+                    <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+                  </q-btn>
+                </q-td>
+                <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>
+
+            <template v-slot:item="props" v-else>
+              <div class="col-xs-12 col-sm-6 col-md-6">
+                <q-card bordered>
+                  <q-card-actions class="bg-grey-3" align="right">
+                    <q-btn
+                      flat
+                      round
+                      color="deep-purple"
+                      icon="mdi-history"
+                      @click="clickHistory(props.row)"
+                    >
+                      <q-tooltip>ประวัติแก้ไขเครื่องราชอิสริยาภรณ์</q-tooltip>
+                    </q-btn>
+                    <q-btn
+                      v-if="checkPermission($route)?.attrIsUpdate"
+                      flat
+                      round
+                      color="edit"
+                      icon="edit"
+                      @click.stop.prevent="onClickOpenDialog(true, props.row)"
+                    >
+                      <q-tooltip>แก่ไขข้อมุล</q-tooltip>
+                    </q-btn>
+                  </q-card-actions>
+                  <q-separator />
+                  <div>
+                    <q-item
+                      v-for="(col, index) in props.cols.filter(
+                      (col:any) => col.name !== 'desc'
+                    )"
+                      :key="col.name"
+                      :class="index % 2 !== 0 ? 'bg-grey-1' : ''"
+                    >
+                      <q-item-section class="text-grey-6">
+                        <q-item-label>{{ col.label }}</q-item-label>
+                      </q-item-section>
+
+                      <q-item-section class="text-dark">
+                        <q-item-label>
+                          {{ col.value ? col.value : "-" }}
+                        </q-item-label>
+                      </q-item-section>
+                    </q-item>
+                  </div>
+                </q-card>
+              </div>
+            </template>
+          </d-table>
+        </div>
+      </q-card>
     </div>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    
     <div class="col-12 q-mt-md">
-      <span class="text-blue-6 text-weight-bold text-body1 q-pb-sm"
+      <span class="text-weight-bold text-body1 q-pb-sm"
         >การพัฒนารายบุคคล (Individual Development Plan)</span
       >
     </div>
     <div class="col-12">
-      <div class="row items-center q-gutter-x-sm q-pb-sm">
-        <q-btn
-          v-if="checkPermission($route)?.attrIsUpdate"
-          dense
-          color="primary"
-          icon="add"
-          flat
-          round
-          ><q-tooltip>เพิ่มข้อมูล</q-tooltip></q-btn
-        >
-
-        <q-space />
-        <q-input
-          standout
-          dense
-          v-model="filterSearchPlan"
-          ref="filterPlanRef"
-          outlined
-          placeholder="ค้นหา"
-          debounce="300"
-        >
-        <template v-slot:append>
-            <q-icon
-              v-if="filterSearchPlan == ''"
-              name="search"
-              @click.stop.prevent="filterSearchPlan = ''"
-              class="cursor-pointer"
+      <q-card bordered class="q-pa-sm">
+        <div class="col-12">
+          <div class="row items-center q-gutter-x-sm q-pb-sm">
+            <q-space />
+            <q-input
+              standout
+              dense
+              v-model="filterSearchPlan"
+              ref="filterPlanRef"
+              outlined
+              placeholder="ค้นหา"
+              debounce="300"
+            >
+              <template v-slot:append>
+                <q-icon
+                  v-if="filterSearchPlan == ''"
+                  name="search"
+                  @click.stop.prevent="filterSearchPlan = ''"
+                  class="cursor-pointer"
+                />
+                <q-icon
+                  v-if="filterSearchPlan"
+                  name="cancel"
+                  @click.stop.prevent="filterSearchPlan = ''"
+                  class="cursor-pointer"
+                />
+              </template>
+            </q-input>
+            <q-select
+              v-if="modeViewPlan == 'table'"
+              v-model="visibleColumnsPlan"
+              multiple
+              outlined
+              dense
+              options-dense
+              :display-value="$q.lang.table.columns"
+              emit-value
+              map-options
+              :options="columnsPlan"
+              option-value="name"
+              options-cover
+              style="min-width: 150px"
             />
-            <q-icon
-              v-if="filterSearchPlan"
-              name="cancel"
-              @click.stop.prevent="filterSearchPlan = ''"
-              class="cursor-pointer"
-            />
-          </template>
-        </q-input>
-        <q-select
-          v-if="modeViewPlan == 'table'"
-          v-model="visibleColumnsPlan"
-          multiple
-          outlined
-          dense
-          options-dense
-          :display-value="$q.lang.table.columns"
-          emit-value
-          map-options
-          :options="columnsPlan"
-          option-value="name"
-          options-cover
-          style="min-width: 150px"
-        />
-        <q-btn-toggle
-          v-model="modeViewPlan"
-          dense
-          class="no-shadow toggle-borderd"
-          toggle-color="grey-4"
-          :options="[
-            { value: 'table', slot: 'table' },
-            { value: 'card', slot: 'card' },
-          ]"
-        >
-          <template v-slot:table>
-            <q-icon
-              name="format_list_bulleted"
-              size="24px"
-              :style="{
-                color: modeViewPlan === 'table' ? '#787B7C' : '#C9D3DB',
-              }"
-            />
-          </template>
+            <q-btn-toggle
+              v-model="modeViewPlan"
+              dense
+              class="no-shadow toggle-borderd"
+              toggle-color="grey-4"
+              :options="[
+                { value: 'table', slot: 'table' },
+                { value: 'card', slot: 'card' },
+              ]"
+            >
+              <template v-slot:table>
+                <q-icon
+                  name="format_list_bulleted"
+                  size="24px"
+                  :style="{
+                    color: modeViewPlan === 'table' ? '#787B7C' : '#C9D3DB',
+                  }"
+                />
+              </template>
 
-          <template v-slot:card>
-            <q-icon
-              name="mdi-view-grid-outline"
-              size="24px"
-              :style="{
-                color: modeViewPlan === 'card' ? '#787B7C' : '#C9D3DB',
-              }"
-            />
-          </template>
-        </q-btn-toggle>
-      </div>
-    </div>
-
-    <div class="col-12">
-      <d-table
-    flat
-    dense
-    bordered
-    :rows="rowsPlan"
-    :paging="true"
-    :columns="columnsPlan"
-    :filter="filterSearchPlan"
-    v-model:pagination="paginationPlan"
-    :grid="modeViewPlan === 'card'"
-    :visible-columns="visibleColumnsPlan"
-    :rows-per-page-options="[20, 50, 100]"
-    :card-container-class="modeViewPlan === 'card' ? 'q-col-gutter-md' : ''"
-  >
-    <template v-slot:header="props">
-      <q-tr :props="props">
-        <q-th auto-width />
-        <q-th v-for="col in props.cols" :key="col.name" :props="props">
-          <span class="text-weight-medium">{{ col.label }}</span>
-        </q-th>
-      </q-tr>
-    </template>
-
-    <template v-slot:body="props" v-if="modeViewPlan === 'table'">
-      <q-tr :props="props">
-        <q-td v-for="col in props.cols" :key="col.name" :props="props">
-          <div class="table_ellipsis">
-            {{ col.value ? col.value : "-" }}
+              <template v-slot:card>
+                <q-icon
+                  name="mdi-view-grid-outline"
+                  size="24px"
+                  :style="{
+                    color: modeViewPlan === 'card' ? '#787B7C' : '#C9D3DB',
+                  }"
+                />
+              </template>
+            </q-btn-toggle>
           </div>
-        </q-td>
-      </q-tr>
-    </template>
+        </div>
 
-    <template v-slot:item="props" v-else>
-      <div class="col-xs-12 col-sm-6 col-md-6">
-        <q-card bordered>
-          <q-card-actions class="bg-grey-3" align="right">
-            <q-btn
-              flat
-              round
-              color="deep-purple"
-              icon="mdi-history"
-            >
-              <q-tooltip>ประวัติแก้ไขการพัฒนารายบุคคล</q-tooltip>
-            </q-btn>
-            <q-btn
-              v-if="checkPermission($route)?.attrIsUpdate"
-              flat
-              round
-              color="edit"
-              icon="edit"
-            >
-              <q-tooltip>แก่ไขข้อมุล</q-tooltip>
-            </q-btn>
-          </q-card-actions>
-          <q-separator />
-          <div>
-            <q-item
-              v-for="(col, index) in props.cols.filter(
+        <div class="col-12">
+          <d-table
+            flat
+            dense
+            bordered
+            :rows="rowsPlan"
+            :paging="true"
+            :columns="columnsPlan"
+            :filter="filterSearchPlan"
+            v-model:pagination="paginationPlan"
+            :grid="modeViewPlan === 'card'"
+            :visible-columns="visibleColumnsPlan"
+            :rows-per-page-options="[20, 50, 100]"
+            :card-container-class="
+              modeViewPlan === 'card' ? 'q-col-gutter-md' : ''
+            "
+          >
+            <template v-slot:header="props">
+              <q-tr :props="props">
+                <q-th auto-width />
+                <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                  <span class="text-weight-medium">{{ col.label }}</span>
+                </q-th>
+              </q-tr>
+            </template>
+
+            <template v-slot:body="props" v-if="modeViewPlan === 'table'">
+              <q-tr :props="props" class="vertical-top">
+                <q-td auto-width>
+                  <q-btn
+                    v-if="checkPermission($route)?.attrIsGet"
+                    flat
+                    round
+                    dense
+                    color="info"
+                    icon="mdi-eye"
+                    @click="openDialogDevelop(props.row)"
+                  >
+                    <q-tooltip>รายละเอียด</q-tooltip>
+                  </q-btn></q-td
+                >
+                <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                  <div v-if="col.name == 'no'">
+                    {{
+                      (paginationPlan.page - 1) * paginationPlan.rowsPerPage +
+                      props.rowIndex +
+                      1
+                    }}
+                  </div>
+                  <div v-else-if="col.name == 'developmentProjects'">
+                    <div class="column">
+                      <q-checkbox
+                        size="xs"
+                        :model-value="props.row.isDevelopment70"
+                        label="70 การลงมือปฏิบัติ (โดยผู้บังคับบัญชามอบหมาย)"
+                      />
+                      <q-checkbox
+                        size="xs"
+                        :model-value="props.row.isDevelopment20"
+                        label="20 การเรียนรู้จากผู้อื่น (Coach/Mentor/Consulting)"
+                      />
+                      <q-checkbox
+                        size="xs"
+                        :model-value="props.row.isDevelopment10"
+                        label="10 การฝึกอบรมอื่นๆ"
+                      />
+                    </div>
+                  </div>
+                  <div v-else-if="col.name == 'developmentResults'">
+                    <div class="column">
+                      <span>
+                        {{
+                          props.row.achievement10
+                            ? `- ${props.row.achievement10} (10)`
+                            : ""
+                        }}
+                      </span>
+                      <span>
+                        {{
+                          props.row.achievement5
+                            ? `- ${props.row.achievement5} (5)`
+                            : ""
+                        }}
+                      </span>
+                      <span>
+                        {{
+                          props.row.achievement0
+                            ? `- ${props.row.achievement10} (0)`
+                            : ""
+                        }}
+                      </span>
+                    </div>
+                  </div>
+                  <div v-else class="table_ellipsis">
+                    {{ col.value ? col.value : "-" }}
+                  </div>
+                </q-td>
+              </q-tr>
+            </template>
+
+            <template v-slot:item="props" v-else>
+              <div class="col-xs-12 col-sm-6 col-md-6">
+                <q-card bordered>
+                  <q-card-actions class="bg-grey-3" align="right">
+                    <q-btn
+                      v-if="checkPermission($route)?.attrIsGet"
+                      flat
+                      round
+                      dense
+                      color="info"
+                      icon="mdi-eye"
+                      @click="openDialogDevelop(props.row)"
+                    >
+                      <q-tooltip>รายละเอียด</q-tooltip>
+                    </q-btn>
+                  </q-card-actions>
+                  <q-separator />
+                  <div>
+                    <q-item
+                      v-for="(col, index) in props.cols.filter(
                 (col:any) => col.name !== 'desc'
               )"
-              :key="col.name"
-              :class="index % 2 !== 0 ? 'bg-grey-1' : ''"
-            >
-              <q-item-section class="text-grey-6">
-                <q-item-label>{{ col.label }}</q-item-label>
-              </q-item-section>
+                      :key="col.name"
+                      :class="index % 2 !== 0 ? 'bg-grey-1' : ''"
+                    >
+                      <q-item-section class="text-grey-6">
+                        <q-item-label>{{ col.label }}</q-item-label>
+                      </q-item-section>
 
-              <q-item-section class="text-dark">
-                <q-item-label>
-                  {{ col.value ? col.value : "-" }}
-                </q-item-label>
-              </q-item-section>
-            </q-item>
-          </div>
-        </q-card>
-      </div>
-    </template>
-  </d-table>
+                      <div v-if="col.name == 'developmentProjects'">
+                        <div class="column">
+                          <q-checkbox
+                            size="xs"
+                            :model-value="props.row.isDevelopment70"
+                            label="70 การลงมือปฏิบัติ (โดยผู้บังคับบัญชามอบหมาย)"
+                          />
+                          <q-checkbox
+                            size="xs"
+                            :model-value="props.row.isDevelopment20"
+                            label="20 การเรียนรู้จากผู้อื่น (Coach/Mentor/Consulting)"
+                          />
+                          <q-checkbox
+                            size="xs"
+                            :model-value="props.row.isDevelopment10"
+                            label="10 การฝึกอบรมอื่นๆ"
+                          />
+                        </div>
+                      </div>
+                      <div v-else-if="col.name == 'developmentResults'">
+                        <div class="column">
+                          <span>
+                            {{
+                              props.row.achievement10
+                                ? `- ${props.row.achievement10} (10)`
+                                : ""
+                            }}
+                          </span>
+                          <span>
+                            {{
+                              props.row.achievement5
+                                ? `- ${props.row.achievement5} (5)`
+                                : ""
+                            }}
+                          </span>
+                          <span>
+                            {{
+                              props.row.achievement0
+                                ? `- ${props.row.achievement10} (0)`
+                                : ""
+                            }}
+                          </span>
+                        </div>
+                      </div>
+                      <q-item-section v-else class="text-dark">
+                        <q-item-label>
+                          {{ col.value ? col.value : "-" }}
+                        </q-item-label>
+                      </q-item-section>
+                    </q-item>
+                  </div>
+                </q-card>
+              </div>
+            </template>
+          </d-table>
+        </div>
+      </q-card>
     </div>
   </div>
 
@@ -1145,6 +1256,8 @@ onMounted(() => {
       </q-card-section>
     </q-card>
   </q-dialog>
+
+  <DialogDevelop v-model:modal="modalDevelop" v-model:id="kpiDevelopmentId" />
 </template>
 
 <style scoped></style>
diff --git a/src/modules/14_KPI/interface/request/index.ts b/src/modules/14_KPI/interface/request/index.ts
index c3f33d408..1ac613fe1 100644
--- a/src/modules/14_KPI/interface/request/index.ts
+++ b/src/modules/14_KPI/interface/request/index.ts
@@ -76,6 +76,11 @@ interface FormQuery {
   keyword: string;
 }
 
+interface DataOptionTechnique {
+  label: string;
+  value: string;
+}
+
 export type {
   FormProfile,
   FormDataAssigned,
@@ -85,5 +90,6 @@ export type {
   FormComment,
   FormCommentByRole,
   FormQuery,
-  DataOptions
+  DataOptions,
+  DataOptionTechnique
 };