diff --git a/src/modules/04_registryPerson/components/detail/Achievement/DialogDevelopmance.vue b/src/modules/04_registryPerson/components/detail/Achievement/DialogDevelopmance.vue index f736e8961..36f6f0393 100644 --- a/src/modules/04_registryPerson/components/detail/Achievement/DialogDevelopmance.vue +++ b/src/modules/04_registryPerson/components/detail/Achievement/DialogDevelopmance.vue @@ -139,7 +139,7 @@ const customPosition = () => ({ top: "385px", left: "410px" }); async function getDataByYear() { if (formData.year) { showLoader(); - http + await http .get(config.API.developmentMain + `/done?year=${formData.year}`) .then(async (res) => { const data = await res.data.result.data; @@ -170,15 +170,15 @@ function getProjectDetail(val: any) { development.value = data.developmentProjectTechniqueActuals; reasonDevelopment70.value = data.developmentProjectTechniqueActuals.includes("other1") - ? data.reasonDevelopment70 + ? data.reasonActual70 : ""; reasonDevelopment20.value = data.developmentProjectTechniqueActuals.includes("other2") - ? data.reasonDevelopment20 + ? data.reasonActual20 : ""; reasonDevelopment10.value = data.developmentProjectTechniqueActuals.includes("other3") - ? data.reasonDevelopment10 + ? data.reasonActual10 : ""; }) .catch((e) => { @@ -218,7 +218,7 @@ watch( http .get(url) .then(async (res) => { - const data = res.data.result; + const data = await res.data.result; formData.year = data.selectTypeYear; await getDataByYear(); setTimeout(() => { @@ -234,6 +234,8 @@ watch( formData.isDevelopment20 = data.isDevelopment20; formData.isDevelopment10 = data.isDevelopment10; formData.achievement10 = data.achievement10; + + console.log("🚀 ~ setTimeout ~ projectName.value:", projectName.value) formData.achievement5 = data.achievement5; formData.achievement0 = data.achievement0; development.value = data.developmentProjects; diff --git a/src/modules/14_KPI/components/Tab/Dialog/DialogDevelop.vue b/src/modules/14_KPI/components/Tab/Dialog/DialogDevelop.vue index a3604a60b..146d3c6d0 100644 --- a/src/modules/14_KPI/components/Tab/Dialog/DialogDevelop.vue +++ b/src/modules/14_KPI/components/Tab/Dialog/DialogDevelop.vue @@ -225,15 +225,15 @@ function getProjectDetail(val: any) { development.value = data.developmentProjectTechniqueActuals; reasonDevelopment70.value = data.developmentProjectTechniqueActuals.includes("other1") - ? data.reasonDevelopment70 + ? data.reasonActual70 : ""; reasonDevelopment20.value = data.developmentProjectTechniqueActuals.includes("other2") - ? data.reasonDevelopment20 + ? data.reasonActual20 : ""; reasonDevelopment10.value = data.developmentProjectTechniqueActuals.includes("other3") - ? data.reasonDevelopment10 + ? data.reasonActual10 : ""; }) .catch((e) => { @@ -344,9 +344,7 @@ watch( v-model="formData.year" :locale="'th'" autoApply - position="center" year-picker - :alt-position="customPosition" :enableTimePicker="false" @update:model-value="getDataByYear(), (projectName = '')" >