Merge branch 'fix/kpi_status' into dev

src/modules/14_KPI/views/detailView.vue

@@ -178,7 +178,7 @@ function onSubmit() {
 }
 
 async function getOrgOp() {
-  showLoader()
+  showLoader();
   await http
     .get(config.API.Kpiorg + `/${store.dataProfile.profileId}`)
     .then((res) => {
@@ -214,7 +214,7 @@ async function getOrgOp() {
           name: `${i.prefix}${i.firstName} ${i.lastName}`,
         }))
         .find((i: any) => i.id == store.dataEvaluation.commanderHighId);
-        hideLoader()
+      hideLoader();
     })
     .catch((e) => {
       messageError($q, e);
@@ -351,7 +351,7 @@ function openStatus() {
   router.push(`/probation-detail/${store.dataEvaluation.id}`);
 }
 
-function sendToEvauator() {
+function sendToEvaluator() {
   dialogConfirm($q, () => {
     showLoader();
     http
@@ -672,6 +672,7 @@ onUnmounted(() => {
                 >*น้ำหนัก(ร้อยละ) ผลสัมฤทธิ์ของงานไม่ถูกต้อง</span
               >
               <br v-if="!$q.screen.gt.xs" />
+
               <q-btn
                 v-if="
                   store.rolePerson == 'USER' &&
@@ -695,12 +696,14 @@ onUnmounted(() => {
               >
                 <q-tooltip>ส่งให้ผู้ประเมินอนุมัติ</q-tooltip>
               </q-btn>
+
               <q-btn
                 v-if="
                   !checkRoutePermisson &&
-                  store.rolePerson == 'USER' &&
-                  store.tabMain == '2' &&
-                  store.dataEvaluation.evaluationStatus == 'APPROVE'
+                  store.rolePerson === 'USER' &&
+                  store.tabMain === '2' &&
+                  store.dataEvaluation.evaluationStatus === 'APPROVE' &&
+                  store.dataEvaluation.evaluationReqEdit !== 'EVALUATOR'
                 "
                 unelevated
                 round
@@ -708,7 +711,7 @@ onUnmounted(() => {
                 color="grey-2"
                 text-color="blue-6"
                 size="md"
-                @click="sendToEvauator"
+                @click="sendToEvaluator"
               >
                 <q-tooltip>ทำการประเมิน</q-tooltip>
               </q-btn>