diff --git a/src/api/org/api.org.ts b/src/api/org/api.org.ts index 8bf9a4a..45d915f 100644 --- a/src/api/org/api.org.ts +++ b/src/api/org/api.org.ts @@ -6,4 +6,5 @@ export default { profilePosition: () => `${org}/profile/keycloak/position`, searchCommander: `${org}/profile/search/commander`, + dataUserInformation: `${org}/profile/user`, }; diff --git a/src/modules/01_dashboard/views/Dashboard.vue b/src/modules/01_dashboard/views/Dashboard.vue index 38b3328..27b38e9 100644 --- a/src/modules/01_dashboard/views/Dashboard.vue +++ b/src/modules/01_dashboard/views/Dashboard.vue @@ -257,7 +257,7 @@ const thaiOptions: Intl.DateTimeFormatOptions = {
diff --git a/src/modules/06_evaluate/components/TableListEvaluate.vue b/src/modules/06_evaluate/components/TableListEvaluate.vue index ef058fb..6b0f5ec 100644 --- a/src/modules/06_evaluate/components/TableListEvaluate.vue +++ b/src/modules/06_evaluate/components/TableListEvaluate.vue @@ -152,7 +152,7 @@ watch([() => currentPage.value, () => pagination.value.rowsPerPage], () => { + - + + diff --git a/src/modules/10_registry/router.ts b/src/modules/10_registry/router.ts new file mode 100644 index 0000000..b59add7 --- /dev/null +++ b/src/modules/10_registry/router.ts @@ -0,0 +1,66 @@ +// registry +const registryPage = () => import("@/modules/10_registry/views/main.vue"); + +const registryInformation = () => import("@/modules/10_registry/tabs/01_information.vue"); +const registryGovernment = () => import("@/modules/10_registry/tabs/02_government.vue"); +const registrySalary = () => import("@/modules/10_registry/tabs/03_salary.vue"); +const registryInsignia = () => import("@/modules/10_registry/tabs/04_insignia.vue"); +const registryOther = () => import("@/modules/10_registry/tabs/05_other.vue"); + +export default [ + { + path: "/registry", + name: "registryMain", + component: registryPage, + meta: { + Auth: true, + Key: [10], + }, + }, + + { + path: "/registry/information", + name: "registryInformation", + component: registryInformation, + meta: { + Auth: true, + Key: [10], + }, + }, + { + path: "/registry/government", + name: "registryGovernment", + component: registryGovernment, + meta: { + Auth: true, + Key: [10], + }, + }, + { + path: "/registry/salary", + name: "registrySalary", + component: registrySalary, + meta: { + Auth: true, + Key: [10], + }, + }, + { + path: "/registry/insignia", + name: "registryInsignia", + component: registryInsignia, + meta: { + Auth: true, + Key: [10], + }, + }, + { + path: "/registry/other", + name: "registryOther", + component: registryOther, + meta: { + Auth: true, + Key: [10], + }, + }, +]; diff --git a/src/modules/10_registry/tabs/01_information.vue b/src/modules/10_registry/tabs/01_information.vue new file mode 100644 index 0000000..f278a4b --- /dev/null +++ b/src/modules/10_registry/tabs/01_information.vue @@ -0,0 +1,615 @@ + + + diff --git a/src/modules/10_registry/tabs/02_government.vue b/src/modules/10_registry/tabs/02_government.vue new file mode 100644 index 0000000..88d63b9 --- /dev/null +++ b/src/modules/10_registry/tabs/02_government.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/modules/10_registry/tabs/03_salary.vue b/src/modules/10_registry/tabs/03_salary.vue new file mode 100644 index 0000000..237aed7 --- /dev/null +++ b/src/modules/10_registry/tabs/03_salary.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/modules/10_registry/tabs/04_insignia.vue b/src/modules/10_registry/tabs/04_insignia.vue new file mode 100644 index 0000000..e3cfffa --- /dev/null +++ b/src/modules/10_registry/tabs/04_insignia.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/modules/10_registry/tabs/05_other.vue b/src/modules/10_registry/tabs/05_other.vue new file mode 100644 index 0000000..00f4b14 --- /dev/null +++ b/src/modules/10_registry/tabs/05_other.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/modules/10_registry/views/main.vue b/src/modules/10_registry/views/main.vue new file mode 100644 index 0000000..c4b0bf4 --- /dev/null +++ b/src/modules/10_registry/views/main.vue @@ -0,0 +1,232 @@ + + \ No newline at end of file diff --git a/src/router/index.ts b/src/router/index.ts index c3b8dbb..200dd87 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -13,6 +13,7 @@ import ModuAppealComplain from "@/modules/07_appealComplain/router"; import ModuleSupport from "@/modules/00_support/router"; import ModuleKPI from "@/modules/08_KPI/router"; import ModuleScholarship from "@/modules/09_scholarship/router"; +import Moduleregistry from "@/modules/10_registry/router"; // TODO: ใช้หรือไม่? import keycloak from "@/plugins/keycloak"; @@ -51,6 +52,7 @@ const router = createRouter({ ...ModuleSupport, ...ModuleKPI, ...ModuleScholarship, + ...Moduleregistry ], }, ], diff --git a/src/style/quasar-variables.sass b/src/style/quasar-variables.sass index 39fea51..b995a40 100644 --- a/src/style/quasar-variables.sass +++ b/src/style/quasar-variables.sass @@ -82,3 +82,9 @@ input.input-alert .input-alert i.text-primary color: #f00 !important + +.select_ellipsis .q-field__native > span + white-space: nowrap + overflow: hidden + text-overflow: ellipsis + width: 200px diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue index 75db048..c058e0f 100644 --- a/src/views/MainLayout.vue +++ b/src/views/MainLayout.vue @@ -7,6 +7,7 @@ import { useQuasar } from "quasar"; import keycloak from "@/plugins/keycloak"; import { useCounterMixin } from "@/stores/mixin"; + const route = useRoute(); const router = useRouter(); @@ -152,6 +153,10 @@ const thaiOptions: Intl.DateTimeFormatOptions = { hour: "2-digit", minute: "2-digit", }; + +function onInfo(){ + router.push(`/registry`) +} + + + + + ข้อมูลทะเบียนประวัติ + + @@ -377,6 +391,7 @@ const thaiOptions: Intl.DateTimeFormatOptions = { +
@@ -389,10 +404,25 @@ const thaiOptions: Intl.DateTimeFormatOptions = { +
+ + + + + ข้อมูลทะเบียนประวัติ +