Merge branch 'develop' into dev

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

@@ -50,7 +50,8 @@ const items = ref<MenuMainList[]>([
     icon: "mdi-account-group-outline",
     title: "แผนผังองค์กร",
     sub: "ดูแผนผังองค์กร",
-    color: "blue-3",
+    // color: "blue-3",
+    color: "grey-3",
     path: "/organization-chart",
     active: false,
   },
@@ -220,7 +221,7 @@ async function onClickOpenPopupDetail(data: InboxDetail) {
     .get(config.API.msgInboxRead(data.no))
     .then(() => {
       const filterDate = inboxList.value.filter(
-        (r: InboxDetail) => r.no == data.no
+        (r: InboxDetail) => r.no == data.no,
       );
       for (const item of filterDate) {
         item.isOpen = true;
@@ -301,8 +302,14 @@ onMounted(async () => {
           <q-card
             v-else
             bordered
-            @click="goToPage(item.path)"
-            class="noactive col-12"
+            @click="
+              item.path === '/organization-chart' ? null : goToPage(item.path)
+            "
+            :class="
+              item.path === '/organization-chart'
+                ? 'disabledcard col-12'
+                : 'noactive col-12'
+            "
           >
             <div class="col-12">
               <q-avatar
@@ -507,7 +514,7 @@ onMounted(async () => {
   border: 1px solid #6dbdb142;
 }
 .disabledcard {
-  color: rgba(209, 209, 209, 0.733) !important;
+  color: rgba(105, 104, 104, 0.733) !important;
   border-color: rgba(207, 207, 207, 0.322) !important;
   box-shadow: none !important;
   border-radius: 12px;