Merge branch 'develop' into feat/issue

* develop:
  fix: edit email
  fix:tooltip card organization-chart
  fix: delete import defineProps
  fix:disable organization-chart
  ปิดตารางประวัติตำแหน่งไปก่อน
  ปิดไม่แสดงข้อมูลตำแหน่งและเงินเดือน
  feat: add position and salary review

# Conflicts:
#	src/api/org/api.org.ts

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

@@ -54,7 +54,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,
   },
@@ -305,8 +306,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
@@ -330,6 +337,9 @@ onMounted(async () => {
             >
               {{ item.sub }}
             </div>
+            <q-tooltip v-if="item.path === '/organization-chart'">
+              อยู่ระหว่างปรับปรุง</q-tooltip
+            >
           </q-card>
         </div>
       </div>
@@ -511,7 +521,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;