รายการประวัติฝึกอบรม/ดูงานลูกจ้าง

src/modules/15_development/views/EmployeeHistory.vue

@@ -6,11 +6,6 @@ import config from "@/app.config";
 import genReportXLSX from "@/plugins/genreportxlsx";
 import { useRouter } from "vue-router";
 
-import type {
-  DataOption,
-  FormFilter,
-} from "@/modules/15_development/interface/index/Main";
-
 /** importStore*/
 import { useDevelopmentDataStore } from "@/modules/15_development/store/developmentStore";
 import { useCounterMixin } from "@/stores/mixin";
@@ -27,7 +22,7 @@ const pagination = ref({
 });
 const maxPage = ref<number>(1);
 const formFilter = reactive({
-  root: "",
+  root: null,
   page: 1,
   pageSize: 20,
   keyword: "",
@@ -35,7 +30,6 @@ const formFilter = reactive({
 });
 
 const rows = ref<any>([]);
-const agency = ref<string>("");
 const agencyOp = ref<[]>([]);
 
 const visibleColumns = ref<string[]>([
@@ -111,9 +105,10 @@ function fetchListOrg() {
   http
     .get(config.API.developmentHistoryListOrg("employee", formFilter.year))
     .then((res) => {
-      formFilter.root = "";
+      formFilter.root = null;
       rows.value = [];
       agencyOp.value = res.data.result;
+      getData();
     })
     .catch((err) => {
       messageError($q, err);
@@ -148,14 +143,6 @@ function onEdit(id: string) {
 }
 
 function getData() {
-  let queryParams: any = {
-    page: formFilter.page,
-    pageSize: formFilter.pageSize,
-    keyword: formFilter.keyword,
-    year: formFilter.year,
-    root: formFilter.root,
-  };
-
   showLoader();
   http
     .post(config.API.developmentHistoryList("employee"), formFilter)
@@ -184,10 +171,6 @@ function getData() {
     });
 }
 
-function yearAll() {
-  formFilter.year = 0;
-  // getData();
-}
 onMounted(() => {
   fetchListOrg();
 });

src/modules/15_development/views/History.vue

@@ -116,6 +116,7 @@ function fetchListOrg() {
     .get(config.API.developmentHistoryListOrg("officer", formFilter.year))
     .then((res) => {
       formFilter.root = null;
+      rows.value = [];
       agencyOp.value = res.data.result;
       getData();
     })