diff --git a/frontend/src/assets/css/style.css b/frontend/src/assets/css/style.css index 0f95dd3..1c63609 100644 --- a/frontend/src/assets/css/style.css +++ b/frontend/src/assets/css/style.css @@ -1169,6 +1169,7 @@ header .user_wrap .user_info .logout { } .contents .pop-btn2 .btn-pcolor { + margin-right: 8px; margin-left: 8px; } diff --git a/frontend/src/components/NavBar.vue b/frontend/src/components/NavBar.vue index b1ae5ad..fef9636 100644 --- a/frontend/src/components/NavBar.vue +++ b/frontend/src/components/NavBar.vue @@ -1,24 +1,21 @@ - \ No newline at end of file diff --git a/frontend/src/components/modal/commonModal.vue b/frontend/src/components/modal/commonModal.vue index a4935da..efc7722 100644 --- a/frontend/src/components/modal/commonModal.vue +++ b/frontend/src/components/modal/commonModal.vue @@ -79,7 +79,6 @@ export default { }, methods :{ alertModalOpen(props){ - console.log("@@@@@@@@@@") console.log(props) var dimmed = document.getElementsByClassName('alertCommon'); for(var i = 0; i < dimmed.length; i++){ diff --git a/frontend/src/modules/attractMgt/views/ChannelList.vue b/frontend/src/modules/attractMgt/views/ChannelList.vue index d7a20af..1d1f420 100644 --- a/frontend/src/modules/attractMgt/views/ChannelList.vue +++ b/frontend/src/modules/attractMgt/views/ChannelList.vue @@ -184,15 +184,14 @@ export default { {name: 'subsDt', header: '가입일', align: 'center', width: '11%'}, {name: 'norgNm', header: '유치업체', align: 'center', width: '10%'}, {name: 'userSeq', header: '사용자일련번호', align: 'center', width: '10%', hidden: true}, - { - name: 'loginId', header: '마당ID(이름)', align: 'center', width: '10%', renderer: { + {name: 'loginId', header: '마당ID(이름)', align: 'center', width: '10%'}, + {name: 'custNm', header: '고객사명', align: 'center', width: '10%', renderer: { type: CustomATagRenderer , options: { callback: this.channelDetail, } } }, - {name: 'custNm', header: '고객사명', align: 'center', width: '10%'}, {name: 'bizrno', header: '사업자번호', align: 'center', width: '12%'}, {name: 'userNm', header: '이름', align: 'center', width: '10%'}, {name: 'subsSttusCd', header: '상태', align: 'center', width: '10%', hidden: true}, @@ -354,7 +353,7 @@ export default { this.grid.params.subsSttusCd = ''; }); - api.commCode({'grpCd': 'CUST_TY_CD'}).then(response => { + api.commCode({'grpCd': 'CUST_KD_CD'}).then(response => { this.custTyCdList = response.data.data.list; this.grid.params.custTyCd = ''; }); @@ -362,10 +361,10 @@ export default { setPeriodDay(day) { this.periodDay = day; this.endDate = new Date(); - this.startDate = moment(this.endDate) - .subtract(day, 'day') - .toDate(); - + // this.startDate = moment(this.endDate) + // .subtract(day, 'day') + // .toDate(); + this.initSetStartDate(); this.closeDate('start'); this.closeDate('end'); }, @@ -405,6 +404,12 @@ export default { return moment(date).format('YYYY-MM-DD'); } }, + initSetStartDate() { + let setYear = Number(moment(new Date()).format('YYYY')); + let initStartDate = new Date(setYear, 0, 1); + this.startDate = initStartDate; + console.log(moment(this.startDate).format('YYYY-MM-DD')); + }, }, beforeRouteLeave(to, from, next) { diff --git a/frontend/src/modules/calculate/views/CalcList.vue b/frontend/src/modules/calculate/views/CalcList.vue index eb57333..750f32d 100644 --- a/frontend/src/modules/calculate/views/CalcList.vue +++ b/frontend/src/modules/calculate/views/CalcList.vue @@ -45,12 +45,12 @@
-
-
diff --git a/frontend/src/modules/channelMgt/views/TmpltList.vue b/frontend/src/modules/channelMgt/views/TmpltList.vue index d306262..8766537 100644 --- a/frontend/src/modules/channelMgt/views/TmpltList.vue +++ b/frontend/src/modules/channelMgt/views/TmpltList.vue @@ -11,8 +11,9 @@
@@ -33,10 +34,11 @@
총 {{ totalItems.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}건
- +
@@ -69,6 +71,7 @@ import channelMgtApi from '../service/channelMgtApi'; import xlsx from '@/common/excel'; import moment from 'moment'; import commonModal from "@/components/modal/commonModal"; +import api from "@/service/api"; export default { name: 'temltList', @@ -82,9 +85,13 @@ export default { pageType: 'CHANN', searchType1: '', searchType2: 'custNm', - // 테이블 리스트 데이터 perPageCnt: 50, + options: [ + {text: '20', value: 20}, + {text: '50', value: 50}, + {text: '100', value: 100} + ], grid: { url: '/api/v1/bo/channelMgt/tmpltList', perPage: 50, @@ -135,8 +142,10 @@ export default { commonModal, }, created() { - const getCondition = this.$store.getters['searchcondition/getSearchCondition']; + // const getCondition = this.$store.getters['searchcondition/getSearchCondition']; this.getExcelHeader(); + this.setCodeData(); + this.grid.pagePerRows = this.perPageCnt; }, destroyed() { this.$store.commit('searchcondition/updateSearchCondition', { @@ -159,7 +168,7 @@ export default { // store에 저장된 페이지 정보 및 검색 조건을 불러오기 let isKeep = false; if (getCondition) { - this.grid.pagePerRows = getCondition.perPage; + this.grid.pagePerRows = 50; this.grid.params = getCondition.params; page = getCondition.page; isKeep = true; @@ -171,7 +180,10 @@ export default { console.log(this.grid.params); this.grid.params.searchType1 = this.searchType1 this.grid.params.searchType2 = this.searchType2 + this.grid.params.pagePerRows = this.perPageCnt + this.grid.perPage = this.perPageCnt + console.log(this.grid) this.$refs.table.search(this.grid.params, isKeep); this.sendStoreData(); }, @@ -181,11 +193,7 @@ export default { this.$store.commit('searchcondition/updateSearchCondition', { page: getP._currentPage, perPage: this.perPageCnt, - params: { - searchType1: '', - searchType2: 'custNm', - searchText1: '' - } + params: this.grid.params }); const getCondition = this.$store.getters['searchcondition/getSearchCondition']; @@ -238,6 +246,15 @@ export default { this.excelHeader = res; }); }, + setCodeData() { + // 상태 옵션 셋팅. + api.commCode({'grpCd': 'TMPLT_STTUS_CD'}).then(response => { + this.statType = response.data.data.list; + }); + }, + changePerPage: function () { // 페이지당 조회할 개수 + this.grid.pagePerRows = this.perPageCnt; + }, }, beforeRouteLeave(to, from, next) { diff --git a/frontend/src/modules/custMgt/components/CarryOverListPop.vue b/frontend/src/modules/custMgt/components/CarryOverListPop.vue index 5ca0d4c..6d1752f 100644 --- a/frontend/src/modules/custMgt/components/CarryOverListPop.vue +++ b/frontend/src/modules/custMgt/components/CarryOverListPop.vue @@ -1,47 +1,47 @@ - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/frontend/src/modules/custMgt/components/MemberBulkRegPop.vue b/frontend/src/modules/custMgt/components/MemberBulkRegPop.vue index 84ba6e9..12c9217 100644 --- a/frontend/src/modules/custMgt/components/MemberBulkRegPop.vue +++ b/frontend/src/modules/custMgt/components/MemberBulkRegPop.vue @@ -37,7 +37,7 @@
- + @@ -49,7 +49,7 @@ import {utils_mixin, chkPattern2} from '../service/mixins'; import xlsx from '@/common/excel'; import moment from 'moment'; import XLSX from 'xlsx'; -import ValidationConfirmPop from "@/modules/custMgt/components/ValidationConfirmPop"; +// import ValidationConfirmPop from "./ValidationConfirmPop"; export default { name: 'memberBulkRegPop', @@ -68,7 +68,7 @@ export default { }; }, components: { - ValidationConfirmPop, + // ValidationConfirmPop, }, created() { this.getExcelHeader(); @@ -101,10 +101,10 @@ export default { toComplete() { this.row.serviceId = this.adminId; // 팝업으로 교체 예정 - if (confirm('정상 업로드 되었습니다.')) { - this.excelPopClose(); - this.$parent.memberDetail(this.adminId); - } + // if (confirm('정상 업로드 되었습니다.')) { + this.excelPopClose(); + this.$parent.memberDetail(this.adminId); + // } }, async doInsert() { if (this.doValidate() && window.confirm('등록 하시겠습니까?')) { @@ -274,6 +274,7 @@ export default { // uploadFile }, async saveExcel() { + this.row = {} // this.row.adminId = this.adminId; @@ -293,15 +294,9 @@ export default { this.row.totalCnt = this.totalCnt this.row.successCnt = this.successCnt this.row.failCnt = this.failCnt - this.$refs.validationConfirmPop.failFileuploadOpen(this.row); - // 팝업으로 교체 예정 - // var resultMsg = '파일 업로드 중 오류가 발생하여 정상건만 업로드 완료하였습니다.\n\n 총 '+result.data.totalCnt+'건, 정상 '+ result.data.successCnt+'건, 오류 '+result.data.failCnt+'건\n\n오류건은 확인 후 재등록 부탁 드립니다.'; - // alert(resultMsg); - // this.excelPopClose(); - // this.$parent.memberDetail(this.adminId); + this.$parent.$refs.validationConfirmPopModal.failFileuploadOpen(this.row); } else { - - this.toComplete(); + this.$parent.$refs.validationConfirmPopModal.successFileuploadOpen(); } } } catch (error) { @@ -309,7 +304,7 @@ export default { // 팝업으로 교체 예정 var title = '청약고객 관리\n'; var msg1 = '실패 하였습니다.'; - alert(title + msg1); + // alert(title + msg1); // this.row.title = '청약고객관리'; // this.row.msg1 = '실패 하였습니다.'; // this.$refs.validationConfirmPop.failFileuploadOpen(this.row); diff --git a/frontend/src/modules/custMgt/components/MemberRegPop.vue b/frontend/src/modules/custMgt/components/MemberRegPop.vue index ed20e10..a2751c7 100644 --- a/frontend/src/modules/custMgt/components/MemberRegPop.vue +++ b/frontend/src/modules/custMgt/components/MemberRegPop.vue @@ -118,8 +118,12 @@ export default { this.$refs.validationConfirmPopModal.confirmInsertOpen(); } }, + doMemberInsert(){ + console.log("aaaaaaaa") + }, //사용자ID 수정 처리 async memberInsert() { + console.log(123123) this.row.adminId = this.adminId; this.row.userId = this.userId; this.row.userNm = this.userNm; diff --git a/frontend/src/modules/custMgt/components/TestIdRegPop.vue b/frontend/src/modules/custMgt/components/TestIdRegPop.vue index c7fc277..f1f0baa 100644 --- a/frontend/src/modules/custMgt/components/TestIdRegPop.vue +++ b/frontend/src/modules/custMgt/components/TestIdRegPop.vue @@ -80,7 +80,7 @@ export default { name:'', mdn:'', email:'', - userStat: '', + userStat: '01', userNm:"", userPwd1:"", userPwd2:"", diff --git a/frontend/src/modules/custMgt/components/ValidationConfirmPop.vue b/frontend/src/modules/custMgt/components/ValidationConfirmPop.vue index 01b8ed2..f215dc1 100644 --- a/frontend/src/modules/custMgt/components/ValidationConfirmPop.vue +++ b/frontend/src/modules/custMgt/components/ValidationConfirmPop.vue @@ -228,7 +228,7 @@ export default { for (var i = 0; i < dimmed.length; i++) { dimmed[i].style.display = 'none'; } - this.$parent.memberInsert(); + this.$parent.doMemberInsert(); }, //사용자등록 - 최초등록 Close confirmInsertClose() { @@ -375,7 +375,7 @@ export default { dimmed[i].style.display = 'none'; } // 목록페이지 이동 - this.toComplete(); + this.$parent.toComplete(); }, // 정상완료 후 목록페이지 이동 toComplete() { diff --git a/frontend/src/modules/custMgt/views/MemberList.vue b/frontend/src/modules/custMgt/views/MemberList.vue index f85bc68..761bc0c 100644 --- a/frontend/src/modules/custMgt/views/MemberList.vue +++ b/frontend/src/modules/custMgt/views/MemberList.vue @@ -285,7 +285,7 @@ export default { }, memberDetail: function (props) { this.row.serviceId = props.userId; - if (props.userType == '관리자 ID') { + if (props.userType == '관리자 ID' || props.userType == '테스트 ID') { // 관리자 ID용 상세페이지 이동 this.$router.push({name: 'memberAdminDetail', params: {serviceId: this.row.serviceId}}); } else { diff --git a/frontend/src/modules/custMgt/views/SubsDetail.vue b/frontend/src/modules/custMgt/views/SubsDetail.vue index 0492fdc..f802514 100644 --- a/frontend/src/modules/custMgt/views/SubsDetail.vue +++ b/frontend/src/modules/custMgt/views/SubsDetail.vue @@ -178,9 +178,7 @@ import api from '@/service/api'; import custMgtApi from "../service/custMgtApi.js"; import CarryOverListPop from '../components/CarryOverListPop'; -//import ConfirmPop from '@/components/modal/confirm'; import ValidationConfirmPop from '../components/ValidationConfirmPop'; -//import SearchIDPop from '@/components/modal/searchID'; import AdminNmPop from '../components/AdminNmPop'; import commonModal from "@/components/modal/commonModal"; diff --git a/frontend/src/modules/login/store/index.js b/frontend/src/modules/login/store/index.js index 5bcf33c..68a5d1b 100644 --- a/frontend/src/modules/login/store/index.js +++ b/frontend/src/modules/login/store/index.js @@ -5,7 +5,8 @@ const state = { isAuthChk: false, userId:null, userNm:null, - pwd: null + pwd: null, + rootUrl: null }; const getters = { @@ -16,6 +17,7 @@ const getters = { userId: state => state.userId, userNm: state => state.userNm, getPwd: state => state.pwd, + getRootUrl: state => state.rootUrl }; const mutations = { @@ -47,6 +49,9 @@ const mutations = { }, userNm: (state, value) => { state.userNm = value; + }, + rootUrl: (state, value) => { + state.rootUrl = value; } }; diff --git a/frontend/src/modules/login/views/LoginAuth.vue b/frontend/src/modules/login/views/LoginAuth.vue index c9990be..accba23 100644 --- a/frontend/src/modules/login/views/LoginAuth.vue +++ b/frontend/src/modules/login/views/LoginAuth.vue @@ -74,7 +74,8 @@ export default { number: '', timer: null, timeCounter: 180, - timerStr: "03:00" + timerStr: "03:00", + tempList: [] }; }, components: { @@ -257,8 +258,12 @@ export default { vm.$store.commit("login/isLogin", true); vm.$store.commit("login/isAuthChk", true); vm.$store.commit("login/userId", rsp.data.userId) - vm.$store.commit("login/userNm", rsp.data.userNm) - vm.$router.push({ path: '/'}); + vm.$store.commit("login/userNm", rsp.data.userNm) + var rootUrl = rsp.data.nextUrl; + console.log('rootUrl : '+rootUrl); + vm.$store.commit("login/rootUrl", rsp.data.nextUrl); + console.log(vm.$store.getters); + vm.$router.push({ path: rootUrl}); }else if (rsp.retCode == '4008'){ this.row.title = '휴대폰번호 확인'; this.row.msg1 = '휴대폰번호를 확인해주세요.'; @@ -307,6 +312,7 @@ export default { } return this.errors.length == 0; }, + clickMenu(link){ this.$router.push({ diff --git a/frontend/src/modules/riskMgt/components/IntrcpDetailPopup.vue b/frontend/src/modules/riskMgt/components/IntrcpDetailPopup.vue index 8d1e46c..6bc5044 100644 --- a/frontend/src/modules/riskMgt/components/IntrcpDetailPopup.vue +++ b/frontend/src/modules/riskMgt/components/IntrcpDetailPopup.vue @@ -15,7 +15,7 @@ 발신번호 - + 발송타입 diff --git a/frontend/src/modules/riskMgt/components/IntrcpMsgDetail.vue b/frontend/src/modules/riskMgt/components/IntrcpMsgDetail.vue index ed1db11..c251d6b 100644 --- a/frontend/src/modules/riskMgt/components/IntrcpMsgDetail.vue +++ b/frontend/src/modules/riskMgt/components/IntrcpMsgDetail.vue @@ -1,299 +1,300 @@ \ No newline at end of file diff --git a/frontend/src/modules/riskMgt/views/ZezNum.vue b/frontend/src/modules/riskMgt/views/ZezNum.vue index 3b2bfaa..215bb73 100644 --- a/frontend/src/modules/riskMgt/views/ZezNum.vue +++ b/frontend/src/modules/riskMgt/views/ZezNum.vue @@ -12,7 +12,7 @@
+ @keypress="onlyText" @input="onlyText" maxlength="20"/>
diff --git a/frontend/src/modules/sendNumMgt/views/ApprList.vue b/frontend/src/modules/sendNumMgt/views/ApprList.vue index 2374a13..ffad1a6 100644 --- a/frontend/src/modules/sendNumMgt/views/ApprList.vue +++ b/frontend/src/modules/sendNumMgt/views/ApprList.vue @@ -18,7 +18,7 @@
-
diff --git a/frontend/src/modules/sendNumMgt/views/NumberList.vue b/frontend/src/modules/sendNumMgt/views/NumberList.vue index 07bb459..bf3ace9 100644 --- a/frontend/src/modules/sendNumMgt/views/NumberList.vue +++ b/frontend/src/modules/sendNumMgt/views/NumberList.vue @@ -8,14 +8,6 @@
-
- - -
+ + - - - +
@@ -65,7 +66,6 @@