diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts index 3552d4a07..e8f8f5d66 100644 --- a/src/interface/request/main/main.ts +++ b/src/interface/request/main/main.ts @@ -221,6 +221,38 @@ const menuList = readonly([ label: "เครื่องราชอิสริยาภรณ์", path: "insignia", role: "insignia", + children: [ + { + key: 8.1, + label: "รายการเสนอขอ" /* รายชื่อผู้สอบผ่าน */, + path: "insigniaProposals", + role: "insignia", + }, + { + key: 8.2, + label: "จัดทำรายชื่อข้าราชการสามัญ" /* รายชื่อผู้สอบผ่าน */, + path: "insigniaNameList", + role: "insignia", + }, + { + key: 8.3, + label: "อนุมัติรายชื่อข้าราชการสามัญ" /* รายชื่อผู้สอบผ่าน */, + path: "insigniaNameApprove", + role: "insignia", + }, + { + key: 8.4, + label: "บันทึกผลการได้รับพระราช..." /* รายชื่อผู้สอบผ่าน */, + path: "insigniaRecord", + role: "insignia", + }, + { + key: 8.5, + label: "รายงาน" /* รายชื่อผู้สอบผ่าน */, + path: "insigniaReport", + role: "insignia", + }, + ], }, { key: 9, diff --git a/src/modules/07_insignia/interface/request/Main.ts b/src/modules/07_insignia/interface/request/Main.ts index e4ea7770c..2c598c6d4 100644 --- a/src/modules/07_insignia/interface/request/Main.ts +++ b/src/modules/07_insignia/interface/request/Main.ts @@ -1 +1,9 @@ -export type {}; +interface FormProprsalsRound { + id: number; + name: string; + year: number; + startDate: number; + endDate: number; + status: string; +} +export type { FormProprsalsRound }; diff --git a/src/modules/07_insignia/router.ts b/src/modules/07_insignia/router.ts index 5ffcbaecc..5d4d5deb2 100644 --- a/src/modules/07_insignia/router.ts +++ b/src/modules/07_insignia/router.ts @@ -3,11 +3,17 @@ */ const Main = () => import("@/modules/07_insignia/views/Main.vue"); -const ReportView = () => import("../07_insignia/components/report/ReportView.vue") -const report_01 = () => import("../07_insignia/components/report/Report_01.vue") +const ReportView = () => + import("../07_insignia/components/report/ReportView.vue"); +const report_01 = () => + import("../07_insignia/components/report/Report_01.vue"); const ResultInsignia = () => import("@/modules/07_insignia/components/ResultInsignia.vue"); const Coin = () => import("@/modules/07_insignia/components/Coin.vue"); +const insigniaProposals = () => + import("@/modules/07_insignia/views/1_Proposals/listProposals.vue"); +const roundAdd = () => + import("@/modules/07_insignia/views/1_Proposals/addProposals.vue"); export default [ { diff --git a/src/modules/07_insignia/views/1_Proposals/addProposals.vue b/src/modules/07_insignia/views/1_Proposals/addProposals.vue index e69de29bb..63ee7bb6a 100644 --- a/src/modules/07_insignia/views/1_Proposals/addProposals.vue +++ b/src/modules/07_insignia/views/1_Proposals/addProposals.vue @@ -0,0 +1,175 @@ + + diff --git a/src/modules/07_insignia/views/1_Proposals/listProposals.vue b/src/modules/07_insignia/views/1_Proposals/listProposals.vue index da8a7ef99..48d761c5d 100644 --- a/src/modules/07_insignia/views/1_Proposals/listProposals.vue +++ b/src/modules/07_insignia/views/1_Proposals/listProposals.vue @@ -116,11 +116,11 @@ size="12px" flat round - color="indigo" + color="light-blue-8" @click.stop.prevent="clickProposals(props.row.id)" - icon="mdi-clipboard-arrow-down" + icon="mdi-file-download" > - ดาวน์โหลดเอกสารประกอบ + ดาวน์โหลดเอกสารประกอบ @@ -161,6 +161,7 @@ import { ref, useAttrs } from "vue"; import type { QTableProps } from "quasar"; import router from "@/router"; import { useQuasar } from "quasar"; +import type { FormProprsalsRound } from " @/modules/07_insignia/interface/request/Main.ts"; const $q = useQuasar(); //ใช้ noti quasar const modal = ref(false); @@ -229,7 +230,7 @@ const columns = ref([ ]); // ข้อมูลตาราง (จำลอง) -const rows = ref([ +const rows = ref([ { round: "รอบการเสนอขอพระราชทานเครื่องราชฯ", year: "2566", @@ -284,10 +285,7 @@ const clickDelete = (id: string) => { }; const clickAdd = () => { - modal.value = true; -}; -const clickClose = async () => { - modal.value = false; + router.push({ name: "roundAdd" }); }; // ค้นหาในตาราง diff --git a/src/modules/08_registryEmployee/index/Main.ts b/src/modules/08_registryEmployee/index/Main.ts new file mode 100644 index 000000000..e4ea7770c --- /dev/null +++ b/src/modules/08_registryEmployee/index/Main.ts @@ -0,0 +1 @@ +export type {}; diff --git a/src/modules/08_registryEmployee/request/Main.ts b/src/modules/08_registryEmployee/request/Main.ts new file mode 100644 index 000000000..eecf581d1 --- /dev/null +++ b/src/modules/08_registryEmployee/request/Main.ts @@ -0,0 +1,13 @@ +interface FormRegistryEmployee { + no: string; + name: string; + positionNum: string; + position: string; + path: string; + type: string; + level: string; + affiliation: string; + yearly: number; + pay: string; +} +export type { FormRegistryEmployee }; diff --git a/src/modules/08_registryEmployee/response/Main.ts b/src/modules/08_registryEmployee/response/Main.ts new file mode 100644 index 000000000..e4ea7770c --- /dev/null +++ b/src/modules/08_registryEmployee/response/Main.ts @@ -0,0 +1 @@ +export type {}; diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue index 24c94dede..485ed54d1 100644 --- a/src/modules/08_registryEmployee/views/Main.vue +++ b/src/modules/08_registryEmployee/views/Main.vue @@ -2,157 +2,173 @@
รายชื่อลูกจ้างชั่วคราว
- -
- - เพิ่มข้อมูล - - -
- - - - - - -
-
-
- +
+ + เพิ่มข้อมูล + + +
+ + -