|
|
@@ -96,10 +96,17 @@ const Attendance: React.FC = () => {
|
|
|
if (state.id) {
|
|
|
tryGetRoleStaffList(state.id)
|
|
|
tryGetParametersDetail(state.parametersType)
|
|
|
+<<<<<<< HEAD
|
|
|
}
|
|
|
if (state.menuId === 1) {
|
|
|
formRef.current?.setFieldsValue(...state.contentValue)
|
|
|
}
|
|
|
+=======
|
|
|
+ }
|
|
|
+ if (state.menuId === 1) {
|
|
|
+ formRef.current?.setFieldsValue(...state.contentValue)
|
|
|
+ }
|
|
|
+>>>>>>> 7bd62ee... 1
|
|
|
}, [state.id, state.menuId])
|
|
|
|
|
|
const columns: ColumnsType<API.AttendanceItem> = [
|
