From 04c0f681345984d99979517e3a9f6c5edd20cc2e Mon Sep 17 00:00:00 2001 From: watcharanondh Date: Thu, 8 Jun 2023 15:58:33 +0700 Subject: [PATCH] =?UTF-8?q?add=20router=20=E0=B8=81=E0=B8=81.=20=E0=B9=81?= =?UTF-8?q?=E0=B8=A5=E0=B8=B0=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87?= =?UTF-8?q?=20=3D>Done?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/05_placement/router.ts | 21 + src/modules/05_placement/views/Domination.vue | 496 ++++++++++++++++++ src/modules/05_placement/views/Main.vue | 5 +- 3 files changed, 518 insertions(+), 4 deletions(-) create mode 100644 src/modules/05_placement/views/Domination.vue diff --git a/src/modules/05_placement/router.ts b/src/modules/05_placement/router.ts index 1a67682e0..a5ef2e57f 100644 --- a/src/modules/05_placement/router.ts +++ b/src/modules/05_placement/router.ts @@ -4,6 +4,7 @@ const Main = () => import("@/modules/05_placement/views/Main.vue"); const Detail = () => import("@/modules/05_placement/components/PlacementDetail.vue"); +const Domination = () => import("@/modules/05_placement/views/Domination.vue"); export default [ { @@ -26,5 +27,25 @@ export default [ Role: "placement", }, }, + { + path: "/placement/detail", + name: "placementDetail", + component: Detail, + meta: { + Auth: true, + Key: [7], + Role: "placement", + }, + }, + { + path: "/domination", + name: "domination", + component: Domination, + meta: { + Auth: true, + Key: [7], + Role: "placement", + }, + }, ]; diff --git a/src/modules/05_placement/views/Domination.vue b/src/modules/05_placement/views/Domination.vue new file mode 100644 index 000000000..fe6d18914 --- /dev/null +++ b/src/modules/05_placement/views/Domination.vue @@ -0,0 +1,496 @@ + + + + + diff --git a/src/modules/05_placement/views/Main.vue b/src/modules/05_placement/views/Main.vue index 2455359b8..fe6d18914 100644 --- a/src/modules/05_placement/views/Main.vue +++ b/src/modules/05_placement/views/Main.vue @@ -174,10 +174,7 @@ const fiscalyearOP = reactive([{id: 0, name: 'ทั้งหม const fiscalyearfilter = async () => { for (let data of OriginalData.value) { const year = data.FiscalYear + 543; - if (fiscalyear.value == 0 && !addedFiscalYearValues.includes(1)) { - fiscalyearOP.push({ id: 0, name: "ทั้งหมด" }); - addedFiscalYearValues.push(1); - } else if (!addedFiscalYearValues.includes(year)) { + if (!addedFiscalYearValues.includes(year)) { fiscalyearOP.push({ id: year, name: year.toString() }); addedFiscalYearValues.push(year); }