diff --git a/src/components/account/register/AccountRegisterForm.js b/src/components/account/register/AccountRegisterForm.js index 6aa000e1..9b34e0ed 100644 --- a/src/components/account/register/AccountRegisterForm.js +++ b/src/components/account/register/AccountRegisterForm.js @@ -203,7 +203,9 @@ export const AccountRegisterForm = ({ email: '', hpno: '', clncd: '+82', - crtfyNo: '' + crtfyNo: '', + company: '팔네트웍스', + trmnlId: 'SANDBOX-001' }, resolver: yupResolver(SignupSchema) }); @@ -289,9 +291,15 @@ export const AccountRegisterForm = ({ let hpno = ''; let brthdyDate = ''; + let trmnlId = ''; const onChangeHandler = e => { const { name, value } = e.target; + if (name === 'company') { + trmnlId = value; + setValue('trmnlId', trmnlId); + } + if (name === 'memberName') { setMemberName(value); } @@ -578,7 +586,7 @@ export const AccountRegisterForm = ({ */} -
+ @@ -597,8 +605,51 @@ export const AccountRegisterForm = ({ {errors && errors.userPswd && ( {errors.userPswd.message} )} -
-
+ + + + +
+ + + + + + + {errors && errors.company && ( + {errors.company.message} + )} + + + + {errors && errors.trmnlId && ( + {errors.trmnlId.message} + )} + +
+
+ + @@ -617,7 +668,7 @@ export const AccountRegisterForm = ({ {errors && errors.confirmUserPaswd && ( {errors.confirmUserPaswd.message} )} -
+
{ name='groupId' bsSize='sm' readOnly={true} - value={props.groupData.groupId || ''} + defaultValue={props.groupData.groupId || ''} placeholder='' /> @@ -107,6 +107,32 @@ export const BasisGroupForm = props => { + + + + + {errors && errors.trmnlId && ( + + {errors.trmnlId.message} + + )} + + + {/* diff --git a/src/containers/basis/group/BasisGroupApprovalContainer.js b/src/containers/basis/group/BasisGroupApprovalContainer.js index 2cffb8bd..16c2ac75 100644 --- a/src/containers/basis/group/BasisGroupApprovalContainer.js +++ b/src/containers/basis/group/BasisGroupApprovalContainer.js @@ -170,6 +170,7 @@ export const BasisGroupApprovalContainer = props => { const [saveData, setSaveData] = useState({ cstmrGroupSno: '', + trmnlId: '', // aprvlYn: 'N', //가입은 USER 로만 aprvlYn: 'N', //가입은 NORMAL 로만 aprvUserId: '' @@ -259,14 +260,10 @@ export const BasisGroupApprovalContainer = props => { sortable: false, cell: (row, i) => { let disa = false; - + let trmnlId = ''; if (user.authId === 'ADMIN') { //모든 그룹 조회 가능 - const my = groupList?.find(prev => { - if (prev.groupId === row?.groupId) { - return prev; - } - }); + const my = groupList?.find(prev => prev.groupId === row?.groupId); if (my.myGroupAuthCd === 'NORMAL') { disa = true; } else if (!my.myGroupAuthCd) { @@ -274,11 +271,8 @@ export const BasisGroupApprovalContainer = props => { } } else if (user.authId === 'USER') { //본인 그룹 조회 가능 - const my = joinList?.find(prev => { - if (prev.groupId === row?.groupId) { - return prev; - } - }); + const my = joinList?.find(prev => prev.groupId === row?.groupId); + trmnlId = my?.trmnlId; if (my?.groupAuthCd === 'NORMAL') { disa = true; } @@ -288,7 +282,7 @@ export const BasisGroupApprovalContainer = props => { handlerAprvConfirm(row?.cstmrGroupSno)} + onClick={() => handlerAprvConfirm(row?.cstmrGroupSno, trmnlId)} disabled={disa} > 승인처리 @@ -327,19 +321,19 @@ export const BasisGroupApprovalContainer = props => { param.page = page; dispatch(Actions.APPROVAL_LIST.request({ searchParams: param })); }; - const handlerAprvConfirm = cstmrGroupSno => { + const handlerAprvConfirm = (cstmrGroupSno, trmnlId) => { setModal({ isOpen: true, title: '승인 확인', desc: '해당 사용자를 승인 처리 하시겠습니까?' }); - //승인처리 시 권한부여 O setSaveData({ cstmrGroupSno: cstmrGroupSno, aprvlYn: 'Y', aprvUserId: user?.userId, - groupAuthCd: 'NORMAL' + groupAuthCd: 'NORMAL', + trmnlId: trmnlId }); }; diff --git a/src/containers/basis/group/BasisGroupDetailContainer.js b/src/containers/basis/group/BasisGroupDetailContainer.js index 0bfc3c6c..1c98391d 100644 --- a/src/containers/basis/group/BasisGroupDetailContainer.js +++ b/src/containers/basis/group/BasisGroupDetailContainer.js @@ -38,6 +38,7 @@ export const BasisGroupDetailContainer = () => { useEffect(() => { setGroupData({ + trmnlId: user?.trmnlId, groupId: newGroupId, groupNm: '', type: 'create', @@ -63,6 +64,7 @@ export const BasisGroupDetailContainer = () => { const handlerCreate = data => { const saveData = { + trmnlId: groupData.trmnlId, createDt: '', cstmrSno: groupData.cstmrSno, groupId: groupData.groupId, diff --git a/src/modules/control/gp/models/controlGpModel.ts b/src/modules/control/gp/models/controlGpModel.ts index 95ad85a6..29719dd1 100644 --- a/src/modules/control/gp/models/controlGpModel.ts +++ b/src/modules/control/gp/models/controlGpModel.ts @@ -118,6 +118,7 @@ export interface ControlGroupAuthData { arcrftSno: number; idntfNum: string; createUserId: string; + trmnlId: string; } export interface ControlGpFlightPlanDataList