From fbf9ba9f54c2294e667a82bbf11aa639476565a0 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Thu, 16 Jan 2025 16:59:52 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20kpi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tab/Dialog/01_FormIndicator.vue           |  8 +++
 .../Tab/Dialog/DialogCommentProgress.vue      | 63 ++++++++++---------
 .../components/Tab/Topic/01_Indicator.vue     |  9 +--
 .../components/Tab/Topic/02_Competency.vue    |  2 +-
 .../components/Tab/Topic/03_Develop.vue       |  2 +-
 src/modules/14_KPI/store.ts                   |  3 +-
 src/modules/14_KPI/views/mainDetail.vue       | 12 +++-
 7 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
index 1a24bb6c7..c015d51e3 100644
--- a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
@@ -146,6 +146,11 @@ function fetchListPlanByid(id: string) {
       formDetail.achievement5 = data.achievement5;
       formDetail.documentInfoEvidence = data.documentInfoEvidence;
 
+      formDetail.including = data.including;
+      formDetail.nodeName = data.nodeName;
+      formDetail.strategyName = data.strategyName;
+      formDetail.includingName = data.includingName;
+
       formDetail.startDate = data.startDate;
       formDetail.endDate = data.endDate;
 
@@ -363,6 +368,9 @@ function closeDialog() {
   formDetail.startDate = null;
   formDetail.endDate = null;
 
+  formDetail.nodeName = "";
+  formDetail.strategyName = "";
+  
   formFilter.isAll = false;
   formFilter.keyword = "";
   formFilter.node = 0;
diff --git a/src/modules/14_KPI/components/Tab/Dialog/DialogCommentProgress.vue b/src/modules/14_KPI/components/Tab/Dialog/DialogCommentProgress.vue
index ae7a5c7e8..0d7e179c1 100644
--- a/src/modules/14_KPI/components/Tab/Dialog/DialogCommentProgress.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/DialogCommentProgress.vue
@@ -236,6 +236,9 @@ function onSubmitComment(role: string) {
 /** เก็บคะแนน ลง ตัวแปร */
 function onCheckNumber(num: number) {
   numLevel.value = num.toString();
+  if (num) {
+    formDataAdd.topic = store.mainRowData[`achievement${num}`];
+  }
 }
 
 watch(
@@ -253,7 +256,7 @@ watch(
       <DialogHeader
         :tittle="
           type == 'capacity' || type == 'development'
-            ? 'บันทึกเหตุการณ์/พฤติกรรม'
+            ? `บันทึกเหตุการณ์/พฤติกรรม${store.tabMain == '3' ? `/เหตุผล` : ''}`
             : 'รายงานความก้าวหน้า'
         "
         :close="close"
@@ -270,12 +273,13 @@ watch(
             <div class="q-pa-sm">
               <q-btn
                 v-if="
-                  (!checkRoutePermisson && type == 'capacity') ||
-                  (!checkRoutePermisson && type == 'development') ||
-                  (!checkRoutePermisson &&
-                    type != 'capacity' &&
-                    type != 'development' &&
-                    store.rolePerson == 'USER')
+                  ((!checkRoutePermisson && type == 'capacity') ||
+                    (!checkRoutePermisson && type == 'development') ||
+                    (!checkRoutePermisson &&
+                      type != 'capacity' &&
+                      type != 'development' &&
+                      store.rolePerson == 'USER')) &&
+                  store.tabMain < '3'
                 "
                 icon="add"
                 color="teal"
@@ -289,7 +293,7 @@ watch(
               >
                 <q-tooltip>{{
                   type == "capacity" || type == "development"
-                    ? "เพิ่มเหตุการณ์/พฤติกรรม"
+                    ? `เพิ่มเหตุการณ์/พฤติกรรม${store.tabMain == '3' ? `/เหตุผล` : ''}`
                     : "เพิ่มความก้าวหน้า"
                 }}</q-tooltip>
               </q-btn>
@@ -304,7 +308,7 @@ watch(
                   <div class="col-12">
                     <span>{{
                       type == "capacity" || type == "development"
-                        ? "เหตุการณ์/พฤติกรรม"
+                        ? `เหตุการณ์/พฤติกรรม${store.tabMain == '3' ? `/เหตุผล` : ''}`
                         : "ความก้าวหน้า"
                     }}</span>
                   </div>
@@ -366,7 +370,7 @@ watch(
                   <div class="col-4 text-grey-6">
                     {{
                       type == "capacity" || type == "development"
-                        ? "เหตุการณ์/พฤติกรรม"
+                        ? `เหตุการณ์/พฤติกรรม${store.tabMain == '3' ? `/เหตุผล` : ''}`
                         : "หัวข้อความก้าวหน้า"
                     }}
                   </div>
@@ -574,7 +578,7 @@ watch(
         <DialogHeader
           :tittle="
             type == 'capacity' || type == 'development'
-              ? 'เพิ่มหัวข้อบันทึกเหตุการณ์/พฤติกรรม'
+              ? `เพิ่มหัวข้อบันทึกเหตุการณ์/พฤติกรรม${store.tabMain == '3' ? `/เหตุผล` : ''}`
               : 'เพิ่มหัวข้อความก้าวหน้า'
           "
           :close="closeAdd"
@@ -583,22 +587,6 @@ watch(
 
         <q-card-section>
           <div class="row q-col-gutter-sm">
-            <div class="col-12">
-              <q-input
-                v-model="formDataAdd.topic"
-                outlined
-                class="inputgreen"
-                :label="
-                  type == 'capacity' || type == 'development'
-                    ? 'เหตุการณ์/พฤติกรรม'
-                    : 'หัวข้อความก้าวหน้า'
-                "
-                dense
-                lazy-rules
-                hide-bottom-space
-                :rules="[(val:string) => !!val || `${type == 'capacity'||type == 'development' ? 'กรุณากรอกเหตุการณ์/พฤติกรรม':'กรุณากรอกหัวข้อความก้าวหน้า' }`,]"
-              />
-            </div>
             <div
               class="col-12"
               v-if="type !== 'capacity' && type !== 'development'"
@@ -618,12 +606,31 @@ watch(
                 >
                   <q-tooltip>
                     <div class="text-body2">
-                      <span>{{ i }}</span>
+                      <span
+                        v-html="store.mainRowData[`achievement${i}`]"
+                      ></span>
                     </div>
                   </q-tooltip>
                 </q-btn>
               </q-btn-group>
             </div>
+            <div class="col-12">
+              <q-input
+                v-model="formDataAdd.topic"
+                outlined
+                class="inputgreen"
+                :label="
+                  type == 'capacity' || type == 'development'
+                    ? `เหตุการณ์/พฤติกรรม${store.tabMain == '3' ? `/เหตุผล` : ''}`
+                    : 'หัวข้อความก้าวหน้า'
+                "
+                dense
+                lazy-rules
+                hide-bottom-space
+                :rules="[(val:string) => !!val || `${type == 'capacity'||type == 'development' ? `กรุณากรอกเหตุการณ์/พฤติกรรม${store.tabMain == '3' ? `/เหตุผล` : ''}`:'กรุณากรอกหัวข้อความก้าวหน้า' }`,]"
+              />
+            </div>
+
             <div class="col-12">
               <q-input
                 v-model="formDataAdd.reason"
diff --git a/src/modules/14_KPI/components/Tab/Topic/01_Indicator.vue b/src/modules/14_KPI/components/Tab/Topic/01_Indicator.vue
index 886e10545..246ed6105 100644
--- a/src/modules/14_KPI/components/Tab/Topic/01_Indicator.vue
+++ b/src/modules/14_KPI/components/Tab/Topic/01_Indicator.vue
@@ -188,11 +188,12 @@ function onDelete(id: string) {
 }
 
 /** เปิด popup รายงานความก้าวหน้า */
-function openPopupProgress(id: string) {
+function openPopupProgress(data: any) {
+  store.mainRowData = data
   modalProgress.value = true;
   type.value =
     numpage.value === 1 ? "plan" : numpage.value === 2 ? "role" : "special";
-  idList.value = id;
+  idList.value = data.id;
 }
 
 /** เปิด popup รายงานปัญหา */
@@ -343,7 +344,7 @@ watch(
                   color="blue-6"
                   size="12px"
                   dense
-                  @click="openPopupProgress(props.row.id)"
+                  @click="openPopupProgress(props.row)"
                 >
                   <q-tooltip>รายงานความก้าวหน้า</q-tooltip>
                 </q-btn>
@@ -356,7 +357,7 @@ watch(
                   size="12px"
                   dense
                   main="problem"
-                  @click="openPopupProblem(props.row.id)"
+                  @click="openPopupProblem(props.row)"
                 >
                   <q-tooltip>รายงานปัญหา</q-tooltip>
                 </q-btn>
diff --git a/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue b/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
index cbcf8cd8f..95fdccf40 100644
--- a/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
+++ b/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
@@ -470,7 +470,7 @@ onMounted(() => {
                     dense
                     @click="openPopupProgress(props.row.id)"
                   >
-                    <q-tooltip>บันทึกเหตุการณ์/พฤติกรรม</q-tooltip>
+                    <q-tooltip>{{store.tabMain == '3' ? 'บันทึกเหตุการณ์/พฤติกรรม/เหตุผล':'บันทึกเหตุการณ์/พฤติกรรม'}}</q-tooltip>
                   </q-btn>
                 </div>
 
diff --git a/src/modules/14_KPI/components/Tab/Topic/03_Develop.vue b/src/modules/14_KPI/components/Tab/Topic/03_Develop.vue
index c0fd5d10e..d75965d53 100644
--- a/src/modules/14_KPI/components/Tab/Topic/03_Develop.vue
+++ b/src/modules/14_KPI/components/Tab/Topic/03_Develop.vue
@@ -329,7 +329,7 @@ onMounted(() => {
                   dense
                   @click="openPopupProgress(props.row.id)"
                 >
-                  <q-tooltip>บันทึกเหตุการณ์/พฤติกรรม</q-tooltip>
+                  <q-tooltip>{{store.tabMain == '3' ? 'บันทึกเหตุการณ์/พฤติกรรม/เหตุผล':'บันทึกเหตุการณ์/พฤติกรรม'}}</q-tooltip>
                 </q-btn>
               </div>
 
diff --git a/src/modules/14_KPI/store.ts b/src/modules/14_KPI/store.ts
index e139f4050..c1bc94aea 100644
--- a/src/modules/14_KPI/store.ts
+++ b/src/modules/14_KPI/store.ts
@@ -4,6 +4,7 @@ import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
 import type { FormQuery } from "@/modules/14_KPI/interface/request/index";
 
 export const useKpiDataStore = defineStore("KPIDataAdmin", () => {
+  const mainRowData = ref<any>()
   const tabMainevaluator = ref<string>("1");
   const yearRound = ref<number>(new Date().getFullYear());
   const formQuery = reactive<FormQuery>({
@@ -434,7 +435,7 @@ export const useKpiDataStore = defineStore("KPIDataAdmin", () => {
     excusiveIndicator2PercentVal,
     excusiveIndicator2ScoreVal,
     excusiveIndicatorScore,
-
+    mainRowData,
     //รายการการประเมินผลการปฏิบัติราชการระดับบุคคล
     tabMainevaluator,
     formQuery,
diff --git a/src/modules/14_KPI/views/mainDetail.vue b/src/modules/14_KPI/views/mainDetail.vue
index 2177cd727..2692a83b6 100644
--- a/src/modules/14_KPI/views/mainDetail.vue
+++ b/src/modules/14_KPI/views/mainDetail.vue
@@ -128,6 +128,7 @@ async function getMain() {
       formData.posTypeName = data.posTypeName;
       formData.posExecutiveName = data.posExecutiveName;
       formData.posLevelName = data.posLevelName;
+      formData.isProbation = data.isProbation;
       formData.org = findOrgName(data);
       profileId.value = data.profileId;
       const promises = [];
@@ -277,8 +278,15 @@ onMounted(async () => {
                 <div class="col-4">สังกัด</div>
               </div>
               <div class="row">
-                <div class="col-4">
-                  {{ formData.position ? formData.position : "-" }}
+                <div class="col-4 column">
+                  <span>
+                    {{ formData.position ? formData.position : "-" }}
+                  </span>
+                  <span>
+                    {{
+                      formData.isProbation ? `(ทดลองปฏิบัติหน้าที่ราชการฯ)` : ""
+                    }}
+                  </span>
                 </div>
                 <div class="col-4">
                   {{