From f00e98766cd3a50f1093fe286cbc15915f4d11f9 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Tue, 5 Mar 2024 14:13:46 +0700
Subject: [PATCH] closed #14

---
 .../components/DialogNewStructure.vue                 |  4 ++--
 src/modules/02_organizationalNew/views/main.vue       | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/DialogNewStructure.vue b/src/modules/02_organizationalNew/components/DialogNewStructure.vue
index cd59d44e4..7e1e01c44 100644
--- a/src/modules/02_organizationalNew/components/DialogNewStructure.vue
+++ b/src/modules/02_organizationalNew/components/DialogNewStructure.vue
@@ -29,6 +29,7 @@ const props = defineProps({
   fetchActive: {
     type: Function,
     require: true,
+    default: () => "fetchActive function",
   },
 });
 
@@ -84,7 +85,6 @@ function validateForm() {
   }
   if (hasError.every((result) => result === true)) {
     onSubmit();
-  } else {
   }
 }
 
@@ -102,7 +102,7 @@ function onSubmit() {
           store.draftId = res.data.result.id;
           store.statusView = "list";
           success($q, "บันทึกข้อมูลสำเร็จ");
-          props.fetchActive?.();
+          props.fetchActive();
         })
         .catch((err) => {
           messageError($q, err);
diff --git a/src/modules/02_organizationalNew/views/main.vue b/src/modules/02_organizationalNew/views/main.vue
index 31b3809e5..3a805b1ac 100644
--- a/src/modules/02_organizationalNew/views/main.vue
+++ b/src/modules/02_organizationalNew/views/main.vue
@@ -29,8 +29,8 @@ const modalDateTime = ref<boolean>(false); //  ตั้งเวลาเผย
 
 /** สถานะ*/
 const isStatusData = ref<boolean>(false); // แสดงตั้งเวลาเผยแพร่
-const ishasActive = ref<boolean>(false); // สถานะการทำงาน
-const ishasDraft = ref<boolean>(false); // สถานะแบบร่าง
+// const ishasActive = ref<boolean>(false); // สถานะการทำงาน
+// const ishasDraft = ref<boolean>(false); // สถานะแบบร่าง
 /** List เพิ่มโครงสร้าง*/
 const itemStructure = ref<DataOption[]>([
   {
@@ -73,10 +73,10 @@ async function fetchOrganizationActive() {
           isStatusData.value = true;
           if (isStatusData.value) {
             if (data.activeName === null) {
-              ishasActive.value = true;
+              // ishasActive.value = true;
               store.typeOrganizational = "draft";
             } else if (data.draftName === null) {
-              ishasDraft.value = true;
+              // ishasDraft.value = true;
               store.typeOrganizational = "current";
             }
           }
@@ -225,6 +225,7 @@ onMounted(async () => {
                 :outline="store.typeOrganizational === 'current' ? false : true"
                 color="blue"
                 label="ปัจจุบัน"
+                :disable="store.activeId == '' || store.activeId == null"
                 @click="
                   (store.typeOrganizational = 'current'),
                     (labelHistory = 'ประวัติโครงสร้าง')
@@ -237,11 +238,11 @@ onMounted(async () => {
                 :outline="store.typeOrganizational === 'draft' ? false : true"
                 color="blue"
                 label="แบบร่าง"
+                :disable="store.draftId == '' || store.draftId == null"
                 @click="
                   (store.typeOrganizational = 'draft'),
                     (labelHistory = 'ประวัติโครงสร้าง')
                 "
-                :disable="ishasDraft"
               />
               <q-btn-dropdown
                 v-if="itemHistory.length !== 0"