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

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

@@ -3105,6 +3105,7 @@ var itp_fn_s2ab = function(s) {
     return buf;    
 };
 
+/*
 let itp_fn_excel_data = function(gridColumns, excelData) {
 	var rtnData = [];
 	var cols = [];
@@ -3161,6 +3162,52 @@ var itp_fn_remote_to_excel = function(param) {
 	};
 	fn_ajax_call(options.url, JSON.stringify(options.param), callbackFn, 'POST');
 };
+*/
+
+var itp_fn_remote_to_excel = function(options) { 
+	options.param['pagingYn'] = false; 
+	var callbackFn = function(result) { 
+		const fileName=options.fileName;
+		const data = [], header=[], headerWidths=[], cols=[], mapAlign={};
+		// alignment: { vertical: 'center', horizontal: 'center', wrapText: true }
+		const BORDER_ALL = { border: { top: { style: 'thick' }, right: { style: 'thick' }, bottom: { style: 'thick' }, left: { style: 'thick' } } };
+		for(var c of options.gridColumns) {
+			if(c.hidden || !c.label ) continue;
+			const fill = { fgColor: { rgb: '5ebd3e' } };
+			const font = { bold: true, color: { rgb: 'FFFFFF' } };
+			const alignment = { vertical: 'center', horizontal: 'center', wrapText: true }
+			var width=parseInt(Number(c.width)/7);
+			if(!width ) width=10;
+			header.push({v:c.label,t:'s',s:{...BORDER_ALL,fill,font,alignment}});
+			headerWidths.push({width});
+			cols.push(c.name);
+			if(c.align ) {
+				mapAlign[c.name]=c.align;
+			}
+		}
+		data.push(header);
+		for(var c of result.gridRows) {
+			const row=[];
+			for(var name of cols ) {
+				const sty={...BORDER_ALL}; 
+				const align=mapAlign[name];
+				if(align ) sty.alignment = { vertical: 'center', horizontal:align, wrapText: true };
+				row.push({v:c[name], t:'s',s:sty});
+			}
+			data.push(row);
+		}
+		var wb = XLSX.utils.book_new();
+		const ws = XLSX.utils.aoa_to_sheet(data);
+		ws['!cols'] = headerWidths;
+
+		XLSX.utils.book_append_sheet(wb, ws, options.sheetName); 
+		var wbout = XLSX.write(wb, {bookType:'xlsx', bookSST:false, type: 'binary', showGridLines:true, cellStyles:true });
+		// 엑셀 파일 내보내기 
+		console.log("itp_fn_remote_to_excel callback => ",ws );
+		saveAs(new Blob([itp_fn_s2ab(wbout)],{type:"application/octet-stream"}), fileName); 
+	};
+	fn_ajax_call(options.url, JSON.stringify(options.param), callbackFn, 'POST');
+};
 
 var itp_fn_jqgrid_to_excel = function(gridId, fileName, sheetName){
 	

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

@@ -13,6 +13,8 @@ let MAIN_CHART_STL_CHART = '/api/main/chart/stl-chart';
 let MAIN_CHART_SFT_STCK_CHART = '/api/main/chart/sft-stck-chart';
 let MAIN_CHART_DELI_CHART = '/api/main/chart/deli-chart';
 
+var chartCnt=0;
+
 require(['config'], function() {
 	require([
 		'jquery', 
@@ -56,7 +58,6 @@ require(['config'], function() {
 			google.charts.load('current', {'packages':['corechart']});
 			google.charts.load('current', {'packages':['bar']});
 			
-			/*
 			$('#ITP_MAIN_HEADER_BRAND').hide();
 			$('#ITP_MAIN_HEADER_STORE').hide();
 			$('#ITP_MAIN_HEADER_SPPLY').hide();
@@ -69,12 +70,11 @@ require(['config'], function() {
 			$('#ITP_MAIN_DRAW_DELI_CHART').hide(); 		// 입고
 			$('#ITP_MAIN_DRAW_RELEASE_CHART').hide();	// 출고
 			$('#ITP_MAIN_DRAW_ORDERS_CHART').hide();	// 수주내역
-			*/
-
+			
 			var authTpCd = fn_make_user_info.get('authTpCd'); 
 			// 10:관리자, 20:영업담당자, 30:가맹점, 40:브랜드, 50:매장, 60:공급사
 			// console.log('>>>> authTpCd = ' + authTpCd);
-			var chartCnt=0;
+			
 			if( authTpCd == '40' || authTpCd == '10' ) { // 브랜드
 				$('#ITP_MAIN_HEADER_BRAND').show();
 			
@@ -149,7 +149,7 @@ function drawChartReq() {
 	  	var options = {
 			legend: { position: 'left' }, 
 			bar: { groupWidth: "50%" },
-			width: 300,
+			width: chartCnt==4? 245: 300,
 	  	};	
 	  	var chart = new google.charts.Bar(document.getElementById('ITP_PCH_REQ_GRAPH'));
 	  	// chart.draw(data, options);
@@ -171,7 +171,7 @@ function drawChartOrders() {
 		var data = google.visualization.arrayToDataTable( eval(result.chartData) );
 	  	var options = {
 			legend: { position: 'left' },
-			width: 300,
+			width: chartCnt==4? 245: 300,
 		};	
 	  	var chart = new google.charts.Bar(document.getElementById('ITP_ORDERS_GRAPH'));
 	  	chart.draw(data, options);
@@ -192,7 +192,7 @@ function drawChartDeli() {
 		var data = google.visualization.arrayToDataTable( eval(result.chartData) );
 	  	var options = {
 			legend: { position: 'left' },
-			width: 300,
+			width: chartCnt==4? 245: 300,
 		};	
 	  	var chart = new google.charts.Bar(document.getElementById('ITP_DELI_GRAPH'));
 	  	chart.draw(data, options);
@@ -213,7 +213,7 @@ function drawChartRelease() {
 		var data = google.visualization.arrayToDataTable( eval(result.chartData) );
 	  	var options = {
 			legend: { position: 'left' },
-			width: 300,
+			width: chartCnt==4? 245: 300,
 	  	};	
 	  	var chart = new google.charts.Bar(document.getElementById('ITP_RELEASE_GRAPH'));
 	  	chart.draw(data, options);
@@ -234,7 +234,7 @@ function drawChartPodr() {
 		var options = {
 			legend: { position: 'left' }, 
 			bar: { groupWidth: "50%" },
-			width: 300,
+			width: chartCnt==4? 245: 300,
 		};	
 		var chart = new google.charts.Bar(document.getElementById('ITP_PCH_PODR_GRAPH'));	
 		// chart.draw(data, options);
@@ -350,14 +350,18 @@ var itp_fn_MAIN_NOTICE_search = function() {
 	const formId = '#ITP_FORM_MAIN_SEARCH';
 	let param = $(formId).serializeObject();
 	var searhFn = function(result) {
-		$.each(result.gridRows, function(idx, value) {
-		
-			$('#ITP_NOTE_BAR').append($('#ITP_NOTE_ROWCOPY').val());			
-			$('#ITP_NOTE_BAR .itp_side_bar_note:last').find('.fnTitle').html(value.nticeTitl);
-			$('#ITP_NOTE_BAR .itp_side_bar_note:last').find('.fnDate').html(value.addDt);
-			$('#ITP_NOTE_BAR .itp_side_bar_note:last').find('.fnContents').html(value.nticeDesc);
-			
-		});
+		const tb=$('#ITP_NOTE_PANEL .rtable').find('tbody');
+		console.log("xxxxxxxxx", result, tb)
+		if(Array.isArray(result.gridRows) && result.gridRows.length ) {
+			var s='', idx=1;
+			for(var c of result.gridRows ) {
+				s+=`<tr><td>${idx}</td><td>${c.brandNm}</td><td>${c.nticeTitl}</td><td>${c.nticeStatNm}</td><td>${c.addDt}</td></tr>`;
+				idx++;
+			}
+			tb.html(s);
+		} else {
+			tb.html('<tr><td colspan="5" style="text-align:center;">등록된 공지사항이 없습니다</td></tr>')
+		} 
 	};
 	fn_ajax_call(NTICE_DETAIL_GRID_LIST, JSON.stringify(param), searhFn, 'POST');
 };

src/main/webapp/main.html

@@ -40,7 +40,117 @@
 
 	<script src="./js/app/properties.js"></script>
 	<script src="./js/require.min.js" data-main="./js/app/config.js"></script>
- 
+	<style>
+		#ITP_NOTE_PANEL {
+			margin-top: 16px;
+			margin-bottom: 20px;
+		}
+		#ITP_NOTE_PANEL h3 {
+			font-size: 20px;
+			color: #776;
+    		text-shadow: 2px 2px 3px rgb(255 255 255 / 20%);
+  			line-height: 20px;
+			margin: 0 0 10px 0;
+			color: #233c44;
+		}
+		.itp_graph_panel {
+			border: 1px solid #ccc;
+			padding: 12px;
+		}
+		.rtable { 
+			display: inline-block;
+			vertical-align: top;
+			max-width: 100%;
+			overflow-x: auto;
+			white-space: nowrap;
+			border-collapse: collapse;
+			border-spacing: 0;
+		  }
+		  
+		  .rtable,
+		  .rtable--flip tbody {
+			-webkit-overflow-scrolling: touch;
+			background: radial-gradient(left, ellipse, rgba(0, 0, 0, 0.2) 0%, rgba(0, 0, 0, 0) 75%) 0 center, radial-gradient(right, ellipse, rgba(0, 0, 0, 0.2) 0%, rgba(0, 0, 0, 0) 75%) 100% center;
+			background-size: 10px 100%, 10px 100%;
+			background-attachment: scroll, scroll;
+			background-repeat: no-repeat;
+		  }
+		  
+		  .rtable td:first-child,
+		  .rtable--flip tbody tr:first-child {
+			background-image: linear-gradient(to right, white 50%, rgba(255, 255, 255, 0) 100%);
+			background-repeat: no-repeat;
+			background-size: 20px 100%;
+		  }
+		  
+		  .rtable td:last-child,
+		  .rtable--flip tbody tr:last-child {
+			background-image: linear-gradient(to left, white 50%, rgba(255, 255, 255, 0) 100%);
+			background-repeat: no-repeat;
+			background-position: 100% 0;
+			background-size: 20px 100%;
+		  }
+		  
+		  .rtable th {
+			font-size: 13px;
+			text-align: left;
+			text-transform: uppercase;
+			background: #f2f0e6;
+			height: 40px;
+		  }
+		  
+		  .rtable th,
+		  .rtable td {
+			padding: 6px 12px;
+			border: 1px solid #d9d7ce;
+		  }
+		  
+		  .rtable--flip {
+			display: flex;
+			overflow: hidden;
+			background: none;
+		  }
+		  
+		  .rtable--flip thead {
+			display: flex;
+			flex-shrink: 0;
+			min-width: -webkit-min-content;
+			min-width: -moz-min-content;
+			min-width: min-content;
+		  }
+		  
+		  .rtable--flip tbody {
+			display: flex;
+			position: relative;
+			overflow-x: auto;
+			overflow-y: hidden;
+		  }
+		  
+		  .rtable--flip tr {
+			display: flex;
+			flex-direction: column;
+			min-width: -webkit-min-content;
+			min-width: -moz-min-content;
+			min-width: min-content;
+			flex-shrink: 0;
+		  }
+		  
+		  .rtable--flip td,
+		  .rtable--flip th {
+			display: block;
+		  }
+		  
+		  .rtable--flip td {
+			background-image: none !important;
+			border-left: 0;
+		  }
+		  
+		  .rtable--flip th:not(:last-child),
+		  .rtable--flip td:not(:last-child) {
+			border-bottom: 0;
+		  }
+		  
+	</style>
 </head>
 <body>
 	<div id="ITP_WRAPPER">
@@ -148,6 +258,24 @@
 							<div id="ITP_AJAX_SUMMARY_DETAIL_CONTAINER" class="itp_det_in">
 								<form id="ITP_FORM_MAIN_SEARCH" class="form-horizontal">
 								</form>
+
+								<div id="ITP_NOTE_PANEL">
+									<h3>공지사항</h3>
+									<table class="rtable" style="width:100%;">
+										<thead>
+										  <tr>
+											<th style="width:80px;">번호</th>
+											<th style="width:150px;">브랜드</th>
+											<th style="width:65%;">제목</td>
+											<th style="width:80px;">상태</th>
+											<th style="width:150px;">등록일</th>
+										  </tr>
+										</thead>
+										<tbody>
+										   
+										</tbody>
+									  </table>
+								</div>
 								
 								<textarea id="ITP_NOTE_ROWCOPY" rows="0" cols="0" style="display:none;">
 								<div class="itp_side_bar_note">
@@ -158,11 +286,7 @@
 								</textarea>
 								
 								<!-- 여기는 공급사 매장 로그인 시 나오는 구간 -->
-								<div id="ITP_NOTE_BAR">
-									<div class="itp_side_bar_header">
-										<label>공지사항</label>
-									</div>
-								</div>
+								
 								
 								<div id="ITP_MAIN_HEADER_BRAND" class="itp_main_header" style="display: none;">
 									<div class="col_3" style="margin-left:0">
@@ -254,7 +378,7 @@
 								</div>
 								
 								<div id="ITP_MAIN_GRAPH_AREA">
-									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_CHART_REQ" style="display: none;">
+									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_CHART_REQ">
 										 
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">구매요청</div>
@@ -268,7 +392,7 @@
 										<div id="ITP_PCH_REQ_GRAPH" class="itp_graph_area"></div>
 									</div>
 									
-									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_DELI_CHART" style="display: none;">
+									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_DELI_CHART">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">입고</div>
 											<select id="ITP_FORM_MAIN_SEARCH_PR_TYPE" name="prType">
@@ -281,7 +405,7 @@
 										<div id="ITP_DELI_GRAPH" class="itp_graph_area"></div>
 									</div>
 									
-									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_ORDERS_CHART" style="display: none;">
+									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_ORDERS_CHART">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">수주내역</div>
 											<select id="ITP_FORM_MAIN_SEARCH_PR_TYPE" name="prType">
@@ -294,7 +418,7 @@
 										<div id="ITP_ORDERS_GRAPH" class="itp_graph_area"></div>
 									</div>
 									
-									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_RELEASE_CHART" style="display: none;">
+									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_RELEASE_CHART">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">출고</div>
 											<select id="ITP_FORM_MAIN_SEARCH_PR_TYPE" name="prType">
@@ -307,7 +431,7 @@
 										<div id="ITP_RELEASE_GRAPH" class="itp_graph_area"></div>
 									</div>
 									
-									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_CHART_PODR" style="display: none;">
+									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_CHART_PODR">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">구매발주</div>
 											<select id="ITP_FORM_MAIN_SEARCH_PR_TYPE" name="prType">
@@ -320,7 +444,7 @@
 										<div id="ITP_PCH_PODR_GRAPH" class="itp_graph_area"></div>
 									</div>
 									
-									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_CHART_REQ_UP" style="display: none;">
+									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_CHART_REQ_UP">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">매출순위</div>
 											<select id="ITP_FORM_MAIN_SEARCH_PR_TYPE" name="prType">
@@ -333,7 +457,7 @@
 										<div id="ITP_PCH_REQ_UP_ITEM_GRAPH" class="itp_graph_area"></div>
 									</div>
 									
-									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_CHART_CORE" style="display: none;">
+									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_CHART_CORE">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">정&nbsp;&nbsp;산</div>
 										</div> 
@@ -341,7 +465,7 @@
 									</div>
 									
 								</div>
-								<div class="itp_graph_box" style="width:100%" id="ITP_MAIN_DRAW_LINE" style="display: none;">
+								<div class="itp_graph_box" style="width:100%; margin-top:16px;" id="ITP_MAIN_DRAW_LINE">
 									<div class="itp_graph_title">
 										<div class="itp_graph_info">안전재고</div>
 									</div>

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

@@ -1,6 +1,6 @@
 <section id="ITP_MOBILE_MLOANMNG01010">
 	<div id="ITP_AJAX_MLOANMNG01010_LIST_CONTAINER" style="display: none;" >
-		<form id="ITP_FORM_MLOANMNG01010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
+		<form id="ITP_FORM_MLOANMNG01010_LIST_SEARCH" class="area_full form-horizontal" onsubmit="return false;">
 		  <input type="hidden" id="ITP_FORM_MLOANMNG01010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
 		  <input type="hidden" id="ITP_FORM_MLOANMNG01010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
 		  <div class="content">
@@ -64,10 +64,10 @@
 					<div class="nomal">
 					  <label>한도금액</label>
 					  <span>:</span>
-					  <div class="fnLimitAmt"></div>
-					  <label>가용한도금액</label>
+					  <div class="text_4 fnLimitAmt"></div>
+					  <label class="col_6">가용한도금액</label>
 					  <span>:</span>
-					  <div class="col_6 fnPosbLimitAmt"></div>
+					  <div class="fnPosbLimitAmt">12,000,000000</div>
 					</div>
 				  </div>
 				  <div class="left">
@@ -93,7 +93,7 @@
 	  </form>
 	</div>
 	<div id="ITP_AJAX_MLOANMNG01010_VIEW_CONTAINER" style="display: none;">
-		<form id="ITP_FORM_MLOANMNG01010_VIEW_SEARCH" class="form-horizontal" onsubmit="return false;">
+		<form id="ITP_FORM_MLOANMNG01010_VIEW_SEARCH" class="put_btn form-horizontal" onsubmit="return false;">
 		  <input type="hidden" id="ITP_FORM_MLOANMNG01010_VIEW__SEARCH_BRAND_ID" name="sbrandId" value="">
 		  <input type="hidden" id="ITP_FORM_MLOANMNG01010_VIEW__SEARCH_STORE_ID" name="sstoreId" value="">
 		  <div class="content">
@@ -221,7 +221,7 @@
 			<div id="ITP_LIST_MLOANMNG01010_POP_STORE_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MLOANMNG01010_POP_STORE_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MLOANMNG01010_POP_STORE_ROWCOPY" style="display: none;">
-					<li class="row_2">
+					<li class="row_2 item-row">
 						<div class="scroll_left">
 							<div class="con_2 fnStoreNm"></div>
 							<div class="con_2 wichi fnStoreStNm"></div>

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

@@ -1,11 +1,10 @@
 <section id="ITP_MOBILE_MLOANMNG01011">
 	<div id="ITP_AJAX_MLOANMNG01011_VIEW_CONTAINER">
-		<form id="ITP_FORM_MLOANMNG01011_VIEW_SEARCH" class="form-horizontal" onsubmit="return false;">
+		<form id="ITP_FORM_MLOANMNG01011_VIEW_SEARCH" class="put_btn form-horizontal" onsubmit="return false;">
 		  <input type="hidden" id="ITP_FORM_MLOANMNG01011_VIEW__SEARCH_BRAND_ID" name="sbrandId" value="">
 		  <input type="hidden" id="ITP_FORM_MLOANMNG01011_VIEW__SEARCH_STORE_ID" name="sstoreId" value="">
 			<input type="hidden" id="ITP_FORM_MLOANMNG01011_VIEW_SEARCH_LOAN_MGNT_UNQ_NO" name="sloanMgntUnqNo" value="">
 		  <div class="content">
-		  
 		  	  <div class="content_fix">
 				  <div class="line">
 					  <label>매장명</label>

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

@@ -1,6 +1,6 @@
 <section id="ITP_MOBILE_MLOANMNG02010">
 	<div id="ITP_AJAX_MLOANMNG02010_LIST_CONTAINER" style="display: none;">
-		<form id="ITP_FORM_MLOANMNG02010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
+		<form id="ITP_FORM_MLOANMNG02010_LIST_SEARCH" class="area_full form-horizontal" onsubmit="return false;">
 		  <input type="hidden" id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
 		  <input type="hidden" id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
 		  <input type="hidden" id="ITP_FORM_LOANMNG02010_SEARCH_STORE_LOAN_DVSN" name="loanDvsn" value="">
@@ -58,60 +58,60 @@
 					<button id="ITP_BTN_MLOANMNG02010_LIST_REJECT" class="btn-danger RJT">반려</button>
 				  </div>
 				  <div class="left btn_list">
-					<div class="nomal btn">
-					  <label class="col_5">매장명</label>
+					<div class="nomal">
+					  <label class="col_4">매장명</label>
 					  <span>:</span>
-					  <div class="full_s fnStoreNm"></div>
+					  <div class="full_s fnStoreNm">fasdfsdfssfdsfadfsadfsadfasdsfdsfd</div>
 					</div>
 				  </div>
 				  <div class="left btn_list">
-					<div class="nomal btn">
+					<div class="nomal">
 					  <label class="sub_info">정산타입</label>
 					  <span>:</span>
 					  <div class="fnLoanDvsnNm"></div>
 				      <label class="sub_info">요청일자</label>
 					  <span>:</span>
-					  <div class="fnReqDt"></div>
+					  <div class="text_btn fnReqDt">2020.20.20</div>
 					</div>
 				  </div>
 				  <div class="left btn_list">
-					<div class="nomal btn">
+					<div class="nomal">
 					  <label class="sub_info">입금일자</label>
 					  <span>:</span>
 					  <div class="fnDpstDt"></div>
 					  <label class="sub_info">입금금액</label>
 					  <span>:</span>
-					  <div class="fnDpstAmt"></div>
+					  <div class="text_btn fnDpstAmt">12,000,00000</div>
 					</div>
 				  </div>
 				  <div class="left btn_list">
-					<div class="nomal btn">
+					<div class="nomal">
 					  <label class="sub_info">입금상태</label>
 					  <span>:</span>
 					  <div class="fnDpstStNm"></div>
-					  <label class="col_5">입금자</label>
+					  <label class="col_4">입금자</label>
 					  <span>:</span>
-					  <div class="fnDpstNm"></div>
+					  <div class="text_btn fnDpstNm"></div>
 					</div>
 				  </div>
 				  <div class="left btn_list">
-					<div class="nomal btn">
+					<div class="nomal">
 					  <label class="sub_info">승인일자</label>
 					  <span>:</span>
 					  <div class="fnDpstAuthDt"></div>
 					  <label class="sub_info">반려일자</label>
 					  <span>:</span>
-					  <div class="fnDpstRjctDt"></div>
+					  <div class="text_btn fnDpstRjctDt"></div>
 					</div>
 				  </div>
 				  <div class="left btn_list">
-					<div class="nomal btn">
+					<div class="nomal">
 					  <label class="sub_info">입금은행</label>
 					  <span>:</span>
 					  <div class="fnDpstBnkNm"></div>
 					  <label class="sub_info">계좌번호</label>
 					  <span>:</span>
-					  <div class="fnRcvAcctNo"></div>
+					  <div class="text_btn fnRcvAcctNo"></div>
 					</div>
 				  </div>
 				</li>
@@ -240,7 +240,7 @@
 			<div id="ITP_LIST_MLOANMNG02010_POP_STORE_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MLOANMNG02010_POP_STORE_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MLOANMNG02010_POP_STORE_ROWCOPY" style="display: none;">
-					<li class="row_2">
+					<li class="row_2 item-row">
 						<div class="scroll_left">
 							<div class="con_2 fnStoreNm"></div>
 							<div class="con_2 wichi fnStoreStNm"></div>

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

@@ -1,6 +1,6 @@
 <section id="ITP_MOBILE_MLOANMNG03010">
 	<div id="ITP_AJAX_MLOANMNG03010_LIST_CONTAINER" style="display: none;">
-		 <form id="ITP_FORM_MLOANMNG03010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
+		 <form id="ITP_FORM_MLOANMNG03010_LIST_SEARCH" class="area_full form-horizontal" onsubmit="return false;">
 			 <input type="hidden" id="ITP_FORM_MLOANMNG03010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
 			 <input type="hidden" id="ITP_FORM_MLOANMNG03010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
 		  <div class="content">
@@ -42,13 +42,6 @@
 			  <ul id="ITP_LIST_MLOANMNG03010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
 			  <div id="ITP_LIST_MLOANMNG03010_LIST_ITEM_ROWCOPY" style="display: none;">
 				<li class="history_list7 item-row">
-				  <!-- <div class="left">hidden 처리
-					<div class="nomal">
-				      <label class="history_label">정산번호 </label>
-					  <span>:</span>
-					  <div class="full fnSttlMgntUnqNo">12121212121212121</div>
-					</div>
-				  </div> -->
 				  <div class="left">
 					<div class="nomal">
 					  <label>매장명</label>
@@ -92,112 +85,112 @@
 	  </form>
 	</div>
 	<div id="ITP_AJAX_MLOANMNG03010_VIEW_CONTAINER" style="display: none;">
-		<form id="ITP_FORM_MLOANMNG03010_VIEW" class="form-horizontal" onsubmit="return false;">
+		<form id="ITP_FORM_MLOANMNG03010_VIEW" class="put_btn form-horizontal" onsubmit="return false;">
 			<input type="hidden" id="ITP_FORM_MLOANMNG03010_VIEW_BRAND_ID" name="brandId" value="">
 			<input type="hidden" id="ITP_FORM_MLOANMNG03010_VIEW_STORE_ID" name="storeId" value="">
 			<input type="hidden" id="ITP_FORM_MLOANMNG03010_VIEW_STTL_MGNT_UNQ_NO" name="sttlMgntUnqNo" value="">
 			<input type="hidden" id="ITP_FORM_MLOANMNG03010_VIEW_UNPAID_AMT" name="goodsAmt" value="">
 			<input type="hidden" id="ITP_FORM_MLOANMNG03010_VIEW_RCPT_YN" value="">
-		</form>
-		  <div class="content">
-			  <div class="content_fix">
-				<div class="line">
-				  <label>매장명</label>
-				  <div class="line_right">
-				  	<div class="fnStoreNm"></div>
-				  </div>      
-				</div>
-				<div class="line">
-				  <label>정산상태</label>
-				  <div class="line_right">
-	  			  	<div class="fnSttlStNm"></div>
-				  </div>
-				</div>
-				<div class="line">
-				  <label>정산요청일자</label>
-				  <div class="line_right">
-				  	<div class="fnSttlReqDt"></div>
-				  </div>
-				</div>
-				<div class="line">
-				  <label>정산확정일자</label>
-				  <div class="line_right">
-				  	<div class="fnSttlDt"></div>
-				  </div>
-				</div>
-				<div class="line">
-				  <label>정산요청금액</label>
-				  <div class="line_right">
-				  	<div class="fnSttlReqAmt"></div>
-				  </div>
-				</div>
-				<div class="line">
-				  <label>미납금액</label>
-				  <div class="line_right">
-				  	<div class="fnUnpaidAmt"></div>
-				  </div>
-				</div>
-				<div class="line">
-				  <label>사용가능금액</label>
-				  <div class="line_right">
-				  	<div class="fnUseAmtTotal"></div>
-				  </div>
-				</div>
-				<div class="table_header">
-				  <h1><정산 상세 내역></h1>
-				</div>
-			</div>
-		  </div>
-		  <div id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_AREA" class="scroll_area row-4-1">
-			  <ul id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
-			  <div id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_ROWCOPY" style="display: none;"><!-- style="display: grid;" -->
-				<li class="history_list7 item-row">
-				  <div>
-					<div class="left">
-					  <div class="nomal">
-						<label class="col_5">품목명</label>
-						<span>:</span>
-					    <div class="full fnItemNm"></div>
+			  <div class="content">
+				  <div class="content_fix">
+					<div class="line">
+					  <label>매장명</label>
+					  <div class="line_right">
+					  	<div class="fnStoreNm"></div>
+					  </div>      
+					</div>
+					<div class="line">
+					  <label>정산상태</label>
+					  <div class="line_right">
+		  			  	<div class="fnSttlStNm"></div>
 					  </div>
 					</div>
-					<div class="left">
-					  <div class="nomal">
-						<label class="col_5">단가금액</label>
-						<span>:</span>
-					    <div class="col_82 lit fnUnitAmt"></div>
-						<label class="col_0">정산구분</label>
-						<span>:</span>
-					    <div class="fnSttlDvsnNm"></div>
+					<div class="line">
+					  <label>정산요청일자</label>
+					  <div class="line_right">
+					  	<div class="fnSttlReqDt"></div>
 					  </div>
 					</div>
-					<div class="left">
-					  <div class="nomal">
-						<label class="col_5">발주수량</label>
-						<span>:</span>
-					    <div class="col_82 lit fnPodrQyt"></div>
-						<label class="lit">입고(수거)일자</label>
-						<span>:</span>
-					    <div class="lit col_64 fnWhsColDt"></div>
+					<div class="line">
+					  <label>정산확정일자</label>
+					  <div class="line_right">
+					  	<div class="fnSttlDt"></div>
 					  </div>
 					</div>
-					<div class="left">
-					  <div class="nomal">
-						<label class="lit">입고(수거)수량</label>
-						<span>:</span>
-					    <div class="col_5 lit fnWhsColQty"></div>
-						<label class="lit">입고(수거)금액</label>
-						<span>:</span>
-					    <div class="col_8 lit fnWhsColAmt"></div>
+					<div class="line">
+					  <label>정산요청금액</label>
+					  <div class="line_right">
+					  	<div class="fnSttlReqAmt"></div>
 					  </div>
 					</div>
-				  </div>
-				</li>
+					<div class="line">
+					  <label>미납금액</label>
+					  <div class="line_right">
+					  	<div class="fnUnpaidAmt"></div>
+					  </div>
+					</div>
+					<div class="line">
+					  <label>사용가능금액</label>
+					  <div class="line_right">
+					  	<div class="fnUseAmtTotal"></div>
+					  </div>
+					</div>
+					<div class="table_header">
+					  <h1><정산 상세 내역></h1>
+					</div>
+				</div>
+			  </div>
+			  <div id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_AREA" class="scroll_area row-4-1">
+				  <ul id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
+				  <div id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_ROWCOPY" style="display: none;"><!-- style="display: grid;" -->
+					<li class="history_list7 item-row">
+					  <div>
+						<div class="left">
+						  <div class="nomal">
+							<label class="col_4">품목명</label>
+							<span>:</span>
+						    <div class="full fnItemNm"></div>
+						  </div>
+						</div>
+						<div class="left">
+						  <div class="nomal">
+							<label class="col_4">단가금액</label>
+							<span>:</span>
+						    <div class="col_82 lit fnUnitAmt"></div>
+							<label class="col_7">정산구분</label>
+							<span>:</span>
+						    <div class="fnSttlDvsnNm"></div>
+						  </div>
+						</div>
+						<div class="left">
+						  <div class="nomal">
+							<label class="col_4">발주수량</label>
+							<span>:</span>
+						    <div class="col_82 lit fnPodrQyt"></div>
+							<label class="col_7">입고(수거)일자</label>
+							<span>:</span>
+						    <div class="lit col_64 fnWhsColDt"></div>
+						  </div>
+						</div>
+						<div class="left">
+						  <div class="nomal">
+							<label class="col_7">입고(수거)수량</label>
+							<span>:</span>
+						    <div class="col_5 lit fnWhsColQty"></div>
+							<label class="col_7">입고(수거)금액</label>
+							<span>:</span>
+						    <div class="col_8 lit fnWhsColAmt"></div>
+						  </div>
+						</div>
+					  </div>
+					</li>
+				</div>
+			  </div>
+			<div class="button_bar">
+				<button id="ITP_BTN_MLOANMNG03010_VIEW_PAYMENT" class="btn_col_6 btn-m-orange PAY">결제</button>
+				<button id="ITP_BTN_MLOANMNG03010_VIEW_CANCEL_LIST" class="btn_col_3 btn-gray CLB">취소</button>
 			</div>
-		  </div>
-		<div class="button_bar">
-			<button id="ITP_BTN_MLOANMNG03010_VIEW_PAYMENT" class="btn_col_6 btn-m-orange PAY">결제</button>
-			<button id="ITP_BTN_MLOANMNG03010_VIEW_CANCEL_LIST" class="btn_col_3 btn-gray CLB">취소</button>
-		</div>
+		</form>
 	</div>
 	<div id="ITP_AJAX_MLOANMNG03010_PAY_CONTAINER" style="display: none;">
 		<form id="ITP_FORM_MLOANMNG03010_PAY" class="form-horizontal" onsubmit="return false;">
@@ -319,7 +312,7 @@
 			<div id="ITP_LIST_MLOANMNG03010_POP_STORE_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MLOANMNG03010_POP_STORE_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MLOANMNG03010_POP_STORE_ROWCOPY" style="display: none;">
-					<li class="row_2">
+					<li class="row_2 item-row">
 						<div class="scroll_left">
 							<div class="con_2 fnStoreNm"></div>
 							<div class="con_2 wichi fnStoreStNm"></div>

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

@@ -1,6 +1,6 @@
 <section id="ITP_MOBILE_MRTNMNG04010">
 	<div id="ITP_AJAX_MRTNMNG04010_LIST_CONTAINER" style="display: none;">
-		<form id="ITP_FORM_MRTNMNG04010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
+		<form id="ITP_FORM_MRTNMNG04010_LIST_SEARCH" class="area_full 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="content">
@@ -63,37 +63,37 @@
 			<div id="ITP_LIST_MRTNMNG04010_LIST_ITEM_AREA" class="scroll_area row-9">
 				<ul id="ITP_LIST_MRTNMNG04010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
 				<div id="ITP_LIST_MRTNMNG04010_LIST_ITEM_ROWCOPY" style="display: none;">
-					<li class="history_list7">
+					<li class="history_list7 item-row">
 						<div class="left">
 							<div class="nomal">
-								<label class="col_1">반품발주일자</label>
+								<label class="col_6">반품발주일자</label>
 								<span>:</span>
-								<div class="fnRtnOdrRegDt">2022.10.10</div>
-								<div class="col_0 fnColDvsnNm">(홍길동)</div>
+								<div class="auto fnRtnOdrRegDt">2022.10.10</div>
+								<div class="fnColDvsnNm">(홍길동)</div>
 							</div>
 						</div>
 						<div class="left">
 							<div class="nomal">
-								<label>반품발주상태</label>
+								<label class="col_6">반품발주상태</label>
 								<span>:</span>
 								<div class="col_6 fnRtnOdrStNm">발주가능</div>
 								<label>납품장소명</label>
-								<span class="mg0">:</span>
+								<span>:</span>
 								<div class="fnWhsNm">테스트 브랜드 창고명 ㅁㅇㄴㄻㄴ</div>
 							</div>
 						</div>
 						<div class="left">
 							<div class="nomal">
-								<label>반품발주정보</label>
+								<label class="col_6">반품발주정보</label>
 								<span>:</span>
-								<div class="col_0 fnRtnDodrItemQty">품목수</div>
+								<div class="auto fnRtnDodrItemQty">품목수</div>
 								<span>-</span>
 								<div class="fnRtnDodrTotalAmt">ㅁㄴㅇㄻㄴㅇㄻㄴㅇㄹ</div>
 							</div>
 						</div>
 						<div class="left">
 							<div class="nomal">
-								<label>반품입고장소</label>
+								<label class="col_6">반품입고장소</label>
 								<span>:</span>
 								<div class="full fnRtnWhsNm">ㅌ테스트 브랜드 확인</div>
 							</div>
@@ -104,7 +104,7 @@
 		</form>
 	</div>
 	<div id="ITP_AJAX_MRTNMNG04010_VIEW_CONTAINER" style="display: none;">
-		<form id="ITP_FORM_MRTNMNG04010_VIEW" class="form-horizontal" onsubmit="return false;">
+		<form id="ITP_FORM_MRTNMNG04010_VIEW" class="put_btn form-horizontal" onsubmit="return false;">
 			<input type="hidden" id="ITP_FORM_MRTNMNG04010_VIEW_VIEW_CD" name="viewCd" value="C">
 			<div class="content">
 				<div class="content_fix">
@@ -114,25 +114,25 @@
 					<div class="line">
 						<label>반품발주일자</label>
 						<div class="line_right">
-							<div class="fnRtnOdrRegDt">2022.10.10</div>
+							<div class="fnRtnOdrRegDt"></div>
 						</div>
 					</div>
 					<div class="line">
 						<label>반품발주금액</label>
 						<div class="line_right">
-							<div class="fnRtnDodrTotalAmt">1,000,000</div>
+							<div class="fnRtnDodrTotalAmt"></div>
 						</div>
 					</div>
 					<div class="line">
 						<label>반품장소</label>
 						<div class="line_right">
-							<div class="fnRtnWhsNm">ㅁㄴㅇㄹㄴㄻㄴㄻㄹㅇㄴㄻㄴㅇㄻ</div>
+							<div class="fnRtnWhsNm"></div>
 						</div>
 					</div>
 					<div class="line">
 						<label>반품입고장소</label>
 						<div class="line_right">
-							<div class="fnWhsNm">ㄴㅇㄻㄴㅇㄻㄴㄹㄴㅇㄴㄻㄴㅁ</div>
+							<div class="fnWhsNm"></div>
 						</div>
 					</div>
 					<div class="table_header">
@@ -143,50 +143,49 @@
 			<div id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_AREA" class="scroll_area row-3">
 				<ul id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
 				<div id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_ROWCOPY" style="display: none;">
-					<li class="history_list4">
+					<li class="history_list4 item-row">
 					  <div class="left">
 						<div class="nomal">
-						  <label class="col_3">품목명</label>
+						  <label class="col_4">품목명</label>
 						  <span>:</span>
-						  <div class="full fnItemNm">asdfasdfasffasf</div>
+						  <div class="full fnItemNm"></div>
 						</div>
 					  </div>
 					   <div class="left">
 						<div class="nomal">
-						  <label class="col_3">단가</label>
+						  <label class="col_4">단가</label>
 						  <span>:</span>
-						  <div class="fnRtnOdrQty">1,000,000</div>
+						  <div class="fnRtnOdrQty"></div>
 						  <label class="sub_info">반품구분</label>
 						  <span>:</span>
-						  <div class="fnRtnOdrAmt">사용가능</div>
+						  <div class="fnRtnOdrAmt"></div>
 						</div>
 					  </div>
 					  <div class="left">
 						<div class="nomal">
-						  <label class="col_1">반품수량</label>
+						  <label class="col_4">반품수량</label>
 						  <span>:</span>
-						  <div class="fnRtnOdrQty">10,000</div>
+						  <div class="fnRtnOdrQty"></div>
 						  <label class="sub_info">반품금액</label>
 						  <span>:</span>
-						  <div class="fnRtnOdrAmt">12,000,000원</div>
+						  <div class="fnRtnOdrAmt"></div>
 						</div>
 					  </div>
 					  <div class="left">
 						<div class="nomal">
-						  <label class="col_1">사유구분 </label>
+						  <label class="col_4">사유구분 </label>
 						  <span>:</span>
-						  <div class="full fnUnitAmt">어떤사유길다란거</div>
+						  <div class="full fnUnitAmt"></div>
 						</div>
 					  </div>
 					  <div class="left">
 						<div class="nomal">
-						  <label class="col_1">반품사유 </label>
+						  <label class="col_4">반품사유 </label>
 						  <span>:</span>
-						  <div class="full fnUnitAmt">어쩌고저쩌곰ㅇㄻㄴㄹㅇㅁㄹㅇㄴ</div>
+						  <div class="full fnUnitAmt"></div>
 						</div>
 					  </div>
 					</li>
-					
 				</div>
 			</div>
 			<div class="button_bar">
@@ -220,10 +219,10 @@
 			<div id="ITP_LIST_MRTNMNG04010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWCOPY" style="display:none;">
-					<li class="list-row row_2">
+					<li class="list-row row_2 item-row">
 						<div class="scroll_left">
 							<div class="con_2 fnWhsNm"></div>
-							<div class="con_2 sub fnLocationNm"></div>
+							<div class="con_2 wichi fnLocationNm"></div>
 						</div>
 						<div class="scroll_right">
 							<button id="ITP_BTN_MRTNMNG04010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

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

@@ -1,6 +1,6 @@
 <section id="ITP_MOBILE_MRTNMNG05010">
 	<div id="ITP_AJAX_MRTNMNG05010_LIST_CONTAINER" >
-		<form id="ITP_FORM_MRTNMNG05010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
+		<form id="ITP_FORM_MRTNMNG05010_LIST_SEARCH" class="put_btn form-horizontal" onsubmit="return false;">
 			<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
 			<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
 			<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_IDX" name="sidx" value="0">
@@ -65,12 +65,10 @@
 					</div>
 				</div>
 			</div>
-		</form>
-		<form id="ITP_FORM_MRTNMNG05010_LIST_MODIFY" class="form-horizontal" onsubmit="return false;">
 			<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_AREA" class="scroll_area row-10">
 				<ul id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
 				<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWCOPY" style="display: none;">
-					<li class="history_list2 item-row">
+					<li class="history_list4 item-row">
 						<div class="left">
 							<div class="nomal">
 								<label>반품번호 </label>
@@ -80,7 +78,7 @@
 						</div>
 						<div class="left">
 							<div class="nomal">
-								<label class="history_label">반품예정일</label>
+								<label class="">반품예정일</label>
 								<span>:</span>
 								<div class="fnColSchDt history_info"></div>
 							</div>
@@ -97,17 +95,17 @@
 						</div>
 						<div class="left">
 							<div class="nomal">
-								<label>품목 </label>
+								<label class="">품목 </label>
 								<span>:</span>
 								<div class="full fnItemNm"></div>
 							</div>
 						</div>
 						<div class="left">
 							<div class="nomal">
-								<label class="col_0">반품요청수량</label>
+								<label class="col_6">반품요청수량</label>
 								<span>:</span>
 								<div class=" fnColReqQty"></div>
-								<label class="col_0">반품발주수량</label>
+								<label class="col_6">반품발주수량</label>
 								<span>:</span>
 								<input class="" id="ITP_FORM_MRTNMNG05010_LIST_COL_QTY" type="text" name="colQty">
 							</div>
@@ -146,7 +144,7 @@
 			<div id="ITP_POP_MRTNMNG05010_LIST_SPPLY_AREA" class="popup_scroll">
 				<ul id="ITP_POP_MRTNMNG05010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_POP_MRTNMNG05010_LIST_SPPLY_ROWCOPY" style="display: none;">
-					<li class="row_2">
+					<li class="row_2 item-row">
 						<div class="scroll_left">
 							<div class="con_2 fnSpplyNm">공급업체 명A</div>
 							<div class="con_2 wichi fnStNm">($)</div>
@@ -183,7 +181,7 @@
 			<div id="ITP_LIST_MRTNMNG05010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWCOPY" style="display: none;">
-					<li class="list-row row_2">
+					<li class="list-row row_2 item-row">
 						<div class="scroll_left">
 							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>
 							<div class="con_2 wichi fnLocationNm">(상세위치내용)</div>

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

@@ -1,6 +1,6 @@
 <section id="ITP_MOBILE_MRTNMNG06010">
 	<div id="ITP_AJAX_MRTNMNG06010_LIST_CONTAINER" >
-		<form id="ITP_FORM_MRTNMNG06010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
+		<form id="ITP_FORM_MRTNMNG06010_LIST_SEARCH" class="area_full form-horizontal" onsubmit="return false;">
 			<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
 			<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
 			<div class="content">
@@ -77,9 +77,9 @@
 						</div>
 						<div class="left">
 							<div class="nomal">
-								<label class="history_label">반품예정일</label>
+								<label class="">반품예정일</label>
 								<span>:</span>
-								<div class="fn_info fnColSchDt"></div>
+								<div class="fnColSchDt"></div>
 							</div>
 						</div>
 						<div class="left">
@@ -87,7 +87,7 @@
 								<label>공급업체</label>
 								<span>:</span>
 								<div class="fnSpplyNm"></div>
-								<label class="sub_info">납품장소</label>
+								<label class="">납품장소</label>
 								<span>:</span>
 								<div class="fnRtnWhsNm"></div>
 							</div>
@@ -103,10 +103,10 @@
 							<div class="nomal">
 								<label>발주수량</label>
 								<span>:</span>
-								<div class="col_5 fnColReqQty"></div>
+								<div class="fnColReqQty"></div>
 								<label class="sub_info">입고수량</label>
 								<span>:</span>
-								<div class="fnRodrQty">10</div>
+								<div class="fnRodrQty"></div>
 							</div>
 						</div>
 					</li>
@@ -139,7 +139,7 @@
 			<div id="ITP_POP_MRTNMNG06010_LIST_SPPLY_AREA" class="popup_scroll">
 				<ul id="ITP_POP_MRTNMNG06010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_POP_MRTNMNG06010_LIST_SPPLY_ROWCOPY" style="display: none;">
-					<li class="row_2">
+					<li class="row_2 item-row">
 						<div class="scroll_left">
 							<div class="con_2 fnSpplyNm">공급업체 명A</div>
 							<div class="con_2 wichi fnStNm">($)</div>
@@ -176,7 +176,7 @@
 			<div id="ITP_LIST_MRTNMNG06010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWCOPY" style="display: none;">
-					<li class="row_2">
+					<li class="row_2 item-row">
 						<div class="scroll_left">
 							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>
 							<div class="con_2 wichi fnLocationNm">(상세위치내용)</div>

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

@@ -1,6 +1,6 @@
 <section id="ITP_MOBILE_MSTOCKMNG01010">
 	<div id="ITP_AJAX_MSTOCKMNG01010_LIST_CONTAINER">
-	  <form id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
+	  <form id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH" class="area_full form-horizontal" onsubmit="return false;">
 		  <input type="hidden" id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
 		  <input type="hidden" id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
 		  <div class="content">
@@ -48,47 +48,47 @@
 			<div id="ITP_LIST_MSTOCKMNG01010_LIST_ITEM_AREA" class="scroll_area row-12">
 			  <ul id="ITP_LIST_MSTOCKMNG01010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
 			  <div id="ITP_LIST_MSTOCKMNG01010_LIST_ITEM_ROWCOPY" style="display: none;"><!-- style="display: grid;" -->
-				<li class="history_list2 item-row">
+				<li class="history_list4 item-row">
 					<div class="left">
 					  <div class="nomal over">
-						<label class="col_3">창고명</label>
+						<label class="col_4">창고명</label>
 						<span>:</span>
-					    <div class="col_0 fnWhsNm"></div>
-					    <div class="col_0 fnLocationNm"></div>
+					    <div class="auto fnWhsNm"></div>
+					    <div class="text_two fnLocationNm"></div>
 					  </div>
 					</div>
 				    <div class="left">
 					  <div class="nomal">
-						  <label class="col_3">품목번호</label>
+						  <label class="col_4">품목번호</label>
 						  <span>:</span>
 						  <div class="full fnItemId"></div>
 					  </div>
 				    </div>
 					<div class="left">
 					  <div class="nomal">
-				    	<label class="col_3">품목명</label>
+				    	<label class="col_4">품목명</label>
 				    	<span>:</span>
 		  		  		<div class="full fnItemNm"></div>
 					  </div>
 					</div>
 					<div class="left">
 					  <div class="nomal">
-						<label class="col_3">단위</label>
+						<label class="col_4">단위</label>
 						<span>:</span>
 					    <div class="fnUnit"></div>
 						<label>현재고수량</label>
 						<span>:</span>
-					    <div class="col_9 fnStckQty"></div>
+					    <div class="fnStckQty"></div>
 					  </div>
 					</div>
 					<div class="left">
 					  <div class="nomal">
-						<label>적정재고수량</label>
+						<label class="col_6">적정재고수량</label>
 						<span>:</span>
 					    <div class="fnPrpStckQty"></div>
-						<label>안전재고비율(%)</label>
+						<label class="col_8">안전재고비율(%)</label>
 						<span>:</span>
-					    <div class="col_2 fnSftStckRt"></div>
+					    <div class="fnSftStckRt"></div>
 					  </div>
 					</div>
 				</li>

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

@@ -1,6 +1,6 @@
 <section id="ITP_MOBILE_MSTOCKMNG02010">
 	<div id="ITP_AJAX_MSTOCKMNG02010_LIST_CONTAINER">
-	 <form id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
+	 <form id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH" class="put_btn form-horizontal" onsubmit="return false;">
 		 <input type="hidden" id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_BRAND_ID" name="brandId" value="">
 		 <input type="hidden" id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_STORE_ID" name="storeId" value="">
 		  <div class="content">
@@ -53,17 +53,17 @@
 			<div id="ITP_LIST_MSTOCKMNG02010_LIST_ITEM_AREA" class="scroll_area row-4">
 			  <ul id="ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
 			  <div id="ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWCOPY" style="display: none;">
-				<li class="history_list8 item-row">
+				<li class="history_list10 item-row">
 					<div class="left">
 					  <div class="nomal">
-						<label class="col_3">품목번호</label>
+						<label class="">품목번호</label>
 						<span>:</span>
 					    <div class="full fnItemId" data-normal-yn="Y"></div>
 					  </div>
 					</div>
 					<div class="left">
 					  <div class="nomal">
-						<label class="col_3">품목명</label>
+						<label class="">품목명</label>
 						<span>:</span>
 					    <div class="full fnItemNm"></div>
 					  </div>

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

@@ -488,7 +488,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 
 .scroll_area li .history_info {width: auto;}
 .scroll_area li .left {width:100%; height:28px; margin-top:0px;}
-.scroll_area li .left.btn_list{position:relative; left:-7px;}
+.scroll_area li .left.btn_list{width:calc(100% - 45px);}
 .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;}
@@ -528,7 +528,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .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 .m_btn_bar{position: relative; display:inline-flex; width: 100px; height:25px; font-size: 12pt;}
+.scroll_area li .left .nomal .m_btn_bar{position: relative; display:inline-flex; width: 80px; height:25px; font-size: 12pt; margin-left:10px;}
 .scroll_area li .left .nomal .m_btn_bar button{width: 20px; height: 25px; font-size: 12pt; padding: 0; border:1px solid #E0B8AB; background: #e1cac1; color:#fff;}
 .scroll_area li .left .nomal .m_btn_bar button div{position:relative; width:10px; top:-2px; left:2px;}
 .scroll_area li .left .nomal .m_btn_bar .col_0{width: 40px; text-align:center; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
@@ -540,13 +540,18 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal label.col_3{min-width: 50px;}
 .scroll_area li .left .nomal label.col_4{min-width: 65px;}
 .scroll_area li .left .nomal label.col_6{min-width: 95px;}
+.scroll_area li .left .nomal label.col_7{min-width: 105px;}
+.scroll_area li .left .nomal label.col_8{min-width: 115px;}
 .scroll_area li .left .nomal.over{text-overflow:ellipsis; overflow:hidden; white-space:nowrap;}
 .scroll_area li .left .nomal i{width: 50px; text-align: center;}
 .scroll_area li .left .nomal div{text-overflow:ellipsis; overflow:hidden; white-space:nowrap; text-align:left; font-weight: 700; font-size: 12pt; width:calc(50% - 85px);}
 .scroll_area li .left .nomal .text_6{width:calc(50% - 108px);}
+.scroll_area li .left .nomal .text_4{width:calc(50% - 69px);}
+.scroll_area li .left .nomal .text_btn{width:calc(50% - 56px);}
+.scroll_area li .left .nomal .text_two{width:calc(50% - 56px);}
 
 .scroll_area li .left .nomal div.full{width:calc(100% - 85px);}
-.scroll_area li .left .nomal div.full_s{width:200px;}
+.scroll_area li .left .nomal div.full_s{width:calc(100% - 45px);}
 .scroll_area li .left .nomal div.auto{width:auto;}
 
 

src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG01010.js

@@ -35,7 +35,7 @@ let mobPageObj = {
 
 			// 조회일자 지정
 			$('#ITP_MOBILE_MCOLLMNG01010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_MCOLLMNG01010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', -7));
+			$('#ITP_FORM_MCOLLMNG01010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('D', -7));
 			$('#ITP_FORM_MCOLLMNG01010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 0));
 		},
 		info: function() {

src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG02010.js

@@ -36,7 +36,7 @@ let mobPageObj = {
 
 			// 조회일자 지정
 			$('#ITP_MOBILE_MCOLLMNG02010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_MCOLLMNG02010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', -7));
+			$('#ITP_FORM_MCOLLMNG02010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('D', -7));
 			$('#ITP_FORM_MCOLLMNG02010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 0));
 		},
 		info: function() {
@@ -53,8 +53,8 @@ let mobPageObj = {
 			$('button[id^="ITP_BTN_MCOLLMNG02010_LIST"]').on('click', function() {
 				var id = $(this).attr('id');
 				switch (id) {
-					case 'ITP_BTN_MCOLLMNG02010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(); 		break;
-					case 'ITP_BTN_MCOLLMNG02010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 		break;
+					case 'ITP_BTN_MCOLLMNG02010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(); 	break;
+					case 'ITP_BTN_MCOLLMNG02010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 	break;
 					case 'ITP_BTN_MCOLLMNG02010_LIST_SEARCH'		: mobContObj.list.search();		break;
 					case 'ITP_BTN_MCOLLMNG02010_LIST_CREATE'		: mobContObj.list.colPrint();	break;
 				}

src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG03010.js

@@ -35,7 +35,7 @@ let mobPageObj = {
 
 			// 조회일자 지정
 			$('#ITP_MOBILE_MCOLLMNG03010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_MCOLLMNG03010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', -7));
+			$('#ITP_FORM_MCOLLMNG03010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('D', -7));
 			$('#ITP_FORM_MCOLLMNG03010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 0));
 		},
 		info: function() {
@@ -52,8 +52,8 @@ let mobPageObj = {
 			$('button[id^="ITP_BTN_MCOLLMNG03010_LIST"]').on('click', function() {
 				var id = $(this).attr('id');
 				switch (id) {
-					case 'ITP_BTN_MCOLLMNG03010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(); 		break;
-					case 'ITP_BTN_MCOLLMNG03010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 		break;
+					case 'ITP_BTN_MCOLLMNG03010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(); 	break;
+					case 'ITP_BTN_MCOLLMNG03010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 	break;
 					case 'ITP_BTN_MCOLLMNG03010_LIST_SEARCH'		: mobContObj.list.search();		break;
 					case 'ITP_BTN_MCOLLMNG03010_LIST_COL_VIEW'		: mobContObj.list.colPrint();	break;
 				}

src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG01010.js

@@ -35,7 +35,7 @@ let mobPageObj = {
 
 			// 조회일자 지정
 			$('#ITP_MOBILE_MORDMNG01010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_MORDMNG01010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', -7));
+			$('#ITP_FORM_MORDMNG01010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('D', -7));
 			$('#ITP_FORM_MORDMNG01010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 0));
 		},
 		info: function() {
@@ -67,7 +67,6 @@ let mobPageObj = {
 				return false;
 			});
 
-			$(document).off('click');
 			$(document).on('click', '#ITP_LIST_MORDMNG01010_LIST_ITEM_ROWS li', function() {
 				var item = mobContObj.list.rows[$(this).index()];
 				mobContObj.view.init(item);
@@ -131,15 +130,14 @@ let mobContObj = {
 					$li.find('.fnPodrDt').text(item.podrDt);
 					$li.find('.fnDlvReqDt').text(item.dlvReqDt);
 					$li.find('.fnWhsNm').text(item.whsNm);
-					$li.find('.fnPodrTotalAmt').text(CommonObj.comma.set(item.podrTotalAmt));
-					$li.find('.fnPodrItemQty').text(CommonObj.currency.add(item.podrItemQty, '개'));
+					$li.find('.fnPodrTotalAmt').text(CommonObj.currency.add(item.podrTotalAmt));
+					$li.find('.fnPodrItemQty').text(CommonObj.comma.set(item.podrItemQty));
 					mobContObj.list.rows.push(item);
 				});
 			};
 			const param = $('#ITP_FORM_MORDMNG01010_LIST_SEARCH').serializeObject();
 			param.gridPage = mobContObj.list.listPage;
 			param.gridSize = mobile_list_size;
-			console.log(JSON.stringify(param));
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST');
 		}
 	},

src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG02010.js

@@ -36,8 +36,8 @@ let mobPageObj = {
 
 			// 조회일자 지정
 			$('#ITP_MOBILE_MORDMNG02010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_MORDMNG02010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', -7));
-			$('#ITP_FORM_MORDMNG01010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 0));
+			$('#ITP_FORM_MORDMNG02010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('D', -7));
+			$('#ITP_FORM_MORDMNG02010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 0));
 		},
 		info: function() {
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -70,7 +70,6 @@ let mobPageObj = {
 				return false;
 			});
 
-			$(document).off('click');
 			// $(document).on('click', '#ITP_LIST_MORDMNG02010_LIST_ITEM_ROWS li', function() {
 			// 	mobContObj.list.iChoice = $(this).index();
 			// });

src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG03010.js

@@ -35,7 +35,7 @@ let mobPageObj = {
 
 			// 조회일자 지정
 			$('#ITP_MOBILE_MORDMNG03010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_MORDMNG03010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', -7));
+			$('#ITP_FORM_MORDMNG03010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('D', -7));
 			$('#ITP_FORM_MORDMNG03010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 0));
 		},
 		info: function() {
@@ -69,7 +69,6 @@ let mobPageObj = {
 				return false;
 			});
 
-			$(document).off('click');
 			// $(document).on('click', '#ITP_LIST_MORDMNG03010_LIST_ITEM_ROWS li', function() {
 			// 	mobContObj.list.iChoice = $(this).index();
 			// });

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

@@ -128,7 +128,7 @@ let mobContObj = {
 				mobContObj.list.pager(result.gridTotal);
 				$.each(result.gridRows, function (i, item) {
 					$('#ITP_LIST_MPOMNG04010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG04010_LIST_ITEM_ROWCOPY').html());
-					var $li = $('#ITP_LIST_MPOMNG04010_LIST_ITEM_AREA .panel-group > .list-row2:last');
+					var $li = $('#ITP_LIST_MPOMNG04010_LIST_ITEM_AREA .panel-group > .item-row:last');
 					$li.find('.fnPodrDt').text(item.podrDt);
 					$li.find('.fnPodrMgrNm').text($li.find('.fnPodrMgrNm').text().replace('$', item.podrMgrNm));
 					$li.find('.fnPchodrStCd').text(item.pchOdrStNm);

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

@@ -118,7 +118,7 @@ let mobContObj = {
 				mobContObj.list.pager(result.gridTotal);
 				$.each(result.gridRows, function (i, item) {
 					$('#ITP_LIST_MPOMNG05010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG05010_LIST_ITEM_ROWCOPY').html());
-					var $li = $('#ITP_LIST_MPOMNG05010_LIST_ITEM_AREA .panel-group > .history_list2:last');
+					var $li = $('#ITP_LIST_MPOMNG05010_LIST_ITEM_AREA .panel-group > .item-row:last');
 					$li.find('.fnDlvSttmtUnqNo').text(item.dlvSttmtUnqNo);
 					$li.find('.fnDlvReqDt').text(item.dlvReqDt);
 					$li.find('.fnDlvSchDt').text(item.dlvSchDt);

src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG05010.js

@@ -201,7 +201,6 @@ let mobContObj = {
 					param['brandId'] = $('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_BRAND_ID').val();
 					param['storeId'] = storeId;
 					param['gridInsertData'] = gridInsertData;
-					console.log(JSON.stringify(param));
 					var saveFn = function () {
 						mobContObj.list.search();
 					};
@@ -262,7 +261,7 @@ let mobPopObj = {
 				switch (id) {
 					case 'ITP_BTN_MRTNMNG05010_POP_SPPLY_SEARCH'	: _this.search();			break;
 					case 'ITP_BTN_MRTNMNG05010_POP_SPPLY_CHOICE'	: _this.choice($(this));	break;
-					case 'ITP_BTN_MRTNMNG05010_POP_SPPLY_CLOSE'	: _this.close(); 			break;
+					case 'ITP_BTN_MRTNMNG05010_POP_SPPLY_CLOSE'		: _this.close(); 			break;
 				}
 				return false;
 			});

src/main/webapp/mobile/js/app/mstockmng/ITP_MSTOCKMNG02010.js

@@ -115,7 +115,6 @@ let mobContObj = {
 				$li.find('.fnStckQty').text(CommonObj.currency.add(item.stckQty, '개'));
 				item['cddQty'] = 1;
 				item['normalYn'] = (item.itemId && item.itemId !== '') ? 'Y' : 'N';
-				console.log(item);
 				mobContObj.list.rows.push(item);
 			});
 		},