From 8e7e120d731836dd3cb8fdfbae0e536711e536b1 Mon Sep 17 00:00:00 2001 From: "STW_TTTY\\stwtt" Date: Thu, 23 May 2024 18:03:23 +0700 Subject: [PATCH 1/3] =?UTF-8?q?UI=20=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1?= =?UTF-8?q?=E0=B8=B9=E0=B8=A5=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?= =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?= =?UTF-8?q?=E0=B8=95=E0=B8=B4(=E0=B8=A2=E0=B8=B1=E0=B8=87=E0=B9=84?= =?UTF-8?q?=E0=B8=A1=E0=B9=88=E0=B9=80=E0=B8=AA=E0=B8=A3=E0=B9=87=E0=B8=88?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/org/api.org.ts | 1 + src/modules/10_registry/router.ts | 66 ++ .../10_registry/tabs/01_information.vue | 615 ++++++++++++++++++ .../10_registry/tabs/02_government.vue | 3 + src/modules/10_registry/tabs/03_salary.vue | 3 + src/modules/10_registry/tabs/04_insignia.vue | 3 + src/modules/10_registry/tabs/05_other.vue | 3 + src/modules/10_registry/views/main.vue | 232 +++++++ src/router/index.ts | 2 + src/views/MainLayout.vue | 30 + 10 files changed, 958 insertions(+) create mode 100644 src/modules/10_registry/router.ts create mode 100644 src/modules/10_registry/tabs/01_information.vue create mode 100644 src/modules/10_registry/tabs/02_government.vue create mode 100644 src/modules/10_registry/tabs/03_salary.vue create mode 100644 src/modules/10_registry/tabs/04_insignia.vue create mode 100644 src/modules/10_registry/tabs/05_other.vue create mode 100644 src/modules/10_registry/views/main.vue 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/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/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 = { +
+ + + + + ข้อมูลทะเบียนประวัติ + Date: Thu, 23 May 2024 18:05:18 +0700 Subject: [PATCH 2/3] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9B=E0=B8=A3?= =?UTF-8?q?=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99=E0=B8=9C=E0=B8=A5?= =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9B=E0=B8=8F=E0=B8=B4=E0=B8=9A?= =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=A3=E0=B8=B0=E0=B8=94=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B8=9A=E0=B8=B8=E0=B8=84=E0=B8=84=E0=B8=A5=20=3D>=20?= =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/02_transfer/views/AddTransfer.vue | 14 ++-- src/modules/02_transfer/views/Main.vue | 75 ++++++++----------- src/modules/03_retire/views/DialogRetire.vue | 2 +- src/modules/03_retire/views/addRetire.vue | 25 +++++-- src/modules/03_retire/views/main.vue | 2 +- src/modules/05_leave/components/Table.vue | 6 +- src/modules/05_leave/views/Main.vue | 42 ++++++----- .../08_KPI/components/Evaluator/01_TabAll.vue | 27 +++++++ .../components/Evaluator/02_TabOther.vue | 48 ++++++++++++ src/modules/08_KPI/components/Tab/TabMain.vue | 18 +---- 10 files changed, 162 insertions(+), 97 deletions(-) diff --git a/src/modules/02_transfer/views/AddTransfer.vue b/src/modules/02_transfer/views/AddTransfer.vue index 1294a70..a359a55 100644 --- a/src/modules/02_transfer/views/AddTransfer.vue +++ b/src/modules/02_transfer/views/AddTransfer.vue @@ -59,10 +59,6 @@ const saveData = async () => { const createTransfer = async () => { showLoader(); const formData = new FormData(); - // const blob = files.value.slice(0, files.value[0].size); - // const newFile = new File(blob, nameFile.value, { - // type: files.value[0].type, - // }); formData.append("Organization", tranferOrg.value); formData.append("Reason", noteReason.value); formData.append("file", files.value); @@ -145,7 +141,9 @@ const fileUploadDoc = async (file: any) => {
{ :rules="[(val:string) => !!val || `${'กรุณากรอกหน่วยงานที่ขอโอนไป'}`]" /> {
{
- { - + +
- + diff --git a/src/modules/03_retire/views/DialogRetire.vue b/src/modules/03_retire/views/DialogRetire.vue index 9f48e7d..9c8d213 100644 --- a/src/modules/03_retire/views/DialogRetire.vue +++ b/src/modules/03_retire/views/DialogRetire.vue @@ -20,7 +20,7 @@ const props = defineProps({ fectData: { type: Function, require: true }, }); -const id = ref(route.params.id.toString()); +const id = ref(route.params.id ? route.params.id.toString() : ""); const mixin = useCounterMixin(); const { dialogConfirm, messageError, showLoader, hideLoader, success } = mixin; diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue index b3da355..cc532e2 100644 --- a/src/modules/03_retire/views/addRetire.vue +++ b/src/modules/03_retire/views/addRetire.vue @@ -186,7 +186,12 @@ function downloadFile(data: string) {
{
{{ props.rowIndex + 1 }}
-
+
{{ col.value }}
diff --git a/src/modules/05_leave/components/Table.vue b/src/modules/05_leave/components/Table.vue index 0639bbb..b71361e 100644 --- a/src/modules/05_leave/components/Table.vue +++ b/src/modules/05_leave/components/Table.vue @@ -205,11 +205,11 @@ watch([() => currentPage.value, () => pagination.value.rowsPerPage], () => {
- currentPage.value, () => pagination.value.rowsPerPage], () => { - +
diff --git a/src/modules/05_leave/views/Main.vue b/src/modules/05_leave/views/Main.vue index 46fd6e3..3cb4338 100644 --- a/src/modules/05_leave/views/Main.vue +++ b/src/modules/05_leave/views/Main.vue @@ -452,28 +452,30 @@ onMounted(async () => { - + {{ + col.value ?? "-" + }} + + + + +
+
diff --git a/src/modules/08_KPI/components/Evaluator/01_TabAll.vue b/src/modules/08_KPI/components/Evaluator/01_TabAll.vue index 3a4b976..f114fa1 100644 --- a/src/modules/08_KPI/components/Evaluator/01_TabAll.vue +++ b/src/modules/08_KPI/components/Evaluator/01_TabAll.vue @@ -77,6 +77,33 @@ const pagination = ref({ + +