diff --git a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/crdnExmnr/crdnExmnrSelectPopup.jsp b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/crdnExmnr/crdnExmnrSelectPopup.jsp index 6daacbc..e4506f4 100644 --- a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/crdnExmnr/crdnExmnrSelectPopup.jsp +++ b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/crdnExmnr/crdnExmnrSelectPopup.jsp @@ -13,11 +13,14 @@ + @@ -216,7 +219,6 @@ var totalCount = responseObj.data.contents.length; $("#totalCount").text('총 ' + totalCount.toLocaleString() + '건'); } - }); // 체크 이벤트 @@ -224,6 +226,15 @@ // 기존 선택된 행들의 체크박스 상태 복원 ExmnrPopPopup.restoreCheckboxStates(); }); + + // 행 더블클릭 시 선택 + this.instance.on('dblclick', function(ev) { + var rowData = self.instance.getRow(ev.rowKey); + if (rowData) { + ExmnrPopPopup.onRowCheck(ev); + ExmnrPopPopup.selectExmnr(); + } + }); // 체크 이벤트 this.instance.on('check', function(ev) { @@ -265,6 +276,14 @@ self.search(); }); + //신규 조사원 등록 + $('#newExmnrPopupBtn').on('click', function() { + var w = 450, h = 280; + var left = Math.max(0, (window.screen.availLeft + (window.screen.availWidth - w) / 2)); + var top = Math.max(0, (window.screen.availTop + (window.screen.availHeight - h) / 2)); + window.open('?mode=C', 'exmnrReg', 'width=' + w + ',height=' + h + ',left=' + left + ',top=' + top + ',resizable=yes,scrollbars=yes'); + }); + // 엔터키 검색 $('#schExmnr').on('keypress', function(e) { if (e.which === 13) { diff --git a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/crdnOwnrSelect/crdnOwnrSelectPopup.jsp b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/crdnOwnrSelect/crdnOwnrSelectPopup.jsp index f637027..43661d2 100644 --- a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/crdnOwnrSelect/crdnOwnrSelectPopup.jsp +++ b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/crdnOwnrSelect/crdnOwnrSelectPopup.jsp @@ -47,7 +47,9 @@ - + + + @@ -261,6 +263,11 @@ } self.selectOwners(checkedRows); }); + + $('#newOwnrPopupBtn').on('click', function() { + window.open('?mode=C', 'ownActRegistAndViewReg', 'width=600,height=600,scrollbars=yes'); + }); + // 닫기 버튼 클릭 이벤트 $('#closeBtn, #btnCloseTop').on('click', function(e) { diff --git a/src/main/webapp/WEB-INF/views/crdn/exmnr/popup.jsp b/src/main/webapp/WEB-INF/views/crdn/exmnr/popup.jsp index 093d5af..5b8c422 100644 --- a/src/main/webapp/WEB-INF/views/crdn/exmnr/popup.jsp +++ b/src/main/webapp/WEB-INF/views/crdn/exmnr/popup.jsp @@ -117,6 +117,8 @@ alert(response.message || '처리되었습니다.'); if (window.opener && window.opener.refreshCrdnList) { window.opener.refreshCrdnList(); + }else if (window.opener && window.opener.ExmnrPopPopup) { + window.opener.ExmnrPopPopup.search(); } window.close(); } else { @@ -140,7 +142,10 @@ alert(response.message || '삭제되었습니다.'); if (window.opener && window.opener.refreshCrdnList) { window.opener.refreshCrdnList(); + }else if (window.opener && window.opener.ExmnrPopPopup) { + window.opener.ExmnrPopPopup.search(); } + window.close(); } else { alert(response.message || '삭제 중 오류가 발생했습니다.'); diff --git a/src/main/webapp/WEB-INF/views/crdn/ownact/ownActRegistPopup.jsp b/src/main/webapp/WEB-INF/views/crdn/ownact/ownActRegistPopup.jsp index 73a6f9b..00fdb9a 100644 --- a/src/main/webapp/WEB-INF/views/crdn/ownact/ownActRegistPopup.jsp +++ b/src/main/webapp/WEB-INF/views/crdn/ownact/ownActRegistPopup.jsp @@ -91,7 +91,7 @@ * 지번 주소 - + @@ -99,7 +99,7 @@ * 도로명 주소 - + @@ -226,6 +226,8 @@ alert(response.message || '처리되었습니다.'); if (window.opener && window.opener.refreshOwnActList) { window.opener.refreshOwnActList(); + }else if (window.opener && window.opener.CrdnOwnrSelectPopup) { + window.opener.CrdnOwnrSelectPopup.search(); } window.close(); } else { @@ -249,6 +251,8 @@ alert(response.message || '삭제되었습니다.'); if (window.opener && window.opener.refreshOwnActList) { window.opener.refreshOwnActList(); + }else if (window.opener && window.opener.CrdnOwnrSelectPopup) { + window.opener.CrdnOwnrSelectPopup.search(); } window.close(); } else { @@ -303,6 +307,7 @@ } } } + console.log(isValid, extraValid); return isValid && extraValid; } };