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

src/main/webapp/app/ordmng/ORDMNG01010.html

@@ -38,14 +38,15 @@
 											</select>
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_ORDMNG01010_SEARCH_DLV_PLACE" class="form-control itp_input" name="sDlvPlace" placeholder="납품장소 (매장/창고)" />
+											<input type="text" id="ITP_FORM_ORDMNG01010_DETAIL_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="납품장소 (매장/창고)" />
+											<input type="hidden" id="ITP_FORM_ORDMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="swhsId"/>
 										</div>
 										<div class="col-xs-1 itp_in" style="padding-left: 5px; width:10%;">
-											<button type="button" id="ITP_BTN_ORDMNG01010_SEARCH_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_ORDMNG01010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
+											<button type="button" id="ITP_BTN_ORDMNG01010_SEARCH_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+											<button type="button" id="ITP_BTN_ORDMNG01010_DELETE_WHS_NM" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-5 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_ORDMNG01010_SEARCH_ITEM_NM" class="form-control itp_input" name="sItemNm" placeholder="발주번호/품목번호/품목명" />
+											<input type="text" id="ITP_FORM_ORDMNG01010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호/품목명" />
 										</div>
 									</div>
 								</form>

src/main/webapp/js/app/ordmng/ITP_ORDMNG01010.js

@@ -19,6 +19,14 @@ const ORDMNG01010_VIEW_GRID_EMPTY = '#ITP_ORDMNG01010_VIEW_jqGridEmpty';
 
 let ITP_COMMON_PCH_ODR_ST_CD = fn_make_common_cd_list(CODE_LIST, 'PCH_ODR_ST_CD', true, '발주상태코드');
 
+// 그리드 전화번호 '-' 함수
+function convertTel(value){
+	answer = (value.startsWith('0')) ? value.replace(/[^0-9]/g, "")
+			.replace(/(^02|^0505|^1[0-9]{3}|^0[0-9]{2})([0-9]+)?([0-9]{4})$/,"$1-$2-$3")
+			.replace("--", "-") : '';
+	return answer;
+}
+
 //API URL
 let API_POMNG_PO_SPPLY_PO_GRID_LIST = '/api/pomng/po/spply-po-grid-list';
 let API_POMNG_PO_INFO_SPPLY_PCHORD = '/api/pomng/po/info-spply-pchOdr';
@@ -225,6 +233,8 @@ let pageObj = {
             fn_show_btn_auth_array(['#ITP_BTN_ORDMNG01010_SRH', '#ITP_BTN_ORDMNG01010_NEWREG']);
             $('#ITP_AJAX_ORDMNG01010_LIST_CONTAINER').show();
             $('#ITP_FORM_ORDMNG01010_SEARCH #ITP_FORM_ORDMNG01010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
+            $('#ITP_BTN_ORDMNG01010_SEARCH_WHS_NM').show();
+            $('#ITP_BTN_ORDMNG01010_DELETE_WHS_NM').show();
         } else if(mode == 'ADD') { // 등록
             $('#ITP_AJAX_ORDMNG01010_DETAIL_CONTAINER').show();
             fn_show_btn_auth_array(['#ITP_BTN_ORDMNG01010_CANCELLIST', '#ITP_BTN_ORDMNG01010_SAVE']);
@@ -279,6 +289,7 @@ let pageObj = {
 let listObj = {
 	init: function() {
 		this.grid.init();
+		this.action();
 	},
 	itp_ORDMNG01010_param: {},
 	itp_ORDMNG01010_search: false,
@@ -307,6 +318,9 @@ let listObj = {
         push: function() {
             let param = $('#ITP_FORM_ORDMNG01010_SEARCH').serializeObject();
             listObj.itp_ORDMNG01010_param = param;
+            listObj.itp_ORDMNG01010_param.sbrandId = LOGIN_USER_INFO.brandId;
+            listObj.itp_ORDMNG01010_param.sspplyId = LOGIN_USER_INFO.spplyId;
+            listObj.itp_ORDMNG01010_param.sidx = '0';
         },
         back: function() {
             $('#ITP_FORM_ORDMNG01010_SERVICE_BRAND_TYPE').val(listObj.itp_ORDMNG01010_param.brandType);
@@ -331,7 +345,6 @@ let listObj = {
 		load: function() {
             let param = $('#ITP_FORM_ORDMNG01010_SEARCH').serializeObject();
             param.gridSize = $.jgrid.defaults.rowNum;
-            //param.sbrandId = LOGIN_USER_INFO.brandId;
             param.sspplyId = LOGIN_USER_INFO.spplyId;
             param.sidx = '0';
             console.log(JSON.stringify(param));
@@ -376,6 +389,38 @@ let listObj = {
 		unload: function() {
 			$.jgrid.gridUnload(ORDMNG01010_GRID_ID);
 		}
+	},
+    action: function() {
+		var _this = this;
+		// 납품장소 조회 버튼 클릭
+		$('#ITP_BTN_ORDMNG01010_SEARCH_WHS_NM').on('click', function() {
+			_this.popup();
+		});
+		// 납품장소 텍스트 삭제 버튼 클릭
+		$('#ITP_BTN_ORDMNG01010_DELETE_WHS_NM').on('click', function() {
+			$('#ITP_FORM_ORDMNG01010_DETAIL_WHS_NM').val('');
+			$('#ITP_FORM_ORDMNG01010_DETAIL_WHS_ID').val('');
+		});
+	},
+	popup: function() {
+		// 팝업
+		var popFn = this.callback.create;
+		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		console.log('here');
+		console.log(LOGIN_USER_INFO);
+		console.log(key);
+		fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
+		console.log('here3');
+	},
+	callback: {
+		create: function(rowDataPop) {
+			console.log('here2');
+			console.log(rowDataPop);
+			if(rowDataPop) {
+				$('#ITP_FORM_ORDMNG01010_DETAIL_WHS_NM').val(rowDataPop.whsNm);
+				$('#ITP_FORM_ORDMNG01010_DETAIL_WHS_ID').val(rowDataPop.whsId);
+			}
+		}
 	}
 };
 
@@ -418,12 +463,6 @@ let viewObj = {
 	callback: function(result) {
 		console.log(result);
 		
-		function convertTel(value){
-			answer = (value.startsWith('0')) ? value.replace(/[^0-9]/g, "")
-					.replace(/(^02|^0505|^1[0-9]{3}|^0[0-9]{2})([0-9]+)?([0-9]{4})$/,"$1-$2-$3")
-					.replace("--", "-") : '';
-			return answer;
-		}
 		let telNo = convertTel(result.podrMgrTelNo);
 		
 		pageObj.switchScreen('VIEW');