From 3f20979e665fea003c0e596c49bb5723bc631dfd Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 21 Oct 2024 16:39:25 +0700
Subject: [PATCH] =?UTF-8?q?fix=20bug=20=E0=B8=A3=E0=B8=B2=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B0=E0=B9=80=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94?=
 =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/18_command/components/Step/0_Main.vue   |  1 -
 .../18_command/components/Step/View0_Live.vue       | 13 ++++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/modules/18_command/components/Step/0_Main.vue b/src/modules/18_command/components/Step/0_Main.vue
index 2c1862116..6481fb0ef 100644
--- a/src/modules/18_command/components/Step/0_Main.vue
+++ b/src/modules/18_command/components/Step/0_Main.vue
@@ -46,7 +46,6 @@ async function fetchData() {
       isDraft.value = data.isDraft;
       isSign.value = data.isSign;
       isAttachment.value = data.isAttachment;
-      store.readonly = step.value > 2;
     })
     .catch((err) => {
       messageError($q, err);
diff --git a/src/modules/18_command/components/Step/View0_Live.vue b/src/modules/18_command/components/Step/View0_Live.vue
index 8d94fd43e..50eb44a80 100644
--- a/src/modules/18_command/components/Step/View0_Live.vue
+++ b/src/modules/18_command/components/Step/View0_Live.vue
@@ -3,7 +3,7 @@ import { onMounted, ref } from "vue";
 import { useQuasar } from "quasar";
 import axios from "axios";
 
-import { useRoute } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 import { useCommandDetail } from "@/modules/18_command/store/DetailStore";
 import http from "@/plugins/http";
@@ -15,6 +15,7 @@ import PerviewPDF from "@/modules/18_command/components/Step/PerviewPDF.vue";
 
 const $q = useQuasar();
 const route = useRoute();
+const router = useRouter();
 const store = useCommandDetail();
 const {
   showLoader,
@@ -61,8 +62,9 @@ function onConfirmDraft() {
           sign: isDraft.value,
         })
         .then(async () => {
-          fetchData?.();
-          isCheckDraft.value = true;
+          router.push(`/command/view/${commandId.value}`);
+          // fetchData?.();
+          // isCheckDraft.value = true;
         })
         .catch((err) => {
           messageError($q, err);
@@ -235,8 +237,9 @@ function onConfirmOrder() {
             sign: isAuthority.value,
           })
           .then(async () => {
-            fetchData?.();
-            isCheckAuthority.value = true;
+            router.push(`/command/view/${commandId.value}`);
+            // fetchData?.();
+            // isCheckAuthority.value = true;
           })
           .catch((err) => {
             messageError($q, err);