diff --git a/frontend/src/modules/calculate/router/index.js b/frontend/src/modules/calculate/router/index.js index ba09bab..92b358b 100644 --- a/frontend/src/modules/calculate/router/index.js +++ b/frontend/src/modules/calculate/router/index.js @@ -1,5 +1,6 @@ import CalcList from '../views/CalcList' import Verification from '../views/Verification' +import AdressPopup from '../views/adressPopup' export default [ { @@ -13,6 +14,12 @@ export default [ component: Verification, name: 'verification', meta: { public: false } + }, + { + path: '/calculate/adressPopup', + component: AdressPopup, + name: 'adressPopup', + meta: { public: false } } ] diff --git a/frontend/src/modules/calculate/views/Verification.vue b/frontend/src/modules/calculate/views/Verification.vue index 712b490..78a2202 100644 --- a/frontend/src/modules/calculate/views/Verification.vue +++ b/frontend/src/modules/calculate/views/Verification.vue @@ -22,6 +22,7 @@ +
@@ -183,7 +184,10 @@ export default { totalCnt : 0, noDataStr: '검색 결과가 없습니다.', excelHeader: [], - excelDownAble:false + excelDownAble:false, + zip: '', + addr1: '', + addr2: '' }; }, components: { @@ -230,6 +234,10 @@ export default { return false; } }, + adressModalOpen: function(){ + //this.$refs.adressModal.adressPopupOpen(); + window.open("/calculate/adressPopup", "pop", "width=480, height=800, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbar=no, rel=opener"); + }, initData: function(){ this.list = []; this.totalCnt = 0; @@ -312,8 +320,12 @@ export default { }; xlsx.export(this.list, saveFileName, options).then(() => {}); + }, + jusoCallBack(roadFullAddr, roadAddrPart1, addrDetail, roadAddrPart2, engAddr, jibunAddr, zipNo, admCd, rnMgtSn, bdMgtSn){ + // 도로명주소검색팝업창에서 결과를 리턴하는 스크립트로 빨간 라인은 해당 시스템에 맞게 수정하여 사용 + //2017년 2월 제공항목이 확대되었습니다. 원하시는 항목을 추가하여 사용하시면 됩니다. + console.log(roadFullAddr, roadAddrPart1, addrDetail, roadAddrPart2, engAddr, jibunAddr, zipNo, admCd, rnMgtSn, bdMgtSn); } - - }, + } }; diff --git a/frontend/src/modules/calculate/views/adressPopup.vue b/frontend/src/modules/calculate/views/adressPopup.vue new file mode 100644 index 0000000..ba6bacc --- /dev/null +++ b/frontend/src/modules/calculate/views/adressPopup.vue @@ -0,0 +1,70 @@ + + + diff --git a/frontend/src/router.js b/frontend/src/router.js index 4589580..11fa861 100644 --- a/frontend/src/router.js +++ b/frontend/src/router.js @@ -99,6 +99,11 @@ router.beforeEach((to, from, next) => { store.commit('login/isErrorPage', false); } } + + if(nextUrl == '/calculate/adressPopup'){ + moveFlag = true; + } + } if (