diff --git a/frontend/src/components/NavBar.vue b/frontend/src/components/NavBar.vue index 8aef46e..9619d71 100644 --- a/frontend/src/components/NavBar.vue +++ b/frontend/src/components/NavBar.vue @@ -4,7 +4,7 @@
최근 3개월 내역을 확인할 수 있습니다.
-최근 3개월 내역을 확인할 수 있습니다.
+| 날짜 | +시작 금액 | +사용 금액 | +이월 금액 | +소멸 금액 | +
|---|---|---|---|---|
| {{ option.lmtYm }} | +{{ option.startAmount.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }} | +{{ option.useAmount.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }} | +{{ option.krrrAmount.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }} | +{{ option.extshAmount.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }} | +
| 검색 결과가 없습니다. | +||||
( 최대 100개까지 등록 가능 )
diff --git a/frontend/src/modules/custMgt/components/MemberModifyPop.vue b/frontend/src/modules/custMgt/components/MemberModifyPop.vue index 6067ff0..aa993f8 100644 --- a/frontend/src/modules/custMgt/components/MemberModifyPop.vue +++ b/frontend/src/modules/custMgt/components/MemberModifyPop.vue @@ -70,7 +70,8 @@ import custMgtApi from "../service/custMgtApi.js"; import { utils_mixin, chkPattern2 } from '../service/mixins'; import ValidationConfirmPop from '../components/ValidationConfirmPop.vue'; import lodash from "lodash"; -import commonModal from "@/components/modal/commonModal"; +//import commonModal from "@/components/modal/commonModal"; +import commonModal from "../components/commonModal"; export default { name: "memberModifyPop", @@ -102,13 +103,13 @@ export default { email:'', auth:'', stat: "", - userId: "", - adminId: "", + userId: "", + adminId: "", userNm:"", - userPwd1:"", - userPwd2:"", + userPwd1:"", + userPwd2:"", code:"", - userStat:"", + userStat:"", } }, methods :{ @@ -127,14 +128,14 @@ export default { this.mdn = result.data.mdn; this.userStat = result.data.userStat; } else { - this.row.title = '청약고객관리'; - this.row.msg1 = '실패 하였습니다.'; - this.$refs.commmonModal.alertModalOpen(this.row); + this.row.title = '청약고객관리'; + this.row.msg1 = '실패 하였습니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); } } catch(err) { - this.row.title = '청약고객관리'; - this.row.msg1 = '실패 하였습니다.'; - this.$refs.commmonModal.alertModalOpen(this.row); + this.row.title = '청약고객관리'; + this.row.msg1 = '실패 하였습니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); } // 모달 오픈 var dimmed = document.getElementsByClassName('memberUpdate'); @@ -162,20 +163,20 @@ export default { const result = response.data; console.log(result); if (result != null && result.retCode == "0000") { - this.row.title = '청약고객관리'; - this.row.msg1 = '수정 완료하였습니다.'; - this.$refs.commmonModal.alertModalOpen(this.row); - this.toComplete(); + this.row.title = '청약고객관리'; + this.row.msg1 = '수정 완료하였습니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); + this.toComplete(); } else { - this.row.title = '청약고객관리'; - this.row.msg1 = '실패 하였습니다.'; - this.$refs.commmonModal.alertModalOpen(this.row); - } + this.row.title = '청약고객관리'; + this.row.msg1 = '실패 하였습니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); + } } catch(err) { - this.row.title = '청약고객관리'; - this.row.msg1 = '실패 하였습니다.'; - this.$refs.commmonModal.alertModalOpen(this.row); + this.row.title = '청약고객관리'; + this.row.msg1 = '실패 하였습니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); } }, //사용자ID 수정 모달 Close @@ -193,36 +194,36 @@ export default { doPwdValidate(){ if(this.isNull(this.userPwd2)){ this.row.title = '청약고객관리'; - this.row.msg1 = '비밀번호 확인을 입력해 주세요.'; - this.$refs.commmonModal.alertModalOpen(this.row); - this.$refs._pwd2.focus(); + this.row.msg1 = '비밀번호 확인을 입력해 주세요.'; + this.row.focusTaget = '2'; + this.$refs.commmonModal.alertModalOpen(this.row); return false; } if(!lodash.isEqual(this.userPwd1, this.userPwd2)){ this.row.title = '청약고객관리'; - this.row.msg1 = '비밀번호가 일치하지 않습니다.'; - this.$refs.commmonModal.alertModalOpen(this.row); - this.$refs._pwd2.focus(); + this.row.msg1 = '비밀번호가 일치하지 않습니다.'; + this.row.focusTaget = '2'; + this.$refs.commmonModal.alertModalOpen(this.row); return false; } const pwdLen = this.bytes(this.userPwd1); if(!(pwdLen >= 8 && pwdLen <= 16)){ - this.row.title = '청약고객관리'; - this.row.msg1 = '비밀번호는 8~16자의 영문, 숫자, 특수문자(!,@, $, %, ^, &, *) 조합이 필요합니다.'; - this.$refs.commmonModal.alertModalOpen(this.row); - this.$refs._pwd1.focus(); + this.row.title = '청약고객관리'; + this.row.msg1 = '비밀번호는 8~16자의 영문, 숫자, 특수문자(!,@, $, %, ^, &, *) 조합이 필요합니다.'; + this.row.focusTaget = '1'; + this.$refs.commmonModal.alertModalOpen(this.row); return false; } const pEng = /[A-Za-z]/g; // 영문자 const pNum = /[0-9]/g; // 숫자 const pSpc = /[!@$%^&*]/g; // 특수문자 if(!(pEng.test(this.userPwd1) && pNum.test(this.userPwd1) && pSpc.test(this.userPwd1))) { - this.row.title = '청약고객관리'; - this.row.msg1 = '비밀번호는 8~16자의 영문, 숫자, 특수문자(!,@, $, %, ^, &, *) 조합이 필요합니다.'; - this.$refs.commmonModal.alertModalOpen(this.row); - this.$refs._pwd1.focus(); + this.row.title = '청약고객관리'; + this.row.msg1 = '비밀번호는 8~16자의 영문, 숫자, 특수문자(!,@, $, %, ^, &, *) 조합이 필요합니다.'; + this.row.focusTaget = '1'; + this.$refs.commmonModal.alertModalOpen(this.row); return false; - } + } return true; }, @@ -231,65 +232,78 @@ export default { if(!this.doPwdValidate()){ return false; } + } + + if(this.isNull(this.userPwd1) && !this.isNull(this.userPwd2)){ + this.row.title = '청약고객관리'; + this.row.msg1 = '비밀번호를 입력해 주세요.'; + this.row.focusTaget = '1'; + this.$refs.commmonModal.alertModalOpen(this.row); + return false; } - if(this.isNull(this.userNm)){ - this.row.title = '청약고객관리'; - this.row.msg1 = '이름을 입력해 주세요.'; - this.$refs.commmonModal.alertModalOpen(this.row); - this.$refs._userNm.focus(); + if(this.isNull(this.userNm)){ + this.row.title = '청약고객관리'; + this.row.msg1 = '이름을 입력해 주세요.'; + this.row.focusTaget = '3'; + this.$refs.commmonModal.alertModalOpen(this.row); return false; } - if(this.isNull(this.email)){ + if(this.isNull(this.mdn)){ this.row.title = '청약고객관리'; - this.row.msg1 = '이메일을 입력해주세요.'; - this.$refs.commmonModal.alertModalOpen(this.row); - this.$refs._email.focus(); - return false; - } - const email = this.email; - if(!this.isNull(email) && !lodash.isEqual(email,'@') && !this.emailCheck(email)){ - // alert("이메일 형식이 잘못되었습니다. 확인해 주세요"); - // this.$refs._email.focus(); - this.$refs.validationConfirmPopModal.validationEmailOpen(); - - return false; - } - - if(this.isNull(this.mdn)){ - this.row.title = '청약고객관리'; - this.row.msg1 = '휴대폰번호를 입력해주세요.'; - this.$refs.commmonModal.alertModalOpen(this.row); - this.$refs._phone.focus(); + this.row.msg1 = '휴대폰번호를 입력해주세요.'; + this.row.focusTaget = '4'; + this.$refs.commmonModal.alertModalOpen(this.row); return false; } const hp = this.mdn; if(!this.isNull(hp) && !this.isMobile(hp)){ - //alert("휴대폰 번호 형식이 잘못되었습니다. 확인해 주세요"); - //this.$refs._phone.focus(); - this.$refs.validationConfirmPopModal.validationPhonenumberOpen(); - + this.$refs.validationConfirmPopModal.validationPhonenumberOpen(); return false; } - if(this.isNull(this.userStat)){ + if(this.isNull(this.email)){ this.row.title = '청약고객관리'; - this.row.msg1 = '상태를 선택 해주세요.'; - this.$refs.commmonModal.alertModalOpen(this.row); + this.row.msg1 = '이메일을 입력해주세요.'; + this.row.focusTaget = '5'; + this.$refs.commmonModal.alertModalOpen(this.row); + return false; + } + const email = this.email; + if(!this.isNull(email) && !lodash.isEqual(email,'@') && !this.emailCheck(email)){ + this.$refs.validationConfirmPopModal.validationEmailOpen(); + return false; + } + + if(this.isNull(this.userStat)){ + this.row.title = '청약고객관리'; + this.row.msg1 = '상태를 선택 해주세요.'; + this.$refs.commmonModal.alertModalOpen(this.row); return false; } return true; }, - checkPhoneFocus(){ - //this.mdn = ''; - this.$refs._phone.focus(); - }, - checkEmailFocus(){ - //this.email = ''; - this.$refs._email.focus(); - }, + checkPhoneFocus(){ + this.$refs._phone.focus(); + }, + checkEmailFocus(){ + this.$refs._email.focus(); + }, + checkFocus(){ + if(this.row.focusTaget === '1'){ + this.$refs._pwd1.focus(); + } else if(this.row.focusTaget === '2'){ + this.$refs._pwd2.focus(); + } else if(this.row.focusTaget === '3'){ + this.$refs._userNm.focus(); + } else if(this.row.focusTaget === '4'){ + this.$refs._phone.focus(); + } else if(this.row.focusTaget === '5'){ + this.$refs._email.focus(); + } + }, } } diff --git a/frontend/src/modules/custMgt/components/MemberRegPop.vue b/frontend/src/modules/custMgt/components/MemberRegPop.vue index 3a6da9f..30cfeba 100644 --- a/frontend/src/modules/custMgt/components/MemberRegPop.vue +++ b/frontend/src/modules/custMgt/components/MemberRegPop.vue @@ -61,7 +61,8 @@ import custMgtApi from "../service/custMgtApi.js"; import { utils_mixin, chkPattern2 } from '../service/mixins'; import ValidationConfirmPop from '../components/ValidationConfirmPop.vue'; import lodash from "lodash"; -import commonModal from "@/components/modal/commonModal"; +//import commonModal from "@/components/modal/commonModal"; +import commonModal from "../components/commonModal"; export default { name: "memberRegPop", @@ -82,22 +83,22 @@ export default { //props: ['sendData'], created(){ // this.setAuthData(); - // this.formReset(); + this.formReset(); }, data(){ return{ row:{}, madangId:'', - adminId:'', + adminId:'', name:'', mdn:'', email:'', auth:'', - stat: "", - userId:"", + stat: "01", + userId:"", userNm:"", code:"", - userTotalCnt:0, + userTotalCnt:0, } }, methods :{ @@ -132,22 +133,22 @@ export default { const result = response.data; console.log(result); if (result != null && result.retCode == "0000") { - this.row.title = '청약고객관리'; - this.row.msg1 = '사용자 생성 완료하였습니다.'; - this.$refs.commmonModal.alertModalOpen(this.row); - this.toComplete(); - } else if(result != null && result.retCode == "4018"){ - // 이미 사용중인 ID - this.$refs.validationConfirmPopModal.validationIdDuplicateOpen(); + this.row.title = '청약고객관리'; + this.row.msg1 = '사용자 생성 완료하였습니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); + this.toComplete(); + } else if(result != null && result.retCode == "4018"){ + // 이미 사용중인 ID + this.$refs.validationConfirmPopModal.validationIdDuplicateOpen(); } else { - this.row.title = '청약고객관리'; - this.row.msg1 = '실패 하였습니다.'; - this.$refs.commmonModal.alertModalOpen(this.row); + this.row.title = '청약고객관리'; + this.row.msg1 = '실패 하였습니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); } } catch(err) { - this.row.title = '청약고객관리'; - this.row.msg1 = '실패 하였습니다.'; - this.$refs.commmonModal.alertModalOpen(this.row); + this.row.title = '청약고객관리'; + this.row.msg1 = '실패 하였습니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); } }, //사용자ID 생성 모달 Close @@ -156,7 +157,7 @@ export default { for(var i = 0; i < dimmed.length; i++){ dimmed[i].style.display = 'none'; } - //this.formReset(); + this.formReset(); }, toComplete(){ this.row.serviceId = this.adminId; @@ -169,86 +170,91 @@ export default { this.authType = response.data.data.list; }); }, - // formReset(){ - // var targetAdminId = this.adminId; - // Object.assign(this.$data, this.$options.data()); - // this.adminId = targetAdminId; - // }, + formReset(){ + var targetAdminId = this.adminId; + Object.assign(this.$data, this.$options.data()); + this.adminId = targetAdminId; + }, doValidate(){ - if(this.userTotalCnt >= 100){ - // 사용자등록제한_최대100개까지 - this.$refs.validationConfirmPopModal.validationMaxlimitOpen(); - return false; - } + if(this.userTotalCnt >= 100){ + // 사용자등록제한_최대100개까지 + this.$refs.validationConfirmPopModal.validationMaxlimitOpen(); + return false; + } - if(this.isNull(this.userId)){ - this.row.title = '청약고객관리'; - this.row.msg1 = 'ID를 입력해 주세요.'; - this.$refs.commmonModal.alertModalOpen(this.row); + if(this.isNull(this.userId)){ this.$refs._userId.focus(); + this.row.title = '청약고객관리'; + this.row.msg1 = 'ID를 입력해 주세요.'; + this.row.focusTaget = '1'; + this.$refs.commmonModal.alertModalOpen(this.row); return false; } - if(this.isNull(this.userNm)){ - this.row.title = '청약고객관리'; - this.row.msg1 = '이름을 입력해 주세요.'; - this.$refs.commmonModal.alertModalOpen(this.row); - this.$refs._userNm.focus(); + if(this.isNull(this.userNm)){ + this.row.title = '청약고객관리'; + this.row.msg1 = '이름을 입력해 주세요.'; + this.row.focusTaget = '2'; + this.$refs.commmonModal.alertModalOpen(this.row); return false; } - if(this.isNull(this.email)){ - this.row.title = '청약고객관리'; - this.row.msg1 = '이메일을 입력해주세요.'; - this.$refs.commmonModal.alertModalOpen(this.row); - this.$refs._email.focus(); - return false; - } - const email = this.email; - if(!this.isNull(email) && !lodash.isEqual(email,'@') && !this.emailCheck(email)){ - - this.$refs.validationConfirmPopModal.validationEmailOpen(); - - return false; - } - - if(this.isNull(this.mdn)){ - this.row.title = '청약고객관리'; - this.row.msg1 = '휴대폰번호를 입력해주세요.'; - this.$refs.commmonModal.alertModalOpen(this.row); - this.$refs._phone.focus(); + if(this.isNull(this.mdn)){ + this.row.title = '청약고객관리'; + this.row.msg1 = '휴대폰번호를 입력해주세요.'; + this.row.focusTaget = '3'; + this.$refs.commmonModal.alertModalOpen(this.row); return false; } const hp = this.mdn; if(!this.isNull(hp) && !this.isMobile(hp)){ - - this.$refs.validationConfirmPopModal.validationPhonenumberOpen(); - + this.row.focusTaget = '3'; + this.$refs.validationConfirmPopModal.validationPhonenumberOpen(); return false; } - if(this.isNull(this.stat)){ - this.row.title = '청약고객관리'; - this.row.msg1 = '상태를 선택 해주세요.'; - this.$refs.commmonModal.alertModalOpen(this.row); + if(this.isNull(this.email)){ + this.row.title = '청약고객관리'; + this.row.msg1 = '이메일을 입력해주세요.'; + this.row.focusTaget = '4'; + this.$refs.commmonModal.alertModalOpen(this.row); + return false; + } + const email = this.email; + if(!this.isNull(email) && !lodash.isEqual(email,'@') && !this.emailCheck(email)){ + this.$refs.validationConfirmPopModal.validationEmailOpen(); + return false; + } + + if(this.isNull(this.stat)){ + this.row.title = '청약고객관리'; + this.row.msg1 = '상태를 선택 해주세요.'; + this.$refs.commmonModal.alertModalOpen(this.row); return false; } return true; + }, + checkFocus(){ + if(this.row.focusTaget === '1'){ + this.$refs._userId.focus(); + } else if(this.row.focusTaget === '2'){ + this.$refs._userNm.focus(); + } else if(this.row.focusTaget === '3'){ + this.$refs._phone.focus(); + } else if(this.row.focusTaget === '4'){ + this.$refs._email.focus(); + } }, - checkPhoneFocus(){ - //this.mdn = ''; - this.$refs._phone.focus(); - }, - checkEmailFocus(){ - //this.email = ''; - this.$refs._email.focus(); - }, - checkIdDupFocus(){ - //this.email = ''; - this.$refs._userId.focus(); - }, - + checkPhoneFocus(){ + this.$refs._phone.focus(); + }, + checkEmailFocus(){ + this.$refs._email.focus(); + }, + checkIdDupFocus(){ + this.$refs._userId.focus(); + }, } } \ No newline at end of file diff --git a/frontend/src/modules/custMgt/components/SearchIdPopup.vue b/frontend/src/modules/custMgt/components/SearchIdPopup.vue index d6b5088..3dba93d 100644 --- a/frontend/src/modules/custMgt/components/SearchIdPopup.vue +++ b/frontend/src/modules/custMgt/components/SearchIdPopup.vue @@ -4,42 +4,39 @@ -입력하신 마당 ID를 조회할 수 없습니다.
-입력하신 마당 ID를 조회할 수 없습니다.
+선택하신 정보가 아래와 같습니다.
-유치자 정보를 수정하시겠습니까?
-선택하신 정보가 아래와 같습니다.
+유치자 정보를 수정하시겠습니까?
+{{ msg1 }}
+{{ msg2 }}
+{{ msg3 }}
+{{ msg4 }}
+{{ msg1 }}
+{{ msg2 }}
+{{ msg3 }}
+{{ msg4 }}
+{{ msg1 }}
+{{ msg2 }}
+{{ msg3 }}
+{{ msg4 }}
+{{ msg1 }}
+{{ msg2 }}
+{{ msg3 }}
+{{ msg4 }}
+{{ msg1 }}
+{{ msg2 }}
+{{ msg3 }}
+{{ msg4 }}
+{{ msg1 }}
+{{ msg2 }}
+{{ msg3 }}
+{{ msg4 }}
+임시비밀번호로 로그인할 경우 비밀번호를 변경 후
서비스 이용이 가능합니다.