diff --git a/src/api/15_development/api.development.ts b/src/api/15_development/api.development.ts index da7c97e9e..619a66198 100644 --- a/src/api/15_development/api.development.ts +++ b/src/api/15_development/api.development.ts @@ -2,5 +2,6 @@ import env from "../index"; const development = `${env.API_URI}/development`; export default { - development, + /** รายการโครงการ*/ + developmentMain: `${development}/main`, }; diff --git a/src/modules/15_development/interface/index/Main.ts b/src/modules/15_development/interface/index/Main.ts index 9eb2758ed..b94f36dfa 100644 --- a/src/modules/15_development/interface/index/Main.ts +++ b/src/modules/15_development/interface/index/Main.ts @@ -8,4 +8,18 @@ interface DataOptionCheckBox { value: string; } -export type { DataOption, DataOptionCheckBox }; +interface ItemsMenu { + label: string; + value: string; + icon: string; + color: string; +} + +interface NewPagination { + descending: boolean; + page: number; + rowsPerPage: number; + sortBy: string; +} + +export type { DataOption, DataOptionCheckBox, ItemsMenu, NewPagination }; diff --git a/src/modules/15_development/interface/request/Main.ts b/src/modules/15_development/interface/request/Main.ts index fcc87379e..f2b500b0b 100644 --- a/src/modules/15_development/interface/request/Main.ts +++ b/src/modules/15_development/interface/request/Main.ts @@ -1,5 +1,7 @@ -interface FormQueryProject { +interface FormQueryListProject { year: number; + page: number; + pageSize: number; keyword: string; } @@ -45,47 +47,47 @@ interface FormFollowOther { address: string; province: string; budget: string; - accept: number|null; - receive: number|null; - approved: number|null; - budgetPay: number|null; - issues:string - chance:string - effects:string - riskLevel:string - riskManagement:string - benefits:string - topicsIssues:string - trainingStudy:string + accept: number | null; + receive: number | null; + approved: number | null; + budgetPay: number | null; + issues: string; + chance: string; + effects: string; + riskLevel: string; + riskManagement: string; + benefits: string; + topicsIssues: string; + trainingStudy: string; } -interface FormAddHistory{ - citizenId:string - name:string - position:string - type:string - level:string - positionSide:string - oc:string +interface FormAddHistory { + citizenId: string; + name: string; + position: string; + type: string; + level: string; + positionSide: string; + oc: string; [key: string]: any; } -interface FormAddHistoryProject{ - project:string - year:string - trainingStart:string - trainingEnd:string - totalTraining:string - location:string - topic:string - studyStart:string - studyEnd:string - organizingTraining:string +interface FormAddHistoryProject { + project: string; + year: string; + trainingStart: string; + trainingEnd: string; + totalTraining: string; + location: string; + topic: string; + studyStart: string; + studyEnd: string; + organizingTraining: string; [key: string]: any; } export type { - FormQueryProject, + FormQueryListProject, FormBasicinfo, FormGroupTarget, FormGroupRelate, diff --git a/src/modules/15_development/interface/response/Main.ts b/src/modules/15_development/interface/response/Main.ts index 34f0c3237..192501bd1 100644 --- a/src/modules/15_development/interface/response/Main.ts +++ b/src/modules/15_development/interface/response/Main.ts @@ -14,4 +14,10 @@ interface ResLevel { posLevelAuthority: string; } -export type { ResGroup, ResLevel }; +interface ResListProject { + id: string; + projectName: string; + year: number; +} + +export type { ResGroup, ResLevel, ResListProject }; diff --git a/src/modules/15_development/store/developmentStore.ts b/src/modules/15_development/store/developmentStore.ts index 3b025bc05..406547c37 100644 --- a/src/modules/15_development/store/developmentStore.ts +++ b/src/modules/15_development/store/developmentStore.ts @@ -1,23 +1,16 @@ import { defineStore } from "pinia"; -import { reactive } from "vue"; -import { ref } from 'vue' -import type { FormQueryProject } from "@/modules/15_development/interface/request/Main"; +import { ref } from "vue"; + import type { QTableProps } from "quasar"; // store export const useDevelopmentDataStore = defineStore( "developmentDataStore", () => { - const formFilter = reactive({ - year: new Date().getFullYear(), - keyword: "", - }); - const visibleColumns = ref([]); const columns = ref([]); - const rows = ref([]) + const rows = ref([]); return { - formFilter, visibleColumns, columns, rows, diff --git a/src/modules/15_development/views/MainPage.vue b/src/modules/15_development/views/MainPage.vue index b5daab52a..202f43027 100644 --- a/src/modules/15_development/views/MainPage.vue +++ b/src/modules/15_development/views/MainPage.vue @@ -1,20 +1,27 @@