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 @@ - +
@@ -36,7 +36,7 @@ :borderless="false" :outlined="true" :hide-dropdown-icon="false" - style="min-width: 150px;" + style="min-width: 150px" @update:model-value="searchFilterTable" />
@@ -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(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 @@
- + @@ -16,7 +16,7 @@ - + @@ -25,7 +25,7 @@ - + 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", + }, + }, ];