|
@@ -1,7 +1,7 @@ |
|
|
import React from "react"; |
|
|
import React from "react"; |
|
|
import EditStaff, { comboItem } from "./EditStaff"; |
|
|
import EditStaff, { comboItem } from "./EditStaff"; |
|
|
import EditStaffLoading from "./EditStaffLoading"; |
|
|
import EditStaffLoading from "./EditStaffLoading"; |
|
|
import { StaffResult, fetchIndivStaff, fetchStaff, fetchTeamLeads, preloadStaff } from "@/app/api/staff"; |
|
|
|
|
|
|
|
|
import { StaffResult, fetchIndivStaff, fetchStaff, fetchStaffSalaryEffectiveInfo, fetchTeamLeads, preloadStaff } from "@/app/api/staff"; |
|
|
import { useSearchParams } from "next/navigation"; |
|
|
import { useSearchParams } from "next/navigation"; |
|
|
import { fetchTeamCombo } from "@/app/api/team/actions"; |
|
|
import { fetchTeamCombo } from "@/app/api/team/actions"; |
|
|
import { fetchDepartmentCombo } from "@/app/api/departments/actions"; |
|
|
import { fetchDepartmentCombo } from "@/app/api/departments/actions"; |
|
@@ -32,6 +32,7 @@ const EditStaffWrapper: React.FC<Props> & SubComponents = async ({ |
|
|
GradeCombo, |
|
|
GradeCombo, |
|
|
SkillCombo, |
|
|
SkillCombo, |
|
|
SalaryCombo, |
|
|
SalaryCombo, |
|
|
|
|
|
SalaryEffectiveInfo, |
|
|
] = await Promise.all([ |
|
|
] = await Promise.all([ |
|
|
fetchIndivStaff(id), |
|
|
fetchIndivStaff(id), |
|
|
fetchCompanyCombo(), |
|
|
fetchCompanyCombo(), |
|
@@ -41,6 +42,7 @@ const EditStaffWrapper: React.FC<Props> & SubComponents = async ({ |
|
|
fetchGradeCombo(), |
|
|
fetchGradeCombo(), |
|
|
fetchSkillCombo(), |
|
|
fetchSkillCombo(), |
|
|
fetchSalaryCombo(), |
|
|
fetchSalaryCombo(), |
|
|
|
|
|
fetchStaffSalaryEffectiveInfo(id), |
|
|
]); |
|
|
]); |
|
|
|
|
|
|
|
|
console.log(SalaryCombo.records) |
|
|
console.log(SalaryCombo.records) |
|
@@ -54,9 +56,10 @@ const EditStaffWrapper: React.FC<Props> & SubComponents = async ({ |
|
|
salary: SalaryCombo.records, |
|
|
salary: SalaryCombo.records, |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// [{id:0, salaryPoint: 1, date:"2021-05-05"}, {id:1, salaryPoint: 43, date:"2024-05-05"}] |
|
|
console.log(Staff.data) |
|
|
console.log(Staff.data) |
|
|
|
|
|
|
|
|
return <EditStaff Staff={Staff.data} combos={combos} SalaryEffectiveInfo={[{id:0, salaryPoint: 1, date:"2021-05-05"}, {id:1, salaryPoint: 43, date:"2024-05-05"}]}/>; |
|
|
|
|
|
|
|
|
return <EditStaff Staff={Staff.data} combos={combos} SalaryEffectiveInfo={SalaryEffectiveInfo}/>; |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
EditStaffWrapper.Loading = EditStaffLoading; |
|
|
EditStaffWrapper.Loading = EditStaffLoading; |
|
|