Merge branch 'develop' into devTee

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

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

@@ -5,7 +5,6 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 
 /** importType*/
-import type { DataActive } from "@/modules/02_organizationalNew/interface/response/organizational";
 
 /** importComponents*/
 import ListView from "@/modules/02_organizationalNew/components/listView.vue";
@@ -37,62 +36,57 @@ const itemStructure = ref<any>([
     name: "สร้างใหม่",
   },
   {
-    val: "STRUCTURE",
+    val: "ORG",
     name: "ทำสำเนาเฉพาะโครงสร้าง",
   },
   {
-    val: "STRUCTUREANDPOSITION",
+    val: "ORG_POSITION",
     name: "ทำสำเนาโครงสร้างและตำแหน่ง",
   },
   {
-    val: "STRUCTUREANDPOSITION",
+    val: "ORG_POSITION_PERSON",
     name: "ทำสำเนาโครงสร้าง ตำแหน่งและคนครอง",
   },
 ]);
-const dataActive = ref<DataActive>();
 
 async function fetchOrganizationActive() {
-  const data = {
-    activeId: null,
-    activeName: "null",
-    draftId: null,
-    draftName: null,
-  };
-
-  // dataActive.value = data;
-
   showLoader();
   await http
     .get(config.API.activeOrganization)
     .then((res) => {
-      console.log(res);
-      // if (data) {
-      //   if (data.activeName === null && data.draftName === null) {
-      //     isStatusData.value = false;
-      //   } else {
-      //     isStatusData.value = true;
-      //   }
-      //   if (isStatusData.value) {
-      //     if (data.activeName === null) {
-      //       ishasActive.value = true;
-      //       stroe.typeOrganizational = "draft";
-      //     } else if (data.draftName === null) {
-      //       ishasDraft.value = true;
-      //       stroe.typeOrganizational = "current";
-      //     }
-
-      //   }
-      // }
+      const data = res.data.result;
+      if (data) {
+        stroe.fetchDataActive(data);
+        if (data.activeName === null && data.draftName === null) {
+          isStatusData.value = false;
+        } else {
+          isStatusData.value = true;
+          if (isStatusData.value) {
+            if (data.activeName === null) {
+              ishasActive.value = true;
+              stroe.typeOrganizational = "draft";
+            } else if (data.draftName === null) {
+              ishasDraft.value = true;
+              stroe.typeOrganizational = "current";
+            }
+          }
+        }
+      }
     })
     .catch((err) => {
       messageError($q, err);
-      console.log(err);
     })
     .finally(() => {
       hideLoader();
     });
 }
 
+const typeStructure = ref<string>("");
+function ocClickAddStructure(type: string) {
+  modalNewStructure.value = !modalNewStructure.value;
+  typeStructure.value = type;
+}
+
 const modalDateTime = ref<boolean>(false);
 function onClickDateTime() {
   modalDateTime.value = !modalDateTime.value;
@@ -151,7 +145,7 @@ onMounted(async () => {
               color="primary"
               size="lg"
               icon="add"
-              @click="modalNewStructure = true"
+              @click="ocClickAddStructure('NEW')"
             >
               <q-tooltip>เพิ่มโครงสร้าง </q-tooltip>
             </q-btn>
@@ -189,6 +183,7 @@ onMounted(async () => {
                   v-close-popup
                   v-for="(item, index) in itemStructure"
                   :key="index"
+                  @click="ocClickAddStructure(item.val)"
                 >
                   <q-item-section>
                     <q-item-label>{{ item.name }}</q-item-label>
@@ -236,10 +231,13 @@ onMounted(async () => {
   <DialogFormNewStructure
     v-model:new-structure="modalNewStructure"
     v-model:status="isStatusData"
+    v-model:type="typeStructure"
   />
 
+  <!-- ตั้งเวลาเผยแพร่ -->
   <DialogDateTime :modal="modalDateTime" :close="onClickDateTime" />
 
+  <!-- ประวัติโครงสร้าง -->
   <DialogHistory :modal="modalHistory" :close="onClickHistory" />
 
   <!-- รายละเอียดโครงสร้าง -->