From 25b594a5ede4fa4619ad714f64962df42adf6171 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 12 Nov 2024 14:08:16 +0700 Subject: [PATCH 1/4] fixing retire --- .../06_retirement/components/resignEMP/Table.vue | 5 +++-- src/modules/06_retirement/router.ts | 13 +++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/modules/06_retirement/components/resignEMP/Table.vue b/src/modules/06_retirement/components/resignEMP/Table.vue index 4674c8959..b87f295d9 100644 --- a/src/modules/06_retirement/components/resignEMP/Table.vue +++ b/src/modules/06_retirement/components/resignEMP/Table.vue @@ -300,7 +300,6 @@ onMounted(async () => { map-options :options="columns" option-value="name" - style="min-width: 140px" /> @@ -349,7 +348,9 @@ onMounted(async () => { round color="edit" icon="edit" - @click.pervent="onRedirectToDetail('resign-employee', props.row.id)" + @click.pervent=" + onRedirectToDetail('resign-employee', props.row.id) + " > แก้ไขข้อมูล diff --git a/src/modules/06_retirement/router.ts b/src/modules/06_retirement/router.ts index 8fb842b7d..a709c33ee 100644 --- a/src/modules/06_retirement/router.ts +++ b/src/modules/06_retirement/router.ts @@ -141,7 +141,7 @@ export default [ component: resign_EMP, meta: { Auth: true, - Key: "SYS_RESIGN_EMP", + Key: "SYS_RETIREMENT_EMP", Role: "STAFF", }, }, @@ -166,15 +166,13 @@ export default [ }, }, - - { path: "/retirement/resign-employee/:id", name: "resignbyidEMP", component: resignByidEMP, meta: { Auth: true, - Key: "SYS_RESIGN_EMP", + Key: "SYS_RETIREMENT_EMP", Role: "STAFF", }, }, @@ -184,12 +182,11 @@ export default [ component: resignByidEMP, meta: { Auth: true, - Key: "SYS_RESIGN_EMP", + Key: "SYS_RETIREMENT_EMP", Role: "STAFF", }, }, - { path: "/retirement/resign-reject/:id", name: "resignReject", @@ -217,7 +214,7 @@ export default [ component: resignRejectEMP, meta: { Auth: true, - Key: "SYS_RESIGN_EMP", + Key: "SYS_RETIREMENT_EMP", Role: "STAFF", }, }, @@ -227,7 +224,7 @@ export default [ component: resignRejectEMP, meta: { Auth: true, - Key: "SYS_RESIGN_EMP", + Key: "SYS_RETIREMENT_EMP", Role: "STAFF", }, }, From 17c205f074d2edff7d71eb65fc77aebb56710504 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 12 Nov 2024 14:08:36 +0700 Subject: [PATCH 2/4] fix config --- tsconfig.config.json | 3 ++- vite.config.ts | 51 ++++++++++++++++++++++---------------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/tsconfig.config.json b/tsconfig.config.json index 47bd2ee27..48ba8afb8 100644 --- a/tsconfig.config.json +++ b/tsconfig.config.json @@ -10,6 +10,7 @@ "composite": true, "types": ["node"], "ignoreDeprecations": "5.0", - "verbatimModuleSyntax": true + "verbatimModuleSyntax": true, + "module": "esnext" } } diff --git a/vite.config.ts b/vite.config.ts index 9393aa965..4c9d87af5 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,30 +1,31 @@ -import { fileURLToPath, URL } from "node:url" +import { fileURLToPath, URL } from "node:url"; -import { defineConfig } from "vite" -import vue from "@vitejs/plugin-vue" -import vueJsx from "@vitejs/plugin-vue-jsx" -import { quasar, transformAssetUrls } from "@quasar/vite-plugin" +import { defineConfig } from "vite"; +import vue from "@vitejs/plugin-vue"; +import vueJsx from "@vitejs/plugin-vue-jsx"; +import { quasar, transformAssetUrls } from "@quasar/vite-plugin"; // https://vitejs.dev/config/ export default defineConfig({ - plugins: [ - vue({ - template: { transformAssetUrls }, - }), - quasar({ - sassVariables: "src/style/quasar-variables.sass", - }), - vueJsx(), - ], - resolve: { - alias: { - "@": fileURLToPath(new URL("./src", import.meta.url)), - }, + plugins: [ + vue({ + template: { transformAssetUrls }, + }), + quasar({ + sassVariables: "src/style/quasar-variables.sass", + }), + vueJsx(), + ], + resolve: { + alias: { + "@": fileURLToPath(new URL("./src", import.meta.url)), }, - build: { - target: "esnext", - }, - server: { - port: 3006, - }, -}) + }, + build: { + target: "esnext", + }, + server: { + port: 3006, + }, + base: "./", +}); From 39fa08b0f445f27175f974136133b9917ffb192d Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 12 Nov 2024 14:37:53 +0700 Subject: [PATCH 3/4] fixing req IDP & registry --- .../components/requestEdit/02_TabIDP.vue | 4 ++-- .../views/requestEditView.vue | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue b/src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue index f4e4f8452..77a9f0138 100644 --- a/src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue +++ b/src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue @@ -15,6 +15,7 @@ import type { } from "@/modules/04_registryPerson/interface/index/Main"; import type { DataListsIDP } from "@/modules/04_registryPerson/interface/response/Main"; +const props = defineProps<{ isIdp: boolean | null }>(); const $q = useQuasar(); const router = useRouter(); const route = useRoute(); @@ -283,9 +284,8 @@ watch( } ); -/** HooK lifecycle ทำงานเมื่อมีการเรียกใช้งาน Componenets*/ onMounted(() => { - fetchData(); + props.isIdp && fetchData(); }); diff --git a/src/modules/04_registryPerson/views/requestEditView.vue b/src/modules/04_registryPerson/views/requestEditView.vue index 5a8c3f861..c15020ff5 100644 --- a/src/modules/04_registryPerson/views/requestEditView.vue +++ b/src/modules/04_registryPerson/views/requestEditView.vue @@ -1,5 +1,5 @@ @@ -63,7 +67,9 @@ onMounted(() => { - + + + From 713bd17207e01ae9129b8f1b951a78fa9c8c6c84 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 12 Nov 2024 15:47:30 +0700 Subject: [PATCH 4/4] fixing bug --- src/modules/02_organization/components/DialogFormAgency.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/02_organization/components/DialogFormAgency.vue b/src/modules/02_organization/components/DialogFormAgency.vue index 318bac59a..d94a89858 100644 --- a/src/modules/02_organization/components/DialogFormAgency.vue +++ b/src/modules/02_organization/components/DialogFormAgency.vue @@ -591,7 +591,7 @@ function onChangeIsDeputy() {