From 88f91dd74e3ddd0d5ad955ae8f81d6bd5c06045d Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Fri, 20 Jun 2025 10:10:18 +0700 Subject: [PATCH] fix loading add person of retire, fix bug display point of IDP --- .../detail/Achievement/DialogDevelopmance.vue | 2 ++ .../06_retirement/components/01_retirement/AddList.vue | 2 ++ .../14_KPI/components/results/dialogIndividual.vue | 10 ++++++++++ 3 files changed, 14 insertions(+) diff --git a/src/modules/04_registryPerson/components/detail/Achievement/DialogDevelopmance.vue b/src/modules/04_registryPerson/components/detail/Achievement/DialogDevelopmance.vue index 6425d9d87..f736e8961 100644 --- a/src/modules/04_registryPerson/components/detail/Achievement/DialogDevelopmance.vue +++ b/src/modules/04_registryPerson/components/detail/Achievement/DialogDevelopmance.vue @@ -161,6 +161,7 @@ function getProjectDetail(val: any) { .then((res) => { const data = res.data.result; formData.name = val.projectName; + formData.point = data.point; formData.group = data.group; formData.isDevelopment70 = data.isDevelopment70; formData.isDevelopment20 = data.isDevelopment20; @@ -226,6 +227,7 @@ watch( (i: any) => i.id == data.selectTypeId ); formData.name = data.name; + formData.point = data.point; formData.group = data.group; formData.target = data.target; formData.isDevelopment70 = data.isDevelopment70; diff --git a/src/modules/06_retirement/components/01_retirement/AddList.vue b/src/modules/06_retirement/components/01_retirement/AddList.vue index b6597dce2..67fce1b76 100644 --- a/src/modules/06_retirement/components/01_retirement/AddList.vue +++ b/src/modules/06_retirement/components/01_retirement/AddList.vue @@ -160,6 +160,7 @@ function clickAdd(props: any) { dialogConfirm( $q, async () => { + showLoader(); await http .put(config.API.profileRetire(retireld.value), { profileId: data }) .then(() => { @@ -167,6 +168,7 @@ function clickAdd(props: any) { updateListData(retireld.value, data); }) .catch((e) => { + hideLoader(); messageError($q, e); }) .finally(() => { diff --git a/src/modules/14_KPI/components/results/dialogIndividual.vue b/src/modules/14_KPI/components/results/dialogIndividual.vue index ae704b1d3..dfb8d1346 100644 --- a/src/modules/14_KPI/components/results/dialogIndividual.vue +++ b/src/modules/14_KPI/components/results/dialogIndividual.vue @@ -26,6 +26,7 @@ const development = ref([]); const reasonDevelopment70 = ref(""); const reasonDevelopment20 = ref(""); const reasonDevelopment10 = ref(""); +const point = ref(0); const checkOtherBox11 = computed(() => { return development.value.includes("other1"); @@ -118,6 +119,8 @@ function fetchDetailIndividual() { ? data.reasonDevelopment10 : ""; + point.value = data.point; + const achievements = ["10", "5", "0"]; rows.value = achievements.map((i) => ({ achievement: i, @@ -320,6 +323,13 @@ watch( + +
+ ผลการพัฒนา +
+ {{ point }} +
+