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

src/main/webapp/app/inoutmng/INOUTMNG01010.html

@@ -68,6 +68,7 @@
 					<div class="itp_table fix">
 						<div id="ITP_INOUTMNG01010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
 							<div id="ITP_INOUTMNG01010_jqGridView" class="itp_views fix"></div>
+							<button type="button" id="ITP_BTN_INOUTMNG01010_EXCEL" class="btn btn-success btn-sm Excel" style="float:right;"><i class="glyphicon "></i>Excel</button>
 							<table id="ITP_INOUTMNG01010_jqGrid"></table>
 							<div id="ITP_INOUTMNG01010_jqGridPager"></div>
 							<div id="ITP_INOUTMNG01010_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/inoutmng/INOUTMNG02010.html

@@ -70,6 +70,7 @@
 					<div class="itp_table fix">
 						<div id="ITP_INOUTMNG02010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
 							<div id="ITP_INOUTMNG02010_jqGridView" class="itp_views fix"></div>
+							<button type="button" id="ITP_BTN_INOUTMNG02010_EXCEL" class="btn btn-success btn-sm Excel" style="float:right;"><i class="glyphicon "></i>Excel</button>
 							<table id="ITP_INOUTMNG02010_jqGrid"></table>
 							<div id="ITP_INOUTMNG02010_jqGridPager"></div>
 							<div id="ITP_INOUTMNG02010_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/inoutmng/INOUTMNG03010.html

@@ -67,6 +67,7 @@
 					<div class="itp_table fix">
 						<div id="ITP_INOUTMNG03010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
 							<div id="ITP_INOUTMNG03010_jqGridView" class="itp_views fix"></div>
+							<button type="button" id="ITP_BTN_INOUTMNG03010_EXCEL" class="btn btn-success btn-sm Excel" style="float:right;"><i class="glyphicon "></i>Excel</button>
 							<table id="ITP_INOUTMNG03010_jqGrid"></table>
 							<div id="ITP_INOUTMNG03010_jqGridPager"></div>
 							<div id="ITP_INOUTMNG03010_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/inoutmng/INOUTMNG04010.html

@@ -70,6 +70,7 @@
 					<div class="itp_table fix">
 						<div id="ITP_INOUTMNG04010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
 							<div id="ITP_INOUTMNG04010_jqGridView" class="itp_views fix"></div>
+							<button type="button" id="ITP_BTN_INOUTMNG04010_EXCEL" class="btn btn-success btn-sm Excel" style="float:right;"><i class="glyphicon "></i>Excel</button>
 							<table id="ITP_INOUTMNG04010_jqGrid"></table>
 							<div id="ITP_INOUTMNG04010_jqGridPager"></div>
 							<div id="ITP_INOUTMNG04010_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/rtnmng/RTNMNG02010.html

@@ -60,6 +60,7 @@
 					<div class="itp_table fix">
 						<div id="ITP_RTNMNG02010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
 							<div id="ITP_RTNMNG02010_jqGridView" class="itp_views fix"></div>
+							<button type="button" id="ITP_BTN_RTNMNG02010_EXCEL" class="btn btn-success btn-sm Excel" style="float:right;"><i class="glyphicon "></i>Excel</button>
 							<table id="ITP_RTNMNG02010_jqGrid"></table>
 							<div id="ITP_RTNMNG02010_jqGridPager"></div>
 							<div id="ITP_RTNMNG02010_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/rtnmng/RTNMNG03010.html

@@ -70,6 +70,7 @@
 					<div class="itp_table fix">
 						<div id="ITP_RTNMNG03010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
 							<div id="ITP_RTNMNG03010_jqGridView" class="itp_views fix"></div>
+							<button type="button" id="ITP_BTN_RTNMNG03010_EXCEL" class="btn btn-success btn-sm Excel" style="float:right;"><i class="glyphicon "></i>Excel</button>
 							<table id="ITP_RTNMNG03010_jqGrid"></table>
 							<div id="ITP_RTNMNG03010_jqGridPager"></div>
 							<div id="ITP_RTNMNG03010_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/rtnmng/RTNMNG04010.html

@@ -89,6 +89,7 @@
 					<div class="itp_table fix">
 						<div id="ITP_RTNMNG04010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
 							<div id="ITP_RTNMNG04010_jqGridView" class="itp_views fix"></div>
+							<button type="button" id="ITP_BTN_RTNMNG04010_EXCEL" class="btn btn-success btn-sm Excel" style="float:right;"><i class="glyphicon "></i>Excel</button>
 							<table id="ITP_RTNMNG04010_jqGrid"></table>
 							<div id="ITP_RTNMNG04010_jqGridPager"></div>
 							<div id="ITP_RTNMNG04010_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/rtnmng/RTNMNG05010.html

@@ -79,6 +79,7 @@
 					<div class="itp_table fix">
 						<div id="ITP_RTNMNG05010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
 							<div id="ITP_RTNMNG05010_jqGridView" class="itp_views fix"></div>
+							<button type="button" id="ITP_BTN_RTNMNG05010_EXCEL" class="btn btn-success btn-sm Excel" style="float:right;"><i class="glyphicon "></i>Excel</button>
 							<table id="ITP_RTNMNG05010_jqGrid"></table>
 							<div id="ITP_RTNMNG05010_jqGridPager"></div>
 							<div id="ITP_RTNMNG05010_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/rtnmng/RTNMNG06010.html

@@ -78,6 +78,7 @@
 					<div class="itp_table fix">
 						<div id="ITP_RTNMNG06010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
 							<div id="ITP_RTNMNG06010_jqGridView" class="itp_views fix"></div>
+							<button type="button" id="ITP_BTN_RTNMNG06010_EXCEL" class="btn btn-success btn-sm Excel" style="float:right;"><i class="glyphicon "></i>Excel</button>
 							<table id="ITP_RTNMNG06010_jqGrid"></table>
 							<div id="ITP_RTNMNG06010_jqGridPager"></div>
 							<div id="ITP_RTNMNG06010_jqGridEmpty" class="itp_no_data"></div>

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

@@ -1013,7 +1013,8 @@ function itp_fn_logined_check(user_nm_update, fn) {
         }
 	} else {
 		// 로그인 페이지로 이동
-		$(location).attr('href', ITP_CONTEXTPATH + '/login.html');
+		if($(location).attr('pathname').indexOf('login.html') < 0)
+			$(location).attr('href', ITP_CONTEXTPATH + '/login.html');
 	}
 }
 

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG01010.js

@@ -436,6 +436,7 @@ let pageObj = {
 						case 'ITP_BTN_INOUTMNG01010_OUC'				: listObj.button.shmtcreat();		break;	// 출하생성 버튼
 						case 'ITP_BTN_INOUTMNG01010_OUT'				: modifyObj.button.save(); 			break;	// 출하지시 버튼
 						case 'ITP_BTN_INOUTMNG01010_CANCELLIST'			: modifyObj.button.cancel(); 		break;	// 취소/목록 버튼
+						case 'ITP_BTN_INOUTMNG01010_EXCEL'				: listObj.excelDown(); 				break;	// 엑셀다운로드
 					}
 				});
 			});
@@ -464,6 +465,8 @@ let pageObj = {
 			$('#ITP_FORM_INOUTMNG01010_DELETE_WHS_NM').show();
 			fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG01010_SRH', '#ITP_BTN_INOUTMNG01010_OUC']);
 			$('#ITP_FORM_INOUTMNG01010_DETAIL_SBRAND_ID').val(fn_make_user_info.get('brandId'));
+			
+			$('#ITP_BTN_INOUTMNG01010_EXCEL').show();
 		} else if(mode == 'DETAIL') { // 출하지시 상세
 			$('#ITP_AJAX_INOUTMNG01010_DETAIL_CONTAINER').show();
 			fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG01010_OUT', '#ITP_BTN_INOUTMNG01010_CANCELLIST']);
@@ -644,6 +647,16 @@ let listObj = {
 			$(INOUTMNG01010_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
 			$(INOUTMNG01010_GRID_EMPTY).show();
 		}
+	},
+	excelDown: function() {
+		var param = {
+			'url': API_DETAIL_GRID_LIST,
+			'param': $('#ITP_FORM_INOUTMNG01010_SEARCH').serializeObject(),
+			'gridColumns': $(INOUTMNG01010_GRID_ID).jqGrid('getGridParam', 'colModel'),
+			'fileName': '출하지시대상정보.xlsx',
+			'sheetName': '출하지시대상리스트'
+		};
+		itp_fn_remote_to_excel(param);
 	}
 };
 

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG02010.js

@@ -193,6 +193,7 @@ let pageObj = {
 						case 'ITP_BTN_INOUTMNG02010_MODIFY'				: modifyObj.button.modify();	break;	// 수정 버튼
 						case 'ITP_BTN_INOUTMNG02010_CANCELLIST'			: modifyObj.button.cancel(); 	break;	// 취소/목록 버튼
 						case 'ITP_BTN_INOUTMNG02010_DELETE'				: modifyObj.button.del();		break;	// 발주 취소 버튼(예정)
+						case 'ITP_BTN_INOUTMNG02010_EXCEL'				: listObj.excelDown();		break;	// 엑셀다운로드
 					}
 				});
 			});
@@ -215,6 +216,7 @@ let pageObj = {
             $('#ITP_BTN_INOUTMNG02010_DELETE_SHMT_WHS_NM').show();
             $('#ITP_BTN_INOUTMNG02010_SEARCH_WHS_ID').show();
             $('#ITP_BTN_INOUTMNG02010_DELETE_WHS_ID').show();
+			$('#ITP_BTN_INOUTMNG02010_EXCEL').show();
             
         } /*else if(mode == 'ADD') { // 등록
             $('#ITP_AJAX_INOUTMNG02010_DETAIL_CONTAINER').show();
@@ -445,6 +447,16 @@ let listObj = {
 			$('#ITP_FORM_INOUTMNG02010_DETAIL_WHS_ID').val(rowDataPop.whsId);
 			$('#ITP_FORM_INOUTMNG02010_DETAIL_WHS_NM').val(rowDataPop.whsNm);
 		}
+	},
+	excelDown: function() {
+		var param = {
+			'url': API_POMNG_INOUTMNG_OUTSEARCH_GRID_LIST,
+			'param': $('#ITP_FORM_INOUTMNG02010_SEARCH').serializeObject(),
+			'gridColumns': $(INOUTMNG02010_GRID_ID).jqGrid('getGridParam', 'colModel'),
+			'fileName': '출하지시현황.xlsx',
+			'sheetName': '출하지시현황리스트'
+		};
+		itp_fn_remote_to_excel(param);
 	}
 }
 

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG03010.js

@@ -428,6 +428,7 @@ let pageObj = {
 						case 'ITP_BTN_INOUTMNG03010_CUC'				: listObj.button.colcreat();		break;	// 수거생성 버튼
 						case 'ITP_BTN_INOUTMNG03010_CUD'				: modifyObj.button.save(); 			break;	// 수거지시 버튼
 						case 'ITP_BTN_INOUTMNG03010_CANCELLIST'			: modifyObj.button.cancel(); 		break;	// 취소/목록 버튼
+						case 'ITP_BTN_INOUTMNG03010_EXCEL'				: listObj.excelDown(); 				break;	// 엑셀다운로드
 					}
 				});
 			});
@@ -456,6 +457,8 @@ let pageObj = {
 			$('#ITP_FORM_INOUTMNG03010_DELETE_RTN_WHS_NM').show();
 			fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG03010_SRH', '#ITP_BTN_INOUTMNG03010_CUC']);
 			$('#ITP_FORM_INOUTMNG03010_DETAIL_SBRAND_ID').val(fn_make_user_info.get('brandId'));
+			
+			$('#ITP_BTN_INOUTMNG03010_EXCEL').show();
 		} else if(mode == 'DETAIL') { // 출하지시 상세
 			$('#ITP_AJAX_INOUTMNG03010_DETAIL_CONTAINER').show();
 			fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG03010_CUD', '#ITP_BTN_INOUTMNG03010_CANCELLIST']);
@@ -630,6 +633,16 @@ let listObj = {
 			$(INOUTMNG03010_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
 			$(INOUTMNG03010_GRID_EMPTY).show();
 		}
+	},
+	excelDown: function() {
+		var param = {
+			'url': API_DETAIL_GRID_LIST,
+			'param': $('#ITP_FORM_INOUTMNG03010_SEARCH').serializeObject(),
+			'gridColumns': $(INOUTMNG03010_GRID_ID).jqGrid('getGridParam', 'colModel'),
+			'fileName': '수거지시대상정보.xlsx',
+			'sheetName': '수거지시대상리스트'
+		};
+		itp_fn_remote_to_excel(param);
 	}
 };
 

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG04010.js

@@ -195,6 +195,7 @@ let pageObj = {
 				$(this).on('click', function() {
 					switch (id) {
 						case 'ITP_BTN_INOUTMNG04010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
+						case 'ITP_BTN_INOUTMNG04010_EXCEL'				: listObj.excelDown();		break;	// 엑셀다운로드
 					}
 				});
 			});
@@ -213,6 +214,8 @@ let pageObj = {
             $('#ITP_BTN_INOUTMNG04010_DELETE_RTN_WHS_ID').show();
             $('#ITP_BTN_INOUTMNG04010_DELETE_WHS_ID').show();
             $('#ITP_FORM_INOUTMNG04010_SEARCH #ITP_FORM_INOUTMNG04010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
+
+			$('#ITP_BTN_INOUTMNG04010_EXCEL').show();
         } 
     },
     action: function() {
@@ -377,6 +380,16 @@ let listObj = {
 			$('#ITP_FORM_INOUTMNG04010_SEARCH_SWHS_ID').val(rowDataPop.whsId);
 			$('#ITP_FORM_INOUTMNG04010_SEARCH_SWHS_NM').val(rowDataPop.whsNm);
 		}
+	},
+	excelDown: function() {
+		var param = {
+			'url': API_RTNMNG_INOUTMNG_OUTSEARCH_GRID_LIST,
+			'param': $('#ITP_FORM_INOUTMNG04010_SEARCH').serializeObject(),
+			'gridColumns': $(INOUTMNG04010_GRID_ID).jqGrid('getGridParam', 'colModel'),
+			'fileName': '수거지시현황.xlsx',
+			'sheetName': '수거지시리스트'
+		};
+		itp_fn_remote_to_excel(param);
 	}
 }
 

src/main/webapp/js/app/login.js

@@ -13,13 +13,14 @@ require(['config'], function() {
 			var $th = $(this);
 	        $th.val($th.val().replace(/(<([^>]+)>)/ig, function() {return '';}));
 		});
-		
+
 		$('#login_btn').click(function() {
 			if(itp_fn_login_validate()) {
 				itp_fn_login_proc();
-			}	
+			}
+			return false;
 		});
-		
+
 		var callbackFn = function(result) {
 			POP_LIST = result.popList;
 			fn_proc_popup_view('L');

src/main/webapp/js/app/rtnmng/ITP_RTNMNG02010.js

@@ -386,6 +386,7 @@ let pageObj = {
 						case 'ITP_BTN_RTNMNG02010_SAVE'					: modifyObj.button.save("RR00"); break;	// 임시저장
 						case 'ITP_BTN_RTNMNG02010_DETAIL_ADDROW'			: pageObj.grid.button.addRow(); break;	// 품목추가
 						case 'ITP_BTN_RTNMNG02010_DETAIL_DELROW'			: pageObj.grid.button.delRow(); break;	// 품목삭제
+						case 'ITP_BTN_RTNMNG02010_EXCEL'			: listObj.excelDown(); break;	// 엑셀다운로드
 					}
 				});
 			});
@@ -413,6 +414,8 @@ let pageObj = {
 			$('#ITP_AJAX_RTNMNG02010_LIST_CONTAINER').show();
 			$('#ITP_FORM_RTNMNG02010_DETAIL_SBRAND_ID').val(fn_make_user_info.get('brandId'));
 			$('#ITP_FORM_RTNMNG02010_DETAIL_SSTORE_ID').val(fn_make_user_info.get('storeId'));
+			$('#ITP_BTN_RTNMNG02010_EXCEL').show();
+			
 			SCREEN_MODE = 'LIST' ;
 		} else if(mode == 'ADD') { // 등록
 			fn_show_btn_auth_array(['#ITP_BTN_RTNMNG02010_CANCELLIST', '#ITP_BTN_RTNMNG02010_SAVE']);
@@ -623,6 +626,16 @@ let listObj = {
 		unload : function() {
 			$.jgrid.gridUnload(RTNMNG02010_GRID_ID);
 		}
+	},
+	excelDown: function() {
+		var param = {
+			'url': API_DETAIL_GRID_LIST,
+			'param': $('#ITP_FORM_RTNMNG02010_SEARCH').serializeObject(),
+			'gridColumns': $(RTNMNG02010_GRID_ID).jqGrid('getGridParam', 'colModel'),
+			'fileName': '반품요청현황.xlsx',
+			'sheetName': '반품요청리스트'
+		};
+		itp_fn_remote_to_excel(param);
 	}
 };
 

src/main/webapp/js/app/rtnmng/ITP_RTNMNG03010.js

@@ -632,6 +632,7 @@ let pageObj = {
 						case 'ITP_BTN_RTNMNG03010_CANCELLIST'			: modifyObj.button.cancel(); 		break;	// 취소/목록 버튼
 						case 'ITP_BTN_RTNMNG03010_NDETAIL_ADDROW'		: pageObj.grid.button.addRow(); 	break;	// 품목추가
 						case 'ITP_BTN_RTNMNG03010_NDETAIL_DELROW'		: pageObj.grid.button.delRow(); 	break;	// 품목삭제
+						case 'ITP_BTN_RTNMNG03010_EXCEL'				: listObj.excelDown(); 				break;	// 엑셀다운로드
 					}
 				});
 			});
@@ -662,6 +663,7 @@ let pageObj = {
 			fn_show_btn_auth_array(['#ITP_BTN_RTNMNG03010_SRH', '#ITP_BTN_RTNMNG03010_NEWCREATE','#ITP_BTN_RTNMNG03010_POCREATE', '#ITP_BTN_RTNMNG03010_POREJECT']);
 			// $('#ITP_FORM_RTNMNG03010_DETAIL_SBRAND_ID').val(fn_make_user_info.get('brandId'));
 			// $('#ITP_FORM_RTNMNG03010_DETAIL_SSTORE_ID').val(fn_make_user_info.get('storeId'));
+			$('#ITP_BTN_RTNMNG03010_EXCEL').show();
 			SCREEN_MODE = 'LIST' ;
 			
 		} else if(mode == 'NPC') { // 신규발주등록
@@ -945,6 +947,16 @@ let listObj = {
 			$(RTNMNG03010_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
 			$(RTNMNG03010_GRID_EMPTY).show();
 		}
+	},
+	excelDown: function() {
+		var param = {
+			'url': API_DETAIL_GRID_LIST,
+			'param': $('#ITP_FORM_RTNMNG03010_SEARCH').serializeObject(),
+			'gridColumns': $(RTNMNG03010_GRID_ID).jqGrid('getGridParam', 'colModel'),
+			'fileName': '반품발주대상정보.xlsx',
+			'sheetName': '반품발주대상리스트'
+		};
+		itp_fn_remote_to_excel(param);
 	}
 };
 

src/main/webapp/js/app/rtnmng/ITP_RTNMNG04010.js

@@ -218,6 +218,7 @@ let pageObj = {
 						case 'ITP_BTN_RTNMNG04010_MODIFY'			: modifyObj.button.modify();	break;	// 수정 버튼
 						case 'ITP_BTN_RTNMNG04010_CANCELLIST'		: modifyObj.button.cancel(); 	break;	// 취소/목록 버튼
 						case 'ITP_BTN_RTNMNG04010_RTNCANCEL'		: modifyObj.button.del();		break;	// 발주 취소 버튼(예정)
+						case 'ITP_BTN_RTNMNG04010_EXCEL'			: listObj.excelDown();		break;	// 엑셀 다운로드
 					}
 				});
 			});
@@ -240,6 +241,7 @@ let pageObj = {
             $('#ITP_BTN_RTNMNG04010_SEARCH_DEL_SWHS_NM').show();
             $('#ITP_BTN_RTNMNG04010_SEARCH_DEL_SRTN_WHS_NM').show();
             $('#ITP_BTN_RTNMNG04010_SEARCH_DEL_SSPPLY_NM').show();
+			$('#ITP_BTN_RTNMNG04010_EXCEL').show();
             
         } else if(mode == 'MODIFY') { // 수정
             $('#ITP_AJAX_RTNMNG04010_DETAIL_CONTAINER').show();
@@ -419,6 +421,16 @@ let listObj = {
 			$('#ITP_FORM_RTNMNG04010_SEARCH_SSPPLY_NM').val(rowDataPop.spplyNm);
 			$('#ITP_FORM_RTNMNG04010_SEARCH_SSPPLY_ID').val(rowDataPop.spplyId);
 		}
+	},
+	excelDown: function() {
+		var param = {
+			'url': API_RTNMNG_RTN_DETAIL_GRID_LIST,
+			'param': $('#ITP_FORM_RTNMNG04010_SEARCH').serializeObject(),
+			'gridColumns': $(RTNMNG04010_GRID_ID).jqGrid('getGridParam', 'colModel'),
+			'fileName': '반품발주현황.xlsx',
+			'sheetName': '반품발주현황리스트'
+		};
+		itp_fn_remote_to_excel(param);
 	}
 };
 

src/main/webapp/js/app/rtnmng/ITP_RTNMNG05010.js

@@ -225,6 +225,8 @@ let listObj = {
 		$('#ITP_BTN_RTNMNG05010_SEARCH_DEL_SRTN_WHS_NM').show();
 		$('#ITP_BTN_RTNMNG05010_SEARCH_DEL_SSPPLY_NM').show();
 		$('#ITP_BTN_RTNMNG05010_SEARCH_DEL_SWHS_NM').show();
+		
+		$('#ITP_BTN_RTNMNG05010_EXCEL').show();
 	},
 	itp_RTNMNG05010_search: false,
 	button: {
@@ -403,6 +405,7 @@ let listObj = {
 					switch (id) {
 						case 'ITP_BTN_RTNMNG05010_SRH'		: listObj.button.search(); 	break;	// 조회 버튼 클릭
 						case 'ITP_BTN_RTNMNG05010_RTN_PROC'	: listObj.button.save(); 	break;	// 입고처리 버튼
+						case 'ITP_BTN_RTNMNG05010_EXCEL'	: listObj.excelDown(); 	break;	// 엑셀다운로드
 
 					}
 				});
@@ -481,6 +484,21 @@ let listObj = {
 			$(RTNMNG05010_GRID_EMPTY).show();
 		}
 		
+	},
+	excelDown: function() {
+		
+		var excelParam =  $('#ITP_FORM_RTNMNG05010_SEARCH').serializeObject();
+		excelParam.sbrandId = fn_make_user_info.get('brandId');
+		excelParam.sstoreId = fn_make_user_info.get('storeId');
+		
+		var param = {
+			'url': API_DETAIL_GRID_LIST,
+			'param': excelParam,
+			'gridColumns': $(RTNMNG05010_GRID_ID).jqGrid('getGridParam', 'colModel'),
+			'fileName': '반품처리정보.xlsx',
+			'sheetName': '반품처리대상리스트'
+		};
+		itp_fn_remote_to_excel(param);
 	}
 };
 

src/main/webapp/js/app/rtnmng/ITP_RTNMNG06010.js

@@ -149,6 +149,9 @@ let pageObj = {
 			$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SRTN_WHS_NM').show();
 			$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SSPPLY_NM').show();
 			$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SWHS_NM').show();
+			
+			$('#ITP_BTN_RTNMNG06010_EXCEL').show();
+			
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(RTNMNG06010_GRID_ID, RTNMNG06010_GRID_LIST, 'lg');
@@ -174,6 +177,7 @@ let pageObj = {
 						case 'ITP_BTN_RTNMNG06010_MODIFY'			: modifyObj.button.modify();	break;	// 수정 버튼
 						case 'ITP_BTN_RTNMNG06010_CANCELLIST'		: viewObj.button.cancel(); 		break;	// 취소/목록 버튼
 						case 'ITP_BTN_RTNMNG06010_DELETE'			: 								break;	// 삭제 버튼
+						case 'ITP_BTN_RTNMNG06010_EXCEL'			: listObj.excelDown(); 		break;	// 엑셀다운로드
 					}
 				});
 			});
@@ -333,5 +337,15 @@ let listObj = {
 			$('#ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_NM').val(rowDataPop.whsNm);
 			$('#ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_ID').val(rowDataPop.whsId);
 		}
+	},
+	excelDown: function() {
+		var param = {
+			'url': API_POMNG_INOUTMNG_WAREHOUSE_GRID_LIST,
+			'param': $('#ITP_FORM_RTNMNG06010_SEARCH').serializeObject(),
+			'gridColumns': $(RTNMNG06010_GRID_ID).jqGrid('getGridParam', 'colModel'),
+			'fileName': '반품처리현황.xlsx',
+			'sheetName': '반품처리현황리스트'
+		};
+		itp_fn_remote_to_excel(param);
 	}
 }

src/main/webapp/login.html

@@ -35,7 +35,7 @@
 					</div>
 					<div class="panel panel-default itp_box">
 						<div class="panel-body itp_body">
-							<form id="command" class="form-horizontal" action="" method="post" onsubmit="return false;">
+							<form id="command" class="form-horizontal" method="post" onsubmit="return false;">
 								<input id="userId" name="userId" type="hidden" value="" />
 	        					<input id="password" name="password" type="hidden" value="" />
 								<div class="row" style="margin-top:100px;">
@@ -68,7 +68,7 @@
 										</div>
 									</div>
 									<div class="col-xs-12 itp_btn_bar">
-										<button type="submit" id="login_btn" class="btn btn-orange btn-lg itp_btn">로그인</button>
+										<button type="button" id="login_btn" class="btn btn-orange btn-lg itp_btn">로그인</button>
 									</div>
 									<div class="col-xs-12 itp_login_input">
 										<div class="form-group">

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

@@ -20,11 +20,11 @@
       <form id="ITP_FORM_MOBILE_LOGIN" class="form-horizontal" action="" method="post" onsubmit="return false;">
         <input id="userId" name="userId" type="hidden" value="" />
         <input id="password" name="password" type="hidden" value="" />
-        <input id="appReg" name="appReg" type="hidden" value="" />
-        <input id="appVer" name="appVer" type="hidden" value="" />
-        <input id="deviId" name="deviId" type="hidden" value="" />
-        <input id="deviOsVer" name="deviOsVer" type="hidden" value="" />
-        <input id="deviTpCd" name="deviTpCd" type="hidden" value="" />
+        <input id="appReg" name="appReg" type="hidden" value="e-Bnui5gTQK2TaijkhFCS_:APA91bHGRgcE_Ioav_LSg6kKGAjIu52c_4B3W20vC2IqhxNBGy3wt62Dy-T7rQQTHuYdd9gUtyeJCOLKPVv2UUr7sXPE8jZQpQrHEJOj33gttY4-zzP3c00IZTg7MTY2jxNIpIrBAMU9" />
+        <input id="appVer" name="appVer" type="hidden" value="1.0.0" />
+        <input id="deviId" name="deviId" type="hidden" value="99b811f8db76fc0a" />
+        <input id="deviOsVer" name="deviOsVer" type="hidden" value="31" />
+        <input id="deviTpCd" name="deviTpCd" type="hidden" value="SA" />
       <div class="login_popup">
         <div class="login_info">
 			<img src="../img/oqpologo.png" alt="로고" class=" ">

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

@@ -35,7 +35,9 @@
                 <input type="text" id="ITP_FORM_MPOMNG01010_DETAIL_WHS_NM" class="" name="whsNm" data-check-required="empty" placeholder="매장명" readonly />
                 <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" value="" />
                 <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_LOCATION" class="form-control itp_input" name="location" value="" />
-             	<button id="ITP_BTN_MPOMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MPOMNG01010_WHS_AREA"><img src="../img/search.png" alt=""></button>
+		        <div class="itp_input_btn">
+		         	<button id="ITP_BTN_MPOMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MPOMNG01010_WHS_AREA"><img src="../img/search.png" alt=""></button>
+		       	</div>
             </div>
             <div class="float_right_btn">
               <!-- <button id="ITP_BTN_MPOMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MPOMNG01010_WHS_AREA"><img src="../img/search.png" alt=""></button> -->
@@ -52,7 +54,7 @@
       </div>
       <div id="ITP_LIST_MPOMNG01010_ITEM_AREA" class="scroll_area row-3">
         <ul id="ITP_LIST_MPOMNG01010_DETAIL_ROWS" class="mb_0"></ul>
-        <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display: block;">
+        <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display: none;">
       <!--   검색된 데이터가 없습니다  -->
       	<div class="itp_non_data" style="display:none;">
       		<div>검색된 데이터가 없습니다.</div>
@@ -64,28 +66,28 @@
               </div>
               <div class="thick">
                 <div class="itp_item fnItemNm">품목명</div>
-                <div class="itp_item fnUnit">EA</div>
+                <div class="itp_item fnUnit"></div>
               </div>
               <div class="thick">
-                <div class="itp_gram fnUnitAmt">700g</div>
+                <div class="itp_gram fnUnitAmt"></div>
               </div>
               <div class="thick">
-                <div class="itp_amt fnUnitAmt">1,120,000원</div>
+                <div class="itp_amt fnUnitAmt"></div>
               </div>
             </div>
+            <div class="right">
+              <button id="ITP_BTN_MPOMNG01010_DETAIL_MINUS">-</button>
+              <div class="num fnPchReqQty">1</div>
+              <button id="ITP_BTN_MPOMNG01010_DETAIL_PLUS">+</button>
+            </div>
             <div class="md_info">
             	<div class="thick">
-            		<div>2022.12.15</div>
+            		<div></div>
             	</div>
             	<div class="thick">
-            		<div>브랜드 창고A</div>
+            		<div></div>
             	</div>
             </div>
-            <div class="right">
-              <button id="ITP_BTN_MPOMNG01010_DETAIL_MINUS">-</button>
-              <div class="num fnPchReqQty">1</div>
-              <button id="ITP_BTN_MPOMNG01010_DETAIL_PLUS">+</button>
-            </div>
           </li>
           
         </div>
@@ -106,11 +108,11 @@
             </div>
             <div class="pop_line">
                 <label>품목수&nbsp;&nbsp; :</label>
-                <div class="fnItemQty">개</div>
+                <div class="fnItemQty"></div>
             </div>
             <div class="pop_line">
                 <label>구매금액 &nbsp;&nbsp;:</label>
-                <div class="fnOrdAmt">원</div>
+                <div class="fnOrdAmt"></div>
             </div>
             <!--<label class="pop_label msg_save">구매요청 하시겠습니까?</label>-->
             <div class="pop_msg">구매요청 하시겠습니까?</div>
@@ -154,16 +156,6 @@
                             <button id="ITP_BTN_MPOMNG01010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
                         </div>
                     </li>
-                     <li class="row_2">
-                        <div class="scroll_left">
-                            <div class="fnWhsNm">브랜드 창고 명A</div>
-                            <div class="sub fnLocationNm">서울특별시 동대문구 서울 시립대로 12길</div>
-                            <div class="sub fnLocationNm">누리자 B/D</div>
-                        </div>
-                        <div class="scroll_right">
-                            <button id="ITP_BTN_MPOMNG01010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
-                        </div>
-                    </li>
                 </div>
             </div>
         </div>
@@ -191,38 +183,21 @@
             </form>
             <div id="ITP_LIST_MPOMNG01010_POP_ITEM_AREA" class="popup_scroll">
                 <ul id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWS" class="mb_0"></ul>
-                <div id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWCOPY" style="display: block;">
-                     <li class="row_2">
-                        <div class="scroll_left">
-                            <div class="fnItemNm">품목명 001</div>
-                            <div class="sub fnKg">700g</div>
-                            <div class="amt fnItemAmt">30,500원</div>
-                        </div>
-                        <div class="scroll_right">
-                            <button id="ITP_BTN_MPOMNG01010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
-                        </div>
-                      	<div class="itp_num_set">
-		                      <div class="right">
-				              <button id="ITP_BTN_MPOMNG01010_DETAIL_MINUS">-</button>
-				              <div class="num fnPchReqQty">1</div>
-				              <button id="ITP_BTN_MPOMNG01010_DETAIL_PLUS">+</button>
-				            </div>
-			            </div>
-                    </li>
+                <div id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWCOPY" style="display: none;">
                      <li class="row_2">
                         <div class="scroll_left">
-                            <div class="fnItemNm">품목명 001</div>
-                            <div class="sub fnKg">700g</div>
-                            <div class="amt fnItemAmt">30,500원</div>
+                            <div class="fnItemNm"></div>
+                            <div class="sub fnKg"></div>
+                            <div class="amt fnUnitAmt"></div>
                         </div>
                         <div class="scroll_right">
                             <button id="ITP_BTN_MPOMNG01010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
                         </div>
                       	<div class="itp_num_set">
 		                      <div class="right">
-				              <button id="ITP_BTN_MPOMNG01010_DETAIL_MINUS">-</button>
+				              <button id="ITP_BTN_MPOMNG01010_POP_ITEM_MINUS">-</button>
 				              <div class="num fnPchReqQty">1</div>
-				              <button id="ITP_BTN_MPOMNG01010_DETAIL_PLUS">+</button>
+				              <button id="ITP_BTN_MPOMNG01010_POP_ITEM_PLUS">+</button>
 				            </div>
 			            </div>
                     </li>

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

@@ -4,17 +4,20 @@
       <form id="ITP_FORM_MPOMNG02010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
         <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
         <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
+   	    <div class="line header">
+			<div class="itp_search_header">구매요청현황</div>
+      	</div>
         <div class="line">
           <label>구매요청일</label>
-        <div class="input-group date_to date">
-          <input type="date" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_FROM_DT" name="fromDt" pattern="\d{4}.\d{2}.\d{2}">
-          <div class="at">~</div>
-          <input type="date" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_TO_DT" name="toDt" pattern="\d{4}.\d{2}.\d{2}">
-        </div>
-      </div>
+	        <div class="date_to date">
+	          <input type="date" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_FROM_DT" name="fromDt" pattern="\d{4}.\d{2}.\d{2}">
+	          <div class="at">~</div>
+	          <input type="date" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_TO_DT" name="toDt" pattern="\d{4}.\d{2}.\d{2}">
+	        </div>
+		</div>
       <div class="line">
         <label>구매요청상태</label>
-        <div class="line_right">
+        <div class="float_left">
           <select id="ITP_FORM_MPOMNG02010_LIST_SEARCH_PCH_REQ_ST_CD" data-select-code="PCH_REQ_ST_CD" class="stcd" name="spchReqStCd">
             <option value="">상태</option>
           </select>
@@ -22,15 +25,15 @@
       </div>
       <div class="line">
         <label>납품장소</label>
-        <div class="search_wrap">
-	        <div class="float_left">
-	          <input id="ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" type="text" placeholder="납품창고" readonly>
-              <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_ID" name="swhsId" value="">
-	        </div>
-	        <div class="float_left_btn">
-	          <button id="ITP_BTN_MPOMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
-	          <button id="ITP_BTN_MPOMNG02010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
-	        </div>
+        <div class="float_left">
+          <input id="ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" type="text" placeholder="납품창고" readonly>
+             <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_ID" name="swhsId" value="">
+             <div class="itp_input_btn">
+         		 <button id="ITP_BTN_MPOMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
+  			</div>
+        </div>
+        <div class="float_right_btn">
+          <button id="ITP_BTN_MPOMNG02010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
         </div>
       </div>
       <div class="line" style="height:50px;">
@@ -39,13 +42,13 @@
         </div>
       </div>
       <div class="table_header">
-        <h1>>구매 요청 내역</h1>
+        <h1><구매 요청 내역></h1>
       </div>
       </form>
     </div>
-    <div id="ITP_LIST_MPOMNG02010_LIST_AREA" class="scroll_area row-1-1">
-      <ul id="ITP_LIST_MPOMNG02010_LIST_ROWS" class="panel-group"></ul>
-      <div id="ITP_LIST_MPOMNG02010_LIST_ROWCOPY" style="display:none;">
+    <div id="ITP_LIST_MPOMNG02010_LIST_AREA" class="scroll_area row-1">
+      <ul id="ITP_LIST_MPOMNG02010_LIST_ROWS" class="mb_0"></ul>
+      <div id="ITP_LIST_MPOMNG02010_LIST_ROWCOPY" style="display: block;">
         <li class="history_list list-row">
           <div class="left">
             <div class="nomal">
@@ -77,7 +80,7 @@
           </div>
           <div class="left">
             <div class="nomal">
-              <label style="width: 127px;">구매요청 정보</label>
+              <label>구매요청 정보</label>
               <span>:</span>
               <div class="history">
                 <div class="fnPchReqItemQty">품목수(3)</div>
@@ -91,7 +94,7 @@
               <label>결재정보 </label>
               <span>:</span>
               <div class="history">
-                <div class="fnPchReqRjctNm"></div>
+                <div class="fnPchReqRjctNm">결제완료</div>
               </div>
             </div>
           </div>
@@ -104,7 +107,7 @@
       <div class="line">
         <label>납기요청일</label>
         <div class="line_right">
-          <div class="fnDlvReqDt"></div>
+          <div class="fnDlvReqDt">2022.10.12</div>
         </div>      
       </div>
       <div class="line">
@@ -126,26 +129,27 @@
         </div>
       </div>
       <div class="table_header">
-        <h1>>구매 품목</h1>
+        <h1><구매 품목></h1>
       </div>
     </div>
     <div id="ITP_LIST_MPOMNG02010_VIEW_AREA" class="scroll_area row-2">
-      <ul id="ITP_LIST_MPOMNG02010_VIEW_ROWS" class="panel-group"></ul>
-      <div id="ITP_LIST_MPOMNG02010_VIEW_ROWCOPY" style="display:none;">
+      <ul id="ITP_LIST_MPOMNG02010_VIEW_ROWS" class="mb_0"></ul>
+      <div id="ITP_LIST_MPOMNG02010_VIEW_ROWCOPY" style="display: block;">
         <li class="list-row">
           <div class="left_info">
-            <div class="thick">
-              <div class="fnItemNm">품목명</div>
-              <div>-</div>
-              <div class="fnUnit">2EA</div>
-            </div>
-            <div class="thick">
-              <label class="space0">구매가 :</label>
-              <div class="fnPchReqAmt">1,120,000</div>
-            </div>
-          </div>
+             <div class="thick">
+                <div class="itp_item fnItemNm">품목명</div>
+                <div class="itp_item fnUnit">EA</div>
+              </div>
+              <div class="thick">
+                <div class="itp_gram fnUnitAmt">700g</div>
+              </div>
+              <div class="thick">
+                <div class="itp_amt fnUnitAmt">1,120,000원</div>
+              </div>
+           </div>   
           <div class="right">
-            <div class="fnPchReqQty">2</div>
+            <div class="fnnum fnPchReqQty">2</div>
           </div>
         </li>
       </div>
@@ -166,6 +170,9 @@
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_ST_CD" name="pchReqStCd" value="">
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_MALL_ID" name="mallId" value="">
       <div class="content">
+      	<div class="line header">
+			<div class="itp_search_header fnMenuNm">구매요청현황</div>
+      	</div>
         <div class="line">
           <label>납기요청일</label>
           <input id="ITP_FORM_MPOMNG02010_MODIFY_DLV_REQ_DT" name="dlvReqDt" class="date fnDlvReqDt" data-check-required="empty" type="date" placeholder="">
@@ -173,53 +180,54 @@
         <div class="line">
           <label>구매요청금액</label>
           <div class="line_right">
-            <div class="fnPchReqAmtTot">0원</div>
+            <div class="fnPchReqAmtTot">0 원</div>
           </div>
         </div>
         <div class="line">
           <label>구매가능금액</label>
           <div class="line_right">
-            <div class="fnOrdUseAmt">0원</div>
+            <div class="fnOrdUseAmt">0 원</div>
           </div>
         </div>
         <div class="line">
           <label>납품장소</label>
-          <div class="search_nm">
             <div class="float_left">
               <input type="text" id="ITP_FORM_MPOMNG02010_MODIFY_WHS_NM" class="" name="whsNm" data-check-required="empty" placeholder="매장명" readonly />
               <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_WHS_ID" class="form-control itp_input" name="whsId" value="" />
               <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_LOCATION" class="form-control itp_input" name="location" value="" />
+              <div class="itp_input_btn">
+              	<button id="ITP_BTN_MPOMNG02010_MODIFY_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
+              </div>
             </div>
-            <div class="float_left_btn">
-              <button id="ITP_BTN_MPOMNG02010_MODIFY_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
+            <div class="float_right_btn">
               <button id="ITP_BTN_MPOMNG02010_MODIFY_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
             </div>
-          </div>
         </div>
-        <div class="line">
+        <div class="header line">
           <div class="table_header">
-            <h1>>구매 품목</h1>
+            <h1><구매 품목></h1>
             <button type="button" id="ITP_BTN_MPOMNG02010_MODIFY_DEL_ROW" class="btn-primary btn-sm ADB">품목삭제</button>
             <button type="button" id="ITP_BTN_MPOMNG02010_MODIFY_ADD_ROW" class="btn-primary btn-sm ADB">품목추가</button>
           </div>
         </div>
       </div>
       <div id="ITP_LIST_MPOMNG02010_MODIFY_AREA" class="scroll_area row-1-1">
-        <ul id="ITP_LIST_MPOMNG02010_MODIFY_ROWS" class="panel-group"></ul>
-        <div id="ITP_LIST_MPOMNG02010_MODIFY_ROWCOPY" style="display:none;">
+        <ul id="ITP_LIST_MPOMNG02010_MODIFY_ROWS" class="mb_0"></ul>
+        <div id="ITP_LIST_MPOMNG02010_MODIFY_ROWCOPY" style="display: block;">
           <li class="list-row">
             <div class="left_info">
-              <div class="check_box"><!-- class 변경 -->
+              <div class="check_box">
                 <div><input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" /></div>
               </div>
               <div class="thick">
-                <div class="fnItemNm">품목명</div>
-                <div>-</div>
-                <div class="fnUnit">EA</div>
+                <div class="itp_item fnItemNm">품목명</div>
+                <div class="itp_item fnUnit">EA</div>
               </div>
               <div class="thick">
-                <label class="space0">구매가 :</label>
-                <div class="fnUnitAmt"></div>
+                <div class="itp_gram fnUnitAmt">700g</div>
+              </div>
+              <div class="thick">
+                <div class="itp_amt fnUnitAmt">1,120,000원</div>
               </div>
             </div>
             <div class="right">
@@ -259,11 +267,11 @@
     </div>
   </div>
   <div id="ITP_MOBILE_JS"></div>
-  <div id="ITP_POP_MPOMNG02010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
+  <div id="ITP_POP_MPOMNG02010_WHS_AREA" class="popup2 mobile-pop-close" style="display: block;">
     <div class="pop">
       <div class="header">
         <div class="header_left">
-          <label>> 납품장소</label>
+          <label>납품장소</label>
         </div>
         <div class="header_right">
           <button type="button" id="ITP_BTN_MPOMNG02010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
@@ -277,16 +285,17 @@
           <button id="ITP_BTN_MPOMNG02010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
         </form>
       </div>
-      <div class="search_bar">
-        <button id="ITP_BTN_MPOMNG02010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
+      <div class="select_btn">
+        <button id="ITP_BTN_MPOMNG02010_POP_WHS_NM" class="btn_blue">납품장소 V</button>
       </div>
       <div id="ITP_LIST_MPOMNG02010_POP_WHS_AREA" class="popup_scroll">
-        <ul id="ITP_LIST_MPOMNG02010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
-        <div id="ITP_LIST_MPOMNG02010_POP_WHS_ROWCOPY" style="display:none;">
-          <li class="list-row">
+        <ul id="ITP_LIST_MPOMNG02010_POP_WHS_ROWS" class="mb_0 itp_nav"></ul>
+        <div id="ITP_LIST_MPOMNG02010_POP_WHS_ROWCOPY" style="display: block;">
+          <li class="row_2">
             <div class="scroll_left">
-              <div class="fnWhsNm"></div>
-              <div class="fnLocationNm"></div>
+              <div class="fnWhsNm">브랜드 창고 명A</div>
+              <div class="sub fnLocationNm">서울특별시 동대문구 서울 시립대로 12길</div>
+              <div class="sub fnLocationNm">누리자 B/D</div>
             </div>
             <div class="scroll_right">
               <button id="ITP_BTN_MPOMNG02010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
@@ -300,7 +309,7 @@
     <div class="pop">
       <div class="header">
         <div class="header_left">
-          <label>> 품목 검색</label>
+          <label><품목 검색></label>
         </div>
         <div class="header_right">
           <button type="button" id="ITP_BTN_MPOMNG02010_POP_ITEM_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
@@ -313,37 +322,30 @@
           <input id="ITP_FORM_MPOMNG02010_POP_ITEM_KEYWORD" name="sitemNm" type="text" placeholder="품목명/품목번호" />
           <button id="ITP_BTN_MPOMNG02010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
         </div>
-        <div class="search_bar">
+        <div class="select_btn">
           <button id="ITP_BTN_MPOMNG02010_POP_ITEM_NM" class="btn_blue">품목명▼</button>
         </div>
       </form>
       <div id="ITP_LIST_MPOMNG02010_POP_ITEM_AREA" class="popup_scroll">
-        <ul id="ITP_LIST_MPOMNG02010_POP_ITEM_ROWS" class="panel-group"></ul>
-        <div id="ITP_LIST_MPOMNG02010_POP_ITEM_ROWCOPY" style="display:none;">
-          <li class="row_2">
-            <div class="left" style="width:180px;">
-              <!--<div class="check_box">
-                  <input type="checkbox" id="ITP_FORM_MPOMNG02010_POP_ITEM_CHECKBOX" name="itemId" />
-              </div>-->
-              <div class="thick">
-                <div class="fnItemNm">품목명</div>
-                <div>-</div>
-                <div class="fnUnit">EA</div>
-              </div>
-              <div class="thick" style="font-weight:100;">
-                <div class="space">구매가 :</div>
-                <div class="fnUnitAmt">0</div>
-              </div>
-            </div>
-            <div class="right">
-              <button id="ITP_BTN_MPOMNG02010_POP_ITEM_MINUS" class="POP_ITEM_MINUS">-</button>
-              <div class="num fnPchReqQty">1</div>
-              <button id="ITP_BTN_MPOMNG02010_POP_ITEM_PLUS" class="POP_ITEM_PLUS">+</button>
-            </div>
-            <div class="add">
-              <button id="ITP_BTN_MPOMNG02010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
-            </div>
-          </li>
+        <ul id="ITP_LIST_MPOMNG02010_POP_ITEM_ROWS" class="mb_0"></ul>
+        <div id="ITP_LIST_MPOMNG02010_POP_ITEM_ROWCOPY" style="display: block;">
+           <li class="row_2">
+             <div class="scroll_left">
+                 <div class="fnItemNm">품목명 001</div>
+                 <div class="sub fnKg">700g</div>
+                 <div class="amt fnItemAmt">30,500원</div>
+             </div>
+             <div class="scroll_right">
+                 <button id="ITP_BTN_MPOMNG01010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
+             </div>
+           	<div class="itp_num_set">
+             <div class="right">
+			    <button id="ITP_BTN_MPOMNG01010_DETAIL_MINUS">-</button>
+			    <div class="num fnPchReqQty">1</div>
+			    <button id="ITP_BTN_MPOMNG01010_DETAIL_PLUS">+</button>
+			  </div>
+		   </div>
+         </li>
         </div>
       </div>
     </div>

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

@@ -11,13 +11,13 @@ body{background: #fff; position: relative; width: 100%; height: auto; font-famil
 /* 팝업 */
 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;}
-section .popup .pop label.pop_label {position:relative; top:10px; font-size: 1.2rem;}
-section .popup .pop div.pop_msg {position:relative; top:10px; font-size: 18px;}
+section .popup .pop label.pop_label {position:relative; top:10px; font-size: 16px;}
+section .popup .pop div.pop_msg {position:relative; top:10px; font-size: 16px;}
 section .popup .pop .pop_line { width: 100%; height: 30px;}
 section .popup .pop .pop_line label { font-size: 16px; margin-left: 20px; float: left; width: auto; text-align: left;}
 section .popup .pop .pop_line div {text-align: right; float: right; font-size: 16px; margin-right: 20px; width: auto;}
 section .popup .pop .popup_btn { position: absolute; background-color: #ccc; bottom: 0; width: 100%; height: 51px; border-top: 2px solid #000;}
-section .popup .pop .popup_btn button { position: relative; float: left; width: 100%; height: 50px; font-size: 1rem; font-weight: 700; border-radius: 0px; border: none;}
+section .popup .pop .popup_btn button { position: relative; float: left; width: 100%; height: 50px; font-size: 18px; font-weight: 100; border-radius: 0px; border: none;}
 section .popup .pop .popup_btn button.ok { width: 64%; border-left: 2px solid #000;}
 section .popup .pop .popup_btn button.cancel {width: 36%;}
 
@@ -266,26 +266,27 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 }
 .content {position:fixed; z-index: 10; padding-top: 10px; width:100%; background: #f4f5f4; border-bottom:1px solid #E0B8AB;}
 .content .header {width:100% !important; height:55px !important; margin:0 !important;}
-.content .line {position: relative; display: inline-block; width: 90%; height: 45px; margin:auto 5%; margin-bottom: -10px;}
+.content .line {position: relative; display: inline-block; width: 99%; height: 45px; margin:auto 1%; margin-bottom: -10px;}
 .content .line div {font-weight: 700;}
 .content .line div.itp_search_header {font-weight:100; background:#fff; margin:5px 10px; padding:9px 10px 4px 9px; text-align: left; color:#b88278;border: 1px solid #aaa; border-radius: 5px;}
 .content .line label {min-width:110px; color:#666; font-size: 18px; margin-left: 10px; float: left; text-align: left; margin-top: 10px; font-weight:100;}
 .content .line label.pay_label {margin:38px 1%; width:98%;}
 .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_wrap {float:right; margin-right:10px;}
-.content .line .float_left {float: left; margin-top:2px; width:200px;}
-.content .line .float_left button {top:5px; left:280px; position:absolute; background:transparent; border:none; width:36px; height:36px; padding:0;} 
+.content .line .float_left {float: left; margin-top:2px; width:50%;}
+.content .line .float_left button {float:right; left:-5px; position:relative; background:transparent; border:none; width:36px; height:36px; padding:0;} 
 .content .line .float_left button img {width:22px;}
-.content .line .float_left input {width:200px;}
+.content .line .float_left input {width:100%; font-size:14px;}
 .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 .itp_input_btn {top:5px; margin:0; position:absolute; width:50%;}
 .content .line .float_right_btn {float: left; margin-top: 5px; margin-left: 5px;}
 .content .line .float_right_btn button {padding:0; width:36px; height:36px; border-radius:5px; border:1px solid #aaa;}
 .content .line .float_right_btn button img {width:20px; height:20px;}
-.content .line .float_left select {float: left; width: 150px; height: 30px; margin-top: 7px; border: 1px solid #000; font-size: 1rem;}
-.content .line .line_right {font-size: 2rem; float: right; margin-right: 0%;}
-.content .line .line_right div {float: right; font-size: 18px;; margin-top: 12px; margin-right: 30px; color:#555;}
+.content .line .float_left select {float: left; width: 100%; height: 36px; border: 1px solid #aaa; border-radius:5px; font-size: 1rem;}
+.content .line .line_right {font-size: 2rem; float: left; margin-right: 0%; width:50%}
+.content .line .line_right div {float: right; font-size: 18px;; margin-top: 12px; color:#555;}
 .content .line .line_right input {position: relative; text-align: right; margin-right: 84px;}
 .content .line .line_right input.m9 {margin-right:93px;}
 .content .line .line_right input.left {text-align: left;}
@@ -293,12 +294,13 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line .line_right select.m9 {margin-right:83px;}
 .content .line .line_right input.date{width:140px; margin-right:132px; height:35px;} 
 .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 input.date {width: 200px; margin: 5px 0; height: 35px; float: left; text-align:center; font-size:14px;background: url(../img/calender.png)no-repeat 95% 50%/20px auto #fff;}
+.content .line input.date {width: 50%; margin: 5px 0; height: 35px; float: left; text-align:center; font-size:14px;background: url(../img/calender.png)no-repeat 95% 50%/20px auto #fff;}
 .content .line input.date2 {width: 140px; height: 30px; margin-right:133px;}
-.content .line div.date_to {float: right; margin-right:10px;}
+.content .line div.date_to {width:60%; float: left; margin-right:10px;}
+.content .line div.date_to input {width:45%}
 .content .line div.date_to input.year {width: 120px; height: 30px;}
 .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 {width: 100%; height: 50px; padding-top:8px;}
 .content .line .search button {width: 50%; height: 35px; font-size: 1rem; padding: 0;}
 .content .line .search button.col_3 {width: 25%; margin:0 12px;}
 .content .list_line {width:98%; float:left; height:50px;display: inline-flex; margin:0 1%; font-size:12px;}
@@ -355,9 +357,9 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 
 /* scroll_area 조정 */
 .scroll_area {position: absolute; width: 100%; height: 1090px; bottom: 30px; overflow: auto; background: #fff;}
-.row-1{top: 240px;}
-.row-1-1{top:288px;}
-.row-2{top: 282px;}
+.row-1{top: 350px;}
+.row-1-1{top:364px;}
+.row-2{top: 300px;}
 
 .row-3{top: 363px;}
 .row-4{top: 377px;}
@@ -371,18 +373,19 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area ul.mb_0 {margin-bottom:0 !important;}
 .scroll_area .itp_non_data {margin:35% auto;}
 .scroll_area li {margin:0; list-style: none; width: 100%; height: 85px; border: 1px solid #ccc; background-color: #fff;}
-.scroll_area li.list-row {height:110px;}
-.scroll_area li .left_info {width:35%; float:left; font-size:1rem;}
+.scroll_area li.list-row {height:100px;}
+.scroll_area li .left_info {width:155px; float:left; font-size:1rem; margin-top:6px;}
 .scroll_area li .left_info div {display: inline-block;}
 .scroll_area li .left_info label{font-size: 1.1rem; font-weight:100; margin-left:10px;}
-.scroll_area li .left_info .thick {float:left;  margin: 2px 0 0 20px; font-size: 18px; text-align: left; width: 90%; font-weight: 100;}
+.scroll_area li .left_info .check_box {padding:20px 3px; height:88px; float:left; width:13px;}
+.scroll_area li .left_info .thick {float:left;  margin: 2px 0 0 8px; font-size: 18px; text-align: left; width: 85%; font-weight: 100;}
 .scroll_area li .left_info .thick .itp_item {color:gray;}
 .scroll_area li .left_info .thick .itp_gram {color:#aaa; font-size:16px;}
 .scroll_area li .left_info .thick .itp_amt {color:#b88278; margin-top: 4px;}
 .scroll_area li .left_info .history {font-weight: 700; font-size: 1.1rem; margin-top:-2px;}
 .scroll_area li .left_info .history input{width: 150px;}
-.scroll_area li .md_info{width:35%; float:left; font-size:1rem; margin-top:25px;}
-.scroll_area li .md_info .thick {float:left;  margin: 2px 0 0 20px; font-size: 18px; text-align: left; width: 90%; font-weight: 100;}
+.scroll_area li .md_info{width:140px; float:right; font-size:1rem; margin-top:17px;}
+.scroll_area li .md_info .thick {float:left;  margin: 2px; font-size: 18px; text-align: left; width: 90%; font-weight: 100;}
 .scroll_area li .md_info .thick div{color:gray;}
 .scroll_area li.history_list {height: 140px; padding-top:8px;}
 .scroll_area li.history_list .btn_check {height:158px; margin-top:-5px; width:90%; float:right; padding-top:7px; }
@@ -420,30 +423,32 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .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 .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;}
+.scroll_area li .left .nomal .half {float:left;}
+.scroll_area li .left .nomal .half label {min-width:auto;}
+.scroll_area li .left .nomal .half div {min-width:auto; margin-right:5px;}
 .scroll_area li .left .nomal  input{width: 85px; height:30px;}
 
 .scroll_area li .scroll_btn {width:10%; height:158px; margin-top:-5px; display:inline-flex;}
 
 .scroll_area li .scroll_btn input {width:15px; margin:auto 10px;}
 .scroll_area li .scroll_btn input:checked ~ .scroll_btn {background:#eee;}
-.scroll_area li .left .nomal span {margin:0 10px;}
+.scroll_area li .left .nomal span {margin:0 5px;}
 
 .scroll_area li .left .nomal .btn_bar{position: relative; width: auto; font-size: 2.2rem;}
 .scroll_area li .left .nomal .btn_bar button{width: 25px; height: 30px; font-size: 1rem; padding: 0;}
 .scroll_area li .left .nomal .btn_bar .col_0{min-width: auto; margin: 5px 20px;}
 
-.scroll_area li .left .nomal label{position:relative; margin-left: 10px;}
+.scroll_area li .left .nomal label{position:relative; margin-left: 10px; font-size:15px; font-weight:100; min-width:100px; text-align:left;}
 .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 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 div{ display: inline-flex; font-weight: 100; font-size: 15px;}
 .scroll_area li .left .nomal .col_5{min-width:50px;}
 
-.scroll_area li .right {margin: 42px 10px 0 0; position: relative; display: flex; height:35px; font-size: 1.4rem; font-weight: 700; float: right;}
+.scroll_area li .right {margin: 28px 10px 0 0; position: relative; display: flex; height:35px; font-size: 1.4rem; font-weight: 700; float: right;}
 .scroll_area li .right .num {padding:8px 22px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
+.scroll_area li .right .fnnum {margin:13px 30px;}
 .scroll_area li .right button {background:#e1cac1; color:#fff; border:1px solid #E0B8AB; padding:0px 7px; font-size: 1.5rem; border-radius: 0px;}
 
 /* ITP_FOOTER */
@@ -476,3 +481,15 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 #ITP_FOOTER .itp_modal .itp_mg_top {margin-top: 10px;} 
 #ITP_FOOTER .itp_modal .itp_form .itp_mlb {font-size:13px; height:42px; text-align:left; padding:12px 5px 8px 10px; color:#333; border:1px solid #ccc;}
 #ITP_FOOTER .itp_modal .itp_form .itp_mip {padding: 8px 5px 4px 12px; height:42px; text-align: left; font-size: 16px; border:1px solid #ccc;}
+
+@media screen and (min-width: 550px) {
+	.content .line input.date {width: 70%;}
+	.content .line .line_right {width:70%}
+	.content .line .float_left .itp_input_btn {width:70%;}
+	.content .line .float_left {width:70%;}
+	.content .line div.date_to {width:70%;}
+	.content .line div.date_to input {width:45%}
+	.content .line {margin:-5px 3%;}
+}
+
+

src/main/webapp/mobile/js/app/login.js

@@ -101,8 +101,6 @@ function itp_fn_login_proc() {
 	    	$(location).attr('href', MOBILE_CONTEXTPATH + '/app/main.html');
 		};
 		var params = $('#ITP_FORM_MOBILE_LOGIN').serializeObject();
-		console.log('/api/member/sign-in-app');
-		console.log(JSON.stringify(params));
 		fn_ajax_call('/api/member/sign-in-app', JSON.stringify(params), loginFn, 'POST'); //암호화 해서 보내는 경우 먼저 해시키를 가져와서 암호화해서 보낸다
 	};
 	fn_ajax_call('/api/session/hashed', null, callbackFn, 'GET'); //Crypto 암호화를 위한 해쉬키.. 로그인 후에는 Jwt 포함인 /api/session/hashedKey 이걸로 호출해서 사용한다.

src/main/webapp/mobile/js/properties.js

@@ -1,6 +1,6 @@
 
-// const DOMAIN = 'http://106.246.249.162:38050';
-const DOMAIN = 'http://192.168.0.13:8050';
+const DOMAIN = 'http://106.246.249.162:38050';
+// const DOMAIN = 'http://192.168.0.13:8050';
 const ITP_CONTEXTPATH = '/oqpo-view';
 const MOBILE_CONTEXTPATH = ITP_CONTEXTPATH + '/mobile';
 const ITP_LANGUAGE = 'ko';