Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

src/main/webapp/app/stinfo/STINFO02010.html

@@ -225,12 +225,12 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb"></label>
 											<div class="col-xs-10 itp_ip">
-												<input type="hidden" id="ITP_FORM_STINFO02010_DETAIL_LOTS_ADDRESS" value="" />
+												<input type="hidden" id="ITP_FORM_STINFO02010_DETAIL_LOTS_ADDRESS" name="lotsAddress" value="" />
 												<input type="hidden" id="ITP_FORM_STINFO02010_DETAIL_STREET_ADDRESS" value="" />
 												<input type="hidden" name="latX" id="ITP_FORM_STINFO02010_DETAIL_LAT" value="" />
 												<input type="hidden" name="longY" id="ITP_FORM_STINFO02010_DETAIL_LNG" value="" />
-												<input type="hidden" id="ITP_FORM_STINFO02010_DETAIL_HJ_DONG" value="" />
-												<input type="hidden" id="ITP_FORM_STINFO02010_DETAIL_BJ_DONG" value="" />
+												<input type="hidden" id="ITP_FORM_STINFO02010_DETAIL_HJ_DONG" name="hjDong" value="" />
+												<input type="hidden" id="ITP_FORM_STINFO02010_DETAIL_BJ_DONG" name="bjDong" value="" />
 												<div id="ITP_FORM_STINFO02010_DETAIL_MAP" style="width:700px; height:400px;"></div>
 											</div>
 										</div>
@@ -449,12 +449,12 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb"></label>
 											<div class="col-xs-10 itp_ip">
-												<input type="hidden" id="ITP_FORM_STINFO02010_VIEW_LOTS_ADDRESS" value="" />
+												<input type="hidden" id="ITP_FORM_STINFO02010_VIEW_LOTS_ADDRESS" name="lotsAddress" value="" />
 												<input type="hidden" id="ITP_FORM_STINFO02010_VIEW_STREET_ADDRESS" value="" />
 												<input type="hidden" name="cmpyLat" id="ITP_FORM_STINFO02010_VIEW_LAT" value="" />
 												<input type="hidden" name="cmpyLng" id="ITP_FORM_STINFO02010_VIEW_LNG" value="" />
-												<input type="hidden" id="ITP_FORM_STINFO02010_VIEW_HJ_DONG" value="" />
-												<input type="hidden" id="ITP_FORM_STINFO02010_VIEW_BJ_DONG" value="" />
+												<input type="hidden" id="ITP_FORM_STINFO02010_VIEW_HJ_DONG" name="hjDong" value="" />
+												<input type="hidden" id="ITP_FORM_STINFO02010_VIEW_BJ_DONG" name="bjDong" value="" />
 												<div id="ITP_FORM_STINFO02010_VIEW_MAP" style="width:700px; height:400px;"></div>
 											</div>
 										</div>

src/main/webapp/app/stinfo/STINFO02011.html

@@ -229,12 +229,12 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb"></label>
 											<div class="col-xs-10 itp_ip">
-												<input type="hidden" id="ITP_FORM_STINFO02011_DETAIL_LOTS_ADDRESS" value="" />
+												<input type="hidden" id="ITP_FORM_STINFO02011_DETAIL_LOTS_ADDRESS" name="lotsAddress" value="" />
 												<input type="hidden" id="ITP_FORM_STINFO02011_DETAIL_STREET_ADDRESS" value="" />
 												<input type="hidden" name="latX" id="ITP_FORM_STINFO02011_DETAIL_LAT" value="" />
 												<input type="hidden" name="longY" id="ITP_FORM_STINFO02011_DETAIL_LNG" value="" />
-												<input type="hidden" id="ITP_FORM_STINFO02011_DETAIL_HJ_DONG" value="" />
-												<input type="hidden" id="ITP_FORM_STINFO02011_DETAIL_BJ_DONG" value="" />
+												<input type="hidden" id="ITP_FORM_STINFO02011_DETAIL_HJ_DONG" name="hjDong" value="" />
+												<input type="hidden" id="ITP_FORM_STINFO02011_DETAIL_BJ_DONG" name="bjDong" value="" />
 												<div id="ITP_FORM_STINFO02011_DETAIL_MAP" style="width:700px; height:400px;"></div>
 											</div>
 										</div>
@@ -429,12 +429,12 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb"></label>
 											<div class="col-xs-10 itp_ip">
-												<input type="hidden" id="ITP_FORM_STINFO02011_VIEW_LOTS_ADDRESS" value="" />
+												<input type="hidden" id="ITP_FORM_STINFO02011_VIEW_LOTS_ADDRESS" name="lotsAddress" value="" />
 												<input type="hidden" id="ITP_FORM_STINFO02011_VIEW_STREET_ADDRESS" value="" />
 												<input type="hidden" name="cmpyLat" id="ITP_FORM_STINFO02011_VIEW_LAT" value="" />
 												<input type="hidden" name="cmpyLng" id="ITP_FORM_STINFO02011_VIEW_LNG" value="" />
-												<input type="hidden" id="ITP_FORM_STINFO02011_VIEW_HJ_DONG" value="" />
-												<input type="hidden" id="ITP_FORM_STINFO02011_VIEW_BJ_DONG" value="" />
+												<input type="hidden" id="ITP_FORM_STINFO02011_VIEW_HJ_DONG" name="hjDong" value="" />
+												<input type="hidden" id="ITP_FORM_STINFO02011_VIEW_BJ_DONG" name="bjDong" value="" />
 												<div id="ITP_FORM_STINFO02011_VIEW_MAP" style="width:700px; height:400px;"></div>
 											</div>
 										</div>

src/main/webapp/css/style.css

@@ -629,7 +629,7 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
 #ITP_ASIDE .itp_modal .itp_form .itp_lb.itp_required:before {content:'*'; color:#a94442; position:absolute; top:8px; left:8px;}
 #ITP_ASIDE .itp_modal .itp_form .itp_ipGrp_left .itp_input {border-top-right-radius:0; border-bottom-right-radius:0; border-right:none;}
 #ITP_ASIDE .itp_modal .itp_form .itp_ipGrp_right .itp_input {border-top-left-radius:0; border-bottom-left-radius:0;}
-#ITP_ASIDE .itp_modal .itp_form .itp_err_msg {display: inline-block; font-size: 12px; color: #a94442; margin-left: 1px;}  /* 송호성 추가(2021.07.11) */
+#ITP_ASIDE .itp_modal .itp_form .itp_err_msg {display: inline-block; font-size: 12px; color: #a94442; margin-left: 1px;}  
 #ITP_ASIDE .itp_modal .itp_form_inline {margin-bottom:10px; padding:0;}
 #ITP_ASIDE .itp_modal .itp_form_inline .form-horizontal {margin-bottom:10px; font-size:18px;}
 #ITP_ASIDE .itp_modal .itp_form_inline .form-horizontal .itp_div_label {display:inline-flex; margin-left:20px;}
@@ -743,7 +743,7 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
 #ITP_NOT_FOUND .notfound a {font-family:sans-serif; font-size:14px; text-decoration:none; text-transform:uppercase; background:#189cf0; display:inline-block; padding:16px 38px; border:2px solid transparent; border-radius:40px; color:#fff; font-weight:400; transition:0.2s all;}
 #ITP_NOT_FOUND .notfound a:hover {background-color:#fff; border-color:#189cf0; color:#189cf0;}
 
-/* 송호성 추가 */
+
 #ITP_CONTAINER .itp_detail .itp_form_head {padding:0 4px 0 4px; height:42px; background:#f5f5f5;}
 #ITP_CONTAINER .itp_detail .itp_form_head .itp_form_tit {font-size:15px; margin:0; padding:0px 18px; line-height:42px; display: inline-block; background: none; border: none; }
 #ITP_CONTAINER .itp_detail .itp_form_head .itp_cicon {line-height:32px; height:32px; margin-top: 3px; margin-right: 3px;}

src/main/webapp/js/app/config.js

@@ -2939,7 +2939,7 @@ function itp_fn_call_popup(href, container, fnm, param, popFn, args, returnType)
 	});
 };
 
-// 2021.07.07 송호성 추가
+
 function fn_call_popup(type, popnm, container,  popFn, args, returnType) {
 	// console.log('[ITP_CALL_POPUP] type = ' + type + ', popnm = ' + popnm);
 	$.ajax({

src/main/webapp/js/app/stinfo/ITP_STINFO02010.js

@@ -426,6 +426,11 @@ let viewObj = {
 		$('#ITP_FORM_STINFO02010_VIEW .fnZipNo').text(result.zipNo);
 		$('#ITP_FORM_STINFO02010_VIEW .fnLoadAddr').text(result.addr1);
 		$('#ITP_FORM_STINFO02010_VIEW .fnDtlAddr').text(result.addr2);
+		
+		$('#ITP_FORM_STINFO02010_VIEW #ITP_FORM_STINFO02010_VIEW_LOTS_ADDRESS').val(result.lotsAddress);
+		$('#ITP_FORM_STINFO02010_VIEW #ITP_FORM_STINFO02010_VIEW_HJ_DONG').val(result.hjDong);
+		$('#ITP_FORM_STINFO02010_VIEW #ITP_FORM_STINFO02010_VIEW_BJ_DONG').val(result.bjDong);
+		
 
 		var cmpyAdres = result.addr1/* + ' ' + result.addr*/;
 		kakaoMap.init('ITP_FORM_STINFO02010_VIEW', cmpyAdres);
@@ -503,6 +508,11 @@ let modifyObj = {
 					$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_ADRES_DTL').val(data.addr2);	// 주소2
 					$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_FROM_DT').val(getDateStr(data.openDate));	// 개점일					
 					itp_fn_set_date_form('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_FROM_DT');
+					
+					$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_LOTS_ADDRESS').val(data.lotsAddress);
+					$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_HJ_DONG').val(data.hjDong);
+					$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_BJ_DONG').val(data.bjDong);
+					
 										
 				} else {
 					itp_fn_modal_alert(data.message);	
@@ -556,6 +566,12 @@ let modifyObj = {
 		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_OQ_BRAND_ID').val(result.oqBrandId);
 		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_OQ_STORE_ID').val(result.oqStoreId);
 		
+		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_LOTS_ADDRESS').val(result.lotsAddress);
+		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_HJ_DONG').val(result.hjDong);
+		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_BJ_DONG').val(result.bjDong);
+		
+		
+		
 		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_LOAN_DVSN').attr('disabled', true);
 		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_LIMIT_AMT').attr('readonly', true);
 		
@@ -648,6 +664,7 @@ let createObj = {
 					callBack: (args) => {
 						itp_fn_form_event.removeChar('#ITP_FORM_OPER03010_DETAIL');
 						let param = $(formId).serializeObject();
+						//console.log(JSON.stringify(param));
 						if(!param.zipNo || param.zipNo=='undefined') {
 							itp_fn_modal_alert('우편번호를 확인해주세요');
 							return;

src/main/webapp/js/app/stinfo/ITP_STINFO02011.js

@@ -183,6 +183,11 @@ let viewObj = {
 		$('#ITP_FORM_STINFO02011_VIEW .fnZipNo').text(result.zipNo);
 		$('#ITP_FORM_STINFO02011_VIEW .fnLoadAddr').text(result.addr1);
 		$('#ITP_FORM_STINFO02011_VIEW .fnDtlAddr').text(result.addr2);
+		
+		$('#ITP_FORM_STINFO02011_VIEW #ITP_FORM_STINFO02011_VIEW_LOTS_ADDRESS').val(result.lotsAddress);
+		$('#ITP_FORM_STINFO02011_VIEW #ITP_FORM_STINFO02011_VIEW_HJ_DONG').val(result.hjDong);
+		$('#ITP_FORM_STINFO02011_VIEW #ITP_FORM_STINFO02011_VIEW_BJ_DONG').val(result.bjDong);
+		
 
 		var cmpyAdres = result.addr1/* + ' ' + result.addr*/;
 		kakaoMap.init('ITP_FORM_STINFO02011_VIEW', cmpyAdres);
@@ -239,7 +244,7 @@ let modifyObj = {
 					}
 				}
 				
-				console.log(param);
+				//console.log(param);
 				var searhFn = function() {
 					ITP_FORM_STINFO02011_DETAIL_IS_WRITING = false;
 					viewObj.init();
@@ -296,6 +301,10 @@ let modifyObj = {
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_LOAN_MGNT_UNQ_NO').val(result.loanMgntUnqNo);
 		
 		
+		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_LOTS_ADDRESS').val(result.lotsAddress);
+		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_HJ_DONG').val(result.hjDong);
+		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_BJ_DONG').val(result.bjDong);
+		
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_LOAN_DVSN').attr('disabled', true);
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_LIMIT_AMT').attr('readonly', true);
 		

src/main/webapp/mobile/js/config.js

@@ -416,7 +416,7 @@ function fnSessionOut() { //1시간 동안 아무것도 안할때 또는 강제
 	fn_ajax_call('/api/session/expire', null, callbackFn, 'PATCH');
 }
 
-// 2021.07.07 송호성 추가
+
 function fn_call_popup(type, popnm, container,  popFn, args, returnType) {
 	/*console.log('[ITP_CALL_POPUP] type = ' + type + ', popnm = ' + popnm);*/
 	var contextPath = returnType === 'S' ? ITP_CONTEXTPATH : MOBILE_CONTEXTPATH;