From fa8926e01c9f7a677e80fd07b3b4879961af57ce Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Fri, 1 Dec 2023 21:50:01 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=8A=E0=B8=B7?=
 =?UTF-8?q?=E0=B9=88=E0=B8=ADstatus=E0=B8=AA=E0=B8=A3=E0=B8=B8=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=9C=E0=B8=A5=E0=B8=A7=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

---
 .../11_discipline/components/4_Result/EditPage.vue   |  7 ++++++-
 src/modules/11_discipline/store/ResultStore.ts       | 12 +++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/modules/11_discipline/components/4_Result/EditPage.vue b/src/modules/11_discipline/components/4_Result/EditPage.vue
index f7841891d..8dba93c0b 100644
--- a/src/modules/11_discipline/components/4_Result/EditPage.vue
+++ b/src/modules/11_discipline/components/4_Result/EditPage.vue
@@ -277,7 +277,12 @@ watch(
       <div class="q-ma-none">แก้ไขผลการพิจารณาทางวินัย</div>
       <q-space />
       <div class="q-gutter-x-sm">
-        <q-btn label="ส่งไปออกคำสั่ง" color="public" @click="sentIssue" />
+        <q-btn
+          v-if="status === 'DONE'"
+          label="ส่งไปออกคำสั่ง"
+          color="public"
+          @click="sentIssue"
+        />
       </div>
     </div>
     <q-card flat class="col-12">
diff --git a/src/modules/11_discipline/store/ResultStore.ts b/src/modules/11_discipline/store/ResultStore.ts
index a4f74f377..4d4e4d3aa 100644
--- a/src/modules/11_discipline/store/ResultStore.ts
+++ b/src/modules/11_discipline/store/ResultStore.ts
@@ -64,12 +64,14 @@ export const useDisciplineResultStore = defineStore(
     /** function สถานะ*/
     function convertStatus(val: string) {
       switch (val) {
-        case "NEW":
-          return "กำลังสรุปผลการพิจารณา";
-        case "STOP":
-          return "ยุติเรื่อง";
+        // case "NEW":
+        //   return "กำลังสรุปผลการพิจารณา";
+        // case "STOP":
+        //   return "ยุติเรื่อง";
         case "DONE":
-          return "เสร็จสิ้น";
+          return "กำลังสรุปผลการพิจารณา";
+        case "REPORT":
+          return "ส่งไปออกคำสั่ง";
       }
     }