From 9e1386c05267e2f850edec498380f2de31b1cc9b Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Fri, 26 Jan 2024 13:25:00 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=20popup=20=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/modules/02_organizationalNew/components/DialogNewStructure.vue b/src/modules/02_organizationalNew/components/DialogNewStructure.vue
index b0c22a02b..9037568a3 100644
--- a/src/modules/02_organizationalNew/components/DialogNewStructure.vue
+++ b/src/modules/02_organizationalNew/components/DialogNewStructure.vue
@@ -15,6 +15,7 @@ const $q = useQuasar();
 const mixin = useCounterMixin();
 const { dialogConfirm } = mixin;
 
+const status = defineModel("status");
 const rows = ref<any[]>([]);
 const typeOp = ref<DataOption[]>([
   {
@@ -70,6 +71,7 @@ function validateForm() {
 /** ฟังชั่น บันทึก */
 function onSubmit() {
   dialogConfirm($q, () => {
+    status.value = true;
     console.log(formData);
   });
   modal.value = false;
diff --git a/src/modules/02_organizationalNew/views/main.vue b/src/modules/02_organizationalNew/views/main.vue
index e950af507..3ae95c7f0 100644
--- a/src/modules/02_organizationalNew/views/main.vue
+++ b/src/modules/02_organizationalNew/views/main.vue
@@ -45,12 +45,6 @@ function onClickHistory() {
 }
 </script>
 <template>
-  <q-btn
-    color="indigo-9"
-    label="pop up สร้างโครงสร้างใหม่"
-    @click="modalNewStructure = true"
-  >
-  </q-btn>
   <div class="row">
     <div class="toptitle text-dark row items-center">โครงสร้างอัตรากำลัง</div>
     <q-space />
@@ -94,7 +88,7 @@ function onClickHistory() {
               color="primary"
               size="lg"
               icon="add"
-              @click="isStatusData = true"
+              @click="modalNewStructure = true"
             >
               <q-tooltip>เพิ่มโครงสร้าง </q-tooltip>
             </q-btn>
@@ -173,7 +167,7 @@ function onClickHistory() {
     </div>
   </q-card>
 
-  <DialogFormNewStructure v-model:new-structure="modalNewStructure" />
+  <DialogFormNewStructure v-model:new-structure="modalNewStructure" v-model:status="isStatusData"/>
   <DialogDateTime :modal="modalDateTime" :close="onClickDateTime" />
 
   <DialogHistory :modal="modalHistory" :close="onClickHistory" />