diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts index 3552d4a07..fc19715ec 100644 --- a/src/interface/request/main/main.ts +++ b/src/interface/request/main/main.ts @@ -221,6 +221,14 @@ const menuList = readonly([ label: "เครื่องราชอิสริยาภรณ์", path: "insignia", role: "insignia", + children: [ + { + key: 8.1, + label: "รายการเสนอขอ" /* รายชื่อผู้สอบผ่าน */, + path: "insigniaProposals", + role: "insignia", + }, + ], }, { key: 9, diff --git a/src/modules/07_insignia/router.ts b/src/modules/07_insignia/router.ts index 20a41a5c3..fd30260db 100644 --- a/src/modules/07_insignia/router.ts +++ b/src/modules/07_insignia/router.ts @@ -3,6 +3,10 @@ */ const Main = () => import("@/modules/07_insignia/views/Main.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 [ { @@ -15,4 +19,24 @@ export default [ Role: "insignia", }, }, + { + path: "/insignia/round-proposals", + name: "insigniaProposals", + component: insigniaProposals, + meta: { + Auth: true, + Key: [7.1], + Role: "insignia", + }, + }, + { + path: "/insignia/round/add", + name: "roundAdd", + component: roundAdd, + meta: { + Auth: true, + Key: [7.1], + Role: "insignia", + }, + }, ]; diff --git a/src/modules/07_insignia/views/1_Proposals/addProposals.vue b/src/modules/07_insignia/views/1_Proposals/addProposals.vue index e69de29bb..1e63df651 100644 --- a/src/modules/07_insignia/views/1_Proposals/addProposals.vue +++ b/src/modules/07_insignia/views/1_Proposals/addProposals.vue @@ -0,0 +1,171 @@ + + diff --git a/src/modules/07_insignia/views/1_Proposals/listProposals.vue b/src/modules/07_insignia/views/1_Proposals/listProposals.vue index da8a7ef99..ebda6400a 100644 --- a/src/modules/07_insignia/views/1_Proposals/listProposals.vue +++ b/src/modules/07_insignia/views/1_Proposals/listProposals.vue @@ -118,9 +118,9 @@ round color="indigo" @click.stop.prevent="clickProposals(props.row.id)" - icon="mdi-clipboard-arrow-down" + icon="mdi-file-download" > - ดาวน์โหลดเอกสารประกอบ + ดาวน์โหลดเอกสารประกอบ @@ -284,10 +284,7 @@ const clickDelete = (id: string) => { }; const clickAdd = () => { - modal.value = true; -}; -const clickClose = async () => { - modal.value = false; + router.push({ name: "roundAdd" }); }; // ค้นหาในตาราง diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue index d8d241366..441a9ee82 100644 --- a/src/views/MainLayout.vue +++ b/src/views/MainLayout.vue @@ -716,7 +716,10 @@ if (keycloak.tokenParsed != null) { expand-icon="mdi-chevron-down" expanded-icon="mdi-chevron-up" v-if=" - menuItem.key == 3 || menuItem.key == 5 || menuItem.key == 6 + menuItem.key == 3 || + menuItem.key == 5 || + menuItem.key == 6 || + menuItem.key == 8 " > @@ -751,7 +754,9 @@ if (keycloak.tokenParsed != null) { :to="{ name: `${subMenu2.path}` }" > - {{ subMenu2.label }} + {{ subMenu2.label }} + @@ -781,7 +786,9 @@ if (keycloak.tokenParsed != null) { :to="{ name: `${subMenu.path}` }" > - {{ subMenu.label }} + {{ + subMenu.label + }} @@ -930,7 +937,7 @@ if (keycloak.tokenParsed != null) { .menuSub .q-item { border-radius: 0 100px 100px 0; margin-right: 2%; - font-weight: 500 ; + font-weight: 500; } .expan2 .q-item { padding-left: 10%; @@ -938,8 +945,8 @@ if (keycloak.tokenParsed != null) { /* .menuSubAct { background: #1e2529d9; } */ -.font-400{ - font-weight: 400 ; +.font-400 { + font-weight: 400; } .expan2 .menuSubHover { padding-left: 30%;