Merge branch 'nice_dev' into develop

2023-07-25 10:03:34 +07:00 · 2023-07-25 10:03:34 +07:00 · befd2db27b
commit befd2db27b
parent 576dbf9fbe 1b6157165a
2 changed files with 2 additions and 2 deletions
--- a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
+++ b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
@ -485,7 +485,7 @@ const OriginalDataFetch = async () => {

 // ดูรายการหน้าต่อไป
 const redirectToPage = (id?: number) => {
-  router.push(`/retirement/dismiss-order/add`);
+  router.push(`/dismiss-order/addorder`);
 };

 const clickDelete = (id: string) => {
--- a/src/modules/06_retirement/router.ts
+++ b/src/modules/06_retirement/router.ts
@ -92,7 +92,7 @@ export default [
    },
  },
  {
-    path: "retirement/dismiss-order/add",
+    path: "/dismiss-order/addorder",
    name: "dismiss-order-add",
    component: addOrder,
    meta: {