แก้ไขสิทธิ์ของประเมิน และเพิ่มเมนูออกคำสั่งลงโทษทางวินัย

src/interface/request/main/main.ts

@@ -463,6 +463,12 @@ const menuList = readonly<any[]>([
         path: "appealComplain",
         role: "discipline",
       },
+      {
+        key: 11.5,
+        label: "ออกคำสั่งลงโทษทางวินัย",
+        path: "disciplineOrder",
+        role: "discipline",
+      },
       {
         label: "ข้อมูลพื้นฐาน",
         path: "",
@@ -483,46 +489,12 @@ const menuList = readonly<any[]>([
       },
     ],
   },
-  // {
-  //   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<any[]>([
         label: "กรรมการและการประชุม",
         path: "",
         key: 11.7,
-        role: "discipline",
+        role: "evaluate",
         children: [
           {
             label: "กรรมการ",
             path: "evaluateDirector",
-            role: "discipline",
+            role: "evaluate",
           },
           {
             label: "การประชุม",
             path: "evaluateMeeting",
-            role: "discipline",
+            role: "evaluate",
           },
         ],
       },

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();

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 step01 from "@/modules/11_discipline/components/9_Order/Step01.vue";
-import step02 from "@/modules/11_discipline/components/4_Order/Step02.vue";
+import step02 from "@/modules/11_discipline/components/9_Order/Step02.vue";
-import step03 from "@/modules/11_discipline/components/4_Order/Step03.vue";
+import step03 from "@/modules/11_discipline/components/9_Order/Step03.vue";
 
 const router = useRouter();
 const step = ref<number>(1);

src/modules/11_discipline/router.ts

@@ -50,10 +50,10 @@ const InvestigateDisciplinaryAdd = () =>
   import(
     "@/modules/11_discipline/components/3_InvestigateDisciplinary/AddPage.vue"
   );
-// const orderPage = () =>
+const orderPage = () =>
-//   import("@/modules/11_discipline/components/4_Order/OrderPage.vue");
+  import("@/modules/11_discipline/components/9_Order/OrderPage.vue");
-// const oredrMain = () =>
+const oredrMain = () =>
-//   import("@/modules/11_discipline/components/4_Order/MainPage.vue");
+  import("@/modules/11_discipline/components/9_Order/MainPage.vue");
 
 /** หน้ารายการสรุปผลการพิจารณาทางวินัย */
 const resultMainPage = () =>
@@ -316,24 +316,24 @@ export default [
     },
   },
 
-  // {
+  {
-  //   path: "/discipline-order",
+    path: "/discipline-order",
-  //   name: "disciplineOrder",
+    name: "disciplineOrder",
-  //   component: oredrMain,
+    component: oredrMain,
-  //   meta: {
+    meta: {
-  //     Auth: true,
+      Auth: true,
-  //     Key: [11.4],
+      Key: [11.4],
-  //     Role: "discipline",
+      Role: "discipline",
-  //   },
+    },
-  // },
+  },
-  // {
+  {
-  //   path: "/discipline-order/add",
+    path: "/discipline-order/add",
-  //   name: "disciplineOrderAdd",
+    name: "disciplineOrderAdd",
-  //   component: orderPage,
+    component: orderPage,
-  //   meta: {
+    meta: {
-  //     Auth: true,
+      Auth: true,
-  //     Key: [11.4],
+      Key: [11.4],
-  //     Role: "discipline",
+      Role: "discipline",
-  //   },
+    },
-  // },
+  },
 ];

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",
     },
   },
 ];