updated

src/modules/08_KPI/components/Tab/Dialog/DialogStatus.vue

@@ -13,7 +13,7 @@ const store = useKpiDataStore();
 
 const route = useRoute();
 const router = useRouter();
-const id = ref<string>(route.params.id as string)
+const id = ref<string>(route.params.id as string);
 const work = ref<boolean>(false);
 const $q = useQuasar();
 const mixin = useCounterMixin();
@@ -29,35 +29,37 @@ const {
 } = mixin;
 
 const modal = defineModel<boolean>("modal", { required: true });
+const isProbation = defineModel<boolean>("isProbation", { required: true });
 
 function close() {
   modal.value = false;
 }
 
-function getData() {
+// function getData() {
-  showLoader();
+//   showLoader();
-  http
+//   http
-    .get(config.API.orgPosition+`/${store.dataProfile.profileId}`)
+//     .get(config.API.orgPosition+`/${store.dataProfile.profileId}`)
-    .then((res) => {
+//     .then((res) => {
-      const data = res.data.result.isProbation;
+//       const data = res.data.result.isProbation;
-      work.value = data;
+//       work.value = data;
-    })
+//     })
-    .catch((e) => {
+//     .catch((e) => {
-      messageError($q, e);
+//       messageError($q, e);
-    })
+//     })
-    .finally(() => {
+//     .finally(() => {
-      hideLoader();
+//       hideLoader();
-    });
+//     });
-}
+// }
-watch(
+// watch(
-  () => modal.value,
+//   () => modal.value,
-  (n) => {
+//   (n) => {
-    if (n == true) {
+//     if (n == true) {
-      getData();
+//       getData();
-    }
+//     }
-  }
+//   }
-);
+// );
 </script>
+
 <template>
   <q-dialog persistent v-model="modal">
     <q-card bordered style="min-width: 20vw">
@@ -66,7 +68,9 @@ watch(
       <q-card-section class="q-pa-sm">
         <div class="row">
           <div class="col-12 text-center bg-grey-1 q-pa-md rounded-borders">
-            <span class="text-weight-bold text-teal">{{work ? `อยู่ระหว่างทดลองงาน`:'พ้นจากการทดลองงาน'}}</span>
+            <span class="text-weight-bold text-teal">{{
+              isProbation ? `อยู่ระหว่างทดลองงาน` : "-"
+            }}</span>
           </div>
         </div>
       </q-card-section>

src/modules/08_KPI/views/form.vue

@@ -63,7 +63,7 @@ async function fetchEvaluation() {
     .get(config.API.kpiEvaluation + `/${id.value}`)
     .then(async (res) => {
       const data = res.data.result;
-      console.log("🚀 ~ .then ~ data:", data)
+      // console.log("🚀 ~ .then ~ data:", data);
 
       store.dataEvaluation = await data;
       formProfile.status = store.convertStatus(data.evaluationStatus);
@@ -89,10 +89,10 @@ async function fetchEvaluation() {
 
 async function getProfile() {
   await http
-    .get(config.API.profilePosition())
+    .get(config.API.orgPosition + `/${store.dataEvaluation.profileId}`)
     .then(async (res) => {
-      const data = res.data.result;
+      const data = await res.data.result;
-      store.dataProfile = await data;
+      store.dataProfile = data;
     })
     .catch((e) => {
       messageError($q, e);
@@ -252,8 +252,8 @@ function filterOption(val: any, update: Function, refData: string) {
 // }
 
 async function getAll() {
-  await getProfile();
   await fetchEvaluation();
+  await getProfile();
   await getOrgOp();
   await store.checkStep();
 }
@@ -335,7 +335,7 @@ function sendToCommander() {
         messageError($q, e);
       })
       .finally(() => {
-        hideLoader()
+        hideLoader();
       });
   });
 }
@@ -418,7 +418,8 @@ onMounted(async () => {
                           store.indicatorWeightTotal != 100) ||
                         (store.dataEvaluation.posExecutiveName != null &&
                           (store.indicatorWeight1Total != 100 ||
-                            store.indicatorWeight2Total != 20)) && store.dataEvaluation.evaluationStatus == 'NEW'
+                            store.indicatorWeight2Total != 20) &&
+                          store.dataEvaluation.evaluationStatus == 'NEW')
                       "
                       class="text-red"
                       >*น้ำหนัก(ร้อยละ) ผลสัมฤทธิ์ของงานไม่ถูกต้อง</span
@@ -465,7 +466,8 @@ onMounted(async () => {
                     <q-btn
                       v-if="
                         store.rolePerson == 'USER' &&
-                        store.dataEvaluation.evaluationStatus == 'EVALUATING' && store.tabMain == '3'
+                        store.dataEvaluation.evaluationStatus == 'EVALUATING' &&
+                        store.tabMain == '3'
                       "
                       unelevated
                       round
@@ -831,7 +833,10 @@ onMounted(async () => {
   </q-dialog> -->
 
   <DialogGovernment v-model:modal="modalGovernment" />
-  <DialogStatus v-model:modal="modalStatus" />
+  <DialogStatus
+    v-model:modal="modalStatus"
+    v-model:is-probation="store.dataProfile.isProbation"
+  />
 </template>
 <style>
 .bg-toolbar {