diff --git a/frontend/src/assets/css/style.css b/frontend/src/assets/css/style.css index 0d2ff86..f87ebc2 100644 --- a/frontend/src/assets/css/style.css +++ b/frontend/src/assets/css/style.css @@ -539,58 +539,95 @@ header .user_wrap .user_info .logout { } /* input cal + search-box*/ -.w35{width:35%;} -.contents .table.table_form.m50{margin-bottom: 50px;} +/*.w35{width:35%;}*/ +/*.contents .table.table_form.m50{margin-bottom: 50px;}*/ -.contents .input_box.cal{ - display: inline-block; - width: 27.34%; +/*.contents .input_box.cal{*/ +/* display: inline-block;*/ +/* width: 27.34%;*/ +/*}*/ + +/*.contents .input_box.cal label {*/ +/* display: block;*/ +/*}*/ + +/*.contents .input_box.cal .txt{*/ +/* display: inline-block;*/ +/*}*/ + +/*.contents .input_box.cal p{*/ +/* display: inline-flex;*/ +/* margin-left: 10px;*/ +/*}*/ + +/*.contents .input_box.cal input {*/ +/* display: inline-block;*/ +/* width: 48%;*/ +/* float: left;*/ +/* background: #fff url(../images/icon-calender.png) no-repeat right 6% center;*/ +/*}*/ + +/*.contents .input_box.cal input {*/ +/* display: inline-block;*/ +/* width: 48%;*/ +/* float: left;*/ +/* background: #fff url(../images/icon-calender.png) no-repeat right 6% center;*/ +/*}*/ + +/*.contents .input_box.cal span {*/ +/* display: inline-block;*/ +/* width: 48%;*/ +/* float: left;*/ +/* background: #fff url(../images/icon-calender.png) no-repeat right 6% center;*/ +/*}*/ + +.custom_input.icon_date input[type="text"] { + width: 52%; + float: left; + background: #fff url(../images/icon-calender.png) no-repeat right 6% center; +} +.custom_input.icon_date input[type="text"]:focus { + border-color: #cccccc; + background-color: #f6f6f6; + color: #898989; } -.contents .input_box.cal label { - display: block; -} - -.contents .input_box.cal .txt{ - display: inline-block; -} - -.contents .input_box.cal p{ - display: inline-flex; - margin-left: 10px; -} - -.contents .input_box.cal input { - display: inline-block; - width: 48%; - float: left; - background: #fff url(../images/icon-calender.png) no-repeat right 6% center; -} -.contents .input_box.cal input + input{ +.contents .input_box.cal span + input{ margin-left: 5%; } -.contents .input_box.cal.one{ - width: 13.67%; + +.vdp-datepicker__calendar header { + display: block; + line-height: 40px; + height: 40px; } -.contents .input_box.cal.one input{ - width: 100%; -} +/*.contents .input_box.cal input + input{*/ +/* margin-left: 5%;*/ +/*}*/ -.contents .input_box.cal.one + .btn-a{ - margin-right: 10px; -} +/*.contents .input_box.cal.one{*/ +/* width: 13.67%;*/ +/*}*/ -.contents .input_box.cal .term{ - display: flex; - justify-content: space-around; - align-items: center; -} +/*.contents .input_box.cal.one input{*/ +/* width: 100%;*/ +/*}*/ -.contents .input_box.cal .term input:nth-child(1){ - margin-right: 4%; -} +/*.contents .input_box.cal.one + .btn-a{*/ +/* margin-right: 10px;*/ +/*}*/ + +/*.contents .input_box.cal .term{*/ +/* display: flex;*/ +/* justify-content: space-around;*/ +/* align-items: center;*/ +/*}*/ + +/*.contents .input_box.cal .term input:nth-child(1){*/ +/* margin-right: 4%;*/ +/*}*/ .contents .input_box .search-box { background: #fff url(../images/icon-search.png) no-repeat 6% center/14px auto; @@ -1003,12 +1040,12 @@ header .user_wrap .user_info .logout { position: relative; font-size: 14px; } -.contents .table table td a { +.contents .table table td a, .popup.popup_form table td a { text-decoration: underline; color: #333333; } -.contents .table table td a:hover { +.contents .table table td a:hover, .popup.popup_form table td a:hover { color: #eb008b; } @@ -1156,6 +1193,15 @@ header .user_wrap .user_info .logout { margin-left: 8px; } +.contents .table.table_form .check.system .label_group{ + height: 30px; +} + +.contents .table.table_form .check.system .label_group label{ + padding-left: 30px; + margin:0; +} + .popup .pop-cont-detail { font-size: 16px; color: #666666; @@ -1163,6 +1209,7 @@ header .user_wrap .user_info .logout { background-color: #f5f6f8; padding: 15px; margin-top: 13px; + width: 100%; } .popup .pop-cont-detail li { @@ -1190,8 +1237,9 @@ header .user_wrap .user_info .logout { width: 525px; } -.popup.popup_form .info .count { +.popup.popup_form .info { margin-bottom: 12px; + padding: 0; } .popup.popup_form .pop-head { @@ -1232,6 +1280,10 @@ header .user_wrap .user_info .logout { height: 50px; } +.popup.popup_form .table-c tr:hover{ + background-color: #fafaff; +} + .popup.popup_form table tr:last-child { border-bottom: none; } @@ -1348,15 +1400,7 @@ header .user_wrap .user_info .logout { border: none; min-width: 80px; margin-left: 10px; -} - -.popup .button.grey { - background-color: #35354f; - font-size: 16px; -} - -.popup .button.grey:hover { - background-color: #0a0b24; + font-weight: 500; } /*customer popup*/ @@ -1448,6 +1492,7 @@ header .user_wrap .user_info .logout { align-items: center; justify-content: normal; font-size: 16px; + padding: 0; } .popup.popup_form .popup-btn2.bulk button:nth-child(1)::before{ @@ -1511,7 +1556,7 @@ header .user_wrap .user_info .logout { margin: 0 0 0 5px; } -.popup.popup_form.register{ +.popup.popup_form.w700{ width:700px; } @@ -1548,10 +1593,10 @@ header .user_wrap .user_info .logout { background: url(../images/icon-add-b.png) no-repeat center center; } -.popup.popup_form.register .input_add div:nth-child(2){ - width: 89%; - padding-top: 5px; -} +/*.popup.popup_form.register .input_add div:nth-child(2){*/ +/* width: 89%;*/ +/* padding-top: 5px;*/ +/*}*/ .popup .button.white{ background-color: #fff; @@ -1684,6 +1729,11 @@ header .user_wrap .user_info .logout { .popup.popup_form table .input_add input{ width: 85%; } + +.popup .input_search input + .button.btn-p2color{ + width:25% !important; +} + .essential{ display: flex; align-items: flex-start; diff --git a/frontend/src/components/CustomGrid.vue b/frontend/src/components/CustomGrid.vue index aa4f940..6d8cc1d 100644 --- a/frontend/src/components/CustomGrid.vue +++ b/frontend/src/components/CustomGrid.vue @@ -619,9 +619,9 @@ export default { for (var i = first; i <= last; i++) { let actCls = ''; if (i == this.currentIndex) { - actCls = 'v:class="active"'; + actCls = 'class="active"'; } - pData += '
  • ' + i + '
  • '; + pData += '
  • ' + i + '
  • '; } pData += '' pData += '
    ' diff --git a/frontend/src/components/LoginPopup.vue b/frontend/src/components/LoginPopup.vue index f87788d..7fb4408 100644 --- a/frontend/src/components/LoginPopup.vue +++ b/frontend/src/components/LoginPopup.vue @@ -1,30 +1,7 @@ @@ -104,6 +126,7 @@ import moment from 'moment'; import api from '@/service/api.js'; import custMgtApi from "../service/custMgtApi.js"; import xlsx from '@/common/excel'; +import commonModal from "@/components/modal/commonModal"; class CustomATagRenderer { constructor(props) { @@ -132,13 +155,12 @@ export default { data() { return { // 달력 데이터 + ko: vdp_translation_ko.js, + periodDay: 7, sDateDiv: 'day', - eDateDiv: 'year', - startDate: null, - endDate: null, - disabledSDate: { from: new Date()}, - disabledEDate: { to: new Date()}, - + startDate: new Date(), + endDate: new Date(), + statType: [], userType: [], row:{}, @@ -192,13 +214,16 @@ export default { }; }, components: { - customGrid: customGrid + customGrid: customGrid, + commonModal, + vuejsDatepicker, }, created(){ this.$store.commit("login/isLogin", true); this.$store.commit("login/isAuthChk", true); this.setCodeData(); this.getExcelHeader(); + this.setPeriodDay(0); }, destroyed() { @@ -221,6 +246,18 @@ export default { } this.search(isKeep); }, + beforeRouteLeave(to, from, next) { + + const getP = this.$refs.table.getPagination(); + console.log("==========getP : " + getP._currentPage); + this.$store.commit('searchcondition/updateSearchCondition', { + page: getP._currentPage, + perPage: this.perPageCnt, + params: this.grid.params + }); + // 라우트 하기전 실행 + next(); + }, methods: { search: function(isKeep) { console.log('this.perPageCnt'+this.perPageCnt); @@ -243,8 +280,8 @@ export default { const getP = this.$refs.table.getPagination(); console.log("==========getP : " + getP._currentPage); this.$store.commit('searchcondition/updateSearchCondition', { - page: getP._currentPage, - perPage: this.perPageCnt, + page: getP._currentPage, + perPage: this.perPageCnt, params: this.grid.params }); @@ -287,7 +324,9 @@ export default { }, // end of getExcelDataDown async excelDown() { if (this.$refs.table.getData().length <= 0) { - alert('조회된 데이터가 없습니다.'); + this.row.title = '청약고객관리'; + this.row.msg1 = '조회된 데이터가 없습니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); return false; } @@ -308,18 +347,52 @@ export default { this.excelHeader = res; }); }, - }, - beforeRouteLeave(to, from, next) { + setPeriodDay(day) { + this.periodDay = day; + this.endDate = new Date(); + this.startDate = moment(this.endDate) + .subtract(day, 'day') + .toDate(); - const getP = this.$refs.table.getPagination(); - console.log("==========getP : " + getP._currentPage); - this.$store.commit('searchcondition/updateSearchCondition', { - page: getP._currentPage, - perPage: this.perPageCnt, - params: this.grid.params - }); - // 라우트 하기전 실행 - next(); + this.closeDate('start'); + this.closeDate('end'); + }, + + selectedStartDate(day) { + if (day != undefined && day != null) { + this.periodDay = day; + } + if (this.startDate > this.endDate) { + this.startDate = this.endDate; + } + console.log(this.disabledSDate) + // this.grid.params.startDt = day + }, + selectedEndDate(day) { + if (day != undefined && day != null) { + this.periodDay = day; + } + }, + closeDate(type) { + if (type != undefined && type != null) { + if (type == 'start') { + this.disabledSDate = { from: this.endDate }; + this.disabledEDate = { to: this.startDate, from: this.endDate }; + } else if (type == 'end') { + this.disabledSDate = { from: this.endDate }; + this.disabledEDate = { to: this.startDate, from: new Date() }; + } + } + }, + customFormatter: function(date) { + if (this.sDateDiv == 'month') { + return moment(date).format('YYYY-MM'); + } else if (this.sDateDiv == 'year') { + return moment(date).format('YYYY'); + } else { + return moment(date).format('YYYY-MM-DD'); + } + }, }, }; \ 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 4dbb4f9..fd0984a 100644 --- a/frontend/src/modules/login/views/LoginAuth.vue +++ b/frontend/src/modules/login/views/LoginAuth.vue @@ -37,241 +37,268 @@
    + diff --git a/frontend/src/modules/login/views/LoginMain.vue b/frontend/src/modules/login/views/LoginMain.vue index d3c2960..a380522 100644 --- a/frontend/src/modules/login/views/LoginMain.vue +++ b/frontend/src/modules/login/views/LoginMain.vue @@ -1,142 +1,167 @@ diff --git a/frontend/src/modules/login/views/UpdatePassword.vue b/frontend/src/modules/login/views/UpdatePassword.vue index 462388f..cc8bb49 100644 --- a/frontend/src/modules/login/views/UpdatePassword.vue +++ b/frontend/src/modules/login/views/UpdatePassword.vue @@ -1,25 +1,26 @@ @@ -31,8 +32,8 @@ import { mapGetters } from 'vuex'; import LoginPopup from '@/components/LoginPopup.vue'; import tokenSvc from '@/common/token-service'; import { commonPwdView, validation } from '../service/mixins'; - // import { chkPattern } from '@/common/vue-mixins'; - // import * as utils from '@/common/utils'; +import commonModal from "@/components/modal/commonModal"; + export default { mixins: [commonPwdView, validation], data: function() { @@ -89,7 +90,8 @@ export default { }, components: { - LoginPopup : LoginPopup + LoginPopup : LoginPopup, + commonModal, }, methods: { @@ -108,20 +110,26 @@ export default { }, doPwdValidate(){ - debugger; + //debugger; if(lodash.isNil(this.newPw)){ - alert("비밀번호 확인을 입력해 주세요."); + this.row.title = '비밀번호 변경'; + this.row.msg1 = '비밀번호 확인을 입력해 주세요.'; + this.$refs.commmonModal.alertModalOpen(this.row); this.$refs._newPw2.focus(); return false; } if(!lodash.isEqual(this.newPw, this.newPw2)){ - alert("비밀번호가 일치하지 않습니다."); + this.row.title = '비밀번호 변경'; + this.row.msg1 = '비밀번호가 일치하지 않습니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); this.$refs._newPw2.focus(); return false; } const pwdLen = this.bytes(this.newPw); if(!(pwdLen >= 8 && pwdLen <= 16)){ - alert("비밀번호는 8~16자의 영문, 숫자, 특수문자(!,@, $, %, ^, &, *) 조합이 필요합니다."); + this.row.title = '비밀번호 변경'; + this.row.msg1 = '비밀번호는 8~16자의 영문, 숫자, 특수문자(!,@, $, %, ^, &, *) 조합이 필요합니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); this.$refs._newPw2.focus(); return false; } @@ -129,7 +137,9 @@ export default { const pNum = /[0-9]/g; // 숫자 const pSpc = /[!@$%^&*]/g; // 특수문자 if(!(pEng.test(this.newPw) && pNum.test(this.newPw) && pSpc.test(this.newPw))) { - alert("비밀번호는 8~16자의 영문, 숫자, 특수문자(!,@, $, %, ^, &, *) 조합이 필요합니다."); + this.row.title = '비밀번호 변경'; + this.row.msg1 = '비밀번호는 8~16자의 영문, 숫자, 특수문자(!,@, $, %, ^, &, *) 조합이 필요합니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); this.$refs._newPw2.focus(); return; } @@ -155,26 +165,31 @@ export default { if(rsp.retCode == '0000') { // vm.chgChkUserId(); - - if(vm.ModalOpen('modal16')){ - vm.$router.push({ path: '/login' }); - } + this.row.title = '비밀번호 변경'; + this.row.msg1 = '비밀번호가 정상적으로 변경되었습니다.'; + this.row.msg2 = '변경된 비밀번호로 다시 로그인 해주세요.'; + this.$refs.commmonModal.alertModalOpen(this.row); + // if(vm.ModalOpen('modal16')){ + vm.$router.push({ path: '/login' }); + // } } else if(rsp.retCode == '4016') { - vm.ModalOpen('modal14') + this.row.title = '비밀번호 변경'; + this.row.msg1 = '비밀번호를 확인해주세요.'; + this.$refs.commmonModal.alertModalOpen(this.row); + // vm.ModalOpen('modal14') } else if(rsp.retCode == '4017') { - vm.ModalOpen('modal15') + this.row.title = '비밀번호 오류'; + this.row.msg1 = '비밀번호를 사용할 수 없습니다.'; + this.row.msg2 = '비밀번호는 영문/숫자/특수기호를 혼합하여'; + this.row.msg3 = '8~16자리로 설정해주세요.'; + this.$refs.commmonModal.alertModalOpen(this.row); + // vm.ModalOpen('modal15') } else if(rsp.retCode == '4003') { - if(vm.ModalOpen('modal14')) { - //수정사항 : 모달오픈 -> 기존비밀번호 포커스 - alert('1'); - } - - // //this.$refs.oldPw.focus(); - // alert('비밀번호 유효성체크'); - // vm.$refs.oldPw.focus(); - } - else { - return; + this.row.title = '아이디 오류'; + this.row.msg1 = '등록되지 않은 아이디입니다.'; + this.row.msg1 = '아이디를 다시 확인하세요'; + this.$refs.commmonModal.alertModalOpen(this.row); + } }); diff --git a/frontend/src/modules/riskMgt/components/InsertIntrcpPop.vue b/frontend/src/modules/riskMgt/components/InsertIntrcpPop.vue index 417a95e..98932a3 100644 --- a/frontend/src/modules/riskMgt/components/InsertIntrcpPop.vue +++ b/frontend/src/modules/riskMgt/components/InsertIntrcpPop.vue @@ -14,14 +14,17 @@ 발신번호 - + 발송타입 - -
    - + -
    + \ No newline at end of file diff --git a/frontend/src/modules/riskMgt/components/IntrcpDetailPopup.vue b/frontend/src/modules/riskMgt/components/IntrcpDetailPopup.vue index 729c0e2..6745476 100644 --- a/frontend/src/modules/riskMgt/components/IntrcpDetailPopup.vue +++ b/frontend/src/modules/riskMgt/components/IntrcpDetailPopup.vue @@ -20,7 +20,7 @@ 발송타입 -
    +
    @@ -87,7 +88,7 @@ import sysMgtApi from "../service/sysMgtApi.js"; import { utils_mixin, chkPattern2 } from '../service/mixins'; import SearchIdPopup from '../components/SearchIdPopup.vue'; import lodash from "lodash"; -// searchIdPopModal +import commonModal from "@/components/modal/commonModal"; export default { name: "adminRegPop", @@ -109,8 +110,8 @@ export default { auth:'', stat: '', userNm:"", - userPwd1:"", - userPwd2:"", + userPwd1:"", + userPwd2:"", code:"", idCheck: false, props: {}, @@ -118,6 +119,7 @@ export default { }, components: { SearchIdPopup, + commonModal, }, model: { prop: 'sendData', @@ -132,23 +134,31 @@ export default { methods :{ doPwdValidate(){ if(this.isNull(this.userPwd1)){ - alert("비밀번호를 입력해 주세요."); + this.row.title = '관리자/유치채널 관리'; + this.row.msg1 = '비밀번호를 입력해 주세요.'; + this.$refs.commmonModal.alertModalOpen(this.row); this.$refs._pwd1.focus(); return false; } if(this.isNull(this.userPwd2)){ - alert("비밀번호 확인을 입력해 주세요."); + this.row.title = '관리자/유치채널 관리'; + this.row.msg1 = '비밀번호 확인을 입력해 주세요.'; + this.$refs.commmonModal.alertModalOpen(this.row); this.$refs._pwd2.focus(); return false; } if(!lodash.isEqual(this.userPwd1, this.userPwd2)){ - alert("비밀번호가 일치하지 않습니다."); + this.row.title = '관리자/유치채널 관리'; + this.row.msg1 = '비밀번호가 일치하지 않습니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); this.$refs._pwd2.focus(); return false; } const pwdLen = this.bytes(this.userPwd1); if(!(pwdLen >= 8 && pwdLen <= 16)){ - alert("비밀번호는 8~16자의 영문, 숫자, 특수문자(!,@, $, %, ^, &, *) 조합이 필요합니다."); + this.row.title = '관리자/유치채널 관리'; + this.row.msg1 = '비밀번호는 8~16자의 영문, 숫자, 특수문자(!,@, $, %, ^, &, *) 조합이 필요합니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); this.$refs._pwd1.focus(); return false; } @@ -156,7 +166,9 @@ export default { const pNum = /[0-9]/g; // 숫자 const pSpc = /[!@$%^&*]/g; // 특수문자 if(!(pEng.test(this.userPwd1) && pNum.test(this.userPwd1) && pSpc.test(this.userPwd1))) { - alert("비밀번호는 8~16자의 영문, 숫자, 특수문자(!,@, $, %, ^, &, *) 조합이 필요합니다."); + this.row.title = '관리자/유치채널 관리'; + this.row.msg1 = '비밀번호는 8~16자의 영문, 숫자, 특수문자(!,@, $, %, ^, &, *) 조합이 필요합니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); this.$refs._pwd1.focus(); return; } @@ -165,7 +177,9 @@ export default { }, doValidate(){ if(!this.idCheck){ - alert("유효한 마당ID가 아닙니다."); + this.row.title = '관리자/유치채널 관리'; + this.row.msg1 = '유효한 마당ID가 아닙니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); this.$refs.madangId.focus(); return false; } @@ -173,39 +187,54 @@ export default { return false; } if(this.isNull(this.userNm)){ - alert("이름을 입력해 주세요"); + this.row.title = '관리자/유치채널 관리'; + this.row.msg1 = '이름을 입력해 주세요.'; + this.$refs.commmonModal.alertModalOpen(this.row); this.$refs._userNm.focus(); return false; } if(this.isNull(this.mdn)){ - alert('휴대폰번호를 입력해주세요.'); + this.row.title = '관리자/유치채널 관리'; + this.row.msg1 = '휴대폰번호를 입력해주세요.'; + this.$refs.commmonModal.alertModalOpen(this.row); this.$refs._phone.focus(); return false; } const hp = this.mdn; if(!this.isNull(hp) && !this.isMobile(hp)){ - alert("휴대폰 번호 형식이 잘못되었습니다. 확인해 주세요"); + this.row.title = '관리자/유치채널 관리'; + this.row.msg1 = '휴대폰 번호 형식이 잘못되었습니다. 확인해 주세요.'; + this.$refs.commmonModal.alertModalOpen(this.row); this.$refs._phone.focus(); return false; } if(this.isNull(this.email)){ - alert('이메일을 입력해주세요.'); + 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.row.title = '관리자/유치채널 관리'; + this.row.msg1 = '이메일 형식이 잘못되었습니다.'; + this.row.msg2 = '확인해 주세요.'; + this.$refs.commmonModal.alertModalOpen(this.row); this.$refs._email.focus(); return false; } if(this.isNull(this.auth)){ - alert('권한을 선택 해주세요.'); + this.row.title = '관리자/유치채널 관리'; + this.row.msg1 = '권한을 선택 해주세요.'; + this.$refs.commmonModal.alertModalOpen(this.row); this.$refs._auth.focus(); return false; } if(this.isNull(this.stat)){ - alert('상태를 선택 해주세요.'); + this.row.title = '관리자/유치채널 관리'; + this.row.msg1 = '상태를 선택 해주세요.'; + this.$refs.commmonModal.alertModalOpen(this.row); // this.$refs._auth.focus(); return false; } @@ -225,13 +254,15 @@ export default { async searchMadangId(){ if(!this.madangId){ - alert('마당ID를 입력해주세요'); + this.row.title = '관리자/유치채널 관리'; + this.row.msg1 = '마당ID를 입력해주세요.'; + this.$refs.commmonModal.alertModalOpen(this.row); this.$refs.madangId.focus(); return false; } var params = { "madangId": this.madangId - } + } console.log(this.madangId); try { @@ -253,20 +284,29 @@ export default { }else if(result.retCode == '1004'){ //alert('마당ID 정보가 없습니다.'); - this.searchIdFailPop(); + this.row.title = '관리자/유치채널 관리'; + this.row.msg1 = '마당ID 정보가 없습니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); + // this.searchIdFailPop(); this.idCheck = false; this.$refs.madangId.focus(); return false; }else { //alert('마당ID 조회에 실패하였습니다.'); - this.searchIdFailPop(); + this.row.title = '관리자/유치채널 관리'; + this.row.msg1 = '마당ID 정보가 없습니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); + // this.searchIdFailPop(); this.idCheck = false; this.$refs.madangId.focus(); return false; } } catch(err) { //alert("실패 하였습니다."); - this.searchIdFailPop(); + this.row.title = '관리자/유치채널 관리'; + this.row.msg1 = '마당ID 정보가 없습니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); + // this.searchIdFailPop(); this.idCheck = false; this.$refs.madangId.focus(); return false; @@ -325,11 +365,15 @@ export default { const response = await sysMgtApi.insertAdmin(this.row); const result = response.data; if (result != null && result.retCode == "0000") { - alert('저장 하였습니다.'); + this.row.title = '관리자/유치채널 관리'; + this.row.msg1 = '저장 하였습니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); this.toComplete(); } } catch(err) { - alert("실패 하였습니다."); + this.row.title = '관리자/유치채널 관리'; + this.row.msg1 = '실패 하였습니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); } } }, @@ -347,9 +391,3 @@ export default { } } - - \ No newline at end of file diff --git a/frontend/src/modules/sysMgt/views/AdminList.vue b/frontend/src/modules/sysMgt/views/AdminList.vue index 5c76eb8..ee9c905 100644 --- a/frontend/src/modules/sysMgt/views/AdminList.vue +++ b/frontend/src/modules/sysMgt/views/AdminList.vue @@ -62,6 +62,7 @@ +
    @@ -69,7 +70,7 @@