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

 소스 문제로 인한 한쪽 소스로 정리해서 올림.. 이후 자신이 작업한 파일부분은 복원해서 처리하면 됨
# Conflicts:
#	src/main/webapp/js/app/pomng/ITP_POMNG01010.js

src/main/webapp/app/pomng/POMNG01010.html

@@ -18,8 +18,7 @@
 								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_STORE_ID" name="storeId" value="">
 								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_LOAN_DVSN" name="loanDvsn" value="">
 								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_LOAN_MGNT_UNQ_NO" name="loanMgntUnqNo" value="">
-								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_PCH_REQ_DVSN" name="pchReqDvsn" value="">
-								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_PCH_REQ_ST_CD" name="pchReqStCd" value="">
+								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_pchReqDvsn" name="pchReqDvsn" value="">
 					
 								<section class="itp_form_sec">
 									<h4 class="itp_form_tit">구매요청정보</h4>
@@ -57,22 +56,22 @@
 									</div>
 									<div class="itp_form_in">	
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">납기요청일 *</label>
+											<label class="col-xs-2 itp_lb">납기요청일</label>
 												<div class="col-xs-4 itp_ip">
 													<div class="col-xs-4 itp_in">
 														<div class="input-daterange input-group date">
-															<input type="text" id="ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT" data-check-required="empty" class="form-control itp_input" name="dlvReqDt" value="">
+															<input type="text" id="ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT" class="form-control itp_input" name="dlvReqDt" value="">
 														</div>
 													</div>
 												</div>
-											<label class="col-xs-2 itp_lb">납품장소 *</label>
+											<label class="col-xs-2 itp_lb">납품장소</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-4 itp_in">
-													<input type="text" id="ITP_FORM_POMNG01010_DETAIL_WHS_NM" data-check-required="empty" class="form-control itp_input" name="whsNm" value="" />
+													<input type="text" id="ITP_FORM_POMNG01010_DETAIL_WHS_NM" class="form-control itp_input" name="whsNm" value="" />
 													<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" value="" />
 												</div>
 												<div class="col-xs-4 itp_in">
-													<input type="text" id="ITP_FORM_POMNG01010_DETAIL_LOCATION_NM" data-check-required="empty" class="form-control itp_input" name="locationNm" value="" />
+													<input type="text" id="ITP_FORM_POMNG01010_DETAIL_LOCATION_NM" class="form-control itp_input" name="locationNm" value="" />
 													<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_LOCATION" class="form-control itp_input" name="location" value="" />
 												</div>
 												<div class="col-xs-1 itp_in" style="width:23%; padding:0px;">
@@ -98,7 +97,7 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">비고</label>
 											<div class="col-xs-10 itp_ip">
-												<input type="text" id="ITP_FORM_POMNG01010_DETAIL_NOTE" class="form-control itp_input" name="note" value="" />
+												<input type="text" id="ITP_FORM_POMNG01010_DETAIL_NOTE" class="form-control itp_input" name="fnNote" value="" />
 											</div>
 										</div>
 									</div>

src/main/webapp/js/app/pomng/ITP_POMNG01010.js

@@ -0,0 +1,394 @@
+require(['config'], function() {
+	require([
+	], function($) {
+		pageObj.init();
+	});
+});
+
+/********************************************************
+ --------------------------------------------------------
+ - Object 목록								            -
+ --------------------------------------------------------
+ * const gridColModel = {}	: 화면 Grid Object			*
+ * let pageObj = {}			: 화면공통 Object			*
+ * let listObj = {}			: 목록화면 Object			*
+ * let viewObj = {}			: 상세화면 Object			*
+ * let modifyObj = {}		: 수정화면 Object			*
+ * let createObj = {}		: 신규화면 Object			*
+ *******************************************************/
+
+/*화면 변수*/
+/*
+const POMNG01010_GRID_ID = '#ITP_POMNG01010_jqGrid';
+const POMNG01010_GRID_LIST = '#ITP_POMNG01010_jqGrid_list';
+const POMNG01010_GRID_PAGER = '#ITP_POMNG01010_jqGridPager';
+const POMNG01010_GRID_EMPTY = '#ITP_POMNG01010_jqGridEmpty';
+
+const POMNG01010_VIEW_GRID_ID = '#ITP_POMNG01010_VIEW_jqGrid';
+const POMNG01010_VIEW_GRID_LIST = '#ITP_POMNG01010_VIEW_jqGrid_list';
+const POMNG01010_VIEW_GRID_PAGER = '#ITP_POMNG01010_VIEW_jqGridPager';
+const POMNG01010_VIEW_GRID_EMPTY = '#ITP_POMNG01010_VIEW_jqGridEmpty';
+*/
+const POMNG01010_DETAIL_GRID_ID = '#ITP_POMNG01010_DETAIL_jqGrid';
+const POMNG01010_DETAIL_GRID_LIST = '#ITP_POMNG01010_DETAIL_jqGrid_list';
+const POMNG01010_DETAIL_GRID_PAGER = '#ITP_POMNG01010_DETAIL_jqGridPager';
+const POMNG01010_DETAIL_GRID_EMPTY = '#ITP_POMNG01010_DETAIL_jqGridEmpty';  // ==>dwkim html확인필요
+
+/*
+let ITP_FORM_POMNG01010_DETAIL_IS_DUPLICATE = false;
+let ITP_FORM_POMNG01010_DETAIL_IS_WRITING = false;
+*/
+
+/*API URL*/
+let API_DETAIL_INIT_INFO = '/api/pomng/init-pchReq'
+//let API_DETAIL_GRID_LIST = '/api/affl/detail-grid-list';
+//let API_DETAIL_INFO = '/api/affl/info-affl';
+//let COMPANY_INFO_COMPANY = '/api/affl/info-affl';
+let API_DETAIL_SAVE = '/api/pomng/save-pchReq';
+//let API_CHECK_DUPLICATE = '/api/affl/check-duplicate';
+//let API_INTI_USERPW = '/api/user/inti-userpw';
+
+/*화면 Grid ColModel   ==>선택박스 항목 추가 부분  */
+const gridColModel = {
+	detail: [
+		{
+			index: 'VIEW_CD', name: 'viewCd',
+			label: ITP_MSG_LOCALE.label.viewCd,
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: true
+		},
+		{
+			index: 'ITEM_ID', name: 'itemId',
+			label: ITP_MSG_LOCALE.label.itemId,
+			width: '20', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text',
+			editrules: { required: true }
+		},
+		{
+			index: 'ITEM_NM', name: 'itemNm',
+			label: ITP_MSG_LOCALE.label.itemNm,
+			width: '30', fixed: false, align: 'center',
+			sortable: true, editable: false, edittype: 'text',
+			editrules: { required: true }
+		},
+		{
+			index: 'UNIT', name: 'unit',
+			label: ITP_MSG_LOCALE.label.unit,
+			width: '10', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text'
+		},
+		{
+			index: 'UNIT_AMT', name: 'unitAmt',
+			label: ITP_MSG_LOCALE.label.unitAmt,
+			width: '10', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text', hidden: false
+		},
+		{
+			index: 'PCH_REQ_QTY', name: 'pchReqQty',
+			label: ITP_MSG_LOCALE.label.pchReqQty, //단가
+			width: '10', fixed: false, align: 'right',
+			sortable: true, editable: true, edittype: 'text',
+			editrules: { number:true}
+		},
+		{
+			index: 'PCH_REQ_AMT', name: 'pchReqAmt',
+			label: ITP_MSG_LOCALE.label.pchReqAmt,
+			width: '10', fixed: false, align: 'right',
+			sortable: false, editable: false, edittype: 'text', hidden: false
+		},
+
+		{
+			index: 'BRAND_UNIT_UNQ_NO', name: 'brandUnitUnqNo',
+			label: ITP_MSG_LOCALE.label.brandUnitUnqNo,
+			width: '10', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text', hidden: true
+		},
+		{
+			index: 'STORE_UNIT_UNQ_NO', name: 'storeUnitUnqNo',
+			label: ITP_MSG_LOCALE.label.storeUnitUnqNo,
+			width: '10', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text', hidden: true
+		},
+		{
+			index: 'UNIT_GUBUN', name: 'unitGubun',
+			label: ITP_MSG_LOCALE.label.unitGubun,
+			width: '10', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text', hidden: true
+		}
+	]
+};
+
+/*화면공통 Object*/
+let pageObj = {
+	init: function() {
+		this.ui.init();
+		this.event.init();
+		this.action();
+	},
+	action: function () {
+		var _this = this;
+		// 납품장소 조회 버튼 클릭
+		$('#ITP_FORM_POMNG01010_SEARCH_WHS_NM').on('click', function() {
+			_this.popup();
+		});
+		// 납품장소 텍스트 삭제 버튼 클릭
+		$('#ITP_FORM_POMNG01010_DELETE_WHS_NM').on('click', function() {
+			$('#ITP_FORM_POMNG01010_DETAIL_WHS_NM').val('');
+			$('#ITP_FORM_POMNG01010_DETAIL_WHS_ID').val('');
+			$('#ITP_FORM_POMNG01010_DETAIL_LOCATION_NM').val('');
+			$('#ITP_FORM_POMNG01010_DETAIL_LOCATION').val('');
+			
+		});
+	},
+	popup: function () {
+		// 팝업
+		var popFn = this.callback.create;
+		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
+		
+	},
+	callback: {
+		create: function(rowDataPop) {
+			console.log(rowDataPop);
+			if(rowDataPop) {
+				$('#ITP_FORM_POMNG01010_DETAIL_WHS_NM').val(rowDataPop.whsNm);
+				$('#ITP_FORM_POMNG01010_DETAIL_WHS_ID').val(rowDataPop.whsId);
+				$('#ITP_FORM_POMNG01010_DETAIL_LOCATION_NM').val(rowDataPop.locationNm);
+				$('#ITP_FORM_POMNG01010_DETAIL_LOCATION').val(rowDataPop.location);
+			}
+		}
+	},
+	itp_POMNG01010_param: {},  // ==>dwkim 
+	itp_POMNG01010_search: false,  // ==>dwkim 
+	ui: {
+		init: function() {
+			this.view();
+			this.grid();
+			this.ready();
+		},
+		view: function() {
+			// 버튼 권한설정
+			fn_proc_btn_auth('POMNG01010');
+			
+			// 공통코드 표시
+			$('select').each(function() {
+				if ($(this).data('select-code')) {
+					fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
+				}
+			});
+
+			// 조회일자 지정
+			var now = new Date();
+			$('#ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT').datepicker('dlvReqDt', new Date(now.setDate(now.getDate() + 5)));
+			
+			//납품장소 필드 readonly
+			$('#ITP_FORM_POMNG01010_DETAIL_WHS_NM').attr('readonly', true);
+			$('#ITP_FORM_POMNG01010_DETAIL_LOCATION_NM').attr('readonly', true);
+			// form alert message 주입
+			/*
+			$('input[data-alert-required="ONLYCHK"]').each(function() {
+				if($(this).data('alert-msg') === 'address') {
+					$(this).data('alert-msg', ITP_MSG_LOCALE.message.form.emptyAddr);
+				}
+			});
+			*/
+		},
+		grid: function() {
+			itp_fn_jqgrid_resize(POMNG01010_DETAIL_GRID_ID, POMNG01010_DETAIL_GRID_LIST, 'lg');
+			//listObj.empty.init();
+			itp_fn_fire_window_resize();
+		},
+		ready: function() {
+			createObj.init();
+		}
+	},
+	event: {
+		init: function() {
+			this.button();
+		},
+		button: function() {
+			// 버튼 클릭 이벤트
+			$('button').each(function() {
+				var id = $(this).attr('id');
+				$(this).on('click', function() {
+					switch (id) {
+						case 'ITP_BTN_POMNG01010_SRH': modifyObj.button.save(); break;	// 구매요청
+						case 'ITP_BTN_POMNG01010_NEWREG': modifyObj.button.newReg(); break;	// 임시저장
+						case 'ITP_BTN_POMNG01010_DETAIL_ADDROW': pageObj.grid.button.addRow(); break;	// 품목추가
+						case 'ITP_BTN_POMNG01010_DETAIL_DELROW': pageObj.grid.button.delRow(); break;	// 품목삭제
+					}
+				});
+			});
+
+			$('body').on('click', function(e) {
+				// afflUserObj.grid.resetGrid(e);
+			});
+
+		}
+	},
+	grid: {
+		init: function(mode, gridData) {
+			this.mode = mode;
+			this.gridId = POMNG01010_DETAIL_GRID_ID;
+			this.unload();  // ==>dwkim 
+			this.load(gridData);
+		},
+		mode: 'DETAIL',
+		gridId: '',
+		button: {
+			addRow: function() {
+				// 팝업
+				var popFn = function(rowDataPop) {
+					console.log(rowDataPop);
+					// 기존등록 데이터
+					var exists = '';
+					const rowData = $(POMNG01010_DETAIL_GRID_ID).getRowData();
+					$.each(rowData, function(key, value) {
+						//exists = exists + value.itemId + ';';
+						exists = exists + value.brandUnitUnqNo + ';';
+					});
+
+					$.each(rowDataPop, function(key, value) {
+						// if (exists.indexOf(value.itemId) < 0 && value.podrPssblDvsn == 'PO01') {
+						if (exists.indexOf(value.brandUnitUnqNo) < 0 && value.podrPssblDvsn == 'PO01') {
+							value['viewCd'] = "C";
+							$(POMNG01010_DETAIL_GRID_ID).jqGrid('addRowData', value.brandUnitUnqNo, value, 'last');
+						}
+					});
+					$(POMNG01010_DETAIL_GRID_EMPTY).hide();
+				};
+				const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+				fn_call_popup('biz', 'BIZPOP_ITEM', '#ITP_ASIDE', popFn, key, 'S');  // ==>dwkim 추후 작업 진행  파라메타 설명필요
+			},
+			delRow: function() {
+				itp_fn_grid_del_row(POMNG01010_DETAIL_GRID_ID);
+				// 그리드 포문으로 금액 재계산후 구매요청금액에 넣어줌
+				this.load.recal();  //==>dwkim 왜 호출이 안될까요
+			}
+		},
+		load: function(gridData) {  // ==>dwkim  오픈시 데이타 가져오는 부분 넣으면 되는건지 여부 gird가 아님
+			var _this = this;
+			var option = {
+				gridId: this.gridId,
+				colModel: gridColModel.detail,
+				data: gridData,
+				multiselect: true,
+				cellEdit: true,
+				loadComplete: function(data) {
+					_this.clearData();
+				},
+				afterSaveCell: function(rowid,name,val,iRow,iCol) {
+					// 구매요청금액 계산 (기존금액과 )
+					var unitAmt = jQuery(POMNG01010_DETAIL_GRID_ID).jqGrid('getCell',rowid,iCol-1);
+					jQuery(POMNG01010_DETAIL_GRID_ID).jqGrid('setRowData',rowid,{pchReqAmt: parseInt(val)*parseInt(unitAmt)});
+					// 그리드 포문으로 금액 재계산후 구매요청금액에 넣어줌
+					_this.recal();
+				}
+			};
+			itp_fn_grid_make_local(option);
+		},
+		clearData: function() {
+			console.log(this.gridId);
+			$(POMNG01010_DETAIL_GRID_ID).jqGrid('clearGridData', true);
+			$(POMNG01010_DETAIL_GRID_LIST).find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'hidden');
+			$(POMNG01010_DETAIL_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
+			$(POMNG01010_DETAIL_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
+			$(POMNG01010_DETAIL_GRID_EMPTY).show();
+		},
+		recal: function() {
+			//PCH_REQ_AMT
+			const rowData = $(POMNG01010_DETAIL_GRID_ID).getRowData();
+			var pchReqAmt = 0 ;
+			$.each(rowData, function(key, value) {
+				if (value.pchReqAmt != null && value.pchReqAmt != "") {
+					pchReqAmt = pchReqAmt + parseInt(value.pchReqAmt) ;
+				}
+				
+			});
+			$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text(pchReqAmt);
+		},
+		unload: function() {
+			$.jgrid.gridUnload(this.gridId);
+		}
+	}
+};
+
+/*신규화면 Object*/
+let createObj = {
+	init: function() {
+		$('#ITP_FORM_POMNG01010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
+		$('#ITP_FORM_POMNG01010_DETAIL_STORE_ID').val(fn_make_user_info.get('storeId'));
+		//let param = 'brandId=' + LOGIN_USER_INFO.brandId + "&spplyId=" + LOGIN_USER_INFO.spplyId;
+		this.load();
+	},
+	button: {
+		save: function() {
+			const formId = '#ITP_FORM_POMNG01010_DETAIL';
+			itp_fn_form_clear_validate(null, formId);
+
+			// if (vali_cmpyCd && vali_cmpyStatCd && vali_cmpyTypeCd && vali_cmpyNm && vali_bossNm && vali_mainTel && vali_mainEmail) {
+			if (itp_fn_form_event.isValid(formId)) {
+
+				// if($('#ITP_FORM_POMNG01010_DETAIL_CMPY_ZIPNO').val() === '' || $('#ITP_FORM_POMNG01010_DETAIL_CMPY_ADRES').val() === '') {
+				// 	itp_fn_modal_alert('주소 검색을 통해 회사 주소를 입력하세요.');
+				// 	return;
+				// }
+
+				if (ITP_FORM_POMNG01010_DETAIL_IS_DUPLICATE) {
+					itp_fn_modal_duplicate('회사코드 중복체크를 해주세요.', formId + '_AFFL_SHOP_ID');
+				} else {
+					let gridInsertData = [];
+					let gridUpdateData = [];
+					let gridDeleteData = [];
+					const rowData = $(POMNG01010_DETAIL_GRID_ID).getRowData();
+					const keyValue = $(formId + '_AFFL_SHOP_ID').val();
+					$.each(rowData, function(key, value) {
+						if (value.viewCd !== 'R') {
+							value.afflShopId = keyValue;
+							if (value.viewCd === 'C') {
+								gridInsertData.push(value);
+							} else if (value.viewCd === 'U') {
+								gridUpdateData.push(value);
+							} else if (value.viewCd === 'D') {
+								gridDeleteData.push(value);
+							}
+						}
+					});
+
+					let param = $(formId).serializeObject();
+					param.gridInsertData = gridInsertData;
+					param.gridUpdateData = gridUpdateData;
+					param.gridDeleteData = gridDeleteData;
+					console.log(JSON.stringify(param));
+					var searhFn = function() {
+						ITP_FORM_POMNG01010_DETAIL_IS_WRITING = false;
+						viewObj.init();
+					};
+					fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
+				}
+			}
+		}
+	},
+	load: function() {
+		fn_ajax_call(API_DETAIL_INIT_INFO, '', this.callback, 'GET');
+	},
+	callback: function(result) {
+		console.log(result);
+
+		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_VIEW_CD').val('C');
+
+		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_BRAND_ID').val(result.brandId);
+		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_STORE_ID').val(result.storeId);
+		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_LOAN_DVSN').val(result.loanDvsn);
+		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_LOAN_MGNT_UNQ_NO').val(result.loanMgntUnqNo);
+		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_PCH_REQ_DVSN').val(result.pchReqDvsn);
+		$('#ITP_FORM_POMNG01010_DETAIL .fnBrandNm').text(result.brandNm);
+		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqDept').text(result.reqDept);
+		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqMgrNm').text(result.userNm);
+		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text("0");
+		$('#ITP_FORM_POMNG01010_DETAIL .fnLoanDvsnNm').text(result.loanDvsnNm);
+		$('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text(result.ordUseAmt);
+
+		pageObj.grid.init();
+	}
+};

src/main/webapp/js/app/popup/biz/ITP_BIZPOP_AFFL_SHOP.js

@@ -41,15 +41,6 @@ function itp_fn_BIZPOP_AFFL_SHOP(parentPopFn, args, returnType) {
 	    const selRow = $(THIS_GIRD_ID).getRowData(rowKey);
 	    console.log(selRow);
 
-		var list = [];
-	    var selectedIds = $(THIS_GIRD_ID).getGridParam('selarrrow');
-		for (var i=selectedIds.length-1; i>=0; i--) {
-			list.push($(THIS_GIRD_ID).jqGrid('getRowData', selectedIds[i]));	
-		}
-		parentPopFn(list);
-		$('#ITP_BIZPOP_WHS_LOCATION').modal('hide'); // 팝업닫기
-		
-/*
 		var afflData = {};
 		var callbackFn = function(result) {
 			afflData['AFFL_SHOP'] = selRow;
@@ -59,7 +50,6 @@ function itp_fn_BIZPOP_AFFL_SHOP(parentPopFn, args, returnType) {
 		};
 		var param = {'afflShopId': selRow.afflShopId};
 		fn_ajax_call(BRAND_POP_GRID_LIST, param, callbackFn, 'GET');
-		*/
 	});
 
 	$('#ITP_BIZPOP_AFFL_SHOP_jqGridEmpty').on('click', function() {

src/main/webapp/js/app/popup/biz/ITP_BIZPOP_WHS_LOCATION.js

@@ -42,11 +42,21 @@ function itp_fn_BIZPOP_WHS_LOCATION(parentPopFn, args, returnType) {
 	    if (!rowKey) {
 	    	return;
 	    }
-	
-		const selRow = $(THIS_GIRD_ID).getRowData(rowKey);
-		parentPopFn(selRow);
+
+		var list = [];
+	    var selectedIds = $(THIS_GIRD_ID).getGridParam('selarrrow');
 		
-	
+		/*
+		if(selectedIds.length != 1) { // 1개만 선택
+			 itp_fn_modal_alert('하나의 창고만 선택해주세요!');
+			 return;
+		}
+		*/
+		
+	    for (var i=selectedIds.length-1; i>=0; i--) {
+			list.push($(THIS_GIRD_ID).jqGrid('getRowData', selectedIds[i]));	
+		}
+		parentPopFn(list);
 		$('#ITP_BIZPOP_WHS_LOCATION').modal('hide'); // 팝업닫기
 	});
 

src/main/webapp/mobile/app/main.html

@@ -179,9 +179,6 @@
 			</div>
 			<div id="ITP_CONTAINER" class="fix">
 				<div class="itp_mobile_contents">
-				<section>
-				  
-				</section>
 
 				</div>
 			</div>

src/main/webapp/mobile/app/mloanmng/MLOANMNG01010.html

@@ -1,21 +1,20 @@
+<link rel="stylesheet" href="/style.css">
 <section>
-  <div id="ITP_AJAX_MLOANMNG01010_VIEW_CONTAINER" style="display: none;" >
+  <div id="ITP_AJAX_MLOANMNG01010_VIEW_CONTAINER" style="display: block;" >
     <div class="content">
       <div class="line">
         <label>매장선택</label>
-        <div class="search_wrap">
-	        <div class="float_left">
-	          <input id="ITP_FORM_MLOANMNG01010_VIEW" type="text" placeholder="A매장명">
-	        </div>
-	        <div class="float_left_btn">
-	          <button id="ITP_BTN_MLOANMNG01010"><img src="../img/search.png" alt=""></button>
-	          <button id="ITP_BTN_MLOANMNG01010"><img src="../img/delete.png" alt=""></button>
-	        </div>
+        <div class="float_left">
+          <input id="ITP_FORM_MLOANMNG01010_VIEW" type="text" placeholder="A매장명">
+        </div>
+        <div class="float_left_btn">
+          <button id="ITP_BTN_MLOANMNG01010"><img src="/img/search.png" alt=""></button>
+          <button id="ITP_BTN_MLOANMNG01010"><img src="/img/delete.png" alt=""></button>
         </div>
       </div>
       <div class="line">
         <label>정산타입</label>
-        <div class="line_right">
+        <div class="float_left">
           <select name="" id="ITP_FORM_MLOANMNG01010_VIEW">
             <option value=""></option>
           </select>
@@ -23,13 +22,13 @@
       </div>
       <div class="line">
         <label>사용여부</label>
-        <div class="line_right">
+        <div class="float_left">
           <select name="" id="ITP_FORM_MLOANMNG01010_VIEW">
             <option value=""></option>
           </select>
         </div>
       </div>
-      <div class="line" style="height:45px;">
+      <div class="line">
         <div class="search">
           <button id="ITP_BTN_MLOANMNG01010" class="btn-primary btn-sm ADB">검색</button>
         </div>
@@ -87,42 +86,42 @@
       </li>
     </div>
   </div>
-  <div id="ITP_AJAX_MLOANMNG01010_DETAIL_CONTAINER" style="display: block;">
+  <div id="ITP_AJAX_MLOANMNG01010_DETAIL_CONTAINER" style="display: none;">
     <div class="content">
       <div class="line">
         <label>매장명</label>
         <div class="line_right">
-          <input class="mg0" id="ITP_FORM_MLOANMNG01010_DETAIL" type="text" placeholder="A매장명">
+          <input id="ITP_FORM_MLOANMNG01010_DETAIL" type="text" placeholder="A매장명">
         </div>      
       </div>
       <div class="line">
-        <label>정산타입/사용여부</label>
+        <label class="col_6">정산타입/사용여부</label>
         <div class="line_right">
-          <input class="mg0" id="ITP_FORM_MLOANMNG01010_DETAIL" type="text" >
+          <input id="ITP_FORM_MLOANMNG01010_DETAIL" type="text" >
         </div>
       </div>
       <div class="line">
         <label>한도금액</label>
         <div class="line_right">
-          <input class="mg0" id="ITP_FORM_MLOANMNG01010_DETAIL" type="text" >
+          <input id="ITP_FORM_MLOANMNG01010_DETAIL" type="text" >
         </div>
       </div>
       <div class="line">
         <label>가용한도금액</label>
         <div class="line_right">
-          <input class="mg0" id="ITP_FORM_MLOANMNG01010_DETAIL" type="text" >
+          <input id="ITP_FORM_MLOANMNG01010_DETAIL" type="text" >
         </div>
       </div>
       <div class="line">
         <label>가수금액</label>
         <div class="line_right">
-          <input class="mg0" id="ITP_FORM_MLOANMNG01010_DETAIL" type="text" >
+          <input id="ITP_FORM_MLOANMNG01010_DETAIL" type="text" >
         </div>
       </div>
       <div class="line">
         <label>사용금액</label>
         <div class="line_right">
-          <input class="mg0" id="ITP_FORM_MLOANMNG01010_DETAIL" type="text" >
+          <input id="ITP_FORM_MLOANMNG01010_DETAIL" type="text" >
         </div>
       </div>
       <div class="line">
@@ -133,7 +132,7 @@
           <input id="ITP_FORM_MLOANMNG01010_DETAIL" class="year" type="date">
         </div>
       </div>
-      <div class="line" style="height:50px;">
+      <div class="line">
         <div class="search">
           <button id="ITP_BTN_MLOANMNG01010" class="btn-primary btn-sm ADB">검색</button>
         </div>
@@ -143,7 +142,7 @@
       </div>
     </div>
     <div class="scroll_area row-6">
-      <li class="history_list4">
+      <li class="history_list">
         <div>
           <div class="detail_line">
             <div class="detail_left">

src/main/webapp/mobile/app/mloanmng/MLOANMNG02010.html

@@ -1,3 +1,4 @@
+<link rel="stylesheet" href="/style.css">
 <section>
   <div class="popup2" style="display:none; background: transparent;">
     <div class="pop">
@@ -6,66 +7,52 @@
           <label>> 입금등록</label>
         </div>
         <div class="header_right">
-          <button id="ITP_BTN_MLOANMNG02010"><img src="../img/close.png"></button>
+          <button id="ITP_BTN_MLOANMNG02010"><img src="/img/close.png"></button>
         </div>
       </div>
       <div class="content">
         <div class="line">
           <label>브랜드명</label>
-          <div class="search_wrap">
-	          <div class="float_right">
-	            <input id="ITP_FORM_MLOANMNG02010" type="text" placeholder="A 브랜드명">
-	          </div>
+          <div class="float_right">
+            <input id="ITP_FORM_MLOANMNG02010" type="text" placeholder="A 브랜드명">
           </div>
         </div>
         <div class="line">
           <label>매장명</label>
-          <div class="search_wrap">
-	          <div class="float_right">
-	            <input id="ITP_FORM_MLOANMNG02010" type="text" placeholder="A매장명">
-	          </div>
+          <div class="float_right">
+            <input id="ITP_FORM_MLOANMNG02010" type="text" placeholder="A매장명">
           </div>
         </div>
         <div class="line">
           <label>입금금액</label>
-          <div class="search_wrap">
-	          <div class="float_right">
-	            <input id="ITP_FORM_MLOANMNG02010" type="text" >
-	          </div>	
+          <div class="float_right">
+            <input id="ITP_FORM_MLOANMNG02010" type="text" >
           </div>
         </div>
         <div class="line">
           <label>입금일자</label>
-          <div class="search_wrap">
-	          <div class="float_right">
-	            <input id="ITP_FORM_MLOANMNG02010" style="width:178px;" type="date">
-	          </div>
+          <div class="float_right">
+            <input id="ITP_FORM_MLOANMNG02010" type="date" style="width: 387px;">
           </div>
         </div>
         <div class="line">
           <label>입금자명</label>
-          <div class="search_wrap">
-	          <div class="float_right">
-	            <input id="ITP_FORM_MLOANMNG02010" type="text" >
-	          </div>
+          <div class="float_right">
+            <input id="ITP_FORM_MLOANMNG02010" type="text" >
           </div>
         </div>
         <div class="line">
           <label>입금은행</label>
-          <div class="search_wrap">
-	          <div class="float_right">
-	            <select name="" id="ITP_FORM_MLOANMNG02010" style="width:178px;">
-	              <option value="">은행코드 선택</option>
-	            </select>
-	          </div>
+          <div class="float_right">
+            <select name="" id="ITP_FORM_MLOANMNG02010" style="width: 387px;">
+              <option value="">은행코드 선택</option>
+            </select>
           </div>
         </div>
         <div class="line">
           <label>입금계좌번호</label>
-          <div class="search_wrap">
-	          <div class="float_right">
-	            <input id="ITP_FORM_MLOANMNG02010" type="text" >
-	          </div>
+          <div class="float_right">
+            <input id="ITP_FORM_MLOANMNG02010" type="text" >
           </div>
         </div>
         <div class="line">
@@ -82,20 +69,20 @@
           <label>> 입금요청반려</label>
         </div>
         <div class="header_right">
-          <button id="ITP_BTN_MLOANMNG02010"><img src="../img/close.png"></button>
+          <button id="ITP_BTN_MLOANMNG02010"><img src="/img/close.png"></button>
         </div>
       </div>
       <div class="content">
         <div class="line">
           <label>브랜드명</label>
           <div class="float_left">
-            <div class="fn color-gray">A 브랜드명</div>
+            <div class="fn">A 브랜드명</div>
           </div>
         </div>
         <div class="line">
           <label>매장명</label>
           <div class="float_left">
-            <div class="fn color-gray">A 매장명</div>
+            <div class="fn">A 매장명</div>
           </div>
         </div>
         <div class="line">
@@ -128,7 +115,7 @@
             <div class="fn">11122233333344</div>
           </div>
         </div>
-        <div class="line" style="height: 140px;">
+        <div class="line" style="height: 350px;">
           <label>반려사유</label>
           <div class="float_left note">
             <textarea  class="fn" cols="30" rows="10"></textarea>       
@@ -146,19 +133,17 @@
     <div class="content">
       <div class="line">
         <label>반품장소</label>
-        <div class="search_wrap">
-	        <div class="float_left">
-	          <input id="ITP_FORM_MLOANMNG02010" type="text" placeholder="A매장명">
-	        </div>
-	        <div class="float_left_btn">
-	          <button id="ITP_BTN_MLOANMNG02010"><img src="../img/search.png" alt=""></button>
-	          <button id="ITP_BTN_MLOANMNG02010"><img src="../img/delete.png" alt=""></button>
-	        </div>
+        <div class="float_left">
+          <input id="ITP_FORM_MLOANMNG02010" type="text" placeholder="A매장명">
+        </div>
+        <div class="float_left_btn">
+          <button id="ITP_BTN_MLOANMNG02010"><img src="/img/search.png" alt=""></button>
+          <button id="ITP_BTN_MLOANMNG02010"><img src="/img/delete.png" alt=""></button>
         </div>
       </div>
       <div class="line">
         <label>반품발주상태</label>
-        <div class="line_right">
+        <div class="float_left">
           <select name="" id="ITP_FORM_MLOANMNG02010">
             <option value=""></option>
           </select>
@@ -183,16 +168,16 @@
       </div>
     </div>
     <div class="scroll_area row-2">
-      <li class="history_list" style="padding:0;">
+      <li class="history_list">
         <div class="button_right">
           <button id="ITP_BTN_MLOANMNG02010" class="btn-primary AGR">승인</button>
           <button id="ITP_BTN_MLOANMNG02010" class="btn-danger RJT">반려</button>
         </div>
-        <div class="left btn">
+        <div class="left">
           <div class="nomal">
             <label class="col_0">매장명&nbsp;&nbsp;&nbsp;:&nbsp;</label>
-            <div class="col_5 history">
-              <div class="fn col_5">A매장</div>
+            <div class="history">
+              <div class="fn">A매장</div>
             </div>
             <label class="col_0">입금일자&nbsp;:</label>
             <div class="history">
@@ -200,11 +185,11 @@
             </div>
           </div>
         </div>
-        <div class="left btn">
+        <div class="left">
           <div class="nomal">
             <label class="col_0">입금금액&nbsp;:</label>
-            <div class="col_5 history">
-              <div class="col_5 fn">1,000,000</div>
+            <div class="history">
+              <div class="fn">1,000,000</div>
             </div>
             <label class="col_0">입금자&nbsp;:</label>
             <div class="history">
@@ -212,7 +197,7 @@
             </div>
           </div>
         </div>
-        <div class="left btn">
+        <div class="left">
           <div class="nomal">
             <label class="col_0">입금정보&nbsp;:</label>
             <div class="history">
@@ -221,7 +206,7 @@
             </div>
           </div>
         </div>
-        <div class="left btn">
+        <div class="left">
           <div class="nomal">
             <label class="col_0">처리결과&nbsp;:</label>
             <div class="history">

src/main/webapp/mobile/app/mpomng/MPOMNG01010.html

@@ -1,5 +1,5 @@
 <section id="ITP_MOBILE_MPOMNG01010">
-  <div id="ITP_POP_MPOMNG01010_REQ_CONFIRM" class="popup mobile-pop-close" style="display: none;">
+  <div id="ITP_POP_MPOMNG01010_REQ_CONFIRM" class="popup mobile-popup-div" style="display: none;">
     <div class="pop">
       <div class="pop_line">
         <label>납품요청일 &nbsp;&nbsp;:</label>
@@ -20,7 +20,7 @@
       </div>
     </div>
   </div>
-  <div id="ITP_POP_MPOMNG01010_WHS_NM" class="popup2 mobile-pop-close" style="display: none;">
+  <div id="ITP_POP_MPOMNG01010_WHS_NM" class="popup2 mobile-popup-div" style="display: none;">
     <div class="pop">
       <div class="header">
         <div class="header_left">

src/main/webapp/mobile/app/mrtnmng/MRTNMNG02010.html

@@ -1,5 +1,6 @@
+<link rel="stylesheet" href="/style.css">
 <section>
-  <div id="ITP_AJAX_MRTNMNG02010_VIEW_CONTAINER" style="display: none;">
+  <div id="ITP_AJAX_MRTNMNG02010_VIEW_CONTAINER" style="display:block;">
     <div class="content">
         <div class="line">
           <label>반품요청일</label>
@@ -11,7 +12,7 @@
       </div>
       <div class="line">
         <label>반품요청상태</label>
-        <div class="line_right">
+        <div class="float_left">
           <select class="stcd" name="" id="ITP_FORM_MRTNMNG02010_VIEW">
             <option value="">상태</option>
           </select>
@@ -19,17 +20,15 @@
       </div>
       <div class="line">
         <label>반품장소</label>
-        <div class="search_nm">
-	        <div class="float_left">
-	          <input id="ITP_FORM_MRTNMNG02010_VIEW" class="fn" type="text" placeholder="A매장명">
-	        </div>
-	        <div class="float_left_btn">
-	          <button id="ITP_BTN_MRTNMNG02010"><img src="../img/search.png" alt=""></button>
-	          <button id="ITP_BTN_MRTNMNG02010"><img src="../img/delete.png" alt=""></button>
-	        </div>
-      	</div>   
+        <div class="float_left">
+          <input id="ITP_FORM_MRTNMNG02010_VIEW" class="fn" type="text" placeholder="A매장명">
+        </div>
+        <div class="float_left_btn">
+          <button id="ITP_BTN_MRTNMNG02010"><img src="/img/search.png" alt=""></button>
+          <button id="ITP_BTN_MRTNMNG02010"><img src="/img/delete.png" alt=""></button>
+        </div>
       </div>
-      <div class="line" style="height:45px;">
+      <div class="line">
         <div class="search">
           <button id="ITP_BTN_MRTNMNG02010" class="btn-primary btn-sm ADB">검색</button>
         </div>
@@ -74,7 +73,7 @@
       </li>
     </div>
   </div>
-  <div id="ITP_AJAX_MRTNMNG02010_DETAIL_CONTAINER" style="display: block;">
+  <div id="ITP_AJAX_MRTNMNG02010_DETAIL_CONTAINER" style="display: none;">
     <div class="content">
       <div class="line">
         <label>반품요청일</label>
@@ -100,19 +99,19 @@
     </div>
     <div class="scroll_area row-1" >
       <li>
-        <div class="left_info">
+        <div class="left">
           <div class="thick">
-            <div class="fnItemNm">품목명</div>
+            <div class="fn">품목명</div>
             <div>-</div>
-            <div class="fnUnit">2EA</div>
+            <div class="fn">2EA</div>
           </div>
-          <div class="thick">
+          <div class="nomal">
             <label class="space0">반품가 :</label>
-            <div class="fnPchActAmt">1,120,000</div>
+            <div class="fn">1,120,000</div>
           </div>
         </div>
         <div class="right">
-          <div class="num fnNum">2</div>
+          <div class="fn num">2</div>
         </div>
       </li>
     </div>

src/main/webapp/mobile/app/mrtnmng/MRTNMNG03010.html

@@ -1,5 +1,6 @@
+<link rel="stylesheet" href="/style.css">
 <section>
-  <div id="ITP_AJAX_MRTNMNG03010_VIEW_CONTAINER" style="display: none;">
+  <div id="ITP_AJAX_MRTNMNG03010_VIEW_CONTAINER" style="display: block;">
     <div class="content">
       <div class="line">
         <label>반품발주일자</label>
@@ -11,7 +12,7 @@
       </div>
       <div class="line">
         <label>반품발주상태</label>
-        <div class="line_right">
+        <div class="float_left">
           <select name="" id="ITP_FORM_MRTNMNG03010_VIEW">
             <option value=""></option>
           </select>
@@ -19,29 +20,25 @@
       </div>
       <div class="line">
         <label>반품장소</label>
-        <div class="search_nm">
-	        <div class="float_left">
-	          <input id="ITP_FORM_MRTNMNG03010_VIEW" type="text" placeholder="A매장명">
-	        </div>
-	        <div class="float_left_btn">
-	          <button id="ITP_BTN_MRTNMNG03010"><img src="../img/search.png" alt=""></button>
-	          <button id="ITP_BTN_MRTNMNG03010"><img src="../img/delete.png" alt=""></button>
-	        </div>
+        <div class="float_left">
+          <input id="ITP_FORM_MRTNMNG03010_VIEW" type="text" placeholder="A매장명">
+        </div>
+        <div class="float_left_btn">
+          <button id="ITP_BTN_MRTNMNG03010"><img src="/img/search.png" alt=""></button>
+          <button id="ITP_BTN_MRTNMNG03010"><img src="/img/delete.png" alt=""></button>
         </div>
       </div>
       <div class="line">
         <label>반품입고장소</label>
-        <div class="search_nm">
-	        <div class="float_left">
-	          <input id="ITP_FORM_MRTNMNG03010_VIEW" type="text" placeholder="A공급업체명">
-	        </div>
-	        <div class="float_left_btn">
-	          <button id="ITP_BTN_MRTNMNG03010"><img src="../img/search.png" alt=""></button>
-	          <button id="ITP_BTN_MRTNMNG03010"><img src="../img/delete.png" alt=""></button>
-        	</div>
-        </div>	
+        <div class="float_left">
+          <input id="ITP_FORM_MRTNMNG03010_VIEW" type="text" placeholder="A공급업체명">
+        </div>
+        <div class="float_left_btn">
+          <button id="ITP_BTN_MRTNMNG03010"><img src="/img/search.png" alt=""></button>
+          <button id="ITP_BTN_MRTNMNG03010"><img src="/img/delete.png" alt=""></button>
+        </div>
       </div>
-      <div class="line" style="height:50px;">
+      <div class="line">
         <div class="search">
           <button id="ITP_BTN_MRTNMNG03010" class="btn-primary btn-sm ADB">검색</button>
         </div>
@@ -64,8 +61,8 @@
         <div class="left">
           <div class="nomal">
             <label class="col_2">반품발주상태&nbsp;:</label>
-            <div class="col_5">
-              <div class="col_5 fn">대기</div>
+            <div>
+              <div class="fn">대기</div>
             </div>
             <label>납품장소명&nbsp;:</label>
             <div>
@@ -94,7 +91,7 @@
       </li>
     </div>
   </div>
-  <div id="ITP_AJAX_MRTNMNG03010_DETAIL_CONTAINER" style="display: block;">
+  <div id="ITP_AJAX_MRTNMNG03010_DETAIL_CONTAINER" style="display: none;">
     <div class="content">
       <div class="line">
         <label>반품발주일자</label>
@@ -127,29 +124,30 @@
     <div class="scroll_area row-2">
       <li>
         <div>
-          <div class="left_info col-4">
-            <div class="thick">
-              <div class="fnItemNm">품목명</div>
+          <div class="detail_left">
+            <div class="detail_info">
+              <div class="fn">품목명</div>
               <i>-</i>
-              <div class="fnUnit">2EA</div>
+              <div class="fn">2EA</div>
             </div>
           </div>
-          <div class="left_info col-6">
-            <div class="thick">
+          <div class="detail_right">
+            <div class="detail_info">
               <label>수량/금액</label>
               <div class="fn">2</div>
               <i>/</i>
               <div class="fn">24,000</div>
             </div>
           </div>
-          <div class="left_info col-4">
-            <div class="thick">
-              <label style="margin:0;">구매가 :</label>
-              <div class="fnPchActAmt">12,000</div>
+
+          <div class="detail_left">
+            <div class="detail_info">
+              <label class="space0">구매가 &nbsp;:&nbsp;</label>
+              <div class="fn">12,000</div>
             </div>
           </div>
-          <div class="left_info col-6">
-            <div class="thick">
+          <div class="detail_right">
+            <div class="detail_info">
               <label>납기요청일&nbsp;:&nbsp;</label>
               <div class="fn">2022.10.01</div>
             </div>

src/main/webapp/mobile/app/mrtnmng/MRTNMNG04010.html

@@ -1,15 +1,16 @@
+<link rel="stylesheet" href="/style.css">
 <section>
   <div id="ITP_AJAX_MRTNMNG04010_VIEW_CONTAINER" style="display: block;">
     <div class="content">
       <div class="line">
         <label>반품예정일</label>
-        <div class="line_right">
+        <div class="float_left">
           <input id="ITP_FORM_MRTNMNG04010_VIEW" class="date2" type="date" placeholder="">
         </div>
       </div>
       <div class="line">
         <label>반품서번호</label>
-        <div class="line_right">
+        <div class="float_left">
           <select name="" id="ITP_FORM_MRTNMNG04010_VIEW">
             <option value=""></option>
           </select>
@@ -17,37 +18,31 @@
       </div>
       <div class="line">
         <label>반품입고장소</label>
-        <div class="search_wrap">
-	        <div class="float_left">
-	          <input id="ITP_FORM_MRTNMNG04010_VIEW" type="text" placeholder="A공급업체명">
-	        </div>
-	        <div class="float_left_btn">
-	          <button id="ITP_BTN_MRTNMNG04010"><img src="../img/search.png" alt=""></button>
-	          <button id="ITP_BTN_MRTNMNG04010"><img src="../img/delete.png" alt=""></button>
-	        </div>
+        <div class="float_left">
+          <input id="ITP_FORM_MRTNMNG04010_VIEW" type="text" placeholder="A공급업체명">
+        </div>
+        <div class="float_left_btn">
+          <button id="ITP_BTN_MRTNMNG04010"><img src="/img/search.png" alt=""></button>
+          <button><img src="/img/delete.png" alt=""></button>
         </div>
       </div>
       <div class="line">
         <label>반품장소</label>
-        <div class="search_wrap">
-	        <div class="float_left">
-	          <input id="ITP_FORM_MRTNMNG04010_VIEW" type="text" placeholder="A매장명">
-	        </div>
-	        <div class="float_left_btn">
-	          <button id="ITP_BTN_MRTNMNG04010"><img src="../img/search.png" alt=""></button>
-	          <button id="ITP_BTN_MRTNMNG04010"><img src="../img/delete.png" alt=""></button>
-	        </div>
-      	</div>  
+        <div class="float_left">
+          <input id="ITP_FORM_MRTNMNG04010_VIEW" type="text" placeholder="A매장명">
+        </div>
+        <div class="float_left_btn">
+          <button id="ITP_BTN_MRTNMNG04010"><img src="/img/search.png" alt=""></button>
+          <button id="ITP_BTN_MRTNMNG04010"><img src="/img/delete.png" alt=""></button>
+        </div>
       </div>
       <div class="line">
         <label>반품품목명</label>
-       	<div class="search_wrap">
-	        <div class="float_left">
-	          <input id="ITP_FORM_MRTNMNG04010_VIEW" style="width: 262px;" type="text" placeholder="A매장명">
-	        </div>
-  	  	</div>   
+        <div class="float_left">
+          <input id="ITP_FORM_MRTNMNG04010_VIEW" style="width: 600px;" type="text" placeholder="A매장명">
+        </div>
       </div>
-      <div class="line" style="height:50px;">
+      <div class="line">
         <div class="search">
           <button id="ITP_BTN_MRTNMNG04010" class="btn-primary btn-sm ADB">검색</button>
         </div>
@@ -97,8 +92,8 @@
         <div class="left">
           <div class="nomal">
             <label class="col_2">반품요청수량</label>
-            <div class="col_5 history">
-              <div class="col_5 fn">10</div>
+            <div class="history">
+              <div class="fn">10</div>
             </div>
             <label class="col_0">반품발주수량</label>
             <div class="history">

src/main/webapp/mobile/app/mrtnmng/MRTNMNG05010.html

@@ -1,3 +1,4 @@
+<link rel="stylesheet" href="/style.css">
 <section>
   <div id="ITP_AJAX_MRTNMNG05010_VIEW_CONTAINER">
     <div class="content">
@@ -13,43 +14,37 @@
       </div>
       <div class="line">
         <label>반품발주번호</label>
-        <div class="line_right">
+        <div class="float_left">
           <input id="ITP_FORM_MRTNMNG05010_VIEW" type="text">
         </div>
       </div>
       <div class="line">
         <label>반품입고장소</label>
-        <div class="search_wrap">
-	        <div class="float_left">
-	          <input id="ITP_FORM_MRTNMNG05010_VIEW" type="text" placeholder="A공급업체명">
-	        </div>
-	        <div class="float_left_btn">
-	          <button id="ITP_BTN_MRTNMNG05010"><img src="../img/search.png" alt=""></button>
-	          <button id="ITP_BTN_MRTNMNG05010"><img src="../img/delete.png" alt=""></button>
-	        </div>
+        <div class="float_left">
+          <input id="ITP_FORM_MRTNMNG05010_VIEW" type="text" placeholder="A공급업체명">
+        </div>
+        <div class="float_left_btn">
+          <button id="ITP_BTN_MRTNMNG05010"><img src="/img/search.png" alt=""></button>
+          <button id="ITP_BTN_MRTNMNG05010"><img src="/img/delete.png" alt=""></button>
         </div>
       </div>
       <div class="line">
         <label>반품장소</label>
-        <div class="search_wrap">
-	        <div class="float_left">
-	          <input id="ITP_FORM_MRTNMNG05010_VIEW" type="text" placeholder="A매장명">
-	        </div>
-	        <div class="float_left_btn">
-	          <button id="ITP_BTN_MRTNMNG05010"><img src="../img/search.png" alt=""></button>
-	          <button id="ITP_BTN_MRTNMNG05010"><img src="../img/delete.png" alt=""></button>
-	        </div>
+        <div class="float_left">
+          <input id="ITP_FORM_MRTNMNG05010_VIEW" type="text" placeholder="A매장명">
+        </div>
+        <div class="float_left_btn">
+          <button id="ITP_BTN_MRTNMNG05010"><img src="/img/search.png" alt=""></button>
+          <button id="ITP_BTN_MRTNMNG05010"><img src="/img/delete.png" alt=""></button>
         </div>
       </div>
       <div class="line">
         <label>품목명</label>
-        <div class="search_wrap">
-	        <div class="float_left">
-	          <input id="ITP_FORM_MRTNMNG05010_VIEW" style="width: 262px;" type="text" placeholder="A매장명">
-	        </div>
+        <div class="float_left">
+          <input id="ITP_FORM_MRTNMNG05010_VIEW" style="width: 600px;" type="text" placeholder="A매장명">
         </div>
       </div>
-      <div class="line" style="height:50px;">
+      <div class="line">
         <div class="search">
           <button id="ITP_BTN_MRTNMNG05010"class="btn-primary btn-sm ADB">검색</button>
         </div>
@@ -62,7 +57,7 @@
       <li class="history_list2">
         <div class="left">
           <div class="nomal">
-            <label>반품발주번호 </label>
+            <label class="col_6">반품발주번호 </label>
             <div>
               <div class="fn">202210010000001-0100</div> 
             </div>
@@ -98,11 +93,11 @@
         </div>
         <div class="left">
           <div class="nomal">
-            <label>반품발주수량</label>
-            <div class="col_5">
-              <div class="col_5 fn">10</div>
+            <label class="col_2">반품발주수량</label>
+            <div>
+              <div class="fn">10</div>
             </div>
-            <label>반품입고수량</label>
+            <label class="col_6">반품입고수량</label>
             <div>
               <div class="fn">10</div>
             </div>

src/main/webapp/mobile/css/style.css

@@ -2,7 +2,6 @@
 * {margin: 0; padding: 0; box-sizing: border-box; text-align: center; font-family: 'NanumBarunGothic', 'serif'; list-style: none;}
 section {}
 body{background: #fff; position: relative; width: 100%; height: auto;}
-.color-gray {color:#aaa;}
 /* 팝업 */
 section .popup { position: fixed; width: 100%; height: 100%; background: transparent; z-index: 11;}
 section .popup .pop { position: absolute; top: 45%; left: 50%; transform: translate(-50%,-50%); width: 70%; height: 250px; padding-top: 30px; background: #fff; border: 2px solid #000; border-top-left-radius: 10px; border-top-right-radius: 10px;}
@@ -17,7 +16,7 @@ section .popup .pop .popup_btn button.cancel {width: 36%;}
 
 
 section .popup2 {position: fixed; width: 100%; height: 100%; background: rgba(200, 200,200, 0.8); z-index: 11;}
-section .popup2 .content {position: fixed; z-index: 10; width:100%; background: #fff;}
+section .popup2 .content {padding-top: 5%; top: 100px; position: fixed; z-index: 10; width:100%; background: #fff;}
 section .popup2 .barcode {width: 100%;}
 section .popup2 .barcode_area {width: 70%; height: 35%; margin: auto; background: #fff; border: 1px solid #000; margin-top: 5%;}
 section .popup2 .barcode h1{text-align: left; width: 85%; font-size: 2.6rem; margin:auto; margin-top: 30%;}
@@ -55,19 +54,17 @@ section .popup2 .pop .popup_scroll li .right {margin: 40px 0; position: relative
 section .popup2 .pop .popup_scroll li .right .num {margin: 0 40px; width: auto;}
 section .popup2 .pop .popup_scroll li .right button {margin: -12px; padding: 20px; font-size: 1.5rem; border-radius: 0px;}
 section .popup2 .pop .popup_scroll li .add button{float: right; width: 120px; height: 120px; margin: 10px 20px; border-radius: 30px; font-size: 2rem; background: rgb(198, 170, 250);}
-section .popup2 .pop .content .line button {width: 40%; height: 35px;font-size: 1rem; padding: 0; margin: 0 10px;}
+section .popup2 .pop .content .line button {width: 40%; height: 80px;font-size: 2.4rem; padding: 0; margin: 0 20px;}
 
 section .popup3 { position: fixed; width: 100%; height: 100%; background: transparent; z-index: 11;}
-section .popup3 .content {position: fixed; z-index: 10; width:100%; height:596px; background: #fff;}
-section .popup3 .content label{width:120px; margin-top:7px;}
-section .popup3 .content div{font-weight:100;}
-section .popup3 .pop { position: absolute; top: 37%; left: 50%; transform: translate(-50%,-40%); width: 90%; height: 85%; background: #fff; border: 2px solid #000;}
-section .popup3 .pop .header {position: relative; height: 50px; background: rgb(204, 225, 240); border-bottom: 1px solid #000;}
-section .popup3 .pop .header .header_left {float: left; padding-top: 5px; padding-left: 20px;}
-section .popup3 .pop .header .header_left label {font-size: 1.4rem;} 
+section .popup3 .content {padding-top: 5%; top: 100px; position: fixed; z-index: 10; width:100%; background: #fff;}
+section .popup3 .pop { position: absolute; top: 50%; left: 50%; transform: translate(-50%,-50%); width: 90%; height: 85%; background: #fff; border: 2px solid #000;}
+section .popup3 .pop .header {position: relative; height: 100px; background: rgb(204, 225, 240); border-bottom: 1px solid #000;}
+section .popup3 .pop .header .header_left {float: left; padding-top: 20px; padding-left: 20px;}
+section .popup3 .pop .header .header_left label {font-size: 2.4rem;} 
 section .popup3 .pop .header .header_right {float: right; padding-right: 10px;}
 section .popup3 .pop .header .header_right button {border: none; background: transparent;}
-section .popup3 .pop .header .header_right button img {width:30px; height:30px;}
+
 /* 버튼 */
 button {background-color: #fff; padding: 10px;}
 button.btn-primary  {color: #fff; background-color: #337ab7; border: 1px solid #000;font-weight: 700;}
@@ -146,7 +143,7 @@ body.eee {height: 700px; background: #eee;}
 
 
 input {margin-top: 3px; border: 1px solid #000; margin-top: -2px; height: 36px; font-size: 0.8rem; text-align: left; padding:0 15px;}
-select {border: 1px solid #000; height: 35px; font-size: 1rem; text-align: left; padding:0 15px;}
+select {border: 1px solid #000; height: 60px; font-size: 1rem; text-align: left; padding:0 15px;}
 input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 
 /* 공통화면 */
@@ -198,13 +195,14 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line {position: relative; display: inline-block; width: 100%; height: 35px; margin-bottom: 0px;}
 .content .line div {font-weight: 700;}
 .content .line label {font-size: 1.2rem; margin-left: 10px; float: left; text-align: left; margin-top: 12px;}
+.content .line label.col_6{width: 404px;}
 .content .line select.label {border: 1px solid #000; font-size: 0.9rem;margin:9px 0 0 5px; float: left; width: 120px; height: 30px; text-align: left;}
 .content .line .search_nm {float: right; margin-right: 2%;}
 .content .line .search_wrap {float:right; margin-right:10px;}
 .content .line .float_left {float: left;}
 .content .line .float_left.note {width: 100%; padding: 10px;}
-.content .line .float_left.note textarea {width: 100%; height: 100px; border: 1px solid #000; text-align: left;}
-.content .line .float_left div {font-size: 1rem; margin-top: 8px;}
+.content .line .float_left.note textarea {width: 100%; height: 300px; border: 1px solid #000; text-align: left;}
+.content .line .float_left div {font-size: 2.4rem; margin-top: -8px;}
 .content .line .float_left_btn {float: left; margin-top: 5px; margin-left: 5px;}
 .content .line .float_left_btn button {padding:0; width:36px; height:36px; border-radius:5px;}
 .content .line .float_left_btn button img {width:20px; height:20px;}
@@ -213,8 +211,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line .line_right div {float: right; font-size: 1.2rem; margin-top: 12px; margin-right: 30px;}
 .content .line .line_right input {position: relative; text-align: right; margin-right: 84px;}
 .content .line .line_right input.left {text-align: left;}
-.content .line .line_right input.mg0 {margin-right:10px;}
-.content .line .line_right select {float: right; width: 180px; height: 30px; margin-top: 7px; border: 1px solid #000; font-size: 1rem; margin-right:93px;}
+.content .line .line_right select {float: right; width: 180px; height: 30px; margin-top: 7px; border: 1px solid #000; font-size: 1rem; margin-right:83px;}
 .content .line input.date {width: 40%; margin: 10px; height: 40px; float: right; margin-right: 3%;}
 .content .line input.date2 {width: 140px; height: 30px; margin-right:133px;}
 .content .line div.date_to {float: right; margin-right:10px;}
@@ -222,8 +219,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line div.date_to div.at {width: 3%;  font-size: 1rem; float: right; display: contents;}
 .content .line .search {width: 100%; height: 50px;}
 .content .line .search button {width: 50%; height: 35px; font-size: 1rem; padding: 0;}
-.content .line .search button.col_3 {width: 35%; margin-left:12px; float: left;}
-.content .line .search button.col_5 {width: 55%; margin-right: 10px; float: right;}
+.content .line .search button.col_3 {width: 35%; margin: 0 20px; float: left;}
+.content .line .search button.col_5 {width: 55%; margin: 0 20px; float: right;}
 .content .table_header {margin: 0 auto; width: 100%; height: 50px; background-color: #92c7f6; position: fixed; z-index: 10; border-bottom: 1px solid #000; border-top: 1px solid #000;}
 .content .table_header h1 {margin-top: 12px; margin-left: 10px; font-size: 1.2rem; float: left; color: #fff; font-weight: 100;}
 .content .table_header button {float: right; width: 111px; font-size: 1rem; padding: 5px 20px; margin: 8px;}
@@ -276,7 +273,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .row-3{top: 333px;}
 .row-4{top: 377px;}
 .row-5{top: 850px;}
-.row-6{top: 468px;}
+.row-6{top: 950px;}
 .row-7{top: 1030px;}
 
 .col-4{width:40% !important;}
@@ -292,32 +289,33 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left_info .history input{width: 150px;}
 .scroll_area li.history_list {height: 140px; padding-top:8px;}
 .scroll_area li.history_list .button_right {float: right; display: grid;}
-.scroll_area li.history_list .button_right button {width: 70px; height: 70px; font-size: 1rem; margin: 0; border-radius: 0;}
-.scroll_area li.history_list1 {height: 230px;}
+.scroll_area li.history_list .button_right button {width: 124px; height: 149px; font-size: 2rem; margin: 0; border-radius: 0;}
+.scroll_area li.history_list1 {height: 230px; }
 .scroll_area li.history_list2 {height: 160px; padding-top:5px;}
 .scroll_area li.history_list2 label{min-width:95px; display:inline-flex;}
 .scroll_area li.history_list3 {height: 330px;}
-.scroll_area li.history_list4 {height: 150px;}
 .scroll_area li .history_info {width: auto;}
 .scroll_area li .left {width:100%; height:30px; margin-top:0px;}
-.scroll_area li .btn {width:calc(100% - 70px); padding-top:12px;}
 .scroll_area li .left div {display: inline-block;}
 .scroll_area li .left label{font-size: 1.1rem;}
 .scroll_area li .left .thick {float:left;  margin: 8px 20px; font-size: 1rem; text-align: left; width: 50%; font-weight: 600;}
 .scroll_area li .left .history {font-weight: 700; font-size: 1.1rem; margin-top:-2px;}
 .scroll_area li .left .history input{width: 150px;}
 
-.scroll_area li .detail_line {width: 100%; height:25px; display: inline-block;}
+.scroll_area li div {padding: 1px;}
+.scroll_area li .detail_line {width: 100%; display: inline-block;}
 .scroll_area li .detail_left {float: left;}
+.scroll_area li .detail_left div {display: inline-block;}
 .scroll_area li .detail_left .detail_info {margin: 5px 10px;}
-.scroll_area li .detail_left .detail_info div {width: auto; font-size: 1rem; font-weight: 700;}
-.scroll_area li .detail_left .detail_info i {width: auto; font-size: 1rem; margin: 0 20px;}
-.scroll_area li .detail_left .detail_info label {position:absolute; width: auto;  font-size: 1rem;}
+.scroll_area li .detail_left .detail_info div {width: auto; font-size: 2.2rem; font-weight: 700;}
+.scroll_area li .detail_left .detail_info i {width: auto; font-size: 2.2rem; margin: 0 20px;}
+.scroll_area li .detail_left .detail_info label {width: auto;  font-size: 2rem;}
 .scroll_area li .detail_right {float: right;}
+.scroll_area li .detail_right div {display: inline-block;}
 .scroll_area li .detail_right .detail_info {margin: 5px 25px;}
 .scroll_area li .detail_right .detail_info label {margin: 5px 30px; font-size: 2rem;}
-.scroll_area li .detail_right .detail_info div {width: auto; font-size: 1rem; font-weight: 700;}
-.scroll_area li .detail_right .detail_info i {width: auto; font-size: 1rem; margin: 0 20px;}
+.scroll_area li .detail_right .detail_info div {width: auto; font-size: 2.2rem; font-weight: 700;}
+.scroll_area li .detail_right .detail_info i {width: auto; font-size: 2.2rem; margin: 0 20px;}
 .scroll_area li .left .nomal  {width: 100%; float:left; text-align: left; font-size: 1.2rem;}
 .scroll_area li .left .nomal .half {width:50%; float:left;}
 .scroll_area li .left .nomal .half label {font-weight:100;}
@@ -338,11 +336,12 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal label{position:relative; margin-left: 10px;}
 .scroll_area li .left .nomal label.sub_info{min-width: 70px; display: inline-flex;}
 .scroll_area li .left .nomal label.col_0{width: auto;}
-.scroll_area li .left .nomal label.col_2{width: 95px;}
+.scroll_area li .left .nomal label.col_1{width: 180px;}
+.scroll_area li .left .nomal label.col_2{width: 273px;}
+.scroll_area li .left .nomal label.col_6{width: 250px;}
+.scroll_area li .left .nomal label.col_7{width: 280px;}
 .scroll_area li .left .nomal i{width: 50px; text-align: center;}
 .scroll_area li .left .nomal div{min-width:90px; display: inline-flex; font-weight: 700; font-size: 1.1rem;}
-.scroll_area li .left .nomal .col_5{min-width:50px;}
-
 .scroll_area li .right {margin: 30px 20px 0 0; position: relative; display: flex; font-size: 1.4rem; font-weight: 700; float: right;}
 .scroll_area li .right .num {margin: 0 25px; width: auto;}
 .scroll_area li .right button {margin: -6px; padding:0px 7px; font-size: 1.5rem; border-radius: 0px;}

src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG01010.js

@@ -26,14 +26,15 @@ let contentPageObj = {
 		},
 		button: function() {
 			$('button[id^="ITP_BTN_MPOMNG01010_DETAIL"]').on('click', function() {
+				var id = $(this).attr('id');
+				switch (id) {
+					case 'ITP_BTN_MPOMNG01010_DETAIL_TEMP_SAVE': break;
+					case 'ITP_BTN_MPOMNG01010_DETAIL_TEMP_SAVE': break;
+					case 'ITP_BTN_MPOMNG01010_DETAIL_CANCEL':break;
+				}
 				if($(this).is('[data-call-popup]')) {
 					contentPopObj.show($(this).data('call-popup'));
 				} else {
-					var id = $(this).attr('id');
-					switch (id) {
-						case 'ITP_BTN_MPOMNG01010_DETAIL_TEMP_SAVE': break;
-						case 'ITP_BTN_MPOMNG01010_DETAIL_CANCEL':break;
-					}
 				}
 				return false;
 			});
@@ -43,9 +44,10 @@ let contentPageObj = {
 
 let contentPopObj = {
 	show: function(id, args, fn) {
+		var elem = $('#' + id).closest('.mobile-popup-div');
+		console.log($(elem).attr('id'));
+		$(elem).show();
 		this.button();
-		console.log(id);
-		$('#' + id).show();
 	},
 	button: function() {
 		var _this = this;
@@ -65,6 +67,6 @@ let contentPopObj = {
 		});
 	},
 	hide: function(id) {
-		$('#' + id).closest('.mobile-pop-close').hide();
+		$('#' + id).closest('.mobile-popup-div').hide();
 	}
 };