From c2db1f3d4bd0a00becabf7178ab2224e36f7df1c Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 8 Aug 2024 16:44:31 +0700 Subject: [PATCH 1/3] fixing path config manual --- entrypoint.sh | 1 + src/app.config.ts | 94 ++++++++++++++++++------------------------ src/stores/menuList.ts | 27 ++++++------ 3 files changed, 54 insertions(+), 68 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 9aac55098..f9467745a 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -18,6 +18,7 @@ do sed -i 's|VITE_REALM_KEYCLOAK|'${VITE_REALM_KEYCLOAK}'|g' $file sed -i 's|VITE_CLIENTID_KEYCLOAK|'${VITE_CLIENTID_KEYCLOAK}'|g' $file sed -i 's|VITE_CLIENTSECRET_KEYCLOAK|'${VITE_CLIENTSECRET_KEYCLOAK}'|g' $file + sed -i 's|VITE_MANUAL_URL|'${VITE_MANUAL_URL}'|g' $file done diff --git a/src/app.config.ts b/src/app.config.ts index e973145ce..03d765ebe 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -137,67 +137,52 @@ const API = { ...file, }; -const path = "https://bma-ehr-manual.frappet.synology.me"; +const path = + import.meta.env.VITE_MANUAL_URL ?? + "https://bma-ehr-manual.frappet.synology.me"; const generatePopupPath = (routeName: any) => { if (routeName.includes("metadata")) { return `${path}/manual/chapter-2-admin-metadata`; - } - // if (routeName.includes("KPI")) { - // return `${path}/manual/chapter-3-admin-evaluate`; - // } - if (routeName.includes("compete")) { - return `${path}/manual/chapter-9-admin-recruit`; - } - if (routeName.includes("registryNew")) { + } else if (routeName.includes("registryNew")) { return `${path}/manual/chapter-6-admin-registry`; - } - if (routeName.includes("registry-employee")) { + } else if (routeName.includes("registry-employee")) { return `${path}/manual/chapter-7-admin-registry-employee`; - } - if (routeName.includes("qualify")) { - return `${path}/manual/chapter-9-admin-recruit`; - } - if (routeName.includes("insignia")) { + } else if (routeName.includes("insignia")) { return `${path}/manual/chapter-13-admin-insignia`; - } - if (routeName.includes("acting")) { - return `${path}/manual/chapter-5-admin-acting`; - } - if (routeName.includes("positionEmployee")) { - return `${path}/manual/chapter-6-admin-position-employee`; - } - if (routeName.includes("resign")) { + } else if (routeName.includes("acting")) { + return `${path}/manual/chapter-4-admin-acting`; + } else if (routeName.includes("positionEmployee")) { + return `${path}/manual/chapter-5-admin-position-employee`; + } else if (routeName.includes("resign")) { return `${path}/manual/chapter-12-admin-retirement`; - } - if (routeName.includes("retirement")) { + } else if (routeName.includes("retirement")) { return `${path}/manual/chapter-12-admin-retirement`; - } - if (routeName.includes("deceased")) { + } else if (routeName.includes("deceased")) { return `${path}/manual/chapter-12-admin-retirement`; - } - if (routeName.includes("exit-Interview")) { + } else if (routeName.includes("exit-Interview")) { return `${path}/manual/chapter-12-admin-retirement`; - } - if (routeName.includes("expulsion")) { + } else if (routeName.includes("expulsion")) { return `${path}/manual/chapter-12-admin-retirement`; - } - if (routeName.includes("discharged")) { + } else if (routeName.includes("discharged")) { return `${path}/manual/chapter-12-admin-retirement`; - } - if (routeName.includes("discipline")) { + } else if (routeName.includes("discipline")) { return `${path}/manual/chapter-15-admin-discipline`; - } - if (routeName.includes("appeal")) { + } else if (routeName.includes("appeal")) { return `${path}/manual/chapter-15-admin-discipline`; - } - if (routeName.includes("evaluate")) { - return `${path}/manual/chapter-16-admin-KPI`; - } - if (routeName.includes("salary")) { + } else if (routeName.includes("KPI")) { + return `${path}/manual/chapter-18-admin-perf-evaluation`; + } else if (routeName.includes("salary")) { return `${path}/manual/chapter-17-admin-salary`; - } - if (routeName.includes("development")) { + } else if ( + routeName.includes("qualify") || + routeName.includes("recruiting") || + routeName.includes("compete") || + routeName.includes("disable") || + routeName.includes("manage") + ) { + return `${path}/manual/chapter-9-admin-recruit`; + } else if (routeName.includes("development")) { return `${path}/manual/chapter-19-admin-development`; } else { return manualConfig[routeName as keyof typeof manualConfig]; @@ -226,12 +211,7 @@ const manualConfig = { order: `${path}/manual/chapter-8-admin-order`, OrderDetail: `${path}/manual/chapter-8-admin-order`, OrderAdd: `${path}/manual/chapter-8-admin-order`, - disableperiod: `${path}/manual/chapter-9-admin-recruit`, - manage: `${path}/manual/chapter-9-admin-recruit`, editorweb: `${path}/manual/chapter-9-admin-recruit`, - manageDetaill: `${path}/manual/chapter-9-admin-recruit`, - ExamForm: `${path}/manual/chapter-9-admin-recruit`, - Payment: `${path}/manual/chapter-9-admin-recruit`, placement: `${path}/manual/chapter-10-admin-appointment`, transfer: `${path}/manual/chapter-10-admin-appointment`, receive: `${path}/manual/chapter-10-admin-appointment`, @@ -241,6 +221,8 @@ const manualConfig = { "appoint-employee": `${path}/manual/chapter-10-admin-appointment`, other: `${path}/manual/chapter-10-admin-appointment`, probation: `${path}/manual/chapter-11-admin-probation`, + probationDetail: `${path}/manual/chapter-11-admin-probation`, + probationForm: `${path}/manual/chapter-11-admin-probation`, retirement: `${path}/manual/chapter-12-admin-retirement`, resign: `${path}/manual/chapter-12-admin-retirement`, ExitInterviewEditQuestion: `${path}/manual/chapter-12-admin-retirement`, @@ -256,11 +238,13 @@ const manualConfig = { leaveRejectDetail: `${path}/manual/chapter-14-admin-leave`, leaveReport: `${path}/manual/chapter-14-admin-leave`, appealComplain: `${path}/manual/chapter-15-admin-discipline`, - KPIRound: `${path}/manual/chapter-18-admin-perf-evaluation`, - "KPI​List": `${path}/manual/chapter-18-admin-perf-evaluation`, - KPIDetail: `${path}/manual/chapter-18-admin-perf-evaluation`, - KPIReport: `${path}/manual/chapter-18-admin-perf-evaluation`, - KPIDetailnew: `${path}/manual/chapter-18-admin-perf-evaluation`, + // KPIRound: `${path}/manual/chapter-18-admin-perf-evaluation`, + // "KPI​List": `${path}/manual/chapter-18-admin-perf-evaluation`, + // KPIDetail: `${path}/manual/chapter-18-admin-perf-evaluation`, + // KPIReport: `${path}/manual/chapter-18-admin-perf-evaluation`, + // KPIDetailnew: `${path}/manual/chapter-18-admin-perf-evaluation`, + evaluate: `${path}/manual/chapter-16-admin-KPI`, + evaluateDetail: `${path}/manual/chapter-16-admin-KPI`, }; export default { diff --git a/src/stores/menuList.ts b/src/stores/menuList.ts index 6aeeb2842..cfdba272d 100644 --- a/src/stores/menuList.ts +++ b/src/stores/menuList.ts @@ -13,18 +13,7 @@ import type { export const useMenuDataStore = defineStore("menuUse", () => { /****************** เมนู **************************/ /** รายการเมนู*/ - const menuList = ref([ - { - id: "dashboard", - order: 0, - icon: "mdi-home-variant-outline", - sysName: "หน้าแรก", - sysDescription: "หน้าแรก", - path: "dashboard", - parentId: null, - children: [], - }, - ]); + const menuList = ref([]); /** ข้อมูล Level3*/ const childLevelTree = ref({ @@ -117,7 +106,19 @@ export const useMenuDataStore = defineStore("menuUse", () => { */ function fetchListMenu(data: ListMenu[]) { if (data) { - menuList.value.push(...data); + menuList.value = [ + { + id: "dashboard", + order: 0, + icon: "mdi-home-variant-outline", + sysName: "หน้าแรก", + sysDescription: "หน้าแรก", + path: "dashboard", + parentId: null, + children: [], + }, + ...data, + ]; } } From b4e12f1d89412d3f8eeb05daf4a31d31ff3295f0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 8 Aug 2024 16:56:25 +0700 Subject: [PATCH 2/3] =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87?= =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=AD=E0=B8=B1?= =?UTF-8?q?=E0=B8=95=E0=B8=A3=E0=B8=B2=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1?= =?UTF-8?q?=E0=B8=87=20,=20=E0=B8=A2=E0=B8=B8=E0=B8=97=E0=B8=98=E0=B8=A8?= =?UTF-8?q?=E0=B8=B2=E0=B8=AA=E0=B8=95=E0=B8=A3=E0=B9=8C=20=3D>=20icon=20m?= =?UTF-8?q?enu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/01_masterdata/views/Strategic.vue | 4 +- .../02_organization/components/TreeMain.vue | 296 +++++++++--------- 2 files changed, 144 insertions(+), 156 deletions(-) diff --git a/src/modules/01_masterdata/views/Strategic.vue b/src/modules/01_masterdata/views/Strategic.vue index e023d3c8e..722c4a28b 100644 --- a/src/modules/01_masterdata/views/Strategic.vue +++ b/src/modules/01_masterdata/views/Strategic.vue @@ -258,8 +258,8 @@ onMounted(() => { " flat dense - color="secondary" - icon="mdi-dots-horizontal-circle-outline" + color="grey-13" + icon="mdi-dots-vertical" round > diff --git a/src/modules/02_organization/components/TreeMain.vue b/src/modules/02_organization/components/TreeMain.vue index e74fdf436..1358a11fa 100644 --- a/src/modules/02_organization/components/TreeMain.vue +++ b/src/modules/02_organization/components/TreeMain.vue @@ -428,160 +428,11 @@ watch( :active="nodeId == prop.node.orgTreeId" @click.stop="updateSelected(prop.node)" active-class="my-list-link text-primary text-weight-medium" - class="row col-12 text-dark q-py-xs q-pl-sm rounded-borders my-list" + class="row col-12 text-dark items-center q-py-xs q-pl-sm rounded-borders my-list" > - -
- {{ prop.node.orgTreeName }} - - - - - -
- -
-
- {{ item.label }}หน่วยงาน -
- -
- {{ item.label }}ส่วนราชการ -
-
- {{ item.label }} -
-
- -
-
- {{ item.label }}ส่วนราชการ -
-
- {{ item.label }} -
-
-
- - - - - - - - - - - - - - {{ item.label }} - - - - - +
+
+ {{ prop.node.orgTreeName }}
{{ prop.node.orgCode == null ? null : prop.node.orgCode }} @@ -591,7 +442,144 @@ watch( : prop.node.orgTreeShortName }}
- +
+ + + + + + +
+ +
+
+ {{ item.label }}หน่วยงาน +
+ +
+ {{ item.label }}ส่วนราชการ +
+
+ {{ item.label }} +
+
+ +
+
+ {{ item.label }}ส่วนราชการ +
+
+ {{ item.label }} +
+
+
+ + + + + + + + + + + + + + {{ item.label }} + + + + From 93973bb9b48a520f54139444d39d28d83455241a Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 8 Aug 2024 17:09:13 +0700 Subject: [PATCH 3/3] =?UTF-8?q?fixing=20redirect=20=E0=B8=9B=E0=B8=A3?= =?UTF-8?q?=E0=B8=B1=E0=B8=9A=E0=B8=A3=E0=B8=B0=E0=B8=94=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B8=8A=E0=B8=B1=E0=B9=89=E0=B8=99=E0=B8=87=E0=B8=B2=E0=B8=99?= =?UTF-8?q?=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/04_registryPerson/views/detailView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue index 84bb4f9a3..d926d03d4 100644 --- a/src/modules/04_registryPerson/views/detailView.vue +++ b/src/modules/04_registryPerson/views/detailView.vue @@ -429,7 +429,7 @@ function appointEmployeePost() { await http .post(config.API.appointEmployee(), formData) .then(async () => { - await router.push("/appoint-employee"); + await router.push("/placement/appoint-employee"); await success($q, "ดำเนินการสำเร็จ"); }) .catch((e) => {