diff --git a/src/modules/15_development/components/history/AddPage.vue b/src/modules/15_development/components/history/AddPage.vue new file mode 100644 index 000000000..2788265dc --- /dev/null +++ b/src/modules/15_development/components/history/AddPage.vue @@ -0,0 +1,236 @@ + + + + + เพิ่มประวัติการฝึกอบรม/ดูงานของข้าราชการกรุงเทพมหานครสามัญ + + + + + ข้อมูลข้าราชการ + + + + + + + + + {{ + fieldLabels[field as keyof typeof fieldLabels] + }} + + + {{ formMain[field] ? formMain[field] : "-" }} + + + + + + + + {{ + fieldLabels[field as keyof typeof fieldLabels] + }} + + + {{ formMain[field] ? formMain[field] : "-" }} + + + + + + + + + ข้อมูลโครงการ + + + + + + + + diff --git a/src/modules/15_development/components/history/Dialog.vue b/src/modules/15_development/components/history/Dialog.vue new file mode 100644 index 000000000..8d77159a3 --- /dev/null +++ b/src/modules/15_development/components/history/Dialog.vue @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ col.label }} + + + + + + + + {{ col.value ? col.value : "-" }} + + + + + + + + + + + บันทึกข้อมูล + + + + + diff --git a/src/modules/15_development/interface/request/Main.ts b/src/modules/15_development/interface/request/Main.ts index ad3ddee52..0adefb3c8 100644 --- a/src/modules/15_development/interface/request/Main.ts +++ b/src/modules/15_development/interface/request/Main.ts @@ -52,6 +52,17 @@ interface FormFollowOther { issues:string } +interface FormAddHistory{ + citizenId:string + name:string + position:string + type:string + level:string + positionSide:string + oc:string + [key: string]: any; +} + export type { FormQueryProject, FormBasicinfo, @@ -59,4 +70,5 @@ export type { FormGroupRelate, FormFollowResult, FormFollowOther, + FormAddHistory, }; diff --git a/src/modules/15_development/router.ts b/src/modules/15_development/router.ts index 3cfaf3990..598cd7994 100644 --- a/src/modules/15_development/router.ts +++ b/src/modules/15_development/router.ts @@ -7,7 +7,7 @@ const employeeHistory = () => import("@/modules/15_development/views/EmployeeHistory.vue"); const Scholarship = () => import("@/modules/15_development/views/Scholarship.vue"); - +const historyAdd = () => import('@/modules/15_development/components/history/AddPage.vue') export default [ { path: "/development", @@ -69,4 +69,14 @@ export default [ Role: "development", }, }, + { + path: "/development/history/add", + name: "developmentHistoryAdd", + component: historyAdd, + meta: { + Auth: true, + Key: [1.6], + Role: "development", + }, + }, ]; diff --git a/src/modules/15_development/store/developmentStore.ts b/src/modules/15_development/store/developmentStore.ts index bd4186d1b..3b025bc05 100644 --- a/src/modules/15_development/store/developmentStore.ts +++ b/src/modules/15_development/store/developmentStore.ts @@ -1,7 +1,8 @@ import { defineStore } from "pinia"; import { reactive } from "vue"; - +import { ref } from 'vue' import type { FormQueryProject } from "@/modules/15_development/interface/request/Main"; +import type { QTableProps } from "quasar"; // store export const useDevelopmentDataStore = defineStore( @@ -11,8 +12,15 @@ export const useDevelopmentDataStore = defineStore( year: new Date().getFullYear(), keyword: "", }); + + const visibleColumns = ref([]); + const columns = ref([]); + const rows = ref([]) return { formFilter, + visibleColumns, + columns, + rows, }; } ); diff --git a/src/modules/15_development/views/History.vue b/src/modules/15_development/views/History.vue index 58de6eeb6..25ff54200 100644 --- a/src/modules/15_development/views/History.vue +++ b/src/modules/15_development/views/History.vue @@ -1,5 +1,269 @@ + - - ประวัติฝึกอบรม/ดูงาน ขรก. + + รายการประวัติการฝึกอบรม/ดูงานของข้าราชการกรุงเทพมหานครสามัญ + + + + + + {{ year + 543 }} + {{ + parseInt(value + 543) + }} + + + + + + + + + + + + + + เพิ่ม + + + + ดาวน์โหลด + + + + + + + + + + + + + + + + + + + {{ col.label }} + + + + + + + + {{ col.value ? col.value : "-" }} + + + + + - \ No newline at end of file + +