|
@@ -42,10 +42,10 @@ const StaffInfo: React.FC<Props> = ({ combos }) => { |
|
|
register, |
|
|
register, |
|
|
formState: { errors, defaultValues }, |
|
|
formState: { errors, defaultValues }, |
|
|
control, |
|
|
control, |
|
|
reset, |
|
|
|
|
|
|
|
|
// reset, |
|
|
resetField, |
|
|
resetField, |
|
|
setValue, |
|
|
setValue, |
|
|
getValues, |
|
|
|
|
|
|
|
|
// getValues, |
|
|
watch, |
|
|
watch, |
|
|
clearErrors, |
|
|
clearErrors, |
|
|
} = useFormContext<CreateStaffInputs & { salaryEffectiveInfo: SalaryEffectiveInfo[] }>(); |
|
|
} = useFormContext<CreateStaffInputs & { salaryEffectiveInfo: SalaryEffectiveInfo[] }>(); |
|
@@ -62,18 +62,9 @@ const StaffInfo: React.FC<Props> = ({ combos }) => { |
|
|
|
|
|
|
|
|
// Salary Effiective History edit modal related |
|
|
// Salary Effiective History edit modal related |
|
|
const [salaryEffectiveModelOpen, setSalaaryEffectiveModelOpen] = useState(false); |
|
|
const [salaryEffectiveModelOpen, setSalaaryEffectiveModelOpen] = useState(false); |
|
|
const closeSalaryEffectiveModel = useCallback(() => { |
|
|
|
|
|
setSalaaryEffectiveModelOpen(false); |
|
|
|
|
|
|
|
|
const controlSalaryEffectiveModel = useCallback(() => { |
|
|
|
|
|
setSalaaryEffectiveModelOpen((prev: Boolean) => !prev); |
|
|
}, []); |
|
|
}, []); |
|
|
const openSalaryEffectiveModel = useCallback(() => { |
|
|
|
|
|
setSalaaryEffectiveModelOpen(true); |
|
|
|
|
|
}, []); |
|
|
|
|
|
const onSalaryEffectiveSave = useCallback(async () => { |
|
|
|
|
|
console.log(getValues()) |
|
|
|
|
|
setSalaaryEffectiveModelOpen(false); |
|
|
|
|
|
}, []); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const resetStaff = useCallback(() => { |
|
|
const resetStaff = useCallback(() => { |
|
|
console.log(defaultValues); |
|
|
console.log(defaultValues); |
|
@@ -338,7 +329,7 @@ const StaffInfo: React.FC<Props> = ({ combos }) => { |
|
|
</MenuItem> |
|
|
</MenuItem> |
|
|
))} |
|
|
))} |
|
|
</Select> |
|
|
</Select> |
|
|
<Button variant="contained" size="small" onClick={openSalaryEffectiveModel}> |
|
|
|
|
|
|
|
|
<Button variant="contained" size="small" onClick={controlSalaryEffectiveModel}> |
|
|
{t("Edit")} |
|
|
{t("Edit")} |
|
|
</Button> |
|
|
</Button> |
|
|
</Box> |
|
|
</Box> |
|
@@ -565,8 +556,7 @@ const StaffInfo: React.FC<Props> = ({ combos }) => { |
|
|
</CardContent> |
|
|
</CardContent> |
|
|
<SalaryEffectiveModel |
|
|
<SalaryEffectiveModel |
|
|
open={salaryEffectiveModelOpen} |
|
|
open={salaryEffectiveModelOpen} |
|
|
onClose={closeSalaryEffectiveModel} |
|
|
|
|
|
onSave={onSalaryEffectiveSave} |
|
|
|
|
|
|
|
|
onClose={controlSalaryEffectiveModel} |
|
|
columns={salaryCols} |
|
|
columns={salaryCols} |
|
|
/> |
|
|
/> |
|
|
</Card> |
|
|
</Card> |
|
|