From 2329e7242ff331b65e3c0de60204a6adcb51025e Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 13 May 2025 11:58:45 +0700 Subject: [PATCH 1/3] =?UTF-8?q?fix=20columns=20=E0=B8=97=E0=B8=B0=E0=B9=80?= =?UTF-8?q?=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0?= =?UTF-8?q?=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4=20=E0=B8=9B=E0=B8=A3?= =?UTF-8?q?=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=81=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3=E0=B8=A8=E0=B8=B6=E0=B8=81=E0=B8=A9=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../01_Information/05_Educations.vue | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/src/modules/10_registry/01_Information/05_Educations.vue b/src/modules/10_registry/01_Information/05_Educations.vue index 435c123..2fb6e5d 100644 --- a/src/modules/10_registry/01_Information/05_Educations.vue +++ b/src/modules/10_registry/01_Information/05_Educations.vue @@ -78,10 +78,14 @@ const columns = ref([ align: "left", label: "ตั้งแต่", sortable: true, - field: "startDate", headerStyle: "font-size: 14px", style: "font-size: 14px", - format: (v) => date2Thai(v), + field: (v) => + v.startDate + ? v.isDate + ? date2Thai(v.startDate) + : new Date(v.startDate).getFullYear() + 543 + : "-", sort: (a: string, b: string) => a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, @@ -91,7 +95,11 @@ const columns = ref([ label: "ถึง", sortable: true, field: (v) => - v.isDate ? date2Thai(v.endDate) : new Date(v.endDate).getFullYear() + 543, + v.endDate + ? v.isDate + ? date2Thai(v.endDate) + : new Date(v.endDate).getFullYear() + 543 + : "-", headerStyle: "font-size: 14px", style: "font-size: 14px", sort: (a: string, b: string) => @@ -291,9 +299,11 @@ const columnsHistory = ref([ label: "ตั้งแต่", sortable: true, field: (v) => - v.isDate - ? date2Thai(v.startDate) - : new Date(v.startDate).getFullYear() + 543, + v.startDate + ? v.isDate + ? date2Thai(v.startDate) + : new Date(v.startDate).getFullYear() + 543 + : "-", headerStyle: "font-size: 14px", style: "font-size: 14px", sort: (a: string, b: string) => @@ -305,7 +315,11 @@ const columnsHistory = ref([ label: "ถึง", sortable: true, field: (v) => - v.isDate ? date2Thai(v.endDate) : new Date(v.endDate).getFullYear() + 543, + v.endDate + ? v.isDate + ? date2Thai(v.endDate) + : new Date(v.endDate).getFullYear() + 543 + : "-", headerStyle: "font-size: 14px", style: "font-size: 14px", sort: (a: string, b: string) => From 9f922680870b2173bda7cb33d9173afec167330f Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Tue, 13 May 2025 15:48:12 +0700 Subject: [PATCH 2/3] =?UTF-8?q?=E0=B9=80=E0=B8=9B=E0=B8=A5=E0=B8=B5?= =?UTF-8?q?=E0=B9=88=E0=B8=A2=E0=B8=99=E0=B9=80=E0=B8=AA=E0=B9=89=E0=B8=99?= =?UTF-8?q?=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/org/api.org.ts | 1 + src/modules/06_evaluate/components/viewstep/viewStep1.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api/org/api.org.ts b/src/api/org/api.org.ts index a80edf0..dd86f6f 100644 --- a/src/api/org/api.org.ts +++ b/src/api/org/api.org.ts @@ -52,6 +52,7 @@ export default { `${org}/profile${emType}/salary/position/history/${id}`, dataUserSalary: `${profileOrg}/salary/user`, + dataUserSalaryPosition: `${profileOrg}/salary/position/user`, dataUserSalaryByType: (type: string) => `${org}/profile${type}/salary/user`, dataUserAssessments: `${profileOrg}/assessments/user`, dataUserPortfolio: `${env.API_URI}/development/portfolio/user`, diff --git a/src/modules/06_evaluate/components/viewstep/viewStep1.vue b/src/modules/06_evaluate/components/viewstep/viewStep1.vue index d749a44..a6e7c29 100644 --- a/src/modules/06_evaluate/components/viewstep/viewStep1.vue +++ b/src/modules/06_evaluate/components/viewstep/viewStep1.vue @@ -123,7 +123,7 @@ async function fetchDataAllDetail() { }); // ดึงข้อมูลประวัติการรับราชการ - http.get(config.API.dataUserSalary).then((res) => { + http.get(config.API.dataUserSalaryPosition).then((res) => { formDetail.salaries = res.data.result; }); From 9688d7e22e46ae3ad2137ff2ecf858be480a694d Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Wed, 14 May 2025 09:28:49 +0700 Subject: [PATCH 3/3] =?UTF-8?q?=E0=B9=80=E0=B8=81=E0=B9=87=E0=B8=9A?= =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B9=80?= =?UTF-8?q?=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/06_evaluate/components/step/step2.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/modules/06_evaluate/components/step/step2.vue b/src/modules/06_evaluate/components/step/step2.vue index cb21e06..bfeab2b 100644 --- a/src/modules/06_evaluate/components/step/step2.vue +++ b/src/modules/06_evaluate/components/step/step2.vue @@ -272,6 +272,7 @@ function getCommander() { .get(config.API.searchCommander) .then((res) => { const data = res.data.result; + formCommand.author = data.fullname; formCommand.commanderFullname = data.commanderFullname; formCommand.commanderPosition = data.commanderPosition; formCommand.commanderAboveFullname = data.commanderAboveFullname; @@ -314,9 +315,7 @@ watch( /**lifecycle Hooks*/ onMounted(async () => { const user = await tokenParsed(); - if (user) { - formCommand.author = user.name; - } + try { showLoader();