diff --git a/frontend/src/components/NavBar.vue b/frontend/src/components/NavBar.vue index 9619d71..b1ae5ad 100644 --- a/frontend/src/components/NavBar.vue +++ b/frontend/src/components/NavBar.vue @@ -4,11 +4,13 @@
  • - {{child.menuNm}} + {{child.menuNm}} +
    @@ -20,8 +22,6 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/frontend/src/modules/custMgt/components/ValidationConfirmPop.vue b/frontend/src/modules/custMgt/components/ValidationConfirmPop.vue index 38c7470..affe566 100644 --- a/frontend/src/modules/custMgt/components/ValidationConfirmPop.vue +++ b/frontend/src/modules/custMgt/components/ValidationConfirmPop.vue @@ -18,24 +18,24 @@ - +
    -
    -
    -

    사용자 등록

    -
    -
    -

    해당 사용자를 등록하고 인증 메일을

    -

    발송하시겠습니까?

    -

    사용을 위해서는 등록된 이메일 인증 후

    -

    서비스 이용이 가능합니다.

    -
    -
    - - -
    -
    +
    +
    +

    사용자 등록

    +
    +
    +

    해당 사용자를 등록하고 인증 메일을

    +

    발송하시겠습니까?

    +

    사용을 위해서는 등록된 이메일 인증 후

    +

    서비스 이용이 가능합니다.

    +
    +
    + + +
    +
    @@ -124,18 +124,18 @@
    -
    -
    -

    사용자 수정 확인

    -
    -
    -

    변경된 내용을 저장하시겠습니까?

    -
    -
    - - -
    -
    +
    +
    +

    사용자 수정 확인

    +
    +
    +

    변경된 내용을 저장하시겠습니까?

    +
    +
    + + +
    +
    diff --git a/frontend/src/modules/custMgt/components/commonModal.vue b/frontend/src/modules/custMgt/components/commonModal.vue index 2ddfade..7aa5d41 100644 --- a/frontend/src/modules/custMgt/components/commonModal.vue +++ b/frontend/src/modules/custMgt/components/commonModal.vue @@ -60,6 +60,27 @@ + +
    +
    + +
    +
    +

    {{title}}

    +
    +
    +

    {{ msg1 }}

    +

    {{ msg2 }}

    +

    {{ msg3 }}

    +

    {{ msg4 }}

    +
    +
    + + +
    +
    +
    + @@ -80,14 +101,13 @@ export default { }, methods :{ alertModalOpen(props){ - console.log('>>>>>>>>>> alertModalOpen'); console.log(props.msg1); this.title = props.title; this.msg1 = props.msg1; this.msg2 = props.msg2; this.msg3 = props.msg3; this.msg4 = props.msg4; - + console.log(props) var dimmed = document.getElementsByClassName('alertModal'); for(var i = 0; i < dimmed.length; i++){ dimmed[i].style.display = 'block'; @@ -110,6 +130,7 @@ export default { }, // 모달 오픈 confirmModalOpen(props){ + console.log(props) var dimmed = document.getElementsByClassName('confirm'); for(var i = 0; i < dimmed.length; i++){ dimmed[i].style.display = 'block'; @@ -127,6 +148,18 @@ export default { dimmed[i].style.display = 'block'; } + this.title = props.title; + this.msg1 = props.msg1; + this.msg2 = props.msg2; + this.msg3 = props.msg3; + this.msg4 = props.msg4; + }, + confirmModalOpenMemo(props){ + var dimmed = document.getElementsByClassName('confirmMemo'); + for(var i = 0; i < dimmed.length; i++){ + dimmed[i].style.display = 'block'; + } + this.title = props.title; this.msg1 = props.msg1; this.msg2 = props.msg2; @@ -151,6 +184,17 @@ export default { dimmed[i].style.display = 'none'; } + this.row.result = true; + // 부모 함수 호출. + this.$parent.confirmCalbackFnc(this.row); + }, + // 모달 끄기(ok) + confirmModalCloseMemo(){ + var dimmed = document.getElementsByClassName('confirmMemo'); + for(var i = 0; i < dimmed.length; i++){ + dimmed[i].style.display = 'none'; + } + this.row.result = true; // 부모 함수 호출. this.$parent.confirmCalbackFnc(this.row); @@ -177,6 +221,18 @@ export default { // 부모 함수 호출. this.$parent.confirmCalbackFnc(this.row); }, + // 모달 끄기(취소) + confirmModalCancelMemo(){ + var dimmed = document.getElementsByClassName('confirmMemo'); + for(var i = 0; i < dimmed.length; i++){ + dimmed[i].style.display = 'none'; + } + + this.row.result = false; + // 부모 함수 호출. + this.$parent.memberDeleteConfirmCalbackFnc(this.row); + }, + } } diff --git a/frontend/src/modules/custMgt/service/custMgtApi.js b/frontend/src/modules/custMgt/service/custMgtApi.js index 68fce4e..8e153d4 100644 --- a/frontend/src/modules/custMgt/service/custMgtApi.js +++ b/frontend/src/modules/custMgt/service/custMgtApi.js @@ -68,6 +68,11 @@ const updateAdminInfoTotal = (params) => { return httpClient.post('/api/v1/bo/custMgt/updateAdminInfoTotal', params); } +//insertTestId +const insertTestId = (params) => { + return httpClient.post('/api/v1/bo/custMgt/insertTestId', params); +} + // 메모삭제 const deleteMemo = (params) => { return httpClient.post('/api/v1/bo/custMgt/deleteMemo', params); @@ -111,4 +116,5 @@ export default { deleteUser, updateAdminInfoTotal, deleteMemo, + insertTestId, } diff --git a/frontend/src/modules/custMgt/views/MemberAdminDetail.vue b/frontend/src/modules/custMgt/views/MemberAdminDetail.vue index ce8b5a2..eae0854 100644 --- a/frontend/src/modules/custMgt/views/MemberAdminDetail.vue +++ b/frontend/src/modules/custMgt/views/MemberAdminDetail.vue @@ -98,7 +98,7 @@
    - +
    @@ -348,9 +348,19 @@ export default { this.row.adminId = this.adminId; this.$refs.memoTatalListPop.memoTotalModalOpen(this.row); }, - async memberDelete(){ - - if(window.confirm('삭제 하시겠습니까?')){ + deleteMember() { + console.log('delete count:'+this.selected.length); + if(this.selected.length === 0){ + this.row.title = '청약고객관리'; + this.row.msg1 = '삭제대상을 체크해주세요.'; + this.$refs.commmonModal.alertModalOpen(this.row); + return false; + } + this.row.title ='청약고객관리'; + this.row.msg1 ='삭제 하시겠습니까?' + this.$refs.commmonModal.confirmModalOpen2(this.row); + }, + async memberDelete(){ var serviceId = this.adminId; this.row.list = this.selected.map((row)=>({userId:row})); this.row.adminId = this.adminId; @@ -359,18 +369,20 @@ export default { let response = await custMgtApi.deleteUser(this.row); const result = response.data; if (result != null && result.retCode == "0000") { - this.row.title = '청약고객관리'; - this.row.msg1 = '저장 하였습니다.'; - this.$refs.commmonModal.alertModalOpen(this.row); this.memberDetail(serviceId); - } + }else{ + this.row={} + this.row.title = '청약고객관리'; + this.row.msg1 = '실패 하였습니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); + } } catch (error) { console.log(error); + this.row={} this.row.title = '청약고객관리'; this.row.msg1 = '실패 하였습니다.'; this.$refs.commmonModal.alertModalOpen(this.row); } - } }, setAuthData() { // 권한 옵션. @@ -388,6 +400,12 @@ export default { this.svcUserId = this.userId this.ezSvcUserAuthKey = process.env.VUE_APP_AUTHKEY this.$refs.form.submit() + }, + confirmCalbackFnc(props){ + console.log(props) + if(props.result){ + this.memberDelete(); + } }, }, }; diff --git a/frontend/src/modules/custMgt/views/SubsList.vue b/frontend/src/modules/custMgt/views/SubsList.vue index e4b6702..d517a53 100644 --- a/frontend/src/modules/custMgt/views/SubsList.vue +++ b/frontend/src/modules/custMgt/views/SubsList.vue @@ -308,7 +308,7 @@ export default { }, setCodeData() { // 상태 옵션 셋팅. - api.commCode({'grpCd' : 'SVCUSER_STTUS_CD'}).then(response => { + api.commCode({'grpCd' : 'SUBS_STTUS_CD'}).then(response => { this.statType = response.data.data.list; }); // diff --git a/frontend/src/modules/login/components/commonModal.vue b/frontend/src/modules/login/components/commonModal.vue index 7caa276..1832018 100644 --- a/frontend/src/modules/login/components/commonModal.vue +++ b/frontend/src/modules/login/components/commonModal.vue @@ -180,9 +180,3 @@ export default { } } - - \ No newline at end of file diff --git a/frontend/src/modules/login/views/LoginAuth.vue b/frontend/src/modules/login/views/LoginAuth.vue index 58ab855..c9990be 100644 --- a/frontend/src/modules/login/views/LoginAuth.vue +++ b/frontend/src/modules/login/views/LoginAuth.vue @@ -48,7 +48,7 @@ import api from '../service/api'; import tokenSvc from '@/common/token-service'; import { utils_mixin, chkPattern2 } from '../service/mixins'; import LoginPopup from '@/components/LoginPopup.vue' -import commonModal from "@/components/modal/commonModal"; +import commonModal from "../components/commonModal"; export default { name: 'Params', @@ -137,16 +137,26 @@ export default { async authNum(){ var vm = this; let userId = vm.$route.params.userId; + this.row = {} + if(!this.isLogin){ vm.$store.commit("login/isLogin", false); vm.$store.commit("login/isAuthChk", false); vm.$router.push({ path: '/'}); - return; + return false; } const hp = this.mdn; + + if(this.isNull(hp)){ + this.row.title = '로그인'; + this.row.msg1 = '휴대폰번호를 입력하세요.'; + this.$refs.commmonModal.alertModalOpen(this.row); + return false; + } + if(!this.isNull(hp) && !this.isMobile(hp)){ - this.row.title = '관리자/유치채널 관리'; + this.row.title = '로그인'; this.row.msg1 = '휴대폰 번호 형식이 잘못되었습니다. 확인해 주세요.'; this.$refs.commmonModal.alertModalOpen(this.row); this.$refs._phone.focus(); @@ -162,13 +172,26 @@ export default { const response = await api.authNum(params) console.log(response); var rsp = response.data; - if(rsp.retCode == '0000'){ + if(rsp.retCode == '0000') { this.timerStop(this.timer); this.timer = this.timerStart(); this.row.title = '인증번호 발송'; this.row.msg1 = '인증번호를 발송하였습니다.'; this.$refs.commmonModal.alertModalOpen(this.row); this.isAuthNum = true; + }else if(rsp.retCode == '4008'){ + this.row.title = '휴대폰번호 확인'; + this.row.msg1 = '휴대폰번호를 확인해주세요.'; + this.row.msg2 = '아이디에 등록된 휴대폰번호로만 인증이 가능합니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); + }else if(rsp.retCode == '4011'){ + this.row.title = '인증실패'; + this.row.msg1 = '잘못된 인증번호입니다.'; + this.row.msg2 = '5회 실패 시 로그아웃됩니다.'; + this.row.callFnc = 'login' + vm.$store.commit("login/isLogin", false); + vm.$store.commit("login/isAuthChk", false); + this.$refs.commmonModal.alertModalOpen(this.row); }else if (!this.timer) { this.timerStop(this.timer); this.timer = null; @@ -187,7 +210,7 @@ export default { async ajaxAuth(){ var vm = this; let userId = vm.$route.params.userId; - + this.row = {} if(!this.mdn){ this.row.title = '휴대폰번호 확인'; this.row.msg1 = '휴대폰번호를 확인해 주세요.'; @@ -209,7 +232,11 @@ export default { } if(this.timeCounter == 0){ - this.ModalOpen('modal10'); + // this.ModalOpen('modal10'); + this.row.title = '인증실패'; + this.row.msg1 = '인증시간 초과되었습니다.'; + this.row.msg2 = '다시 휴대폰번호를 입력해주세요.'; + this.$refs.commmonModal.alertModalOpen(this.row); return false; } var params = { @@ -324,7 +351,12 @@ export default { + secondes.toString().padStart(2, "0") ); }, - + alertCalbackFnc(callFnc){ + console.log(callFnc) + if(callFnc === 'login'){ + this.$router.push({ path: '/'}); + } + }, } }; diff --git a/frontend/src/modules/login/views/LoginMain.vue b/frontend/src/modules/login/views/LoginMain.vue index 79f783c..1d6a44a 100644 --- a/frontend/src/modules/login/views/LoginMain.vue +++ b/frontend/src/modules/login/views/LoginMain.vue @@ -1,4 +1,6 @@ - + + + \ No newline at end of file diff --git a/frontend/src/modules/riskMgt/views/IntrcpList.vue b/frontend/src/modules/riskMgt/views/IntrcpList.vue index b399939..fa781e3 100644 --- a/frontend/src/modules/riskMgt/views/IntrcpList.vue +++ b/frontend/src/modules/riskMgt/views/IntrcpList.vue @@ -137,7 +137,7 @@ export default { grid: { url: '/api/v1/bo/riskMgt/sendNum/intrcpList', pagePerRows: 50, - perPage: 50, + //perPage: 50, pagination: true, isCheckbox: false, initialRequest: false, @@ -187,6 +187,8 @@ export default { commonModal, }, destroyed() { + this.grid.params.blckSndrno = ''; + this.grid.params.regId = ''; }, created(){ @@ -212,7 +214,7 @@ export default { this.grid.params.blckRsnCd = this.blckRsnCd this.grid.params.blckYn = this.blckYn this.grid.params.sndblckTpCd = this.sndblckTpCd - this.grid.pagePerRows = this.perPageCnt + //this.grid.pagePerRows = this.perPageCnt this.$refs.table.search(this.grid.params, isKeep); this.sendStoreData(); diff --git a/frontend/src/modules/riskMgt/views/ZezNum.vue b/frontend/src/modules/riskMgt/views/ZezNum.vue index cd01fc4..953eeca 100644 --- a/frontend/src/modules/riskMgt/views/ZezNum.vue +++ b/frontend/src/modules/riskMgt/views/ZezNum.vue @@ -1,13 +1,12 @@