Merge branch 'develop' into devTee

src/modules/15_development/views/MainPage.vue

@@ -30,7 +30,7 @@ const columns = ref<QTableProps["columns"]>([
     sortable: true,
     field: "year",
     headerStyle: "font-size: 14px",
-    style: "font-size: 14px ;width: 10%",
+    style: "font-size: 14px ; width:10%",
     format: (val) => val + 543,
   },
   {
@@ -40,7 +40,7 @@ const columns = ref<QTableProps["columns"]>([
     sortable: true,
     field: "projectName",
     headerStyle: "font-size: 14px",
-    style: "font-size: 14px;width: 45%",
+    style: "font-size: 14px;width:45% ",
   },
 
   {
@@ -50,7 +50,7 @@ const columns = ref<QTableProps["columns"]>([
     sortable: true,
     field: "org",
     headerStyle: "font-size: 14px",
-    style: "font-size: 14px ;width: 45%",
+    style: "font-size: 14px ; width:45% ",
   },
 ]);
 const visibleColumns = ref<string[]>(["year", "projectName", "org"]);
@@ -114,7 +114,7 @@ function fetchListProject() {
  * @param id รายการโครงการ
  */
 function onClickAddOrView(status: boolean = false, id: string = "") {
-  status ? router.push(`development/${id}`) : router.push("development/add");
+  status ? router.push(`/development/${id}`) : router.push("/development/add");
 }
 
 /**
@@ -301,4 +301,11 @@ onMounted(() => {
   </q-card>
 </template>
 
-<style scoped></style>
+<style lang="scss" scoped>
+.table_ellipsis {
+  max-width: 400px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+</style>

src/modules/15_development/views/Scholarship.vue

@@ -4,11 +4,9 @@ import { useQuasar, type QTableProps } from "quasar";
 import { useRouter } from "vue-router";
 
 /** importStore*/
-
 import { useCounterMixin } from "@/stores/mixin";
 
 /** use*/
-
 const $q = useQuasar();
 const router = useRouter();
 const { showLoader, hideLoader } = useCounterMixin();
@@ -47,7 +45,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "type",
     align: "left",
-    label: "ประเภท",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "type",
     headerStyle: "font-size: 14px",
@@ -56,7 +54,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "level",
     align: "left",
-    label: "ระดับ",
+    label: "ระดับตำแหน่ง",
     sortable: true,
     field: "level",
     headerStyle: "font-size: 14px",