diff --git a/src/components/Contract.tsx b/src/components/Contract.tsx index f282785..146f387 100644 --- a/src/components/Contract.tsx +++ b/src/components/Contract.tsx @@ -26,117 +26,119 @@ const Contract = ({ contractId }: Prop) => { return ( <> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
계약서 항목내용
- 근무지 - - {contract?.workPlaceName} -
- 근무지 주소 - - {contract?.workSite} -
- 근무 내용 - - {contract?.workDetail} -
- 근무 시작일 - - {contract?.workStartDate.toLocaleString()} -
- 나의 주소 - - {contract?.employeeAddress} -
- 나의 연락처 - - {contract?.employeePhone} -
- 휴무일 - - {contract?.restDayOfWeek} -
- 시급 - - {contract?.payPerHour} -
- 급여일 - - {contract?.paymentDay} -
- 근무일 - -
- {contract?.workTimes?.map((item, index) => ( - <> -
-
- {item.workDayOfWeek.charAt(0)} -
-
-
- {item.workStartTime}-{item.workEndTime} + {contract && ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - -
계약서 항목내용
+ 근무지 + + {contract?.workPlaceName} +
+ 근무지 주소 + + {contract?.workSite} +
+ 근무 내용 + + {contract?.workDetail} +
+ 근무 시작일 + + {contract?.workStartDate.toLocaleString()} +
+ 나의 주소 + + {contract?.employeeAddress} +
+ 나의 연락처 + + {contract?.employeePhone} +
+ 휴무일 + + {contract?.restDayOfWeek} +
+ 시급 + + {contract?.payPerHour} +
+ 급여일 + + {contract?.paymentDay} +
+ 근무일 + +
+ {contract?.workTimes?.map((item, index) => ( + <> +
+
+ {item.workDayOfWeek.charAt(0)}
-
- (휴) {item.restStartTime}-{item.restEndTime} +
+
+ {item.workStartTime}-{item.workEndTime} +
+
+ (휴) {item.restStartTime}-{item.restEndTime} +
-
- - ))} -
-
+ + ))} +
+
+ )} ); }; diff --git a/src/components/ModalCenter.tsx b/src/components/ModalCenter.tsx index 0d463ca..2da5bda 100644 --- a/src/components/ModalCenter.tsx +++ b/src/components/ModalCenter.tsx @@ -36,7 +36,7 @@ const ModalCenter = ({ )} >
{title}
-
{children}
+
{children}
{hasDecline && ( {
간편 비밀번호를 입력해주세요
-
{ const navigation = useNavigate(); @@ -69,91 +71,15 @@ const MyPage = () => { return ( <> {isModalOpen && paperDetail && ( - -
-
-
근무지
-
- -
-
-
-
근무지 주소
-
{paperDetail?.workSite}
-
-
-
근무 내용
-
{paperDetail?.workDetail}
-
-
-
근무 시작일
-
- {paperDetail.workStartDate - .toString() - .substring( - 0, - paperDetail.workStartDate.toString().indexOf('T') - )} -
-
- -
-
나의 주소
-
{paperDetail?.employeeAddress}
-
-
-
나의 연락처
-
{paperDetail?.employeePhone}
-
-
-
휴무일
-
{paperDetail?.restDayOfWeek}
-
-
-
시급
-
{paperDetail?.payPerHour.toLocaleString()}원
-
-
-
급여일
-
{paperDetail?.paymentDay}일
-
- -
-
근무일
-
- {paperDetail?.workTimes?.map((item) => { - return ( -
-
- {item.workDayOfWeek} -
-
-
- 근무시간 {item.workStartTime} - {item.workEndTime} -
-
- 휴게시간 {item.restStartTime} - {item.restEndTime} -
-
-
- ); - })} -
-
-
-
+ + )} diff --git a/src/pages/employee/PartTimeTab/PaymentMain.tsx b/src/pages/employee/PartTimeTab/PaymentMain.tsx index 4a2f77a..a4ce1f1 100644 --- a/src/pages/employee/PartTimeTab/PaymentMain.tsx +++ b/src/pages/employee/PartTimeTab/PaymentMain.tsx @@ -42,7 +42,7 @@ const PaymentMain = () => { {/* 토글 버튼 */} { selectPayment(); setYearMonth(today); diff --git a/src/pages/employee/PartTimeTab/WorkTime.tsx b/src/pages/employee/PartTimeTab/WorkTime.tsx index 438b2cf..510a298 100644 --- a/src/pages/employee/PartTimeTab/WorkTime.tsx +++ b/src/pages/employee/PartTimeTab/WorkTime.tsx @@ -105,30 +105,32 @@ const WorkTime = () => { )}
- {workPlaceList?.invitatedWorkPlaceList?.length > 0 - ? workPlaceList.invitatedWorkPlaceList.map((item, index) => ( - -
- - { - setCurrSignContractId(item.employmentContractId); - setModalCenterOpen(true); - }} - /> -
-
- )) - : '연동된 매장이 없습니다'} +
+ {workPlaceList?.invitatedWorkPlaceList?.length > 0 + ? workPlaceList.invitatedWorkPlaceList.map((item, index) => ( + +
+ + { + setCurrSignContractId(item.employmentContractId); + setModalCenterOpen(true); + }} + /> +
+
+ )) + : '연동된 매장이 없습니다'} +
{/* 사장님과 연동 */}