From 8db325f75ced801a5bc63d50dec2dcbf0a147ce4 Mon Sep 17 00:00:00 2001 From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com> Date: Fri, 23 Jun 2023 11:34:09 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B9=84=E0=B8=9F=E0=B8=A5?= =?UTF-8?q?=E0=B9=8C=20=E0=B8=AD=E0=B8=B1=E0=B8=9E=E0=B9=80=E0=B8=94?= =?UTF-8?q?=E0=B8=97=20route?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MainOrderPlacement.vue} | 8 +++++--- .../addOrderPlacement.vue} | 0 src/modules/05_placement/router.ts | 16 ++++++++++------ 3 files changed, 15 insertions(+), 9 deletions(-) rename src/modules/05_placement/components/{OrderReplace/MainOrderReplace.vue => OrderPlacement/MainOrderPlacement.vue} (98%) rename src/modules/05_placement/components/{OrderReplace/addOrderReplace.vue => OrderPlacement/addOrderPlacement.vue} (100%) diff --git a/src/modules/05_placement/components/OrderReplace/MainOrderReplace.vue b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue similarity index 98% rename from src/modules/05_placement/components/OrderReplace/MainOrderReplace.vue rename to src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue index 23e35e220..c1eb12396 100644 --- a/src/modules/05_placement/components/OrderReplace/MainOrderReplace.vue +++ b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue @@ -224,7 +224,9 @@ import type { DataOption } from "@/modules/05_placement/interface/index/Main"; import { useCounterMixin } from "@/stores/mixin"; import { usePlacementDataStore } from "@/modules/05_placement/store"; import router from "@/router"; +import { useQuasar } from "quasar"; +const $q = useQuasar(); //ใช้ noti quasar const DataStore = usePlacementDataStore(); const pagination = ref({ sortBy: "desc", @@ -499,10 +501,10 @@ const OriginalDataFetch = async () => { UpdataData.value = OriginalData.value; }; -// ดูรายการสอบแข่งขัน หน้าต่อไป +// ดูรายการหน้าต่อไป const redirectToPage = (id?: number) => { // router.push({ name: 'placementDetail'}); - router.push(`/orderPlacement/detail`); + // router.push(`/orderPlacement/detail`); }; const clickDelete = (id: string) => { @@ -539,7 +541,7 @@ const clickDelete = (id: string) => { // }; const clickAdd = () => { - router.push({ name: "addOrderReplace" }); + router.push({ name: "addOrderPlacement" }); }; // เลือกปีงบประมาณ diff --git a/src/modules/05_placement/components/OrderReplace/addOrderReplace.vue b/src/modules/05_placement/components/OrderPlacement/addOrderPlacement.vue similarity index 100% rename from src/modules/05_placement/components/OrderReplace/addOrderReplace.vue rename to src/modules/05_placement/components/OrderPlacement/addOrderPlacement.vue diff --git a/src/modules/05_placement/router.ts b/src/modules/05_placement/router.ts index cad0932c5..4924693b4 100644 --- a/src/modules/05_placement/router.ts +++ b/src/modules/05_placement/router.ts @@ -10,10 +10,14 @@ const MainOther = () => import("@/modules/05_placement/components/exams_other/Main.vue"); const Placement2Detail = () => import("@/modules/05_placement/components/exams_other/Detail.vue"); -const addOrderReplace = () => - import("@/modules/05_placement/components/OrderReplace/addOrderReplace.vue"); +const addOrderPlacement = () => + import( + "@/modules/05_placement/components/OrderPlacement/addOrderPlacement.vue" + ); const MainOrderPlacement = () => - import("@/modules/05_placement/components/OrderReplace/MainOrderReplace.vue"); + import( + "@/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue" + ); export default [ { path: "/placement/Sorkorcho", @@ -66,9 +70,9 @@ export default [ }, }, { - path: "/placement/addOrderReplace", - name: "addOrderReplace", - component: addOrderReplace, + path: "/placement/addOrderPlacement", + name: "addOrderPlacement", + component: addOrderPlacement, meta: { Auth: true, Key: [8],