Bläddra i källkod

update

tags/Baseline_180220205_Frontend
MSI\derek 11 månader sedan
förälder
incheckning
e8d4558efa
3 ändrade filer med 31 tillägg och 26 borttagningar
  1. +0
    -2
      src/app/(main)/settings/user/edit/page.tsx
  2. +0
    -1
      src/components/EditStaff/EditStaff.tsx
  3. +31
    -23
      src/components/EditStaff/StaffInfo.tsx

+ 0
- 2
src/app/(main)/settings/user/edit/page.tsx Visa fil

@@ -6,8 +6,6 @@ import { I18nProvider } from "@/i18n";
// import EditStaffWrapper from "@/components/EditStaff/EditStaffWrapper";
import { Metadata } from "next";
import EditUser from "@/components/EditUser";
import { useRouter } from 'next/router';
import { getServerSideProps } from "next/dist/build/templates/pages";
import { preloadUserDetail } from "@/app/api/user";
import { searchParamsProps } from "@/app/utils/fetchUtil";



+ 0
- 1
src/components/EditStaff/EditStaff.tsx Visa fil

@@ -281,7 +281,6 @@ const EditStaff: React.FC<formProps> = ({ Staff, combos, SalaryEffectiveInfo, In
variant="scrollable"
>
<Tab label={t("Info")}/>
<Tab label={t("Info History")} />
<Tab label={t("Involved Project History")} />
</Tabs>
</Stack>


+ 31
- 23
src/components/EditStaff/StaffInfo.tsx Visa fil

@@ -114,9 +114,9 @@ const StaffInfo: React.FC<Props> = ({ combos }) => {
resetStaff()
}, [defaultValues]);
useEffect(() => {
console.log(state)
}, [state]);
// useEffect(() => {
// console.log(state)
// }, [state]);

const joinDate = watch("joinDate");
const departDate = watch("departDate");
@@ -699,26 +699,34 @@ const StaffInfo: React.FC<Props> = ({ combos }) => {
</Grid>
</Box>
</CardContent>
<SalaryEffectiveModel
open={state.seModal}
onClose={toggleSeModal}
columns={salaryCols}
/>
<TeamHistoryModal
open={state.teamModal}
onClose={toggleTeamModal}
columns={teamHistoryCols}
/>
<GradeHistoryModal
open={state.gradeModal}
onClose={toggleGradeModal}
columns={gradeHistoryCols}
/>
<PositionHistoryModal
open={state.positionModal}
onClose={togglePositionModal}
columns={positionHistoryCols}
/>
{state.seModal &&
<SalaryEffectiveModel
open={state.seModal}
onClose={toggleSeModal}
columns={salaryCols}
/>
}
{state.teamModal &&
<TeamHistoryModal
open={state.teamModal}
onClose={toggleTeamModal}
columns={teamHistoryCols}
/>
}
{state.gradeModal &&
<GradeHistoryModal
open={state.gradeModal}
onClose={toggleGradeModal}
columns={gradeHistoryCols}
/>
}
{state.positionModal &&
<PositionHistoryModal
open={state.positionModal}
onClose={togglePositionModal}
columns={positionHistoryCols}
/>
}
</Card>
);
};


Laddar…
Avbryt
Spara