Merge branch 'nice_dev' into develop

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;

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>

src/modules/07_insignia/router.ts

@@ -26,15 +26,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",
@@ -45,16 +36,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",
@@ -65,4 +46,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",
+    },
+  },
 ];