From 242f82806bd878805df3e0d07bd498428efc6261 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 1 Aug 2024 14:29:33 +0700
Subject: [PATCH] updated route placement

---
 .../components/AppointEmployee/Detail.vue     |   2 +-
 .../components/AppointMent/Detail.vue         |   2 +-
 .../05_placement/components/Other/Detail.vue  |   2 +-
 .../05_placement/components/Other/Main.vue    |   4 +-
 .../components/Receive/AddEmployee/Main.vue   |   4 +-
 .../components/Receive/receiveDetail2.vue     |   2 +-
 .../components/Receive/receiveMain.vue        |   7 +-
 .../components/Repatriate/RepatriateMain.vue  |   3 +-
 .../components/Repatriate/RepatriatebyId.vue  |   2 +-
 .../components/Transfer/transferMain.vue      |   2 +-
 .../components/Transfer/transferRegistry.vue  |   2 +-
 .../helpgovernment/governmentDetail.vue       |   2 +-
 .../components/helpgovernment/mainHelp.vue    |   3 +-
 src/modules/05_placement/router.ts            | 242 +++++++++---------
 14 files changed, 137 insertions(+), 142 deletions(-)

diff --git a/src/modules/05_placement/components/AppointEmployee/Detail.vue b/src/modules/05_placement/components/AppointEmployee/Detail.vue
index 3055582a9..4844a3d75 100644
--- a/src/modules/05_placement/components/AppointEmployee/Detail.vue
+++ b/src/modules/05_placement/components/AppointEmployee/Detail.vue
@@ -177,7 +177,7 @@ onMounted(async () => {
       flat
       color="primary"
       class="q-mr-sm"
-      @click="router.push(`/appoint-employee`)"
+      @click="router.push(`/placement/appoint-employee`)"
     />
     รายละเอียดการปรับระดับชั้นงานลูกจ้าง {{ title.fullname }}
   </div>
diff --git a/src/modules/05_placement/components/AppointMent/Detail.vue b/src/modules/05_placement/components/AppointMent/Detail.vue
index 29ad044ee..6650aecf9 100644
--- a/src/modules/05_placement/components/AppointMent/Detail.vue
+++ b/src/modules/05_placement/components/AppointMent/Detail.vue
@@ -154,7 +154,7 @@ onMounted(async () => {
       flat
       color="primary"
       class="q-mr-sm"
-      @click="router.push(`/appoint-promote`)"
+      @click="router.push(`/placement/appoint-promote`)"
     />
     รายละเอียดการแต่งตั้ง-เลื่อน-ย้าย {{ title.fullname }}
   </div>
diff --git a/src/modules/05_placement/components/Other/Detail.vue b/src/modules/05_placement/components/Other/Detail.vue
index 8ddfcc6d5..c71679b99 100644
--- a/src/modules/05_placement/components/Other/Detail.vue
+++ b/src/modules/05_placement/components/Other/Detail.vue
@@ -149,7 +149,7 @@ onMounted(async () => {
       flat
       color="primary"
       class="q-mr-sm"
-      @click="router.push(`/other`)"
+      @click="router.push(`/placement/other`)"
     />
     รายละเอียดรายการอื่นๆ {{ fullName }}
   </div>
diff --git a/src/modules/05_placement/components/Other/Main.vue b/src/modules/05_placement/components/Other/Main.vue
index bc8cea639..5f5d181fc 100644
--- a/src/modules/05_placement/components/Other/Main.vue
+++ b/src/modules/05_placement/components/Other/Main.vue
@@ -216,7 +216,7 @@ const clickDelete = (id: string) => {
 //----(เปิดหน้ารายละเอียด)------//
 const nextPage = (id: string) => {
   router.push({
-    path: `/other/detail/${id}`,
+    path: `/placement/other/detail/${id}`,
   });
 };
 
@@ -345,8 +345,6 @@ onMounted(() => {
                     {{ col.value ? col.value : "-" }}
                   </div>
                 </q-td>
-
-
               </q-tr>
             </template>
           </d-table>
diff --git a/src/modules/05_placement/components/Receive/AddEmployee/Main.vue b/src/modules/05_placement/components/Receive/AddEmployee/Main.vue
index 634ac32be..c983d91f7 100644
--- a/src/modules/05_placement/components/Receive/AddEmployee/Main.vue
+++ b/src/modules/05_placement/components/Receive/AddEmployee/Main.vue
@@ -344,7 +344,7 @@ const onSubmit = async () => {
 
 // ปุ่ม back
 const clickBack = () => {
-  router.push("/receive");
+  router.push("/placement/receive");
 };
 
 function calculateAge(birthDate: Date | null) {
@@ -651,7 +651,7 @@ onMounted(async () => {
         color="primary"
         icon="mdi-chevron-left"
         dense
-        @click="router.push(`/receive`)"
+        @click="router.push(`/placement/receive`)"
       >
       </q-btn>
       <q-avatar size="65px" rounded class="containerimage">
diff --git a/src/modules/05_placement/components/Receive/receiveDetail2.vue b/src/modules/05_placement/components/Receive/receiveDetail2.vue
index f636bd112..2fbeb5880 100644
--- a/src/modules/05_placement/components/Receive/receiveDetail2.vue
+++ b/src/modules/05_placement/components/Receive/receiveDetail2.vue
@@ -480,7 +480,7 @@ onMounted(async () => {
       flat
       color="primary"
       class="q-mr-sm"
-      @click="router.push(`/receive`)"
+      @click="router.push(`/placement/receive`)"
     />
     รายละเอียดการรับโอนของ {{ title.fullname }}
   </div>
diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue
index 482fb9f68..d67394e6b 100644
--- a/src/modules/05_placement/components/Receive/receiveMain.vue
+++ b/src/modules/05_placement/components/Receive/receiveMain.vue
@@ -10,7 +10,7 @@ import config from "@/app.config";
 import { useRouter } from "vue-router";
 
 import DialogHeader from "@/modules/05_placement/components/Receive/DialogHeader.vue";
-import DialogOrgTree from "@/modules/05_placement/components/Receive/receiveModal.vue";
+// import DialogOrgTree from "@/modules/05_placement/components/Receive/receiveModal.vue";
 
 import type { QTableProps } from "quasar";
 import type {
@@ -252,7 +252,7 @@ const resetFilter = () => {
 };
 // ไปหน้าเพิ่มข้อมูล
 const add = () => {
-  router.push(`/receive/add`);
+  router.push(`/placement/receive/add`);
 };
 // ปิดโมเดล
 const clickClose = () => {
@@ -314,7 +314,7 @@ const closeModalTree = async () => {
 // ไปหน้ารายละเอียด
 const nextPage = (id: string) => {
   router.push({
-    path: `/receive/${id}`,
+    path: `/placement/receive/${id}`,
   });
 };
 
@@ -594,7 +594,6 @@ onMounted(() => {
                     {{ col.value ? col.value : "-" }}
                   </div>
                 </q-td>
-
               </q-tr>
               <!-- <q-tr :props="props" class="cursor-pointer">
                 <q-td
diff --git a/src/modules/05_placement/components/Repatriate/RepatriateMain.vue b/src/modules/05_placement/components/Repatriate/RepatriateMain.vue
index 471ffea05..4d30a7027 100644
--- a/src/modules/05_placement/components/Repatriate/RepatriateMain.vue
+++ b/src/modules/05_placement/components/Repatriate/RepatriateMain.vue
@@ -147,7 +147,7 @@ const resetFilter = () => {
 
 //เปิดรายละเอียด
 const openDetail = (id: string) => {
-  router.push(`/repatriate/detail/${id}`);
+  router.push(`/placement/repatriate/detail/${id}`);
 };
 // เปิด modal
 const openModal = () => (modal.value = true);
@@ -333,7 +333,6 @@ onMounted(async () => {
                     {{ col.value == null ? "" : col.value }}
                   </div>
                 </q-td>
-
               </q-tr>
             </template>
           </d-table>
diff --git a/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue b/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
index 7472d9473..aaa34a6c2 100644
--- a/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
+++ b/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
@@ -143,7 +143,7 @@ onMounted(() => {
       flat
       color="primary"
       class="q-mr-sm"
-      @click="router.push(`/repatriate`)"
+      @click="router.push(`/placement/repatriate`)"
     />
     รายละเอียดการส่งตัวกลับ {{ fullname }}
   </div>
diff --git a/src/modules/05_placement/components/Transfer/transferMain.vue b/src/modules/05_placement/components/Transfer/transferMain.vue
index 92c998710..48f6e62fe 100644
--- a/src/modules/05_placement/components/Transfer/transferMain.vue
+++ b/src/modules/05_placement/components/Transfer/transferMain.vue
@@ -254,7 +254,7 @@ onMounted(async () => {
                   v-for="col in props.cols"
                   :key="col.id"
                   class="cursor-pointer"
-                  @click="router.push(`/transfer/${props.row.id}`)"
+                  @click="router.push(`/placement/transfer/${props.row.id}`)"
                 >
                   <div v-if="col.name === 'no'">
                     {{ props.rowIndex + 1 }}
diff --git a/src/modules/05_placement/components/Transfer/transferRegistry.vue b/src/modules/05_placement/components/Transfer/transferRegistry.vue
index 6ad6cabb8..cae8c436f 100644
--- a/src/modules/05_placement/components/Transfer/transferRegistry.vue
+++ b/src/modules/05_placement/components/Transfer/transferRegistry.vue
@@ -319,7 +319,7 @@ onMounted(async () => {
       flat
       color="primary"
       class="q-mr-sm"
-      @click="router.push(`/transfer`)"
+      @click="router.push(`/placement/transfer`)"
     />
     รายละเอียดการขอโอนของ {{ responseData.fullname }}
   </div>
diff --git a/src/modules/05_placement/components/helpgovernment/governmentDetail.vue b/src/modules/05_placement/components/helpgovernment/governmentDetail.vue
index 45a852e5f..c0a583a05 100644
--- a/src/modules/05_placement/components/helpgovernment/governmentDetail.vue
+++ b/src/modules/05_placement/components/helpgovernment/governmentDetail.vue
@@ -136,7 +136,7 @@ onMounted(() => {
       flat
       color="primary"
       class="q-mr-sm"
-      @click="router.push(`/help-government`)"
+      @click="router.push(`/placement/help-government`)"
     />
     รายละเอียดการช่วยราชการ {{ fullname }}
   </div>
diff --git a/src/modules/05_placement/components/helpgovernment/mainHelp.vue b/src/modules/05_placement/components/helpgovernment/mainHelp.vue
index 46fd647b7..a83546960 100644
--- a/src/modules/05_placement/components/helpgovernment/mainHelp.vue
+++ b/src/modules/05_placement/components/helpgovernment/mainHelp.vue
@@ -181,7 +181,7 @@ const resetFilter = () => {
 };
 
 const openDetail = (id: string) => {
-  router.push(`/help-government/detail/${id}`);
+  router.push(`/placement/help-government/detail/${id}`);
 };
 const openModal = () => (modal.value = true);
 const closeModal = () => {
@@ -357,7 +357,6 @@ onMounted(async () => {
                     }}
                   </div>
                 </q-td>
-
               </q-tr>
             </template>
           </d-table>
diff --git a/src/modules/05_placement/router.ts b/src/modules/05_placement/router.ts
index 3f3e32ef2..ce7a5dd88 100644
--- a/src/modules/05_placement/router.ts
+++ b/src/modules/05_placement/router.ts
@@ -99,8 +99,8 @@ export default [
     component: PlacementMain,
     meta: {
       Auth: true,
-      Key: [6.1],
-      Role: "placement",
+      Key: "SYS_PLACEMENT_PASS",
+      Role: "STAFF",
     },
   },
   {
@@ -109,8 +109,8 @@ export default [
     component: PlacementDetail,
     meta: {
       Auth: true,
-      Key: [6.1],
-      Role: "placement",
+      Key: "SYS_PLACEMENT_PASS",
+      Role: "STAFF",
     },
   },
   {
@@ -119,8 +119,8 @@ export default [
     component: PlacementPersonalDetail,
     meta: {
       Auth: true,
-      Key: [6.1],
-      Role: "placement",
+      Key: "SYS_PLACEMENT_PASS",
+      Role: "STAFF",
     },
   },
   {
@@ -129,8 +129,8 @@ export default [
     component: mainProbation,
     meta: {
       Auth: true,
-      Key: [6.3],
-      Role: "probation",
+      Key: "SYS_PROBATION",
+      Role: "STAFF",
     },
   },
   {
@@ -139,8 +139,8 @@ export default [
     component: probationDetail,
     meta: {
       Auth: true,
-      Key: [6.3],
-      Role: "probation",
+      Key: "SYS_PROBATION",
+      Role: "STAFF",
     },
   },
   {
@@ -149,8 +149,8 @@ export default [
     component: probationFormEvaluation,
     meta: {
       Auth: true,
-      Key: [6.3],
-      Role: "probation",
+      Key: "SYS_PROBATION",
+      Role: "STAFF",
     },
   },
   {
@@ -159,8 +159,8 @@ export default [
     component: FormSaveResultAdd,
     meta: {
       Auth: true,
-      Key: [6.3],
-      Role: "probation",
+      Key: "SYS_PROBATION",
+      Role: "STAFF",
     },
   },
   {
@@ -169,8 +169,8 @@ export default [
     component: FormEvaluateAdd,
     meta: {
       Auth: true,
-      Key: [6.3],
-      Role: "probation",
+      Key: "SYS_PROBATION",
+      Role: "STAFF",
     },
   },
   {
@@ -179,8 +179,8 @@ export default [
     component: FormSaveResultAddCommander,
     meta: {
       Auth: true,
-      Key: [6.3],
-      Role: "probation",
+      Key: "SYS_PROBATION",
+      Role: "STAFF",
     },
   },
   {
@@ -189,8 +189,8 @@ export default [
     component: FormEvaluateScoreAdd,
     meta: {
       Auth: true,
-      Key: [6.3],
-      Role: "probation",
+      Key: "SYS_PROBATION",
+      Role: "STAFF",
     },
   },
   {
@@ -199,8 +199,8 @@ export default [
     component: probationWorkAdd,
     meta: {
       Auth: true,
-      Key: [6.3],
-      Role: "probation",
+      Key: "SYS_PROBATION",
+      Role: "STAFF",
     },
   },
   {
@@ -209,8 +209,8 @@ export default [
     component: probationWorkAdd,
     meta: {
       Auth: true,
-      Key: [6.3],
-      Role: "probation",
+      Key: "SYS_PROBATION",
+      Role: "STAFF",
     },
   },
   {
@@ -219,208 +219,208 @@ export default [
     component: probationFormAssign,
     meta: {
       Auth: true,
-      Key: [6.3],
-      Role: "probation",
+      Key: "SYS_PROBATION",
+      Role: "STAFF",
     },
   },
   {
-    path: "/transfer",
+    path: "/placement/transfer",
     name: "transfer",
     component: transfer,
     meta: {
       Auth: true,
-      Key: [6.4],
-      Role: "placement",
+      Key: "SYS_TRANSFER_REQ",
+      Role: "STAFF",
     },
   },
   {
-    path: "/transfer/:id",
+    path: "/placement/transfer/:id",
     name: "transfer-id",
     component: transferbyId,
     meta: {
       Auth: true,
-      Key: [6.4],
-      Role: "placement",
+      Key: "SYS_TRANSFER_REQ",
+      Role: "STAFF",
     },
   },
   {
-    path: "/receive",
+    path: "/placement/receive",
     name: "receive",
     component: receiveMain,
     meta: {
       Auth: true,
-      Key: [6.3],
-      Role: "placement",
+      Key: "SYS_TRANSFER_RECEIVE",
+      Role: "STAFF",
     },
   },
   {
-    path: "/receive/add",
+    path: "/placement/receive/add",
     name: "receiveAdd",
     component: ReceiveAdd,
     meta: {
       Auth: true,
-      Key: [6.3],
-      Role: "registryEmployee",
+      Key: "SYS_TRANSFER_RECEIVE",
+      Role: "STAFF",
     },
   },
   {
-    path: "/receive/:id",
+    path: "/placement/receive/:id",
     name: "receiveDetail",
     component: receiveDetail2,
     meta: {
       Auth: true,
-      Key: [6.3],
-      Role: "placement",
+      Key: "SYS_TRANSFER_RECEIVE",
+      Role: "STAFF",
     },
   },
   {
-    path: "/help-government",
+    path: "/placement/help-government",
     name: "help-government",
     component: helpgovernment,
     meta: {
       Auth: true,
-      Key: [6.6],
-      Role: "placement",
+      Key: "SYS_TEMPDUTY",
+      Role: "STAFF",
     },
   },
   {
-    path: "/help-government/detail/:id",
+    path: "/placement/help-government/detail/:id",
     name: "help-governmentbyId",
     component: helpgovernmentbyId,
     meta: {
       Auth: true,
-      Key: [6.6],
-      Role: "placement",
+      Key: "SYS_TEMPDUTY",
+      Role: "STAFF",
     },
   },
   {
-    path: "/repatriate",
+    path: "/placement/repatriate",
     name: "repatriate",
     component: repatriate,
     meta: {
       Auth: true,
-      Key: [6.7],
-      Role: "placement",
+      Key: "SYS_TEMPDUTY2",
+      Role: "STAFF",
     },
   },
   {
-    path: "/repatriate/detail/:id",
+    path: "/placement/repatriate/detail/:id",
     name: "repatriatebyId",
     component: repatriatebyId,
     meta: {
       Auth: true,
-      Key: [6.7],
-      Role: "placement",
+      Key: "SYS_TEMPDUTY2",
+      Role: "STAFF",
     },
   },
   {
-    path: "appoint-promote",
+    path: "/placement/appoint-promote",
     name: "appoint-promote",
     component: AppointmentMain,
     meta: {
       Auth: true,
-      Key: [6.8],
-      Role: "placement",
+      Key: "SYS_PROMOTION_OFFICER",
+      Role: "STAFF",
     },
   },
   {
-    path: "appoint-promote/detail/:id",
+    path: "/placement/appoint-promote/detail/:id",
     name: "appoint-promote-detail",
     component: AppointmentDetail,
     meta: {
       Auth: true,
-      Key: [6.8],
-      Role: "placement",
+      Key: "SYS_PROMOTION_OFFICER",
+      Role: "STAFF",
     },
   },
   {
-    path: "appoint-employee",
+    path: "/placement/appoint-employee",
     name: "appoint-employee",
     component: AppointEmployeeMain,
     meta: {
       Auth: true,
-      Key: [6.9],
-      Role: "placement",
+      Key: "SYS_PROMOTION_EMP",
+      Role: "STAFF",
     },
   },
   {
-    path: "appoint-employee/detail/:id",
+    path: "/placement/appoint-employee/detail/:id",
     name: "appoint-employee-detail",
     component: AppointEmployeeDetail,
     meta: {
       Auth: true,
-      Key: [6.9],
-      Role: "placement",
+      Key: "SYS_PROMOTION_EMP",
+      Role: "STAFF",
     },
   },
   {
-    path: "other",
+    path: "/placement/other",
     name: "other",
     component: OtherMain,
     meta: {
       Auth: true,
-      Key: [6.1],
-      Role: "placement",
+      Key: "SYS_PLACEMENT_OTHER",
+      Role: "STAFF",
     },
   },
   {
-    path: "/relocation",
-    name: "relocation",
-    component: relocation,
-    meta: {
-      Auth: true,
-      Key: [6.1],
-      Role: "placement",
-    },
-  },
-  {
-    path: "other/detail/:id",
+    path: "/placement/other/detail/:id",
     name: "other-detail",
     component: OthertDetail,
     meta: {
       Auth: true,
-      Key: [6.9],
-      Role: "placement",
-    },
-  },
-  {
-    path: "/relocation/detail/:id",
-    name: "relocationId",
-    component: relocationbyId,
-    meta: {
-      Auth: true,
-      Key: [6.9],
-      Role: "placement",
-    },
-  },
-  {
-    path: "/change-positions",
-    name: "changePositions",
-    component: ChangePositionMain,
-    meta: {
-      Auth: true,
-      Key: [6.4],
-      Role: "placement",
-    },
-  },
-  {
-    path: "/change-positions/:id",
-    name: "changePersonalList",
-    component: ChangePersonalList,
-    meta: {
-      Auth: true,
-      Key: [6.4],
-      Role: "placement",
-    },
-  },
-  {
-    path: "/change-positions/personal/:id",
-    name: "changePersonalId",
-    component: ChangePersonalDetail,
-    meta: {
-      Auth: true,
-      Key: [6.4],
-      Role: "placement",
+      Key: "SYS_PLACEMENT_OTHER",
+      Role: "STAFF",
     },
   },
+  // {
+  //   path: "/relocation",
+  //   name: "relocation",
+  //   component: relocation,
+  //   meta: {
+  //     Auth: true,
+  //     Key: [6.1],
+  //     Role: "placement",
+  //   },
+  // },
+  // {
+  //   path: "/relocation/detail/:id",
+  //   name: "relocationId",
+  //   component: relocationbyId,
+  //   meta: {
+  //     Auth: true,
+  //     Key: [6.9],
+  //     Role: "placement",
+  //   },
+  // },
+  // {
+  //   path: "/change-positions",
+  //   name: "changePositions",
+  //   component: ChangePositionMain,
+  //   meta: {
+  //     Auth: true,
+  //     Key: "",
+  //     Role: "STAFF",
+  //   },
+  // },
+  // {
+  //   path: "/change-positions/:id",
+  //   name: "changePersonalList",
+  //   component: ChangePersonalList,
+  //   meta: {
+  //     Auth: true,
+  //     Key: "",
+  //     Role: "placement",
+  //   },
+  // },
+  // {
+  //   path: "/change-positions/personal/:id",
+  //   name: "changePersonalId",
+  //   component: ChangePersonalDetail,
+  //   meta: {
+  //     Auth: true,
+  //     Key: "",
+  //     Role: "placement",
+  //   },
+  // },
 ];