hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'nice_dev' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-04-03 17:51:26 +07:00
commit 7cdcebf5e0
8 changed files with 588 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/15_development/views/MainPage.vue
View file

@ -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");
}
/**

2
src/modules/15_development/views/Scholarship.vue
View file

@ -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();