From 57e46133ef4e855470965ace14c8bb597d97b318 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 17 Jul 2023 16:00:29 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B4=E0=B8=87=E0=B8=84=E0=B9=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/06_retirement/views/Main.vue      |  7 +++-
 .../components/report/ReportView.vue          |  6 +--
 src/modules/07_insignia/router.ts             | 39 ++++++++++---------
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue
index 37712b229..e6211cdf8 100644
--- a/src/modules/06_retirement/views/Main.vue
+++ b/src/modules/06_retirement/views/Main.vue
@@ -17,7 +17,7 @@
         <q-tab name="employee" label="ลูกจ้างประจำ" />
       </q-tabs>
     </div>
-    <q-separator/>
+    <q-separator />
     <div class="col-12 row q-pa-md">
       <div class="row col-12">
         <div class="row col-12 q-col-gutter-sm">
@@ -36,7 +36,7 @@
             :borderless="false"
             :outlined="true"
             :hide-dropdown-icon="false"
-            style="min-width: 150px;"
+            style="min-width: 150px"
             @update:model-value="searchFilterTable"
           />
           <div>
@@ -178,7 +178,9 @@ import type {
   FormMainProbation2,
 } from "@/modules/05_placement/interface/request/Main";
 import { useQuasar } from "quasar";
+import { useRouter } from "vue-router";
 
+const router = useRouter();
 const $q = useQuasar(); //ใช้ noti quasar
 const modal = ref<boolean>(false);
 const pagination = ref({
@@ -334,6 +336,7 @@ const clickDelete = (id: string) => {
 
 const clickAdd = () => {
   //   modal.value = true;
+  router.push("/retirement/list");
 };
 const clickClose = async () => {
   modal.value = false;
diff --git a/src/modules/07_insignia/components/report/ReportView.vue b/src/modules/07_insignia/components/report/ReportView.vue
index 9813b7580..db552bc9f 100644
--- a/src/modules/07_insignia/components/report/ReportView.vue
+++ b/src/modules/07_insignia/components/report/ReportView.vue
@@ -7,7 +7,7 @@
   <div>
     <q-card flat bordered class="col-12 q-mt-sm">
       <div class="q-pa-md">
-        <q-item to="/insignia/report/report-01" dense>
+        <q-item to="/insignia/report/report-01" tag="q-item" dense>
           <q-item-section avatar>
             <q-icon color="primary" name="mdi-file" size="xs" />
           </q-item-section>
@@ -16,7 +16,7 @@
           </q-item-section>
         </q-item>
 
-        <q-item to="/" dense>
+        <q-item to="/insignia/report/report-02" dense>
           <q-item-section avatar>
             <q-icon color="primary" name="mdi-file" size="xs" />
           </q-item-section>
@@ -25,7 +25,7 @@
           </q-item-section>
         </q-item>
 
-        <q-item to="/" dense>
+        <q-item to="/insignia/report/report-03" dense>
           <q-item-section avatar>
             <q-icon color="primary" name="mdi-file" size="xs" />
           </q-item-section>
diff --git a/src/modules/07_insignia/router.ts b/src/modules/07_insignia/router.ts
index 5ffcbaecc..8bb9edd60 100644
--- a/src/modules/07_insignia/router.ts
+++ b/src/modules/07_insignia/router.ts
@@ -20,15 +20,6 @@ export default [
       Role: "insignia",
     },
   },
-  {
-    path: "/insignia/report",
-    name: "insignia-report",
-    component: ReportView,
-    meta: {
-      Auth: true,
-      Key: [7.1],
-    },
-  },
   {
     path: "/insignia/result-insignia",
     name: "result-insignia",
@@ -39,16 +30,6 @@ export default [
       Role: "insignia",
     },
   },
-  {
-    path: "/insignia/report/report-01",
-    name: "insignia-report-report-01",
-    component: report_01,
-    meta: {
-      Auth: true,
-      Key: [7.1],
-      Role: "insignia",
-    },
-  },
   {
     path: "/insignia/coin",
     name: "coin",
@@ -59,4 +40,24 @@ export default [
       Role: "insignia",
     },
   },
+  {
+    path: "/insignia/report",
+    name: "insignia-report",
+    component: ReportView,
+    meta: {
+      Auth: true,
+      Key: [7],
+      Role: "insignia",
+    },
+  },
+  {
+    path: "/insignia/report/report-01",
+    name: "report-report-01",
+    component: report_01,
+    meta: {
+      Auth: true,
+      Key: [7],
+      Role: "insignia",
+    },
+  },
 ];