From 938961f80543b16ae311ba4a6787e0ca3db2b102 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Thu, 30 Jan 2025 11:37:47 +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

---
 .../14_KPI/components/Tab/01_Assessment.vue   | 35 +++++++++++++++++++
 .../components/Tab/Topic/01_Indicator.vue     |  4 +--
 .../components/Tab/Topic/02_Competency.vue    |  4 +--
 .../components/Tab/Topic/03_Develop.vue       |  4 +--
 src/modules/14_KPI/views/detailView.vue       | 18 ++++------
 5 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/src/modules/14_KPI/components/Tab/01_Assessment.vue b/src/modules/14_KPI/components/Tab/01_Assessment.vue
index 76af4380a..9700f93d3 100644
--- a/src/modules/14_KPI/components/Tab/01_Assessment.vue
+++ b/src/modules/14_KPI/components/Tab/01_Assessment.vue
@@ -225,6 +225,41 @@ onMounted(async () => {
     style="height: 100vh; width: auto"
     class="bg-white row col-12 text-dark q-pa-md"
   >
+    <div class="row items-center full-width">
+      <div
+        v-if="
+          store.dataEvaluation.isReject == true &&
+          store.dataEvaluation.isReject !== null
+        "
+        class="col-12 q-pb-sm q-gutter-sm"
+      >
+        <q-banner
+          inline-actions
+          bordered
+          class="bg-orange-1 text-orange border-orange"
+        >
+          <div class="row items-center">
+            <q-icon name="mdi-information-outline" size="20px" />
+            <div class="column q-pl-sm">
+              <span>{{
+                `${
+                  store.dataEvaluation.actorNameReject
+                    ? store.dataEvaluation.actorNameReject
+                    : ""
+                } ${
+                  store.dataEvaluation.actorReject
+                    ? `(${store.dataEvaluation.actorReject})`
+                    : ``
+                }`
+              }}</span>
+              <span
+                >เหตุผลการตีกลับ : {{ store.dataEvaluation.reasonReject }}</span
+              >
+            </div>
+          </div>
+        </q-banner>
+      </div>
+    </div>
     <div class="text-weight-bold text-body2">
       <span class="txt-under text-blue-6">องค์ประกอบที่ 1</span>
       <span class="q-ml-sm"> ผลสัมฤทธิ์ของงาน</span>
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 246ed6105..ac69e01a7 100644
--- a/src/modules/14_KPI/components/Tab/Topic/01_Indicator.vue
+++ b/src/modules/14_KPI/components/Tab/Topic/01_Indicator.vue
@@ -236,7 +236,7 @@ watch(
           </q-btn>
         </div>
         <div class="col-auto">
-          <q-btn
+          <!-- <q-btn
             v-if="isEditStep3 && !checkRoutePermisson"
             flat
             round
@@ -247,7 +247,7 @@ watch(
             @click="onEvaluate"
           >
             <q-tooltip>ประเมิน</q-tooltip>
-          </q-btn>
+          </q-btn> -->
         </div>
       </div>
     </q-card-section>
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 95fdccf40..bd599328f 100644
--- a/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
+++ b/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
@@ -340,7 +340,7 @@ onMounted(() => {
           </div>
 
           <q-space />
-          <q-btn
+          <!-- <q-btn
             v-if="!checkRoutePermisson && isEditStep3"
             flat
             round
@@ -351,7 +351,7 @@ onMounted(() => {
             @click="onEvaluate(item.id)"
           >
             <q-tooltip>ประเมิน</q-tooltip>
-          </q-btn>
+          </q-btn> -->
         </div>
       </q-card-section>
       <q-card-section class="q-pa-sm">
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 d75965d53..8e47757a6 100644
--- a/src/modules/14_KPI/components/Tab/Topic/03_Develop.vue
+++ b/src/modules/14_KPI/components/Tab/Topic/03_Develop.vue
@@ -215,7 +215,7 @@ onMounted(() => {
         </div>
 
         <q-space />
-        <q-btn
+        <!-- <q-btn
           v-if="isEditStep3 && !checkRoutePermisson"
           flat
           round
@@ -226,7 +226,7 @@ onMounted(() => {
           @click="onEvaluate()"
         >
           <q-tooltip>ประเมิน</q-tooltip>
-        </q-btn>
+        </q-btn> -->
       </div>
     </q-card-section>
     <q-card-section class="q-pa-sm">
diff --git a/src/modules/14_KPI/views/detailView.vue b/src/modules/14_KPI/views/detailView.vue
index 2d2b47542..ba4db3237 100644
--- a/src/modules/14_KPI/views/detailView.vue
+++ b/src/modules/14_KPI/views/detailView.vue
@@ -491,17 +491,14 @@ onUnmounted(() => {
             <div class="q-gutter-x-sm">
               <span
                 v-if="
-                  (!checkRoutePermisson &&
-                    store.tabMain === '1' &&
-                    store.dataEvaluation.posTypeName != 'อำนวยการ' &&
+                  store.tabMain === '1' &&
+                  store.dataEvaluation.evaluationStatus == 'NEW' &&
+                  ((store.dataEvaluation.posTypeName != 'อำนวยการ' &&
                     store.dataEvaluation.posTypeName != 'บริหาร' &&
                     store.indicatorWeightTotal != 100) ||
-                  (!checkRoutePermisson &&
-                    store.dataEvaluation.posTypeName == 'อำนวยการ' &&
-                    store.dataEvaluation.posTypeName == 'บริหาร' &&
-                    (store.indicatorWeight1Total != 100 ||
-                      store.indicatorWeight2Total != 20) &&
-                    store.dataEvaluation.evaluationStatus == 'NEW')
+                    ((store.dataEvaluation.posTypeName == 'อำนวยการ' ||
+                      store.dataEvaluation.posTypeName == 'บริหาร') &&
+                      store.indicatorWeightTotal != 100))
                 "
                 class="text-red"
                 >*น้ำหนัก(ร้อยละ) ผลสัมฤทธิ์ของงานไม่ถูกต้อง</span
@@ -510,8 +507,7 @@ onUnmounted(() => {
               <q-btn
                 v-if="
                   store.rolePerson == 'USER' &&
-                  store.dataEvaluation.evaluationStatus == 'NEW' &&
-                  !checkRoutePermisson
+                  store.dataEvaluation.evaluationStatus == 'NEW'
                 "
                 :disabled="
                   ((store.dataEvaluation.posTypeName != 'อำนวยการ' ||