ลบ store ออก

src/modules/15_development/components/history/DialogGov.vue

@@ -2,15 +2,15 @@
 import { ref, watch, computed,reactive } from "vue";
 import Header from "@/components/DialogHeader.vue";
 import type { DataOption,FormFilter,NewPagination } from "@/modules/15_development/interface/index/Main";
-import { useDevelopmentDataStoreHistory } from "@/modules/15_development/store/developmentStoreHistory";
+import { useDevelopmentDataStore } from "@/modules/15_development/store/developmentStore";
 import { useCounterMixin } from "@/stores/mixin";
-import { useQuasar } from "quasar";
+import { useQuasar, type QTableProps } from "quasar";
 
 import http from "@/plugins/http";
 import config from "@/app.config";
 
 
-
+const rows = ref<any[]>([])
 const props = defineProps({
   upDate: { type: Function },
 });
@@ -45,7 +45,7 @@ const {
   showLoader,
   hideLoader,
 } = mixin;
-const store = useDevelopmentDataStoreHistory();
+const store = useDevelopmentDataStore();
 
 const modal = defineModel<boolean>("modal", { required: true });
 
@@ -67,6 +67,72 @@ const govOp = ref<DataOption[]>([
   },
 ]);
 
+const visibleColumns = ref<string[]>([
+  "citizenId",
+  "name",
+  "position",
+  "type",
+  "level",
+  "positionSide",
+]);
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "citizenId",
+    align: "left",
+    label: "เลขประจำตัวประชาชน",
+    sortable: true,
+    field: "citizenId",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "name",
+    align: "left",
+    label: "ชื่อ - นามสกุล",
+    sortable: true,
+    field: "name",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+
+  {
+    name: "position",
+    align: "left",
+    label: "ตําแหน่ง",
+    sortable: true,
+    field: "position",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "type",
+    align: "left",
+    label: "ประเภทตำแหน่ง",
+    sortable: true,
+    field: "type",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "level",
+    align: "left",
+    label: "ระดับตำแหน่ง",
+    sortable: true,
+    field: "level",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "positionSide",
+    align: "left",
+    label: "ตําแหน่งทางการบริหาร",
+    sortable: true,
+    field: "positionSide",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+
 /** save ข้อมูล */
 function onSubmit() {
   if (selected.value?.length == 0) {
@@ -99,7 +165,7 @@ function onSubmit() {
 /** ปิด dialog */
 function closeDialog() {
   modal.value = false;
-  store.rows = [];
+  rows.value = [];
   selected.value = [];
 }
 
@@ -119,7 +185,7 @@ function searchFilter() {
       console.log(res.data.result.data);
       const data = res.data.result.data;
       maxPage.value = Math.ceil(res.data.result.total / formFilter.pageSize);
-      store.rows = data.map((item: any) => ({
+      rows.value = data.map((item: any) => ({
         id:item.id ? item.id : null,
         name: item.firstName ? `${item.prefix}${item.firstName} ${item.lastName}` : null,
         prefix:item.prefix ? item.prefix : null,
@@ -213,14 +279,14 @@ watch(
             v-model:selected="selected"
             for="table"
             ref="table"
-            :columns="store.columns"
-            :rows="store.rows"
+            :columns="columns"
+            :rows="rows"
             row-key="id"
             flat
             bordered
             dense
             class="custom-header-table"
-            :visible-columns="store.visibleColumns"
+            :visible-columns="visibleColumns"
             v-model:pagination="pagination"
             :rows-per-page-options="[20, 25, 50, 100]"
             @update:pagination="updatePageSize"