Merge branch 'develop' into devTee

src/modules/14_KPI/components/competency/04ListCriteria.vue

@@ -55,7 +55,7 @@ function getData() {
   http
     .get(config.API.kpiEvaluation)
     .then((res) => {
-      dataLevel.value = res.data.result;
+      dataLevel.value = res.data.result.data;
     })
     .finally(() => {
       hideLoader();

src/modules/14_KPI/components/competency/AddPage.vue

@@ -86,7 +86,7 @@ function onSubmit() {
       class="q-mr-sm"
       @click="router.go(-1)"
     />
-    <span class="toptitle text-dark">เพิ่มสมรรถนะ</span>
+    <span class="toptitle text-dark">เพิ่ม/แก้ไขสมรรถนะ</span>
   </div>
   <q-card flat bordered>
     <!-- @submit.prevent @validation-success="onSubmit" -->

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

@@ -112,22 +112,6 @@ function onClickAddOrView(status: boolean = false, id: string = "") {
     : router.push("/KPI-indicator-plan/add");
 }
 
-async function fetchData() {
-  showLoader();
-  await http
-    .get(config.API.kpiPlan)
-    .then(async (res) => {
-      const data = res.data.result.data;
-      rows.value = data;
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
 function fetchActive() {
   showLoader();
   http
@@ -179,7 +163,7 @@ async function deleteData(idData: string) {
     http
       .delete(config.API.kpiPlanById(idData))
       .then(() => {
-        fetchData();
+        fetchList();
         success($q, "ลบข้อมูลสำเร็จ");
       })
       .catch((err) => {
@@ -421,8 +405,6 @@ onMounted(() => {
       </div>
     </div>
   </q-card>
-
- 
 </template>
 
 <style lang="scss" scoped>