From a8075effafa1ec22f373dd1925b72b068b27e4d5 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Mon, 8 Jan 2024 16:36:37 +0700
Subject: [PATCH] =?UTF-8?q?fix=20bug=20=E0=B8=AD=E0=B8=AD=E0=B8=81?=
 =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=99=E0=B8=B1=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/10_order/components/Detail.vue    | 22 ++++++++++++++++---
 .../9_Order/{OrderPage.vue => !OrderPage.vue} |  0
 .../9_Order/{Step01.vue => !Step01.vue}       |  0
 .../9_Order/{Step02.vue => !Step02.vue}       |  0
 .../9_Order/{Step03.vue => !Step03.vue}       |  0
 .../components/9_Order/TableOrder.vue         |  2 +-
 6 files changed, 20 insertions(+), 4 deletions(-)
 rename src/modules/11_discipline/components/9_Order/{OrderPage.vue => !OrderPage.vue} (100%)
 rename src/modules/11_discipline/components/9_Order/{Step01.vue => !Step01.vue} (100%)
 rename src/modules/11_discipline/components/9_Order/{Step02.vue => !Step02.vue} (100%)
 rename src/modules/11_discipline/components/9_Order/{Step03.vue => !Step03.vue} (100%)

diff --git a/src/modules/10_order/components/Detail.vue b/src/modules/10_order/components/Detail.vue
index f9bad1bd8..9e645066e 100644
--- a/src/modules/10_order/components/Detail.vue
+++ b/src/modules/10_order/components/Detail.vue
@@ -37,7 +37,13 @@ const nextStep = async () => {
     await http
       .put(config.API.nextStep(orderId.value))
       .then(() => {
-        router.push(`/order/detail/${orderId.value}?step=${step.value + 1}`);
+        if (route.name == "disciplineOrderDatail") {
+          router.push(
+            `/discipline-order/detail/${orderId.value}?step=${step.value + 1}`
+          );
+        } else {
+          router.push(`/order/detail/${orderId.value}?step=${step.value + 1}`);
+        }
       })
       .catch((e) => {
         console.log(e);
@@ -50,7 +56,13 @@ const previousStep = async () => {
     await http
       .put(config.API.prevStep(orderId.value))
       .then(() => {
-        router.push(`/order/detail/${orderId.value}?step=${step.value - 1}`);
+        if (route.name == "disciplineOrderDatail") {
+          router.push(
+            `/discipline-order/detail/${orderId.value}?step=${step.value - 1}`
+          );
+        } else {
+          router.push(`/order/detail/${orderId.value}?step=${step.value - 1}`);
+        }
       })
       .catch((e) => {
         console.log(e);
@@ -88,7 +100,11 @@ onMounted(() => {
       flat
       color="primary"
       class="q-mr-sm"
-      @click="router.go(-1), destroyLocalStorage()"
+      @click="
+        route.name == 'disciplineOrderDatail'
+          ? router.push(`/discipline-order`)
+          : router.push(`/order`)
+      "
     />
     ออกคำสั่ง
   </div>
diff --git a/src/modules/11_discipline/components/9_Order/OrderPage.vue b/src/modules/11_discipline/components/9_Order/!OrderPage.vue
similarity index 100%
rename from src/modules/11_discipline/components/9_Order/OrderPage.vue
rename to src/modules/11_discipline/components/9_Order/!OrderPage.vue
diff --git a/src/modules/11_discipline/components/9_Order/Step01.vue b/src/modules/11_discipline/components/9_Order/!Step01.vue
similarity index 100%
rename from src/modules/11_discipline/components/9_Order/Step01.vue
rename to src/modules/11_discipline/components/9_Order/!Step01.vue
diff --git a/src/modules/11_discipline/components/9_Order/Step02.vue b/src/modules/11_discipline/components/9_Order/!Step02.vue
similarity index 100%
rename from src/modules/11_discipline/components/9_Order/Step02.vue
rename to src/modules/11_discipline/components/9_Order/!Step02.vue
diff --git a/src/modules/11_discipline/components/9_Order/Step03.vue b/src/modules/11_discipline/components/9_Order/!Step03.vue
similarity index 100%
rename from src/modules/11_discipline/components/9_Order/Step03.vue
rename to src/modules/11_discipline/components/9_Order/!Step03.vue
diff --git a/src/modules/11_discipline/components/9_Order/TableOrder.vue b/src/modules/11_discipline/components/9_Order/TableOrder.vue
index 77d4e6f65..9be4c2e97 100644
--- a/src/modules/11_discipline/components/9_Order/TableOrder.vue
+++ b/src/modules/11_discipline/components/9_Order/TableOrder.vue
@@ -240,7 +240,7 @@ onMounted(() => {
           v-for="col in props.cols"
           :key="col.name"
           :props="props"
-          @click="redirectToPage(props.row.orderId, props.row.OrderStatus)"
+          @click="redirectToPage(props.row.orderId, props.row.orderStatusName)"
         >
           <div v-if="col.name === 'no'">
             {{ props.rowIndex + 1 }}