Merge branch 'develop' into dev

* develop:
  fix(organization-chart):Open Menu Structure
  fix:formData.append null

src/modules/01_dashboard/views/Dashboard.vue

@@ -187,14 +187,8 @@ onMounted(async () => {
           <q-card
             v-else
             bordered
-            @click="
+            @click="goToPage(item.path)"
-              item.path === '/organization-chart' ? null : goToPage(item.path)
+            class="noactive col-12"
-            "
-            :class="
-              item.path === '/organization-chart'
-                ? 'disabledcard col-12'
-                : 'noactive col-12'
-            "
           >
             <div class="col-12">
               <q-avatar
@@ -218,9 +212,6 @@ onMounted(async () => {
             >
               {{ item.sub }}
             </div>
-            <q-tooltip v-if="item.path === '/organization-chart'">
-              อยู่ระหว่างปรับปรุง</q-tooltip
-            >
           </q-card>
         </div>
       </div>

src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue

@@ -146,44 +146,57 @@ function onValidate() {
     formData.append("type", formDataFollowSpouse.type); //
     formData.append(
       "leaveStartDate",
-      convertDateToAPI(formDataFollowSpouse.leaveStartDate) ?? ""
+      convertDateToAPI(formDataFollowSpouse.leaveStartDate) ?? "",
     ); //
     formData.append(
       "leaveEndDate",
-      convertDateToAPI(formDataFollowSpouse.leaveEndDate) ?? ""
+      convertDateToAPI(formDataFollowSpouse.leaveEndDate) ?? "",
     ); //
     formData.append(
       "coupleDayStartDateHistory",
-      convertDateToAPI(formDataFollowSpouse.coupleDayStartDateHistory) ?? ""
+      convertDateToAPI(formDataFollowSpouse.coupleDayStartDateHistory) ?? "",
     ); //
     formData.append(
       "coupleDayEndDateHistory",
-      convertDateToAPI(formDataFollowSpouse.coupleDayEndDateHistory) ?? ""
+      convertDateToAPI(formDataFollowSpouse.coupleDayEndDateHistory) ?? "",
     ); //
     formData.append("leaveWrote", formDataFollowSpouse.leaveWrote); //
     formData.append("leaveDetail", formDataFollowSpouse.leaveDetail); //
     formData.append("leaveSalaryText", formDataFollowSpouse.leaveSalaryText); //
     formData.append("leaveSalary", formDataFollowSpouse.leaveSalary); //
-    formData.append(
+
-      "coupleDayTotalHistory",
+    if (formDataFollowSpouse.coupleDayTotalHistory) {
-      formDataFollowSpouse.coupleDayTotalHistory
+      formData.append(
-    ); //
+        "coupleDayTotalHistory",
-    formData.append(
+        formDataFollowSpouse.coupleDayTotalHistory,
-      "coupleDaySumTotalHistory",
+      ); //
-      formDataFollowSpouse.coupleDaySumTotalHistory
+    }
-    ); //
+
-    formData.append(
+    if (formDataFollowSpouse.coupleDaySumTotalHistory) {
-      "coupleDayCountryHistory",
+      formData.append(
-      formDataFollowSpouse.coupleDayCountryHistory
+        "coupleDaySumTotalHistory",
-    ); //
+        formDataFollowSpouse.coupleDaySumTotalHistory,
-    formData.append(
+      ); //
-      "coupleDayLevelCountry",
+    }
-      formDataFollowSpouse.coupleDayLevelCountry
+
-    ); //
+    if (formDataFollowSpouse.coupleDayCountryHistory) {
+      formData.append(
+        "coupleDayCountryHistory",
+        formDataFollowSpouse.coupleDayCountryHistory,
+      ); //
+    }
+
+    if (formDataFollowSpouse.coupleDayLevelCountry) {
+      formData.append(
+        "coupleDayLevelCountry",
+        formDataFollowSpouse.coupleDayLevelCountry,
+      ); //
+    }
+
     formData.append("coupleDayLevel", formDataFollowSpouse.coupleDayLevel); //
     formData.append(
       "coupleDayPosition",
-      formDataFollowSpouse.coupleDayPosition
+      formDataFollowSpouse.coupleDayPosition,
     ); //
     formData.append("coupleDayName", formDataFollowSpouse.coupleDayName); //
     formData.append("leaveTotal", formDataFollowSpouse.leaveTotal); //
@@ -227,7 +240,7 @@ async function fetchCheck() {
         // totalCheck.value = data.totalDate;
         leaveText.value = calculateDurationYmd(
           convertDateToAPI(formDataFollowSpouse.leaveStartDate),
-          convertDateToAPI(formDataFollowSpouse.leaveEndDate)
+          convertDateToAPI(formDataFollowSpouse.leaveEndDate),
         );
         reasonLeave.value = data.message
           ? data.message
@@ -249,7 +262,7 @@ async function fetchCheck() {
 function updateLeaveHistoryTotal() {
   const newLeaveTotal = calculateDurationYmd(
     formDataFollowSpouse.coupleDayStartDateHistory,
-    formDataFollowSpouse.coupleDayEndDateHistory
+    formDataFollowSpouse.coupleDayEndDateHistory,
   );
   formDataFollowSpouse.coupleDayTotalHistory = newLeaveTotal;
   checkTotalHistory();
@@ -310,20 +323,20 @@ watch(
       checkTotalHistory();
       const leaveTotal = calculateDurationYmd(
         props.data.leaveStartDate,
-        props.data.leaveEndDate
+        props.data.leaveEndDate,
       );
       leaveText.value = leaveTotal;
 
       const coupleDayTotalHistory = calculateDurationYmd(
         props.data.coupleDayStartDateHistory,
-        props.data.coupleDayEndDateHistory
+        props.data.coupleDayEndDateHistory,
       );
       formDataFollowSpouse.coupleDayTotalHistory = coupleDayTotalHistory;
       statusCheck.value = props.data.status;
       formDataFollowSpouse.leaveDocument = [];
     }
   },
-  { deep: true }
+  { deep: true },
 );
 
 /**Hook */
@@ -359,13 +372,13 @@ onMounted(async () => {
     checkTotalHistory();
     const leaveTotal = calculateDurationYmd(
       props.data.leaveStartDate,
-      props.data.leaveEndDate
+      props.data.leaveEndDate,
     );
     leaveText.value = leaveTotal;
 
     const coupleDayTotalHistory = calculateDurationYmd(
       props.data.coupleDayStartDateHistory,
-      props.data.coupleDayEndDateHistory
+      props.data.coupleDayEndDateHistory,
     );
     formDataFollowSpouse.coupleDayTotalHistory = coupleDayTotalHistory;
     statusCheck.value = props.data.status;

src/stores/data.ts

@@ -161,8 +161,7 @@ export const useDataStore = defineStore("dataMain", () => {
       icon: "mdi-account-group-outline",
       title: "แผนผังองค์กร",
       sub: "ดูแผนผังองค์กร",
-      // color: "blue-3",
+      color: "blue-3",
-      color: "grey-3",
       path: "/organization-chart",
       active: false,
     },