Merge branch 'develop' into devTee

src/modules/01_metadataNew/components/competency/04ListCriteria.vue

@@ -43,7 +43,7 @@ function onSubmit() {
   };
 
   http
-    .put(config.API.kpiUserEvaluation, body.formScore)
+    .put(config.API.kpiEvaluation, body.formScore)
     .then((res) => {
       success($q, "บันทึกสำเร็จ");
     })
@@ -53,7 +53,7 @@ function onSubmit() {
 function getData() {
   showLoader();
   http
-    .get(config.API.kpiUserEvaluation)
+    .get(config.API.kpiEvaluation)
     .then((res) => {
       dataLevel.value = res.data.result.data;
     })

src/modules/04_registryNew/views/list.vue

@@ -171,6 +171,10 @@ async function fetchDataPerson(search: boolean = false) {
     queryParams.isRetire = formFilter.isShowRetire;
   }
 
+  if (empType.value !== "officer") {
+    queryParams.type = empType.value;
+  }
+
   http
     .get(
       config.API.registryNew(empType.value !== "officer" ? "-employee" : ""),