From 34e795708181c3dcb90fad53787fa154c6f66bbb Mon Sep 17 00:00:00 2001 From: kimre Date: Fri, 15 Jul 2022 14:21:03 +0900 Subject: [PATCH] =?UTF-8?q?TC=20=EA=B8=B0=EB=8A=A5=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?/=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/assets/css/layout.css | 2 +- frontend/src/assets/css/style.css | 1 - frontend/src/components/HubWebHeader.vue | 2 +- frontend/src/components/modal/calendar.vue | 141 -- frontend/src/components/modal/commonModal.vue | 14 +- .../attractMgt/views/ChannelDetail.vue | 449 ++--- .../modules/attractMgt/views/ChannelList.vue | 200 +-- .../src/modules/calculate/views/CalcList.vue | 339 ++-- .../modules/channelMgt/views/TmpltList.vue | 332 ++-- .../modules/custMgt/components/AdminNmPop.vue | 10 +- .../custMgt/components/MemberBulkRegPop.vue | 139 +- .../custMgt/components/MemberModifyPop.vue | 16 +- .../custMgt/components/MemberRegPop.vue | 474 +++--- .../custMgt/components/MemoTotalPop.vue | 3 +- .../custMgt/components/SearchIdPopup.vue | 1 - .../custMgt/components/TestIdRegPop.vue | 135 +- .../components/ValidationConfirmPop.vue | 825 +++++----- .../custMgt/components/commonModal.vue | 270 ++- .../custMgt/views/MemberAdminDetail.vue | 24 +- .../modules/custMgt/views/MemberDetail.vue | 16 +- .../src/modules/custMgt/views/MemberList.vue | 338 ++-- .../src/modules/custMgt/views/SubsDetail.vue | 739 +++++---- .../src/modules/custMgt/views/SubsList.vue | 321 ++-- .../src/modules/mntrng/views/SendList.vue | 332 ++-- .../riskMgt/components/InsertIntrcpPop.vue | 476 +++--- .../riskMgt/components/InsertMsgPop.vue | 397 +++-- .../src/modules/riskMgt/service/mixins.js | 667 ++++---- frontend/src/modules/riskMgt/views/All.vue | 382 ++--- .../src/modules/riskMgt/views/IntrcpList.vue | 342 ++-- frontend/src/modules/riskMgt/views/Msg.vue | 272 +-- frontend/src/modules/riskMgt/views/ZezNum.vue | 251 +-- .../sendNumMgt/components/AdminListPop.vue | 2 +- .../sendNumMgt/components/ApprDetailPop.vue | 26 +- .../sendNumMgt/components/NumberRegPop.vue | 389 ++--- .../sendNumMgt/components/commonModal.vue | 183 +++ .../src/modules/sendNumMgt/views/ApprList.vue | 135 +- .../modules/sendNumMgt/views/NumberList.vue | 396 ++--- .../modules/sendNumMgt/views/ProfileList.vue | 244 ++- .../modules/servMgt/views/rejectRecvList.vue | 264 ++- frontend/src/modules/stats/service/mixins.js | 358 ++++ .../src/modules/stats/views/BsnmDayList.vue | 303 ++-- .../src/modules/stats/views/BsnmMonthList.vue | 323 ++-- frontend/src/modules/stats/views/DayList.vue | 358 ++-- .../src/modules/stats/views/MonthList.vue | 352 ++-- .../sysMgt/components/AdminDetailPop.vue | 14 +- .../modules/sysMgt/components/AdminRegPop.vue | 654 ++++---- .../sysMgt/components/SearchIdPopup.vue | 278 ++-- .../modules/sysMgt/components/commonModal.vue | 207 ++- frontend/src/modules/sysMgt/service/mixins.js | 667 ++++---- .../src/modules/sysMgt/views/AdminList.vue | 344 ++-- frontend/src/modules/sysMgt/views/AuthAdd.vue | 679 ++++---- .../src/modules/sysMgt/views/AuthList.vue | 263 ++- .../src/modules/sysMgt/views/AuthModify.vue | 754 +++++---- frontend/src/views/HubwebLayout.vue | 1 - .../ez/api/attractMgt/AttractMgtService.java | 29 +- .../ez/api/attractMgt/dto/ChannelDetail.java | 22 +- .../attractMgt/dto/ChannelDetailReqDto.java | 2 +- .../api/attractMgt/dto/ChannelDetailRes.java | 44 +- .../ez/api/attractMgt/dto/ChannelInfo.java | 26 +- .../dto/ChannelListExcelReqDto.java | 18 +- .../api/attractMgt/dto/ChannelListReqDto.java | 25 +- .../uplus/ez/api/calculate/dto/CalcList.java | 36 +- .../calculate/dto/CalcListExcelReqDto.java | 8 +- .../ez/api/calculate/dto/CalcListReqDto.java | 19 +- .../ez/api/channelMgt/ChannelMgtMapper.java | 11 +- .../ez/api/channelMgt/dto/TmpltInfo.java | 20 +- .../channelMgt/dto/TmpltListExcelReqDto.java | 10 +- .../api/channelMgt/dto/TmpltListReqDto.java | 20 +- .../kr/co/uplus/ez/api/comm/dto/Auth.java | 8 +- .../kr/co/uplus/ez/api/comm/dto/AuthRes.java | 8 +- .../kr/co/uplus/ez/api/comm/dto/Code.java | 14 +- .../co/uplus/ez/api/comm/dto/CodeReqDto.java | 6 +- .../kr/co/uplus/ez/api/comm/dto/CodeRes.java | 8 +- .../kr/co/uplus/ez/api/comm/dto/Menu.java | 32 +- .../uplus/ez/api/comm/dto/RefreshToken.java | 8 +- .../ez/api/comm/dto/RefreshTokenReqDto.java | 8 +- .../ez/api/custMgt/CustMgtController.java | 10 +- .../uplus/ez/api/custMgt/CustMgtService.java | 1454 +++++++++-------- .../uplus/ez/api/custMgt/dto/AdminInfo.java | 12 +- .../ez/api/custMgt/dto/AdminInfoReqDto.java | 6 +- .../co/uplus/ez/api/mntrng/MntrngService.java | 24 +- .../co/uplus/ez/api/mntrng/dto/SendList.java | 6 +- .../ez/api/mntrng/dto/SendListReqDto.java | 7 +- .../uplus/ez/api/riskMgt/RiskMgtService.java | 12 +- .../kr/co/uplus/ez/common/data/Const.java | 3 + .../kr/co/uplus/ez/common/utils/LogUtils.java | 155 -- .../mysql/attractMgt/attractMgt-mapper.xml | 132 +- .../mysql/channelMgt/channelMgt-mapper.xml | 18 +- .../mapper/mysql/custMgt/custMgt-mapper.xml | 415 +++-- .../mapper/mysql/login/login-mapper.xml | 2 - .../mapper/mysql/riskMgt/riskMgt-mapper.xml | 18 +- 91 files changed, 9087 insertions(+), 8673 deletions(-) delete mode 100644 frontend/src/components/modal/calendar.vue create mode 100644 frontend/src/modules/sendNumMgt/components/commonModal.vue create mode 100644 frontend/src/modules/stats/service/mixins.js delete mode 100644 src/main/java/kr/co/uplus/ez/common/utils/LogUtils.java diff --git a/frontend/src/assets/css/layout.css b/frontend/src/assets/css/layout.css index dad6d67..3108e2c 100644 --- a/frontend/src/assets/css/layout.css +++ b/frontend/src/assets/css/layout.css @@ -130,7 +130,7 @@ max-height: 90vh; overflow: auto;}/*스크린 height 100%를 벗어나는 긴 .popup .pop-cont {} .popup .pop-cont p {font-size: 16px; color: #666666; font-weight: 400; letter-spacing: -0.8px; line-height: 100%;} .popup .pop-cont p + p {margin-top: 10px;} -.popup .popup-btn1 {display: flex; justify-content: flex-start; align-items: center; margin: 35px 0 25px;} +.popup .popup-btn1 {display: flex; justify-content: center; align-items: center; margin: 35px 0 25px;} .popup .popup-btn2 {display: flex; justify-content: space-between; align-items: center; margin: 35px 0 25px;} .popup .popup-btn1 button {width: 49%; height: 40px; font-size: 16px; font-weight: 400; letter-spacing: -1.1px;} .popup .popup-btn2 button {width: 49%; height: 40px; font-size: 16px; font-weight: 400; letter-spacing: -1.1px;} diff --git a/frontend/src/assets/css/style.css b/frontend/src/assets/css/style.css index 448878b..c956be6 100644 --- a/frontend/src/assets/css/style.css +++ b/frontend/src/assets/css/style.css @@ -1708,7 +1708,6 @@ header .user_wrap .user_info .logout { } .essential span{ - color:#eb008b; padding-right: 3px; } diff --git a/frontend/src/components/HubWebHeader.vue b/frontend/src/components/HubWebHeader.vue index a39a098..77e26d9 100644 --- a/frontend/src/components/HubWebHeader.vue +++ b/frontend/src/components/HubWebHeader.vue @@ -8,7 +8,7 @@ {{ this.$store.getters['login/userId'] }}
- 정보수정 + 로그아웃
diff --git a/frontend/src/components/modal/calendar.vue b/frontend/src/components/modal/calendar.vue deleted file mode 100644 index c29e05b..0000000 --- a/frontend/src/components/modal/calendar.vue +++ /dev/null @@ -1,141 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/components/modal/commonModal.vue b/frontend/src/components/modal/commonModal.vue index 2a9ff71..a4935da 100644 --- a/frontend/src/components/modal/commonModal.vue +++ b/frontend/src/components/modal/commonModal.vue @@ -2,10 +2,10 @@
-
-
+
+
-
+

{{title}}

@@ -79,7 +79,9 @@ export default { }, methods :{ alertModalOpen(props){ - var dimmed = document.getElementsByClassName('modal01'); + console.log("@@@@@@@@@@") + console.log(props) + var dimmed = document.getElementsByClassName('alertCommon'); for(var i = 0; i < dimmed.length; i++){ dimmed[i].style.display = 'block'; } @@ -90,13 +92,13 @@ export default { this.msg4 = props.msg4; }, alertModalClose(){ - var dimmed = document.getElementsByClassName('modal01'); + var dimmed = document.getElementsByClassName('alertCommon'); for(var i = 0; i < dimmed.length; i++){ dimmed[i].style.display = 'none'; } }, alertModalCancel(){ - var dimmed = document.getElementsByClassName('modal01'); + var dimmed = document.getElementsByClassName('alertCommon'); for(var i = 0; i < dimmed.length; i++){ dimmed[i].style.display = 'none'; } diff --git a/frontend/src/modules/attractMgt/views/ChannelDetail.vue b/frontend/src/modules/attractMgt/views/ChannelDetail.vue index 0e9aea7..5bd0db1 100644 --- a/frontend/src/modules/attractMgt/views/ChannelDetail.vue +++ b/frontend/src/modules/attractMgt/views/ChannelDetail.vue @@ -9,82 +9,80 @@
상세 정보
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
가입일상태
고객사요금제
대표자사용자 구분
사업자등록번호 -
- - - -
- 		법인등록번호 -
- - -
-
사업장 주소 -
- - - -
-
유치자명 -
- - -
- 		관리자명 -
- - - -
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
가입일상태
고객사요금제
대표자사용자 구분
사업자등록번호 +
+ + + +
+ 		법인등록번호 +
+ + +
+
사업장 주소 +
+ + + +
+
유치자명 +
+ + +
+ 		관리자명 +
+ + + +
+
발송건수 @@ -96,49 +94,49 @@
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
날짜채널별 발송 건수
전체SMSLMSMMS알림톡
합계{{sndCntTotal.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')}}{{sndCntSTotal.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')}}{{sndCntLTotal.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')}}{{sndCntMTotal.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')}}{{sndCntATotal.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')}}
{{option.sumYm}}{{option.sndCnt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')}}{{option.sndCntS.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')}}{{option.sndCntL.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')}}{{option.sndCntM.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')}}{{option.sndCntA.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')}}
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
날짜채널별 발송 건수
전체SMSLMSMMS알림톡
합계{{ sndCntTotal.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}{{ sndCntSTotal.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}{{ sndCntLTotal.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}{{ sndCntMTotal.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}{{ sndCntATotal.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}
{{ option.sumYm }}{{ option.sndCnt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}{{ option.sndCntS.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}{{ option.sndCntL.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}{{ option.sndCntM.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}{{ option.sndCntA.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}
+
@@ -156,92 +154,95 @@ import channelMgtApi from '../service/channelMgtApi'; import moment from 'moment'; import xlsx from '@/common/excel'; import AdminNmPop from '../../custMgt/components/AdminNmPop'; + export default { - name: "channelDetail", - data(){ - return{ - row: {}, - subsDt: '', - norgNm: '', - userSeq: '', - loginId: '', - custNm: '', - bizrno: '', - bizrno1: '', - bizrno2: '', - bizrno3: '', - userNm: '', - subsSttusCd: '', - custTyCd: '', - sndCnt: '', - adr1: '', - adr2: '', - adr3: '', - cprRegNo: '', - cprRegNo1: '', - cprRegNo2: '', - adminId: '', - adminNm: '', - channelId: '', - channelNm: '', - reprNm: '', - plan: '', - sumYm: '', - sndCntS: '', - sndCntL: '', - sndCntM: '', - sndCntA: '', - succCnt: '', - succCntS: '', - succCntL: '', - succCntM: '', - succCntA: '', - sndCntTotal: 0, - sndCntSTotal: 0, - sndCntLTotal: 0, - sndCntMTotal: 0, - sndCntATotal: 0, - list:[], - totalCnt: '', - props: {}, - excelHeader: [], - pageType:'CHANNELDETAIL', - serviceId:'', - } + name: "channelDetail", + data() { + return { + row: {}, + subsDt: '', + norgNm: '', + userSeq: '', + loginId: '', + custNm: '', + bizrno: '', + bizrno1: '', + bizrno2: '', + bizrno3: '', + userNm: '', + subsSttusCd: '', + custTyCd: '', + sndCnt: '', + adr1: '', + adr2: '', + adr3: '', + cprRegNo: '', + cprRegNo1: '', + cprRegNo2: '', + adminId: '', + adminNm: '', + channelId: '', + channelNm: '', + reprNm: '', + plan: '', + sumYm: '', + sndCntS: '', + sndCntL: '', + sndCntM: '', + sndCntA: '', + succCnt: '', + succCntS: '', + succCntL: '', + succCntM: '', + succCntA: '', + sndCntTotal: 0, + sndCntSTotal: 0, + sndCntLTotal: 0, + sndCntMTotal: 0, + sndCntATotal: 0, + list: [], + totalCnt: '', + props: {}, + excelHeader: [], + pageType: 'CHANNELDETAIL', + serviceId: '', + subsSttusNm: '', + custTyNm: '', + } + }, + props: { + userSeq: { + type: String, + default: "", }, - props: { - userSeq: { - type: String, - default: "", - }, - }, - components: { + }, + components: { channelMgtApi, AdminNmPop, - }, - created(){ - console.log(this.$route.params.userSeq); - this.loginId = this.$route.params.loginId; - this.getExcelHeader(); - this.channelDetail(this.$route.params.userSeq); - }, - methods :{ - async channelDetail(userSeq){ + }, + created() { + console.log(this.$route.params.userSeq); + this.loginId = this.$route.params.loginId; + this.getExcelHeader(); + this.channelDetail(this.$route.params.userSeq); + }, + methods: { + async channelDetail(userSeq) { this.row.userSeq = userSeq; try { const response = await channelMgtApi.channelDetail(this.row); const result = response.data; console.log(result); - var sndCntTotal=0; - var sndCntSTotal=0; - var sndCntLTotal=0; - var sndCntMTotal=0; - var sndCntATotal=0; - if(result != null && result.retCode == "0000") { + var sndCntTotal = 0; + var sndCntSTotal = 0; + var sndCntLTotal = 0; + var sndCntMTotal = 0; + var sndCntATotal = 0; + if (result != null && result.retCode == "0000") { //데이터값이 널이면 오류처리 - for(var i = 0; i < result.data.list.length; i++ ){ - console.log('[succCnt]:'+result.data.list[i].succCnt); + for (var i = 0; i < result.data.list.length; i++) { + console.log('[succCnt]:' + result.data.list[i].succCnt); sndCntTotal = sndCntTotal + Number(result.data.list[i].sndCnt); sndCntSTotal = sndCntSTotal + Number(result.data.list[i].sndCntS) sndCntLTotal = sndCntLTotal + Number(result.data.list[i].sndCntL) @@ -265,30 +266,32 @@ export default { this.reprNm = result.data.reprNm; this.bizrno = result.data.bizrno; this.channelId = result.data.channelId; - this.channelNm = result.data.channelNm; + this.channelNm = result.data.channelNm; this.adminId = result.data.adminId; - this.adminNm = result.data.adminNm; + this.adminNm = result.data.adminNm; this.cprRegNo = result.data.cprRegNo; this.adr1 = result.data.adr1; - this.adr2 = result.data.adr2; - this.adr3 = result.data.adr3; + this.adr2 = result.data.adr2; + this.adr3 = result.data.adr3; this.custTyCd = result.data.custTyCd; this.plan = result.data.plan; - if(this.bizrno != '' && this.bizrno != null){ - this.bizrno1 = this.bizrno.substr(0, 3); - this.bizrno2 = this.bizrno.substr(3, 2); - this.bizrno3 = this.bizrno.substr(5); - } - if(this.cprRegNo != '' && this.cprRegNo != null){ - this.cprRegNo1 = this.cprRegNo.substr(0, 6); - this.cprRegNo2 = this.cprRegNo.substr(6); - } + this.subsSttusNm = result.data.subsSttusNm; + this.custTyNm = result.data.custTyNm; + if (this.bizrno != '' && this.bizrno != null) { + this.bizrno1 = this.bizrno.substr(0, 3); + this.bizrno2 = this.bizrno.substr(3, 2); + this.bizrno3 = this.bizrno.substr(5); + } + if (this.cprRegNo != '' && this.cprRegNo != null) { + this.cprRegNo1 = this.cprRegNo.substr(0, 6); + this.cprRegNo2 = this.cprRegNo.substr(6); + } this.serviceId = result.data.userId; } - + } catch (error) { - + } }, @@ -297,7 +300,7 @@ export default { channelMgtApi.getExcelHeader(this.pageType).then(res => { this.excelHeader = res; }); - }, + }, async excelDown() { if (this.list.length <= 0) { @@ -315,9 +318,10 @@ export default { dataOrder: 'header' }; // console.log(data); - xlsx.export(data.list, saveFileName, options).then(() => {}); + xlsx.export(data.list, saveFileName, options).then(() => { + }); }, - + async getExcelDataDown() { try { let response; @@ -327,7 +331,7 @@ export default { // sndCntM: this.sndCntM, // sndCntA: this.sndCntA, userSeq: this.userSeq - + }; response = await channelMgtApi.sendNumberListExcel(params); @@ -335,7 +339,7 @@ export default { const result = response.data; if (result != null && result.retCode == "0000") { return result.data; - }else{ + } else { return false; } } catch (err) { @@ -343,21 +347,20 @@ export default { } }, // end of getExcelDataDown goChannelList() { - this.$router.push({ name: 'channelList'}); + this.$router.push({name: 'channelList'}); }, - searchIDPopOpen: function(){ - console.log('>>> serviceId:'+this.serviceId); + searchIDPopOpen: function () { + console.log('>>> serviceId:' + this.serviceId); var params = { "serviceId": this.serviceId, - "serviceSeq": this.row.userSeq, - "parentDiv": 'channelDetail' + "serviceSeq": this.row.userSeq, + "parentDiv": 'channelDetail' } - this.$refs.adminNmPop.ModalOpen(params); - }, + this.$refs.adminNmPop.ModalOpen(params); + }, - } + } } - \ No newline at end of file diff --git a/frontend/src/modules/attractMgt/views/ChannelList.vue b/frontend/src/modules/attractMgt/views/ChannelList.vue index 1edae20..d7a20af 100644 --- a/frontend/src/modules/attractMgt/views/ChannelList.vue +++ b/frontend/src/modules/attractMgt/views/ChannelList.vue @@ -5,12 +5,11 @@

유치채널현황

유치현황관리 > 유치채널현황

-
-
-
-
- -
+
+
+
+ +
~ - + -
-
-
- - -
-
- - -
-
- - -
-
- -
-
-
- - -
-
- -
- +
+ + +
+
+ + +
+
+ + +
+
+ +
- +
+
+ + +
+
+ +
+ +
+
총 {{ totalItems.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}건
@@ -111,8 +113,6 @@
- -
@@ -130,7 +130,7 @@ class CustomATagRenderer { const el = document.createElement('a'); el.href = 'javascript:void(0);'; el.className = 'btn_text'; - el.innerText= String(props.colValue) + el.innerText = String(props.colValue) this.el = el; } @@ -140,7 +140,7 @@ class CustomATagRenderer { addEvent(selEl) { selEl.addEventListener("click", () => { - const { callback } = this.props["cgrido" + this.props.colName].options; + const {callback} = this.props["cgrido" + this.props.colName].options; callback(this.props); }); } @@ -157,19 +157,19 @@ export default { startDate: new Date(), endDate: new Date(), - row:{}, - pageType:'CHANNEL', - subsSttusCdList:[], - custTyCdList:[], + row: {}, + pageType: 'CHANNEL', + subsSttusCdList: [], + custTyCdList: [], openPicker: false, // 테이블 리스트 데이터 perPageCnt: 50, options: [ - { text: '20', value: 20}, - { text: '50', value: 50}, - { text: '100', value: 100} + {text: '20', value: 20}, + {text: '50', value: 50}, + {text: '100', value: 100} ], - searchType:'01', + searchType: '01', totalItems: 0, grid: { url: '/api/v1/bo/attractMgt/channelList', @@ -180,29 +180,28 @@ export default { addCls: 'box_OFvis', columns: [ - { name: 'no', header: 'No', align: 'center', width: '6%'}, - { 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: 'no', header: 'No', align: 'center', width: '6%'}, + {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: { type: CustomATagRenderer , options: { callback: this.channelDetail, } } }, - { name: 'custNm', header: '고객사명', align: 'center', width: '10%'}, - { name: 'bizrno', header: '사업자번호', align: 'center', width: '12%' - ,formatter: props => { - let result = props.bizrno.substring(0,3)+'-'+ props.bizrno.substring(3,5)+'-'+ props.bizrno.substring(5,10) - return result; - } - }, - { name: 'userNm', header: '이름', align: 'center', width: '10%'}, - { name: 'subsSttusCd', header: '상태', align: 'center', width: '10%'}, - { name: 'custTyCd', header: '구분', align: 'center', width: '10%'}, - { name: 'sndCnt', header: '전체발송건수', align: 'center', width: '11%', - formatter: props =>{ + {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}, + {name: 'subsSttusNm', header: '상태', align: 'center', width: '10%'}, + {name: 'custTyCd', header: '구분', align: 'center', width: '10%', hidden: true}, + {name: 'custTyNm', header: '구분', align: 'center', width: '10%'}, + { + name: 'sndCnt', header: '전체발송건수', align: 'center', width: '11%', + formatter: props => { let result = props.sndCnt; //.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); return result; @@ -213,14 +212,16 @@ export default { params: { searchType: '01', searchType1: '', - searchText: '', + searchText: '', subsStDt: '', subsEdDt: '', subsSttusCd: '', + subsSttusNm: '', loginId: '', norgNm: '', sndCnt: '', custTyCd: '', + custTyNm: '', }, excelHeader: [] } @@ -231,11 +232,11 @@ export default { commonModal, vuejsDatepicker, }, - created(){ + created() { this.setCodeData(); this.getExcelHeader(); this.setPeriodDay(0); - + // this.grid.params.subsSttusCd = ''; // this.grid.params.searchType = '01'; // this.$refs.searchType_. @@ -248,7 +249,7 @@ export default { let page = 1; // 페이지 정보 및 검색 조건 const getCondition = this.$store.getters['searchcondition/getSearchCondition']; - console.log('getCondition : '+getCondition); + console.log('getCondition : ' + getCondition); // store에 저장된 페이지 정보 및 검색 조건을 불러오기 let isKeep = false; @@ -261,19 +262,19 @@ export default { this.search(isKeep); }, methods: { - search: function(isKeep) { + search: function (isKeep) { - console.log('this.perPageCnt'+this.perPageCnt); + console.log('this.perPageCnt' + this.perPageCnt); console.log(this.grid.params); this.grid.params.searchType1 = this.searchType this.$refs.table.search(this.grid.params, isKeep); this.sendStoreData(); }, - changePerPage: function(){ // 페이지당 조회할 개수 + changePerPage: function () { // 페이지당 조회할 개수 this.grid.pagePerRows = this.perPageCnt; this.search(true); }, - sendStoreData: function() { + sendStoreData: function () { const getP = this.$refs.table.getPagination(); console.log("==========getP : " + getP._currentPage); this.$store.commit('searchcondition/updateSearchCondition', { @@ -283,7 +284,7 @@ export default { }); const getCondition = this.$store.getters['searchcondition/getSearchCondition']; - console.log("getCondition : "+ getCondition.perPage); + console.log("getCondition : " + getCondition.perPage); }, async getExcelDataDown() { try { @@ -303,7 +304,7 @@ export default { const result = response.data; if (result != null && result.retCode == "0000") { return result.data; - }else{ + } else { return false; } } catch (err) { @@ -323,14 +324,15 @@ export default { const saveFileName = `유치채널현황_${today}.xlsx`; const data = await this.getExcelDataDown(); - console.log('-------------------------'); + console.log('-------------------------'); console.log(data); let options = { header: this.excelHeader, dataOrder: 'header' }; // console.log(data); - xlsx.export(data.list, saveFileName, options).then(() => {}); + xlsx.export(data.list, saveFileName, options).then(() => { + }); }, getExcelHeader() { // 헤더를 mockup으로 관리한다. @@ -338,21 +340,21 @@ export default { this.excelHeader = res; }); }, - channelDetail(props){ + channelDetail(props) { console.log(props); this.row.userId = props.loginId; this.row.userSeq = props.userSeq; - this.$router.push({ name: 'channelDetail', params: this.row }); + this.$router.push({name: 'channelDetail', params: this.row}); }, setCodeData() { // 상태 옵션 셋팅. - api.commCode({'grpCd' : 'SUBS_STTUS_CD'}).then(response => { + api.commCode({'grpCd': 'SUBS_STTUS_CD'}).then(response => { // grid.params.subsSttusCd this.subsSttusCdList = response.data.data.list; this.grid.params.subsSttusCd = ''; }); - api.commCode({'grpCd' : 'CUST_TY_CD'}).then(response => { + api.commCode({'grpCd': 'CUST_TY_CD'}).then(response => { this.custTyCdList = response.data.data.list; this.grid.params.custTyCd = ''; }); @@ -386,15 +388,15 @@ export default { closeDate(type) { if (type != undefined && type != null) { if (type == 'start') { - this.disabledSDate = { from: this.endDate }; - this.disabledEDate = { to: this.startDate, from: this.endDate }; + 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() }; + this.disabledSDate = {from: this.endDate}; + this.disabledEDate = {to: this.startDate, from: new Date()}; } } }, - customFormatter: function(date) { + customFormatter: function (date) { if (this.sDateDiv == 'month') { return moment(date).format('YYYY-MM'); } else if (this.sDateDiv == 'year') { diff --git a/frontend/src/modules/calculate/views/CalcList.vue b/frontend/src/modules/calculate/views/CalcList.vue index d79f214..c54bfbe 100644 --- a/frontend/src/modules/calculate/views/CalcList.vue +++ b/frontend/src/modules/calculate/views/CalcList.vue @@ -6,13 +6,12 @@

정산이력

정산 > 정산이력

-
-
-
-
- -

전월 최대 3개월까지 조회 가능합니다.

-
+
+
+
+ +

전월 최대 3개월까지 조회 가능합니다.

+
- ~ - + ~ + -
-
-
- - -
-
- - -
- -
- +
+
+ + +
+
+ + +
+ +
+
-
총 {{ totalItems.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}건 -
- -
-
+
총 {{ totalItems.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}건 +
+ +
+
@@ -70,23 +75,23 @@
+ ref="table" + :totalItems="'totalItems'" + :url="grid.url" + :pagePerRows="grid.pagePerRows" + :initialRequest="grid.initialRequest" + :pagination="grid.pagination" + :isCheckbox="grid.isCheckbox" + :columns="grid.columns" + :noDataStr="grid.noDataStr" + :addCls="grid.addCls" + :header="grid.header" + >
- +
@@ -98,9 +103,11 @@ import xlsx from '@/common/excel'; import lodash from 'lodash'; import commonModal from "@/components/modal/commonModal"; import calcMgtApi from "@/modules/calculate/service/calcMgtApi"; +import {utils_mixin, chkPattern2} from '../service/mixins'; export default { name: 'calcList', + mixins: [utils_mixin, chkPattern2], data() { return { // 달력 데이터 @@ -109,136 +116,150 @@ export default { sDateDiv: 'month', startDate: new Date(), endDate: new Date(), - - startDt:'', - endDt:'', - startYear:'', - startMonth:'', - endYear:'', - endMonth:'', - row: {}, - list:[], - totalCnt: '', + startDateOptions: {disabledDate: this.disabledStDate}, + endDateOptions: {disabledDate: this.disabledEdDate}, + startDt: '', + endDt: '', + startYear: '', + startMonth: '', + endYear: '', + endMonth: '', + row: {}, + list: [], + totalCnt: '', pageType: 'CALC', // 테이블 리스트 데이터 perPageCnt: 50, options: [ - { text: '20', value: 20}, - { text: '50', value: 50}, - { text: '100', value: 100} + {text: '20', value: 20}, + {text: '50', value: 50}, + {text: '100', value: 100} ], totalItems: 0, grid: { url: '/api/v1/bo/calculate/calcList', pagePerRows: 20, - pagination: true, + pagination: true, isCheckbox: false, // true:첫번째 컬럼 앞에 체크박스 생성 / false:체크박스 제거 initialRequest: false, addCls: 'box_OFvis', - header:[ + header: [ [ - { header: '날짜', childNames: [] }, - { header: '고객사명', childNames: [] }, - { header: '사업자번호', childNames: [] }, - { header: '요금제', childNames: [] }, - { header: '시작금액', childNames: [] }, - { header: '사용금액', childNames: [] }, - { header: '이월금액', childNames: [] }, - { header: '종량금액', childNames: [] }, - { header: '소멸금액', childNames: [] }, - { header: '청구금액', childNames: [] }, - { header: '채널별 발송 건수', childNames: ['totalSndCnt','smsSndCnt','lmsSndCnt','mmsSndCnt','atlkSndCnt'] }, + {header: '날짜', childNames: []}, + {header: '고객사명', childNames: []}, + {header: '사업자번호', childNames: []}, + {header: '요금제', childNames: []}, + {header: '시작금액', childNames: []}, + {header: '사용금액', childNames: []}, + {header: '이월금액', childNames: []}, + {header: '종량금액', childNames: []}, + {header: '소멸금액', childNames: []}, + {header: '청구금액', childNames: []}, + {header: '채널별 발송 건수', childNames: ['totalSndCnt', 'smsSndCnt', 'lmsSndCnt', 'mmsSndCnt', 'atlkSndCnt']}, ] ], - columns: [ - { name: 'useYm', header: '날짜', align: 'center'}, - { name: 'custNm', header: '고객사명', align: 'center', width: '130px'}, - { name: 'bizrno', header: '사업자번호', align: 'center', width: '120px' - ,formatter: props => { - let result = props.bizrno.substring(0,3)+'-'+ props.bizrno.substring(3,5)+'-'+ props.bizrno.substring(5,10) + columns: [ + {name: 'useYm', header: '날짜', align: 'center'}, + {name: 'custNm', header: '고객사명', align: 'center', width: '130px'}, + { + name: 'bizrno', header: '사업자번호', align: 'center', width: '120px' + // ,formatter: props => { + // let result = props.bizrno.substring(0,3)+'-'+ props.bizrno.substring(3,5)+'-'+ props.bizrno.substring(5,10) + // return result; + // } + }, + { + name: 'prodNm', header: '요금제', align: 'center', width: '160px' + , formatter: props => { + let result = "

" + props.prodNm + "

\n

(" + props.prodAmt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') + ")

"; return result; } }, - { name: 'prodNm', header: '요금제', align: 'center', width: '160px' - ,formatter: props => { - let result = "

"+ props.prodNm+"

\n

("+props.prodAmt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')+")

"; - return result; - } - }, - { name: 'startAmt', header: '시작금액', align: 'center' - ,formatter: props =>{ + { + name: 'startAmt', header: '시작금액', align: 'center' + , formatter: props => { let result = props.startAmt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); return result; } }, - { name: 'useAmt', header: '사용금액', align: 'center' - ,formatter: props =>{ + { + name: 'useAmt', header: '사용금액', align: 'center' + , formatter: props => { let result = props.useAmt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); return result; } }, - { name: 'cfwdAmt', header: '이월금액', align: 'center' - ,formatter: props =>{ + { + name: 'cfwdAmt', header: '이월금액', align: 'center' + , formatter: props => { let result = props.cfwdAmt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); return result; } }, - { name: 'mrtUseAmt', header: '종량금액', align: 'center' - ,formatter: props =>{ + { + name: 'mrtUseAmt', header: '종량금액', align: 'center' + , formatter: props => { let result = props.mrtUseAmt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); return result; } }, - { name: 'extncAmt', header: '소멸금액', align: 'center' - ,formatter: props =>{ + { + name: 'extncAmt', header: '소멸금액', align: 'center' + , formatter: props => { let result = props.extncAmt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); return result; } }, - { name: 'billingAmt', header: '청구금액', align: 'center' - ,formatter: props =>{ + { + name: 'billingAmt', header: '청구금액', align: 'center' + , formatter: props => { let result = props.billingAmt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); return result; } }, - { name: 'totalSndCnt', header: '전체', align: 'center', cls: 'td_line' - ,formatter: props =>{ + { + name: 'totalSndCnt', header: '전체', align: 'center', cls: 'td_line' + , formatter: props => { let result = props.totalSndCnt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); return result; } }, - { name: 'smsSndCnt', header: 'SMS', align: 'center', cls: 'td_line' - ,formatter: props =>{ + { + name: 'smsSndCnt', header: 'SMS', align: 'center', cls: 'td_line' + , formatter: props => { let result = props.smsSndCnt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); return result; } }, - { name: 'lmsSndCnt', header: 'LMS', align: 'center', cls: 'td_line' - ,formatter: props =>{ + { + name: 'lmsSndCnt', header: 'LMS', align: 'center', cls: 'td_line' + , formatter: props => { let result = props.lmsSndCnt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); return result; } }, - { name: 'mmsSndCnt', header: 'MMS', align: 'center', cls: 'td_line' - ,formatter: props =>{ + { + name: 'mmsSndCnt', header: 'MMS', align: 'center', cls: 'td_line' + , formatter: props => { let result = props.mmsSndCnt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); return result; } }, - { name: 'atlkSndCnt', header: '알림톡', align: 'center', cls: 'td_line' - ,formatter: props =>{ + { + name: 'atlkSndCnt', header: '알림톡', align: 'center', cls: 'td_line' + , formatter: props => { let result = props.atlkSndCnt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); return result; } }, ], - noDataStr: '검색 결과가 없습니다.', - params: { + noDataStr: '검색 결과가 없습니다.', + params: { startMonth: '', endMonth: '', }, @@ -246,31 +267,31 @@ export default { } }; - }, + }, components: { customGrid: customGrid, commonModal, vuejsDatepicker, }, - created(){ + created() { this.setPeriodDay(0); this.gridParamSet(); this.getExcelHeader(); }, destroyed() { - + }, mounted() { let page = 1; // 페이지 정보 및 검색 조건 const getCondition = this.$store.getters['searchcondition/getSearchCondition']; - console.log('getCondition : '+getCondition); + console.log('getCondition : ' + getCondition); // store에 저장된 페이지 정보 및 검색 조건을 불러오기 let isKeep = false; if (getCondition) { this.grid.pagePerRows = getCondition.perPage; - this.grid.params = getCondition.params; + this.grid.params = getCondition.params; page = getCondition.page; isKeep = true; } @@ -289,7 +310,7 @@ export default { next(); }, methods: { - search: function(isKeep) { + search: function (isKeep) { console.log('>>>>>>> search Start >>>>>>'); this.$refs.table.search(this.grid.params, isKeep); this.grid.params = { @@ -298,28 +319,28 @@ export default { custNm: this.grid.params.custNm, bizrno: this.grid.params.bizrno }; - console.log('this.perPageCnt'+this.perPageCnt); + console.log('this.perPageCnt' + this.perPageCnt); console.log(this.grid.params); -/* - var currentDate = new Date(); - var currentMonth = moment(currentDate).format('YYYYMM'); - console.log('[currentMonth]:'+currentMonth); + /* + var currentDate = new Date(); + var currentMonth = moment(currentDate).format('YYYYMM'); + console.log('[currentMonth]:'+currentMonth); - if(moment(this.grid.params.startMonth).isBefore(moment(currentMonth).subtract(0, 'months').format('YYYYMM')) || - moment(this.grid.params.endMonth).isBefore(moment(currentMonth).subtract(0, 'months').format('YYYYMM'))){ - this.row.title = '발송통계'; - this.row.msg1 = '검색 기간은 전월만 선택 가능 합니다.'; - this.$refs.commmonModal.alertModalOpen(this.row); - return false - } -*/ - if (moment(this.grid.params.startMonth).isBefore(moment(this.grid.params.endMonth).subtract(2, 'months').format('YYYYMM'))) { - //alert('검색 기간은 전월 최대 3개월까지 선택 가능 합니다.'); - this.row.title = '발송통계'; - this.row.msg1 = '검색 기간은 전월 최대 3개월까지 선택 가능 합니다.'; - this.$refs.commmonModal.alertModalOpen(this.row); - return false - } + if(moment(this.grid.params.startMonth).isBefore(moment(currentMonth).subtract(0, 'months').format('YYYYMM')) || + moment(this.grid.params.endMonth).isBefore(moment(currentMonth).subtract(0, 'months').format('YYYYMM'))){ + this.row.title = '발송통계'; + this.row.msg1 = '검색 기간은 전월만 선택 가능 합니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); + return false + } + */ + // if (moment(this.grid.params.startMonth).isBefore(moment(this.grid.params.endMonth).subtract(2, 'months').format('YYYYMM'))) { + // //alert('검색 기간은 전월 최대 3개월까지 선택 가능 합니다.'); + // this.row.title = '발송통계'; + // this.row.msg1 = '검색 기간은 전월 최대 3개월까지 선택 가능 합니다.'; + // this.$refs.commmonModal.alertModalOpen(this.row); + // return false + // } this.$refs.table.search(this.grid.params, isKeep); this.sendStoreData(); @@ -327,12 +348,16 @@ export default { }, setPeriodDay(day) { this.periodDay = day; - // this.endDate = new Date(); + this.endDate = new Date(); // this.startDate = moment(this.endDate) - // .subtract(day, 'day') + // .subtract(day, 'month') // .toDate(); + + console.log(this.startDt) this.initSetStartDate(); this.initSetEndDate(); + // this.disabledStDate(this.startDate) + // this.disabledEndDate(this.endDate) this.closeDate('start'); this.closeDate('end'); @@ -355,17 +380,25 @@ export default { }, closeDate(type) { if (type != undefined && type != null) { + let initStartDate = new Date(); + initStartDate.setMonth(Number(moment(initStartDate).format('MM')) - 4) if (type == 'start') { - this.disabledSDate = { from: this.endDate }; - this.disabledEDate = { to: this.startDate, from: this.endDate }; + this.disabledSDate = {to: initStartDate, from: new Date()}; + if (this.startDate !== initStartDate) { + this.disabledEDate = {to: this.startDate, from: new Date()}; + + } } else if (type == 'end') { - this.disabledSDate = { from: this.endDate }; - this.disabledEDate = { to: this.startDate, from: new Date() }; + this.disabledEDate = {to: initStartDate, from: new Date()}; + if (this.endDate !== new Date()) { + this.disabledSDate = {from: this.endDate}; + this.disabledSDate = {to: initStartDate, from: new Date()}; + } } } }, - customFormatter: function(date) { - console.log(this.sDateDiv) + customFormatter: function (date) { + // console.log(this.sDateDiv) if (this.sDateDiv == 'month') { return moment(date).format('YYYY-MM'); } else if (this.sDateDiv == 'year') { @@ -374,13 +407,13 @@ export default { return moment(date).format('YYYY-MM-DD'); } }, - changePerPage: function(){ // 페이지당 조회할 개수 + changePerPage: function () { // 페이지당 조회할 개수 this.grid.pagePerRows = this.perPageCnt; this.search(true); }, - sendStoreData: function() { + sendStoreData: function () { const getP = this.$refs.table.getPagination(); - console.log("==========getP : " + getP._currentPage); + // console.log("==========getP : " + getP._currentPage); this.$store.commit('searchcondition/updateSearchCondition', { page: getP._currentPage, perPage: this.perPageCnt, @@ -388,7 +421,7 @@ export default { }); const getCondition = this.$store.getters['searchcondition/getSearchCondition']; - console.log("getCondition : "+ getCondition.perPage); + // console.log("getCondition : " + getCondition.perPage); }, gridParamSet() { this.grid.params = { @@ -398,7 +431,7 @@ export default { bizrno: this.grid.params.bizrno } - console.log("gridParamSet()-startMonth : "+ this.grid.params.startMonth); + // console.log("gridParamSet()-startMonth : " + this.grid.params.startMonth); }, getExcelHeader() { // 헤더를 mockup으로 관리한다. @@ -423,7 +456,8 @@ export default { dataOrder: 'header' }; // console.log(data); - xlsx.export(data.list, saveFileName, options).then(() => {}); + xlsx.export(data.list, saveFileName, options).then(() => { + }); }, async getExcelDataDown() { try { @@ -434,25 +468,26 @@ export default { const result = response.data; if (result != null && result.retCode == "0000") { return result.data; - }else{ + } else { return false; } } catch (err) { return false; } }, - initSetStartDate(){ + initSetStartDate() { let initStartDate = new Date(); - initStartDate.setMonth(Number(moment(initStartDate).format('MM')) -4); + initStartDate.setMonth(Number(moment(initStartDate).format('MM')) - 4); this.startDate = initStartDate; - console.log(moment(this.startDate).format('YYYY-MM-DD')); + // console.log(moment(this.startDate).format('YYYY-MM-DD')); }, - initSetEndDate(){ + initSetEndDate() { let initEndDate = new Date(); - initEndDate.setMonth(Number(moment(initEndDate).format('MM')) -2); + initEndDate.setMonth(Number(moment(initEndDate).format('MM')) - 1); this.endDate = initEndDate; - console.log(moment(this.endDate).format('YYYY-MM-DD')); + // console.log(moment(this.endDate).format('YYYY-MM-DD')); }, } -}; +} +; \ No newline at end of file diff --git a/frontend/src/modules/channelMgt/views/TmpltList.vue b/frontend/src/modules/channelMgt/views/TmpltList.vue index b158b3a..d306262 100644 --- a/frontend/src/modules/channelMgt/views/TmpltList.vue +++ b/frontend/src/modules/channelMgt/views/TmpltList.vue @@ -1,70 +1,66 @@ \ No newline at end of file diff --git a/frontend/src/modules/custMgt/components/AdminNmPop.vue b/frontend/src/modules/custMgt/components/AdminNmPop.vue index 4e8fedb..e3fabd7 100644 --- a/frontend/src/modules/custMgt/components/AdminNmPop.vue +++ b/frontend/src/modules/custMgt/components/AdminNmPop.vue @@ -21,7 +21,7 @@
-
+ \ No newline at end of file diff --git a/frontend/src/modules/custMgt/components/MemberModifyPop.vue b/frontend/src/modules/custMgt/components/MemberModifyPop.vue index d968190..4a120dd 100644 --- a/frontend/src/modules/custMgt/components/MemberModifyPop.vue +++ b/frontend/src/modules/custMgt/components/MemberModifyPop.vue @@ -27,15 +27,18 @@ 이름 - + 휴대폰번호 - + 이메일 - + 상태 @@ -181,8 +184,13 @@ export default { var dimmed = document.getElementsByClassName('memberUpdate'); for(var i = 0; i < dimmed.length; i++){ dimmed[i].style.display = 'none'; - } + } + this.formReset(); }, + formReset() { + this.userPwd1 = ''; + this.userPwd2 = ''; + }, toComplete(){ this.row.serviceId = this.adminId; this.memberUpdateModalClose(); diff --git a/frontend/src/modules/custMgt/components/MemberRegPop.vue b/frontend/src/modules/custMgt/components/MemberRegPop.vue index d12ea12..ed20e10 100644 --- a/frontend/src/modules/custMgt/components/MemberRegPop.vue +++ b/frontend/src/modules/custMgt/components/MemberRegPop.vue @@ -1,255 +1,279 @@ \ No newline at end of file diff --git a/frontend/src/modules/custMgt/components/MemoTotalPop.vue b/frontend/src/modules/custMgt/components/MemoTotalPop.vue index 11ca049..1bd2c08 100644 --- a/frontend/src/modules/custMgt/components/MemoTotalPop.vue +++ b/frontend/src/modules/custMgt/components/MemoTotalPop.vue @@ -7,8 +7,9 @@

전체 메모보기

- 총 {{ totalItems.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}건 +
+
총 {{ totalItems.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}건
- diff --git a/frontend/src/modules/custMgt/components/TestIdRegPop.vue b/frontend/src/modules/custMgt/components/TestIdRegPop.vue index 8d2a189..c7fc277 100644 --- a/frontend/src/modules/custMgt/components/TestIdRegPop.vue +++ b/frontend/src/modules/custMgt/components/TestIdRegPop.vue @@ -1,8 +1,8 @@ - + \ No newline at end of file diff --git a/frontend/src/modules/custMgt/views/SubsDetail.vue b/frontend/src/modules/custMgt/views/SubsDetail.vue index 3b37368..0492fdc 100644 --- a/frontend/src/modules/custMgt/views/SubsDetail.vue +++ b/frontend/src/modules/custMgt/views/SubsDetail.vue @@ -1,179 +1,176 @@ @@ -188,213 +185,213 @@ import AdminNmPop from '../components/AdminNmPop'; import commonModal from "@/components/modal/commonModal"; export default { - name: "subsDetail", - data(){ - return{ - row: {}, - custNm: '', - reprNm: '', - custType: '', - adr1: '', - adr2: '', - adr3: '', - bregNo: '', - bregNo1: '', - bregNo3: '', - bregNo2: '', - cprRegNo: '', - cprRegNo1: '', - cprRegNo2: '', - birth: '', - subsDt: '', - stat: '', - plan: '', - subsNo: '', - adminId: '', - adminNm: '', - bindDis: '', - channelId: '', - channelNm: '', - useAuth: '', - userNm: '', - mdn: '', - carryOver: '', - userCnt: '', - saveConfirm:false, - props: {}, - } - }, - props: { - serviceId: { - type: String, - default: "", - }, - }, - components: { - CarryOverListPop, - //ConfirmPop, - //SearchIDPop, - ValidationConfirmPop, - AdminNmPop, - commonModal, - }, - created(){ - console.log(this.$route.params.serviceId); - this.subsDetail(this.$route.params.serviceId); - // checkVaildBizNum + name: "subsDetail", + data() { + return { + row: {}, + custNm: '', + reprNm: '', + custType: '', + adr1: '', + adr2: '', + adr3: '', + bregNo: '', + bregNo1: '', + bregNo3: '', + bregNo2: '', + cprRegNo: '', + cprRegNo1: '', + cprRegNo2: '', + birth: '', + subsDt: '', + stat: '', + plan: '', + subsNo: '', + adminId: '', + adminNm: '', + bindDis: '', + channelId: '', + channelNm: '', + useAuth: '', + userNm: '', + mdn: '', + carryOver: '', + userCnt: '', + saveConfirm: false, + props: {}, + } }, - methods :{ - callAlert(props){ - //alert("호출됨!"); - this.$refs.commmonModal.alertModalOpen(props); - }, - doValidate(){ - // if(this.isNull(this.userId)){ - // alert("아이디를 입력해 주세요."); - // this.$refs._userId.focus(); - // return false; - // } - return true; - }, - // 저장 후 부모창 호출. - toComplete(){ - this.row.searchType1 = ''; - this.row.searchType2= ''; - this.row.searchType3= ''; - this.row.searchText1= ''; - this.row.startDt= ''; - this.row.endDt= ''; - this.row.page = 1; + props: { + serviceId: { + type: String, + default: "", + }, + }, + components: { + CarryOverListPop, + //ConfirmPop, + //SearchIDPop, + ValidationConfirmPop, + AdminNmPop, + commonModal, + }, + created() { + console.log(this.$route.params.serviceId); + this.subsDetail(this.$route.params.serviceId); + // checkVaildBizNum + }, + methods: { + callAlert(props) { + //alert("호출됨!"); + this.$refs.commmonModal.alertModalOpen(props); + }, + doValidate() { + // if(this.isNull(this.userId)){ + // alert("아이디를 입력해 주세요."); + // this.$refs._userId.focus(); + // return false; + // } + return true; + }, + // 저장 후 부모창 호출. + toComplete() { + this.row.searchType1 = ''; + this.row.searchType2 = ''; + this.row.searchType3 = ''; + this.row.searchText1 = ''; + this.row.startDt = ''; + this.row.endDt = ''; + this.row.page = 1; - this.$router.push({ name: 'subsList', params: this.row }); - }, - async doInsert(props){ - - console.log(props); - // try { - // const response = await custMgtApi.insertTestId(this.row); - // const result = response.data; - // if (result != null && result.retCode == "0000") { - // alert('저장 하였습니다.'); - // this.toComplete(); - // } - // } catch(err) { - // alert("실패 하였습니다."); - // } - // } - }, - async subsDetail(serviceId){ - this.row.serviceId = serviceId; - try { - const response = await custMgtApi.subsDetail(this.row); - const result = response.data; - console.log(result); - if (result != null && result.retCode == "0000") { - //데이터값이 널이면 오류처리 - this.custNm = result.data.custNm; - this.reprNm = result.data.reprNm; - this.custType = result.data.custType; - this.adr1 = result.data.adr1; - this.adr2 = result.data.adr2; - this.adr3 = result.data.adr3; - this.bregNo = result.data.bregNo; - this.cprRegNo = result.data.cprRegNo; - this.birth = result.data.birth; - this.subsDt = result.data.subsDt; - this.stat = result.data.stat; - this.plan = result.data.plan; - this.subsNo = result.data.subsNo; - this.adminId = result.data.adminId; - this.adminNm = result.data.adminNm; - this.bindDis = result.data.bindDis; - this.channelId = result.data.channelId; - this.channelNm = result.data.channelNm; - this.serviceId = result.data.serviceId; - this.useAuth = result.data.useAuth; - this.userNm = result.data.userNm; - this.mdn = result.data.mdn; - this.carryOver = result.data.carryOver; - this.userCnt = result.data.userCnt; - if(this.bregNo != '' && this.bregNo != null){ - this.bregNo1 = this.bregNo.substr(0, 3); - this.bregNo2 = this.bregNo.substr(3, 2); - this.bregNo3 = this.bregNo.substr(5); - } - if(this.cprRegNo != '' && this.cprRegNo != null){ - this.cprRegNo1 = this.cprRegNo.substr(0, 6); - this.cprRegNo2 = this.cprRegNo.substr(6); - } - } - } catch (error) { - this.row.title = '청약고객관리'; - this.row.msg1 = '실패 하였습니다.'; - this.$refs.commmonModal.alertModalOpen(this.row); - } + this.$router.push({name: 'subsList', params: this.row}); + }, + async doInsert(props) { - }, - - // updateAdminInfo 청약고객-사용정보-관리자ID,관리자명 수정 - async updateAdminInfo() { - this.row.serviceId = this.$route.params.serviceId; - this.row.adminId = this.adminId; - this.row.adminNm = this.adminNm; - - try { - const response = await custMgtApi.updateAdminInfo(this.row); - 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 { - this.row.title = '청약고객관리'; - this.row.msg1 = '실패 하였습니다.'; - this.$refs.commmonModal.alertModalOpen(this.row); - } - } catch (error) { + console.log(props); + // try { + // const response = await custMgtApi.insertTestId(this.row); + // const result = response.data; + // if (result != null && result.retCode == "0000") { + // alert('저장 하였습니다.'); + // this.toComplete(); + // } + // } catch(err) { + // alert("실패 하였습니다."); + // } + // } + }, + async subsDetail(serviceId) { + this.row.serviceId = serviceId; + try { + const response = await custMgtApi.subsDetail(this.row); + const result = response.data; + console.log(result); + if (result != null && result.retCode == "0000") { + //데이터값이 널이면 오류처리 + this.custNm = result.data.custNm; + this.reprNm = result.data.reprNm; + this.custType = result.data.custType; + this.adr1 = result.data.adr1; + this.adr2 = result.data.adr2; + this.adr3 = result.data.adr3; + this.bregNo = result.data.bregNo; + this.cprRegNo = result.data.cprRegNo; + this.birth = result.data.birth; + this.subsDt = result.data.subsDt; + this.stat = result.data.stat; + this.plan = result.data.plan; + this.subsNo = result.data.subsNo; + this.adminId = result.data.adminId; + this.adminNm = result.data.adminNm; + this.bindDis = result.data.bindDis; + this.channelId = result.data.channelId; + this.channelNm = result.data.channelNm; + this.serviceId = result.data.serviceId; + this.useAuth = result.data.useAuth; + this.userNm = result.data.userNm; + this.mdn = result.data.mdn; + this.carryOver = result.data.carryOver; + this.userCnt = result.data.userCnt; + if (this.bregNo != '' && this.bregNo != null) { + this.bregNo1 = this.bregNo.substr(0, 3); + this.bregNo2 = this.bregNo.substr(3, 2); + this.bregNo3 = this.bregNo.substr(5); + } + if (this.cprRegNo != '' && this.cprRegNo != null) { + this.cprRegNo1 = this.cprRegNo.substr(0, 6); + this.cprRegNo2 = this.cprRegNo.substr(6); + } + } + } catch (error) { this.row.title = '청약고객관리'; this.row.msg1 = '실패 하였습니다.'; this.$refs.commmonModal.alertModalOpen(this.row); - } + } - }, - carryOverListPopOpen: function(){ - this.$refs.carryOverListPop.carryOverListPopOpen(this.serviceId); - }, - confirmPopOpen: function(){ - if(this.doValidate()){ - // this.row.title = '사용자 수정 확인'; - // this.row.msg = '변경된 내용을 저장하시겠습니까?'; - // console.log(this.row); - // this.$refs.confirmPop.confirmModalOpen(this.row); - this.$refs.validationConfirmPop.confirmUpdateSubOpen(); + }, + + // updateAdminInfo 청약고객-사용정보-관리자ID,관리자명 수정 + async updateAdminInfo() { + this.row.serviceId = this.$route.params.serviceId; + this.row.adminId = this.adminId; + this.row.adminNm = this.adminNm; + + try { + const response = await custMgtApi.updateAdminInfo(this.row); + 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 { + this.row.title = '청약고객관리'; + this.row.msg1 = '실패 하였습니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); + } + } catch (error) { + this.row.title = '청약고객관리'; + this.row.msg1 = '실패 하였습니다.'; + this.$refs.commmonModal.alertModalOpen(this.row); + } + + }, + carryOverListPopOpen: function () { + this.$refs.carryOverListPop.carryOverListPopOpen(this.serviceId); + }, + confirmPopOpen: function () { + if (this.doValidate()) { + // this.row.title = '사용자 수정 확인'; + // this.row.msg = '변경된 내용을 저장하시겠습니까?'; + // console.log(this.row); + // this.$refs.confirmPop.confirmModalOpen(this.row); + this.$refs.validationConfirmPop.confirmUpdateSubOpen(); // this.$refs.commmonModal.confirmModalOpen(this.row); - } - - }, - confirmCalbackFnc: function(props){ - console.log(props); - if(props.result){ - // this.doInsert(props.result); - } - }, - searchIDPopOpen: function(){ - var params = { - "serviceId": this.row.serviceId, - "serviceSeq": '', - "parentDiv": 'subsDetail' - } - this.$refs.adminNmPop.ModalOpen(params); - }, - goMemberDetail: function(props){ - console.log(this.row); - this.$router.push({ name: 'memberAdminDetail', params: {serviceId : this.row.serviceId} }); - }, - } + } + + }, + confirmCalbackFnc: function (props) { + console.log(props); + if (props.result) { + // this.doInsert(props.result); + } + }, + searchIDPopOpen: function () { + var params = { + // "serviceId": this.row.serviceId, + "serviceId": this.serviceId, + "serviceSeq": '', + "parentDiv": 'subsDetail' + } + this.$refs.adminNmPop.ModalOpen(params); + }, + goMemberDetail: function (props) { + console.log(this.row); + this.$router.push({name: 'memberAdminDetail', params: {serviceId: this.row.serviceId}}); + }, + } } - \ No newline at end of file diff --git a/frontend/src/modules/custMgt/views/SubsList.vue b/frontend/src/modules/custMgt/views/SubsList.vue index d517a53..4fda483 100644 --- a/frontend/src/modules/custMgt/views/SubsList.vue +++ b/frontend/src/modules/custMgt/views/SubsList.vue @@ -1,22 +1,22 @@ \ No newline at end of file diff --git a/frontend/src/modules/riskMgt/components/InsertIntrcpPop.vue b/frontend/src/modules/riskMgt/components/InsertIntrcpPop.vue index 68d2f00..b2c4427 100644 --- a/frontend/src/modules/riskMgt/components/InsertIntrcpPop.vue +++ b/frontend/src/modules/riskMgt/components/InsertIntrcpPop.vue @@ -1,255 +1,263 @@ \ No newline at end of file diff --git a/frontend/src/modules/riskMgt/components/InsertMsgPop.vue b/frontend/src/modules/riskMgt/components/InsertMsgPop.vue index 764e323..6c90472 100644 --- a/frontend/src/modules/riskMgt/components/InsertMsgPop.vue +++ b/frontend/src/modules/riskMgt/components/InsertMsgPop.vue @@ -1,223 +1,218 @@ \ 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 fc76cf0..828ed76 100644 --- a/frontend/src/modules/riskMgt/views/IntrcpList.vue +++ b/frontend/src/modules/riskMgt/views/IntrcpList.vue @@ -1,90 +1,93 @@ diff --git a/frontend/src/modules/riskMgt/views/Msg.vue b/frontend/src/modules/riskMgt/views/Msg.vue index 52491ec..ff8565f 100644 --- a/frontend/src/modules/riskMgt/views/Msg.vue +++ b/frontend/src/modules/riskMgt/views/Msg.vue @@ -1,68 +1,73 @@ \ 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 953eeca..3b2bfaa 100644 --- a/frontend/src/modules/riskMgt/views/ZezNum.vue +++ b/frontend/src/modules/riskMgt/views/ZezNum.vue @@ -2,103 +2,113 @@
-
-
-

080 수신번호 차단

-

리스크관리 > 080 수신번호 차단

-
-
-
-
- - -
-
- - -
-
- - -
- -
-
-
-
총 {{ totalItems.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }} 건 -
- -
-
-
-
- - -
- +
+
+

080 수신번호 차단

+

리스크관리 > 080 수신번호 차단

- +
+
+
+ + +
+
+ + +
+
+ + +
+ +
+
+
+
총 {{ totalItems.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }} 건 +
+ +
+
+
+
+ + +
+
+ +
\ No newline at end of file diff --git a/frontend/src/modules/sendNumMgt/components/AdminListPop.vue b/frontend/src/modules/sendNumMgt/components/AdminListPop.vue index 8ee6d1d..51234bf 100644 --- a/frontend/src/modules/sendNumMgt/components/AdminListPop.vue +++ b/frontend/src/modules/sendNumMgt/components/AdminListPop.vue @@ -8,7 +8,7 @@
- +
diff --git a/frontend/src/modules/sendNumMgt/components/ApprDetailPop.vue b/frontend/src/modules/sendNumMgt/components/ApprDetailPop.vue index 5aa7ef7..563f40b 100644 --- a/frontend/src/modules/sendNumMgt/components/ApprDetailPop.vue +++ b/frontend/src/modules/sendNumMgt/components/ApprDetailPop.vue @@ -1,8 +1,8 @@