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

fix เงินเดือน

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-03-28 13:48:02 +07:00
parent 40f2ab9bc2
commit a746e05a86
3 changed files with 38 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/modules/13_salary/components/DialogInfoMain.vue
View file

@ -184,34 +184,36 @@ watch(
</div>
</q-card-section>
<InfoSalary
v-if="type === 'posSalary'"
v-model:profileId="profileId"
:employeeClass="employeeClass"
/>
<InfoDiscipline
v-if="type === 'discipline'"
v-model:profileId="profileId"
:employeeClass="employeeClass"
/>
<q-scroll-area style="height: 55vh; max-width: 100%">
<InfoSalary
v-if="type === 'posSalary'"
v-model:profileId="profileId"
:employeeClass="employeeClass"
/>
<InfoDiscipline
v-if="type === 'discipline'"
v-model:profileId="profileId"
:employeeClass="employeeClass"
/>
<InfoLeave
v-if="type === 'leave'"
v-model:profileId="profileId"
:employeeClass="employeeClass"
/>
<InfoLeave
v-if="type === 'leave'"
v-model:profileId="profileId"
:employeeClass="employeeClass"
/>
<InfoAssessments
v-if="type === 'assessments'"
v-model:profileId="profileId"
:employeeClass="employeeClass"
/>
<InfoAssessments
v-if="type === 'assessments'"
v-model:profileId="profileId"
:employeeClass="employeeClass"
/>
<InfoInsignia
v-if="type === 'insignia'"
v-model:profileId="profileId"
:employeeClass="employeeClass"
/>
<InfoInsignia
v-if="type === 'insignia'"
v-model:profileId="profileId"
:employeeClass="employeeClass"
/>
</q-scroll-area>
</q-card>
</div>
</div>

6
src/modules/13_salary/views/04_salaryLists.vue
View file

@ -121,11 +121,12 @@ async function getRound() {
roundFilter.value = "ไม่มีข้อมูล";
snapFilter.value = "ไม่มีข้อมูล";
agencyFilter.value = "ไม่มีข้อมูล";
hideLoader();
}
})
.catch((e) => {
messageError($q, e);
})
.finally(() => {
hideLoader();
});
}
@ -276,6 +277,9 @@ async function fetchSalalyPeriod(
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
}
}

8
src/modules/13_salary/views/05_salaryListsEmployee.vue
View file

@ -120,11 +120,12 @@ async function getRound() {
roundFilter.value = "ไม่มีข้อมูล";
snapFilter.value = "ไม่มีข้อมูล";
agencyFilter.value = "ไม่มีข้อมูล";
hideLoader();
}
})
.catch((e) => {
messageError($q, e);
})
.finally(() => {
hideLoader();
});
}
@ -247,7 +248,7 @@ async function fetchSalalyPeriod(
const body = {
rootId: rootId,
salaryPeriodId: periodId,
snapshot: snap,
snapshot: snap,
};
await http
@ -260,6 +261,9 @@ async function fetchSalalyPeriod(
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
}
}