From afa42c013367a83a90503f55b663b001b930afc2 Mon Sep 17 00:00:00 2001 From: Thanit Konmek Date: Mon, 17 Jul 2023 17:00:50 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=88=E0=B8=B1=E0=B8=94=E0=B8=AB=E0=B8=99?= =?UTF-8?q?=E0=B9=89=E0=B8=B2=20router?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/interface/request/main/main.ts | 62 ++- .../1_Proposals/addProposals.vue | 0 .../1_Proposals/listProposals.vue | 0 ...{ResultInsignia.vue => RecordInsignia.vue} | 0 src/modules/07_insignia/router.ts | 40 +- src/modules/09_coin/components/Coin.vue | 516 ++++++++++++++++++ src/modules/09_coin/interface/index/Main.ts | 1 + src/modules/09_coin/interface/request/Main.ts | 1 + .../09_coin/interface/response/Main.ts | 1 + src/modules/09_coin/router.ts | 18 + src/modules/09_coin/store.ts | 5 + src/modules/09_coin/views/Main.vue | 12 + src/router/index.ts | 2 + 13 files changed, 633 insertions(+), 25 deletions(-) rename src/modules/07_insignia/{views => components}/1_Proposals/addProposals.vue (100%) rename src/modules/07_insignia/{views => components}/1_Proposals/listProposals.vue (100%) rename src/modules/07_insignia/components/{ResultInsignia.vue => RecordInsignia.vue} (100%) create mode 100644 src/modules/09_coin/components/Coin.vue create mode 100644 src/modules/09_coin/interface/index/Main.ts create mode 100644 src/modules/09_coin/interface/request/Main.ts create mode 100644 src/modules/09_coin/interface/response/Main.ts create mode 100644 src/modules/09_coin/router.ts create mode 100644 src/modules/09_coin/store.ts create mode 100644 src/modules/09_coin/views/Main.vue diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts index e8f8f5d66..293401c14 100644 --- a/src/interface/request/main/main.ts +++ b/src/interface/request/main/main.ts @@ -242,7 +242,8 @@ const menuList = readonly([ }, { key: 8.4, - label: "บันทึกผลการได้รับพระราช..." /* รายชื่อผู้สอบผ่าน */, + label: + "บันทึกผลการได้รับพระราชทานเครื่องราชย์อิสริยสภรณ์" /* รายชื่อผู้สอบผ่าน */, path: "insigniaRecord", role: "insignia", }, @@ -256,6 +257,65 @@ const menuList = readonly([ }, { key: 9, + icon: "mdi-medal-outline", + activeIcon: "mdi-medal", + label: "เหรียญจักรพรรดิมาลา", + path: "coin", + role: "coin", + children: [ + { + key: 9.1, + label: "รายการเสนอขอ", + path: "coinProposals", + role: "coin", + }, + { + key: 9.2, + label: "จัดการคำขอ", + path: "coinManage", + role: "coin", + }, + { + key: 9.3, + label: "บันทึกผลการได้รับพระราชทานเหรียญจักรพรรดิมาลา", + path: "coinReceive", + role: "coin", + }, + { + key: 9.4, + label: "บันทึกผลการจ่ายใบกำกับ", + path: "coinPayment", + role: "coin", + }, + { + key: 9.5, + label: + "รายชื่อที่ยื่นคำร้องขอแก้ไขข้อมูลการขอพระราชทานเหรียญจักรพรรดิมาลา", + path: "coinRequest", + role: "coin", + }, + { + key: 9.6, + label: "ประวัติการยื่นขอ", + path: "coinHistory", + role: "coin", + }, + { + key: 9.7, + label: "จัดสรรเหรียญตรา", + path: "coinAllocate", + role: "coin", + }, + { + key: 9.8, + label: "รายงาน", + path: "coinReport", + role: "coin", + }, + ], + }, + { + key: 10, icon: "o_contact_page", activeIcon: "contact_page", label: "ทะเบียนประวัติลูกจ้าง", diff --git a/src/modules/07_insignia/views/1_Proposals/addProposals.vue b/src/modules/07_insignia/components/1_Proposals/addProposals.vue similarity index 100% rename from src/modules/07_insignia/views/1_Proposals/addProposals.vue rename to src/modules/07_insignia/components/1_Proposals/addProposals.vue diff --git a/src/modules/07_insignia/views/1_Proposals/listProposals.vue b/src/modules/07_insignia/components/1_Proposals/listProposals.vue similarity index 100% rename from src/modules/07_insignia/views/1_Proposals/listProposals.vue rename to src/modules/07_insignia/components/1_Proposals/listProposals.vue diff --git a/src/modules/07_insignia/components/ResultInsignia.vue b/src/modules/07_insignia/components/RecordInsignia.vue similarity index 100% rename from src/modules/07_insignia/components/ResultInsignia.vue rename to src/modules/07_insignia/components/RecordInsignia.vue diff --git a/src/modules/07_insignia/router.ts b/src/modules/07_insignia/router.ts index 5c1d003e5..81ae5c6da 100644 --- a/src/modules/07_insignia/router.ts +++ b/src/modules/07_insignia/router.ts @@ -7,13 +7,13 @@ 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 RecordInsignia = () => + import("@/modules/07_insignia/components/RecordInsignia.vue"); const Coin = () => import("@/modules/07_insignia/components/Coin.vue"); const insigniaProposals = () => - import("@/modules/07_insignia/views/1_Proposals/listProposals.vue"); + import("@/modules/07_insignia/components/1_Proposals/listProposals.vue"); const roundAdd = () => - import("@/modules/07_insignia/views/1_Proposals/addProposals.vue"); + import("@/modules/07_insignia/components/1_Proposals/addProposals.vue"); export default [ { @@ -22,7 +22,7 @@ export default [ component: Main, meta: { Auth: true, - Key: [7], + Key: [8], Role: "insignia", }, }, @@ -32,7 +32,7 @@ export default [ component: insigniaProposals, meta: { Auth: true, - Key: [7.1], + Key: [8.1], Role: "insignia", }, }, @@ -42,26 +42,18 @@ export default [ component: roundAdd, meta: { Auth: true, - Key: [7.1], + Key: [8.1], Role: "insignia", }, }, + { - path: "/insignia/report", - name: "insignia-report", - component: ReportView, + path: "/insignia/record", + name: "insigniaRecord", + component: RecordInsignia, meta: { Auth: true, - Key: [7.1], - }, - }, - { - path: "/insignia/result-insignia", - name: "result-insignia", - component: ResultInsignia, - meta: { - Auth: true, - Key: [7], + Key: [8.4], Role: "insignia", }, }, @@ -71,17 +63,17 @@ export default [ component: Coin, meta: { Auth: true, - Key: [7], + Key: [8], Role: "insignia", }, }, { path: "/insignia/report", - name: "insignia-report", + name: "insigniaReport", component: ReportView, meta: { Auth: true, - Key: [7], + Key: [8.5], Role: "insignia", }, }, @@ -91,7 +83,7 @@ export default [ component: report_01, meta: { Auth: true, - Key: [7], + Key: [8.5], Role: "insignia", }, }, diff --git a/src/modules/09_coin/components/Coin.vue b/src/modules/09_coin/components/Coin.vue new file mode 100644 index 000000000..ca851d7bd --- /dev/null +++ b/src/modules/09_coin/components/Coin.vue @@ -0,0 +1,516 @@ + + + + diff --git a/src/modules/09_coin/interface/index/Main.ts b/src/modules/09_coin/interface/index/Main.ts new file mode 100644 index 000000000..e4ea7770c --- /dev/null +++ b/src/modules/09_coin/interface/index/Main.ts @@ -0,0 +1 @@ +export type {}; diff --git a/src/modules/09_coin/interface/request/Main.ts b/src/modules/09_coin/interface/request/Main.ts new file mode 100644 index 000000000..e4ea7770c --- /dev/null +++ b/src/modules/09_coin/interface/request/Main.ts @@ -0,0 +1 @@ +export type {}; diff --git a/src/modules/09_coin/interface/response/Main.ts b/src/modules/09_coin/interface/response/Main.ts new file mode 100644 index 000000000..e4ea7770c --- /dev/null +++ b/src/modules/09_coin/interface/response/Main.ts @@ -0,0 +1 @@ +export type {}; diff --git a/src/modules/09_coin/router.ts b/src/modules/09_coin/router.ts new file mode 100644 index 000000000..3626006be --- /dev/null +++ b/src/modules/09_coin/router.ts @@ -0,0 +1,18 @@ +/** + * Router เครื่องราชอิสริยาภรณ์ (insignia) + */ + +const Main = () => import("@/modules/09_coin/views/Main.vue"); + +export default [ + { + path: "/coin", + name: "coin", + component: Main, + meta: { + Auth: true, + Key: [9], + Role: "coin", + }, + }, +]; diff --git a/src/modules/09_coin/store.ts b/src/modules/09_coin/store.ts new file mode 100644 index 000000000..a1e6a7fe0 --- /dev/null +++ b/src/modules/09_coin/store.ts @@ -0,0 +1,5 @@ +import { defineStore } from "pinia"; + +export const useCoinDataStore = defineStore("coin", () => { + return {}; +}); diff --git a/src/modules/09_coin/views/Main.vue b/src/modules/09_coin/views/Main.vue new file mode 100644 index 000000000..b127c8a26 --- /dev/null +++ b/src/modules/09_coin/views/Main.vue @@ -0,0 +1,12 @@ + + + + + diff --git a/src/router/index.ts b/src/router/index.ts index 496100f83..28211f6e6 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -12,6 +12,7 @@ import ModulePlacement from "@/modules/05_placement/router"; import ModuleRetirement from "@/modules/06_retirement/router"; import ModuleInsignia from "@/modules/07_insignia/router"; import ModuleRegistryEmployee from "@/modules/08_registryEmployee/router"; +import ModuleCoin from "@/modules/09_coin/router"; // TODO: ใช้หรือไม่? import keycloak from "@/plugins/keycloak"; @@ -42,6 +43,7 @@ const router = createRouter({ ...ModuleRetirement, ...ModuleInsignia, ...ModuleRegistryEmployee, + ...ModuleCoin, ], }, /**