Merge branch 'NiceDev' into develop

src/modules/08_KPI/components/Tab/01_Assessment.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, onMounted, computed } from "vue";
+import { ref, onMounted, computed, watch } from "vue";
 import { useQuasar } from "quasar";
 import { useRoute } from "vue-router";
 
@@ -162,6 +162,33 @@ function getCriteria() {
     });
 }
 
+watch(
+  () => store.dataEvaluation.plannedPoint,
+  (newValue, oldValue) => {
+    if (newValue !== oldValue) {
+      fetchListPlanned();
+    }
+  }
+);
+
+watch(
+  () => store.dataEvaluation.rolePoint,
+  (newValue, oldValue) => {
+    if (newValue !== oldValue) {
+      fetchListRole();
+    }
+  }
+);
+
+watch(
+  () => store.dataEvaluation.specialPoint,
+  (newValue, oldValue) => {
+    if (newValue !== oldValue) {
+      fetchAssigned();
+    }
+  }
+);
+
 onMounted(() => {
   getCriteria();
   fetchListPlanned();

src/modules/08_KPI/components/Tab/Topic/02_Competency.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref, computed } from "vue";
+import { onMounted, ref, computed, watch } from "vue";
 import Dialog from "@/modules/08_KPI/components/Tab/Dialog/04_FormCompetency.vue";
 import DialogEvaluate from "@/modules/08_KPI/components/Tab/DialogEvaluate/02_Competenct.vue";
 
@@ -112,6 +112,7 @@ function onAdd(type: string) {
 const rows = ref<any>([]);
 const lists = ref<any>([]);
 const resultEvaluation = ref<string | 0>(0);
+
 function getData(type: string) {
   showLoader();
   http
@@ -194,6 +195,18 @@ function onEvaluate(type: string) {
   modalEvaluate.value = true;
 }
 
+watch(
+  () => store.dataEvaluation.capacityPoint,
+  (newValue, oldValue) => {
+    if (newValue !== oldValue) {
+      for (let index = 0; index < store.competencyType.length; index++) {
+        const element = store.competencyType[index];
+        getData(element.id);
+      }
+    }
+  }
+);
+
 onMounted(() => {
   for (let index = 0; index < store.competencyType.length; index++) {
     const element = store.competencyType[index];

src/modules/09_scholarship/views/main.vue

@@ -236,12 +236,12 @@ onMounted(async () => {
 
             <q-space />
             <div class="row q-gutter-sm">
-              <q-input
+              <!-- <q-input
                 outlined
                 dense
                 v-model="filterKeyword"
                 label="ค้นหา"
-              ></q-input>
+              ></q-input> -->
               <q-select
                 v-model="visibleColumns"
                 multiple