Merge branch 'develop' into devTee

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>

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>

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>

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>

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">

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>

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

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>

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>

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 }}

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>

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>

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>