From f9d37f990df8a2c45a011f115ea595a0991183e5 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Mon, 18 Dec 2023 16:07:20 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=E0=B8=AA=E0=B8=B4=E0=B8=97=E0=B8=98=E0=B8=B4=E0=B9=8C=E0=B8=82?= =?UTF-8?q?=E0=B8=AD=E0=B8=87=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A1?= =?UTF-8?q?=E0=B8=B4=E0=B8=99=20=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B9=80?= =?UTF-8?q?=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B9=80=E0=B8=A1=E0=B8=99?= =?UTF-8?q?=E0=B8=B9=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=B3=E0=B8=AA?= =?UTF-8?q?=E0=B8=B1=E0=B9=88=E0=B8=87=E0=B8=A5=E0=B8=87=E0=B9=82=E0=B8=97?= =?UTF-8?q?=E0=B8=A9=E0=B8=97=E0=B8=B2=E0=B8=87=E0=B8=A7=E0=B8=B4=E0=B8=99?= =?UTF-8?q?=E0=B8=B1=E0=B8=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/interface/request/main/main.ts | 48 ++++--------------- .../{!4_Order => 9_Order}/MainPage.vue | 2 +- .../{!4_Order => 9_Order}/OrderPage.vue | 6 +-- .../{!4_Order => 9_Order}/Step01.vue | 0 .../{!4_Order => 9_Order}/Step02.vue | 0 .../{!4_Order => 9_Order}/Step03.vue | 0 .../{!4_Order => 9_Order}/TableOrder.vue | 0 src/modules/11_discipline/router.ts | 48 +++++++++---------- src/modules/12_evaluatePersonal/router.ts | 4 +- 9 files changed, 40 insertions(+), 68 deletions(-) rename src/modules/11_discipline/components/{!4_Order => 9_Order}/MainPage.vue (98%) rename src/modules/11_discipline/components/{!4_Order => 9_Order}/OrderPage.vue (91%) rename src/modules/11_discipline/components/{!4_Order => 9_Order}/Step01.vue (100%) rename src/modules/11_discipline/components/{!4_Order => 9_Order}/Step02.vue (100%) rename src/modules/11_discipline/components/{!4_Order => 9_Order}/Step03.vue (100%) rename src/modules/11_discipline/components/{!4_Order => 9_Order}/TableOrder.vue (100%) diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts index 9594a2523..33ec3e61f 100644 --- a/src/interface/request/main/main.ts +++ b/src/interface/request/main/main.ts @@ -463,6 +463,12 @@ const menuList = readonly([ path: "appealComplain", role: "discipline", }, + { + key: 11.5, + label: "ออกคำสั่งลงโทษทางวินัย", + path: "disciplineOrder", + role: "discipline", + }, { label: "ข้อมูลพื้นฐาน", path: "", @@ -483,46 +489,12 @@ const menuList = readonly([ }, ], }, - // { - // key: 11, - // icon: "mdi-account-check", - // activeIcon: "mdi-account-check", - // label: "ประเมิน", - // // path: "evaluate", - // role: "discipline", // evaluate - // children: [ - // { - // key: 12.1, - // label: "ประเมินบุคคล", - // path: "evaluate", - // role: "discipline", - // }, - // { - // label: "ข้อมูลพื้นฐาน", - // path: "", - // key: 12.2, - // role: "discipline", - // children: [ - // { - // label: "กรรมการ", - // path: "evaluateDirector", - // role: "discipline", - // }, - // { - // label: "การประชุม", - // path: "evaluateMeeting", - // role: "discipline", - // }, - // ], - // }, - // ], - // }, { key: 11, icon: "mdi-account-check", activeIcon: "mdi-account-check", label: "ประเมินบุคคล", - role: "discipline", + role: "evaluate", children: [ { key: 11.1, @@ -534,17 +506,17 @@ const menuList = readonly([ label: "กรรมการและการประชุม", path: "", key: 11.7, - role: "discipline", + role: "evaluate", children: [ { label: "กรรมการ", path: "evaluateDirector", - role: "discipline", + role: "evaluate", }, { label: "การประชุม", path: "evaluateMeeting", - role: "discipline", + role: "evaluate", }, ], }, diff --git a/src/modules/11_discipline/components/!4_Order/MainPage.vue b/src/modules/11_discipline/components/9_Order/MainPage.vue similarity index 98% rename from src/modules/11_discipline/components/!4_Order/MainPage.vue rename to src/modules/11_discipline/components/9_Order/MainPage.vue index 15dfede0a..ea54f4e37 100644 --- a/src/modules/11_discipline/components/!4_Order/MainPage.vue +++ b/src/modules/11_discipline/components/9_Order/MainPage.vue @@ -4,7 +4,7 @@ import { useRouter } from "vue-router"; import type { DataList, DataListRes } from "../../interface/response/order"; import { useOrderStore } from "@/modules/11_discipline/store/OrderStore"; -import tableOrder from "@/modules/11_discipline/components/4_Order/TableOrder.vue"; +import tableOrder from "@/modules/11_discipline/components/9_Order/TableOrder.vue"; const router = useRouter(); const OrderStore = useOrderStore(); diff --git a/src/modules/11_discipline/components/!4_Order/OrderPage.vue b/src/modules/11_discipline/components/9_Order/OrderPage.vue similarity index 91% rename from src/modules/11_discipline/components/!4_Order/OrderPage.vue rename to src/modules/11_discipline/components/9_Order/OrderPage.vue index 06860e637..f2cd969ee 100644 --- a/src/modules/11_discipline/components/!4_Order/OrderPage.vue +++ b/src/modules/11_discipline/components/9_Order/OrderPage.vue @@ -3,9 +3,9 @@ import { ref } from "vue"; import { useRouter } from "vue-router"; /** import step */ -import step01 from "@/modules/11_discipline/components/4_Order/Step01.vue"; -import step02 from "@/modules/11_discipline/components/4_Order/Step02.vue"; -import step03 from "@/modules/11_discipline/components/4_Order/Step03.vue"; +import step01 from "@/modules/11_discipline/components/9_Order/Step01.vue"; +import step02 from "@/modules/11_discipline/components/9_Order/Step02.vue"; +import step03 from "@/modules/11_discipline/components/9_Order/Step03.vue"; const router = useRouter(); const step = ref(1); diff --git a/src/modules/11_discipline/components/!4_Order/Step01.vue b/src/modules/11_discipline/components/9_Order/Step01.vue similarity index 100% rename from src/modules/11_discipline/components/!4_Order/Step01.vue rename to src/modules/11_discipline/components/9_Order/Step01.vue diff --git a/src/modules/11_discipline/components/!4_Order/Step02.vue b/src/modules/11_discipline/components/9_Order/Step02.vue similarity index 100% rename from src/modules/11_discipline/components/!4_Order/Step02.vue rename to src/modules/11_discipline/components/9_Order/Step02.vue diff --git a/src/modules/11_discipline/components/!4_Order/Step03.vue b/src/modules/11_discipline/components/9_Order/Step03.vue similarity index 100% rename from src/modules/11_discipline/components/!4_Order/Step03.vue rename to src/modules/11_discipline/components/9_Order/Step03.vue diff --git a/src/modules/11_discipline/components/!4_Order/TableOrder.vue b/src/modules/11_discipline/components/9_Order/TableOrder.vue similarity index 100% rename from src/modules/11_discipline/components/!4_Order/TableOrder.vue rename to src/modules/11_discipline/components/9_Order/TableOrder.vue diff --git a/src/modules/11_discipline/router.ts b/src/modules/11_discipline/router.ts index cae70eafe..7d05cc5fe 100644 --- a/src/modules/11_discipline/router.ts +++ b/src/modules/11_discipline/router.ts @@ -50,10 +50,10 @@ const InvestigateDisciplinaryAdd = () => import( "@/modules/11_discipline/components/3_InvestigateDisciplinary/AddPage.vue" ); -// const orderPage = () => -// import("@/modules/11_discipline/components/4_Order/OrderPage.vue"); -// const oredrMain = () => -// import("@/modules/11_discipline/components/4_Order/MainPage.vue"); +const orderPage = () => + import("@/modules/11_discipline/components/9_Order/OrderPage.vue"); +const oredrMain = () => + import("@/modules/11_discipline/components/9_Order/MainPage.vue"); /** หน้ารายการสรุปผลการพิจารณาทางวินัย */ const resultMainPage = () => @@ -316,24 +316,24 @@ export default [ }, }, - // { - // path: "/discipline-order", - // name: "disciplineOrder", - // component: oredrMain, - // meta: { - // Auth: true, - // Key: [11.4], - // Role: "discipline", - // }, - // }, - // { - // path: "/discipline-order/add", - // name: "disciplineOrderAdd", - // component: orderPage, - // meta: { - // Auth: true, - // Key: [11.4], - // Role: "discipline", - // }, - // }, + { + path: "/discipline-order", + name: "disciplineOrder", + component: oredrMain, + meta: { + Auth: true, + Key: [11.4], + Role: "discipline", + }, + }, + { + path: "/discipline-order/add", + name: "disciplineOrderAdd", + component: orderPage, + meta: { + Auth: true, + Key: [11.4], + Role: "discipline", + }, + }, ]; diff --git a/src/modules/12_evaluatePersonal/router.ts b/src/modules/12_evaluatePersonal/router.ts index 376c2328d..ae43d644e 100644 --- a/src/modules/12_evaluatePersonal/router.ts +++ b/src/modules/12_evaluatePersonal/router.ts @@ -10,7 +10,7 @@ export default [ meta: { Auth: true, Key: [1.1], - Role: "discipline", + Role: "evaluate", }, }, { @@ -20,7 +20,7 @@ export default [ meta: { Auth: true, Key: [12.2], - Role: "discipline", + Role: "evaluate", }, }, ]; \ No newline at end of file