From 80ab12d77d6eeb5c461f2ea8c2af7f5192b56ed4 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Wed, 25 Dec 2024 13:44:02 +0700
Subject: [PATCH] refactor: route

---
 src/pages/09_task-order/MainPage.vue           |  4 ++--
 src/pages/09_task-order/PageView.vue           | 11 +++++++++++
 .../09_task-order/order_view/MainPage.vue      |  2 +-
 src/router/routes.ts                           | 18 ++++++------------
 4 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 src/pages/09_task-order/PageView.vue

diff --git a/src/pages/09_task-order/MainPage.vue b/src/pages/09_task-order/MainPage.vue
index 68c94ef6..8f0af771 100644
--- a/src/pages/09_task-order/MainPage.vue
+++ b/src/pages/09_task-order/MainPage.vue
@@ -88,7 +88,7 @@ async function triggerTaskOrder(opts: {
   id?: string;
 }) {
   const url = new URL(
-    `/task-order/order/${opts.statusDialog === 'create' ? 'add' : opts.id}`,
+    `/task-order/${opts.statusDialog === 'create' ? 'add' : opts.id}`,
     window.location.origin,
   );
 
@@ -99,7 +99,7 @@ async function triggerTaskReceive(opts: {
   statusDialog: 'info' | 'edit';
   id?: string;
 }) {
-  const url = new URL(`/task-order/receive/${opts.id}`, window.location.origin);
+  const url = new URL(`/task-order/${opts.id}`, window.location.origin);
 
   window.open(url.toString(), '_blank');
 }
diff --git a/src/pages/09_task-order/PageView.vue b/src/pages/09_task-order/PageView.vue
new file mode 100644
index 00000000..7f0ef775
--- /dev/null
+++ b/src/pages/09_task-order/PageView.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+import OrderView from './order_view/MainPage.vue';
+import ReceiveView from './receive_view/MainPage.vue';
+
+import { isRoleInclude } from 'src/stores/utils';
+</script>
+
+<template>
+  <OrderView v-if="!isRoleInclude(['messenger'])" />
+  <ReceiveView v-if="isRoleInclude(['messenger'])" />
+</template>
diff --git a/src/pages/09_task-order/order_view/MainPage.vue b/src/pages/09_task-order/order_view/MainPage.vue
index a77ef621..e71ba87d 100644
--- a/src/pages/09_task-order/order_view/MainPage.vue
+++ b/src/pages/09_task-order/order_view/MainPage.vue
@@ -587,7 +587,7 @@ watch([currentFormData.value.taskStatus], () => {
 });
 
 function viewDocument(id: string) {
-  window.open(`/task-order/doc/${id}`, '_blank');
+  window.open(`/task-order/${id}/doc`, '_blank');
 }
 </script>
 <template>
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 6d9a44bc..edc168f6 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -134,21 +134,15 @@ const routes: RouteRecordRaw[] = [
     component: () => import('pages/09_task-order/order_view/MainPage.vue'),
   },
   {
-    path: '/task-order/doc/:id',
+    path: '/task-order/:id',
+    name: 'TaskReceiveView',
+    component: () => import('pages/09_task-order/PageView.vue'),
+  },
+  {
+    path: '/task-order/:id/doc',
     name: 'TaskOrderAdd',
     component: () => import('pages/09_task-order/document_view/MainPage.vue'),
   },
-  {
-    path: '/task-order/order/:id',
-    name: 'TaskOrderView',
-    component: () => import('pages/09_task-order/order_view/MainPage.vue'),
-  },
-
-  {
-    path: '/task-order/receive/:id',
-    name: 'TaskReceiveView',
-    component: () => import('pages/09_task-order/receive_view/MainPage.vue'),
-  },
 
   // Always leave this as last one,
   // but you can also remove it