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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2024-03-21 13:04:37 +07:00
commit ed227359d1
22 changed files with 813 additions and 444 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/13_salary/components/SalaryLists/TabMain.vue
View file

@ -309,15 +309,15 @@ function fetchDataPeriodNew() {
}
function onClickDownload(data: DataOption) {
if (data.id === "gov1-06" || data.id === "gov2-06") {
if (data.id === "gov-06") {
const formData = {
type: "HAFT",
startDate:
data.id === "gov1-06"
data.id === "gov-06"
? `${props?.roundFilter?.year - 1}-10-01`
: `${props?.roundFilter?.year}-04-01`,
endDate:
data.id === "gov1-06"
data.id === "gov-06"
? `${props?.roundFilter?.year}-03-31`
: `${props?.roundFilter?.year}-09-30`,
};
@ -336,6 +336,10 @@ function onClickDownload(data: DataOption) {
} else {
if (props.rootId && props.periodId) {
showLoader();
console.log("id==>", data.id);
console.log("rootId==>", props.rootId);
console.log("periodId==>", props.periodId);
http
.get(
config.API.salaryReportListsByid(