hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'Nice' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-08-06 11:57:53 +07:00
commit 3c5f8f1a6c
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/api/registry/api.registry.ts
View file

@ -222,7 +222,7 @@ export default {
employmentHistoryEmployee: (id: string) =>
`${registryNew}-employee/employment/history/${id}`,
developMentPlan: `${registryNew}/development`,
developMentPlan: (type: string) => `${registryNew}${type}/development`,
requestInformationbyType: (type: string, id: string) =>
`${registryNew}/request-edit/${type}/${id}`,

8
src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
View file

@ -389,7 +389,7 @@ async function getDevelop(isLoad?: boolean) {
isLoad && showLoader();
await http
.get(
config.API.developMentPlan +
config.API.developMentPlan(empType.value) +
`/${profileId.value}?page=${paginationIdp.value.page}&pageSize=${
paginationIdp.value.rowsPerPage
}&searchKeyword=${filterSearchPlan.value.trim()}
@ -553,7 +553,7 @@ watch(
onMounted(async () => {
await fetchData();
!empType.value && (await getDevelop());
empType.value !== "-temp" && (await getDevelop());
hideLoader();
});
</script>
@ -752,12 +752,12 @@ onMounted(async () => {
</q-card>
</div>
<div class="col-12 q-mt-md" v-if="!empType">
<div class="col-12 q-mt-md" v-if="empType !== '-temp'">
<span class="text-weight-bold text-body1 q-pb-sm"
>การพัฒนารายบุคคล (Individual Development Plan)</span
>
</div>
<div class="col-12" v-if="!empType">
<div class="col-12" v-if="empType !== '-temp'">
<q-card bordered class="q-pa-sm">
<div class="col-12">
<div class="row items-center q-gutter-x-sm q-pb-sm">