diff --git a/src/components/basis/dron/BasisIdntform.js b/src/components/basis/dron/BasisIdntform.js index a16ac6c..250b84e 100644 --- a/src/components/basis/dron/BasisIdntform.js +++ b/src/components/basis/dron/BasisIdntform.js @@ -17,6 +17,7 @@ import { X } from 'react-feather'; import Repeater from '@components/repeater'; export const BasisIdntfForm = props => { + return ( @@ -69,8 +70,8 @@ export const BasisIdntfForm = props => { diff --git a/src/containers/basis/dron/BasisIdntfContainer.js b/src/containers/basis/dron/BasisIdntfContainer.js index cb1540f..a4d87ce 100644 --- a/src/containers/basis/dron/BasisIdntfContainer.js +++ b/src/containers/basis/dron/BasisIdntfContainer.js @@ -14,6 +14,7 @@ export const BasisIdntfContainer = props => { const [idntfData, setIdntfData] = useState({ id: '', idntfNum: '', + idntfNum2: '', idntfTypeCd: 'DRON', ownerNm: '', hpno: '', @@ -98,7 +99,7 @@ export const BasisIdntfContainer = props => { const check_kor = /^[가-힣a-zA-Z0-9][^!@#$%^&*()+\=\[\]{};':"\\|,.<>\/?\s]*$/; - if (idntf.idntfNum === 'PA') { + if (idntf.idntfNum < 2) { setModal({ isOpen: true, title: '필수값 입력 오류', @@ -156,11 +157,17 @@ export const BasisIdntfContainer = props => { }); if (!checking) return false; + //saveArr[0].idntfNum = 'PA' + saveArr[0].idntfNum + // saveArr = 'PA' + saveArr[0].idntfNum, saveArr + saveArr dispatch( Actions.IDNTF_CREATE.request({ arcrftSno: detail?.arcrftSno, - data: saveArr + data: saveArr.map((i) => ({ + ...i, + idntfNum: `PA${i.idntfNum}` + })) }) ); } else { @@ -178,6 +185,7 @@ export const BasisIdntfContainer = props => { }; const addData = () => { + setIdntfDataList([...idntDataList, { ...idntfData, id: Math.random() }]); }; @@ -185,21 +193,18 @@ export const BasisIdntfContainer = props => { if (!isSave) { setIdntfDataList(idntDataList.filter(item => item.id !== id)); } else { + dispatch(Actions.IDNTF_DELETE.request(id)); } }; const handlerInput = (event, index) => { const { name, value } = event.target; - let newArr = [...idntDataList]; // copying the old datas array + let newArr = [...idntDataList]; newArr[index] = { ...newArr[index], [name]: value }; - // if (newArr[index].idntfNum.length < 2) { - // setModal({ - // isOpen: true, - // title: '필수값 입력 오류', - // desc: '식별 장치 기본값입니다.' - // }); - newArr[index] = { ...newArr[index], idntfNum: 'PA' }; + + newArr[index] = { ...newArr[index] }; + setIdntfDataList(newArr); }; diff --git a/src/modules/basis/dron/sagas/basisDronSaga.ts b/src/modules/basis/dron/sagas/basisDronSaga.ts index 729a523..962044a 100644 --- a/src/modules/basis/dron/sagas/basisDronSaga.ts +++ b/src/modules/basis/dron/sagas/basisDronSaga.ts @@ -19,6 +19,7 @@ function* listSaga(action: ActionType) { count, errorCode } = res; + if (errorCode) { // 오류메시지 호출 yield put( @@ -67,7 +68,12 @@ function* listIdntfSaga(action: ActionType) { let dataArr = new Array(); data?.map(item => { - dataArr.push({ ...item, isSave: true, id: item?.idntfNum }); + dataArr.push({ + ...item, + isSave: true, + id: item?.idntfNum, + idntfNum: item.idntfNum.substring(2) + }); }); yield put( @@ -145,6 +151,7 @@ function* createIdntfSaga( const res = yield call(Apis.dronAPI.idntfCreate, detail); const { data } = res; + if (data.result) { yield put( MessageActions.IS_MESSAGE({