Merge branch 'develop' into devTee

# Conflicts:
#	src/modules/02_organizationalNew/views/main.vue

src/modules/02_organizationalNew/views/main.vue

@@ -5,6 +5,8 @@ import { ref } from "vue";
 import ListView from "@/modules/02_organizationalNew/components/listView.vue";
 import StructureView from "@/modules/02_organizationalNew/components/structureView.vue";
 import DialogFormNewStructure from "@/modules/02_organizationalNew/components/DialogNewStructure.vue";
+import DialogDateTime from "@/modules/02_organizationalNew/components/DialogFormDateTime.vue";
+import DialogHistory from "@/modules/02_organizationalNew/components/DialogHistory.vue";
 
 /** importStore*/
 import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
@@ -12,8 +14,7 @@ import { useOrganizational } from "@/modules/02_organizationalNew/store/organiza
 const modalNewStructure = ref<boolean>(false);
 const stroe = useOrganizational();
 
-const isStatusData = ref<boolean>(true);
-
+const isStatusData = ref<boolean>(false);
 const itemStructure = ref<any>([
   {
     val: "NEW",
@@ -32,6 +33,16 @@ const itemStructure = ref<any>([
     name: "ทำสำเนาโครงสร้าง ตำแหน่งและคนครอง",
   },
 ]);
+
+const modalDateTime = ref<boolean>(false);
+function onClickDateTime() {
+  modalDateTime.value = !modalDateTime.value;
+}
+
+const modalHistory = ref<boolean>(false);
+function onClickHistory() {
+  modalHistory.value = !modalHistory.value;
+}
 </script>
 <template>
   <q-btn
@@ -45,7 +56,13 @@ const itemStructure = ref<any>([
     <q-space />
 
     <div class="toptitle row" v-if="stroe.typeOrganizational === 'draft'">
-      <q-btn color="indigo-9" icon="alarm" label="ตั้งเวลาเผยแพร่"> </q-btn>
+      <q-btn
+        color="indigo-9"
+        icon="alarm"
+        label="ตั้งเวลาเผยแพร่"
+        @click="onClickDateTime"
+      >
+      </q-btn>
     </div>
   </div>
 
@@ -108,6 +125,7 @@ const itemStructure = ref<any>([
             <q-btn-dropdown color="green" label="ปรับโครงสร้าง">
               <q-list>
                 <q-item
+                  dense
                   clickable
                   v-close-popup
                   v-for="(item, index) in itemStructure"
@@ -120,7 +138,13 @@ const itemStructure = ref<any>([
               </q-list>
             </q-btn-dropdown>
 
-            <q-btn flat round color="primary" icon="history">
+            <q-btn
+              flat
+              round
+              color="primary"
+              icon="history"
+              @click="onClickHistory"
+            >
               <q-tooltip>ประวัติโครงสร้าง</q-tooltip>
             </q-btn>
             <q-space />
@@ -134,7 +158,7 @@ const itemStructure = ref<any>([
             <q-btn
               flat
               round
-              icon="account_tree"
+              icon="mdi-sitemap"
               :color="stroe.statusView === 'tree' ? 'grey-7' : 'grey-4'"
               @click="stroe.statusView = 'tree'"
             />
@@ -150,6 +174,9 @@ const itemStructure = ref<any>([
   </q-card>
 
   <DialogFormNewStructure v-model:new-structure="modalNewStructure" />
+  <DialogDateTime :modal="modalDateTime" :close="onClickDateTime" />
+
+  <DialogHistory :modal="modalHistory" :close="onClickHistory" />
 </template>
 
 <style scoped></style>