diff --git a/src/modules/04_system/components/01_cardBackupRestore.vue b/src/modules/04_system/components/01_cardBackupRestore.vue
index 67f61a29..b8ca754a 100644
--- a/src/modules/04_system/components/01_cardBackupRestore.vue
+++ b/src/modules/04_system/components/01_cardBackupRestore.vue
@@ -1,32 +1,43 @@
@@ -127,10 +155,10 @@ function onRestore(name: string) {
@@ -156,7 +184,6 @@ function onRestore(name: string) {
:columns="columns"
row-key="name"
:visible-columns="visibleColumns"
- :filter="filter"
>
diff --git a/src/modules/04_system/components/02_cardAutoBackup.vue b/src/modules/04_system/components/02_cardAutoBackup.vue
index cc179340..54a28e0d 100644
--- a/src/modules/04_system/components/02_cardAutoBackup.vue
+++ b/src/modules/04_system/components/02_cardAutoBackup.vue
@@ -33,6 +33,7 @@ const {
dialogRemove,
dialogConfirm,
dialogMessageNotify,
+ onSearchDataTable,
} = useCounterMixin();
const {
getSchedule,
@@ -112,8 +113,10 @@ const columns = ref([
align: "left",
label: "วันที่เริ่มการสำรองข้อมูล",
sortable: true,
- field: (v) => date2Thai(v, false, true),
-
+ field: "startAt",
+ format(val, row) {
+ return date2Thai(val, false, true);
+ },
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
@@ -268,6 +271,14 @@ function clearForm() {
formDataschedule.value.time = "";
formDataschedule.value.schedule = "";
}
+const dataMain = ref([]);
+function serchDataTable() {
+ dataSchedule.value = onSearchDataTable(
+ filter.value,
+ dataMain.value,
+ columns.value ? columns.value : []
+ );
+}
watch(tab, () => {
if (tab.value === formDataschedule.value.type) {
@@ -282,7 +293,8 @@ watch(tab, () => {
});
onMounted(async () => {
- getSchedule();
+ await getSchedule();
+ dataMain.value = dataSchedule.value;
});
@@ -309,10 +321,10 @@ onMounted(async () => {
@@ -338,7 +350,6 @@ onMounted(async () => {
:columns="columns"
row-key="name"
:visible-columns="visibleColumns"
- :filter="filter"
>
diff --git a/src/modules/04_system/stores/main.ts b/src/modules/04_system/stores/main.ts
index a943869d..8d5abd1e 100644
--- a/src/modules/04_system/stores/main.ts
+++ b/src/modules/04_system/stores/main.ts
@@ -35,22 +35,23 @@ export const useDataStore = defineStore("systemStore", () => {
* ดึงข้อมูลรายการข้อมูลสำรอง
*/
async function fetchListBackup() {
- showLoader();
- const res = await http.get(config.API.backup);
- hideLoader();
- if (!res) return false;
+ try {
+ showLoader();
+ const res = await http.get(config.API.backup);
- if (res.status === 200) {
- dataBackUp.value = await res.data;
-
- dataBackUp.value = dataBackUp.value.map((item) => {
- return {
- ...item,
- status: "สำเร็จ",
- };
- });
-
- return res.status;
+ if (!res) return false;
+ if (res.status === 200) {
+ dataBackUp.value = await res.data;
+ dataBackUp.value = dataBackUp.value.map((item) => {
+ return {
+ ...item,
+ status: "สำเร็จ",
+ };
+ });
+ return res.status;
+ }
+ } finally {
+ hideLoader();
}
}
diff --git a/src/modules/04_system/views/MainView.vue b/src/modules/04_system/views/MainView.vue
index fbbaba39..2901b7ad 100644
--- a/src/modules/04_system/views/MainView.vue
+++ b/src/modules/04_system/views/MainView.vue
@@ -1,27 +1,22 @@