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

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

@@ -74,16 +74,12 @@
 	              <div class="thick">
 	              	<label>품목명</label>
 	                <span>:</span>
-	                <div class="itp_item fnItemNm">품목명</div>
+	                <div class="itp_item fnItemNm"></div>
 	              </div>
 	              <div class="thick">
-	              	<label class="two">단가/구매가</label>
-	                <span>:</span>
-	                <div class="slash">
-	                	<div class="itp_gram auto fnUnitAmt">1,000원</div>
-	                	<span>/</span>
-	                	<div class="itp_amt amt_wd fnUnitAmt">1,000원</div>
-	                </div>
+                	<div class="itp_gram auto fnUnitAmt"></div>
+                	<span>/</span>
+                	<div class="itp_amt amt_wd fnOrdAmt"></div>
 	              </div>
 	            </div>
 				<div class="right" style="width:125px;">

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

@@ -255,9 +255,9 @@
                 <div class="itp_item fnItemNm"></div>
               </div>
               <div class="thick">
-              	<label>구매가</label>
-                <span>:</span>
-                <div class="itp_amt fnUnitAmt"></div>
+               	<div class="itp_gram auto fnUnitAmt"></div>
+               	<span>/</span>
+               	<div class="itp_amt amt_wd fnOrdAmt"></div>
               </div>
             </div>
             <div class="right">

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

@@ -58,9 +58,9 @@
 			                <div class="itp_item fnItemNm">품목명</div>
 			              </div>
 			              <div class="thick">
-			              	<label>구매가</label>
-			                <span>:</span>
-			                <div class="itp_amt fnUnitAmt"></div>
+			               	<div class="itp_gram auto fnUnitAmt"></div>
+			               	<span>/</span>
+			               	<div class="itp_amt amt_wd fnOrdAmt"></div>
 			              </div>
 			            </div>
 						<div class="right" style="width:125px;">

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

@@ -213,11 +213,11 @@
 								<span>:</span>
 								<div class="itp_item fnItemNm"></div>
 							</div>
-							<div class="thick">
-								<label>구매가</label>
-								<span>:</span>
-								<div class="itp_amt fnUnitAmt"></div>
-							</div>
+							 <div class="thick">
+				               	<div class="itp_gram auto fnUnitAmt"></div>
+				               	<span>/</span>
+				               	<div class="itp_amt amt_wd fnOrdAmt"></div>
+				              </div>
 						</div>
 						<div class="right">
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_MINUS" class="DETAIL_ITEM_MINUS">-</button>

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

@@ -219,7 +219,7 @@
 			<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 item-row">
+					<li class="row_2 item-row">
 						<div class="scroll_left">
 							<div class="con_2 fnWhsNm"></div>
 							<div class="con_2 wichi fnLocationNm"></div>

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

@@ -87,7 +87,7 @@
 								<label>공급업체</label>
 								<span>:</span>
 								<div class="fnSpplyNm"></div>
-								<label class="">납품장소</label>
+								<label class="">수거창고</label>
 								<span>:</span>
 								<div class="fnRtnWhsNm"></div>
 							</div>

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

@@ -467,13 +467,13 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 
 .scroll_area li .left_info span {font-size: 14pt;}
 .scroll_area li .left_info label{width:60px; font-size: 14pt; font-weight:100; margin-top:5px;}
-.scroll_area li .left_info label.two{width:84px;}
+.scroll_area li .left_info label.two{width:84px; font-size: 12pt;}
 .scroll_area li .left_info .check_box {padding-top:8px; height:50px; float:left; width:22px;}
 .scroll_area li .left_info .check_box input[type=checkbox] {width:15px; margin:10px 0 0 7px;}
 .scroll_area li .left_info .thick {float:left; text-align: left; width: 90%; height:38px; font-weight: 100;}
 .scroll_area li .left_info .thick .itp_item {color:gray;text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:calc(100% - 81px); top:7px; text-align:left; position:relative;}
 .scroll_area li .left_info .thick .itp_gram {position:relative; top:7px; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; color:#aaa; font-size:14pt; text-align:right; width: 85px;}
-.scroll_area li .left_info .thick .auto {width:auto; float:left;}
+.scroll_area li .left_info .thick .auto {width:auto;}
 .scroll_area li .left_info .thick .itp_amt {color:#b88278; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width: calc(100% - 105px); top: 7px; position:relative; text-align:left;}
 .scroll_area li .left_info .thick .amt_wd {width:calc(100% - 95px);}
 .scroll_area li .left_info .history {font-weight: 700; font-size: 1.1rem; margin-top:-2px;}

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

@@ -172,7 +172,7 @@ let mobContObj = {
 			$(id).find('.fnWhsNm').text(result.whsNm);
 			$.each(result.rtnOdrDtlList, function (i, item) {
 				$('#ITP_LIST_MRTNMNG04010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MRTNMNG04010_VIEW_ITEM_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MRTNMNG04010_VIEW_ITEM_AREA .panel-group > .history_list5:last');
+				var $li = $('#ITP_LIST_MRTNMNG04010_VIEW_ITEM_AREA .panel-group > .item-row:last');
 				$li.find('.fnItemNm').text(item.itemNm);
 				$li.find('.fnRtnOdrQty').text(CommonObj.comma.set(item.rtnOdrQty, item.unit));
 				$li.find('.fnRtnOdrAmt').text(CommonObj.currency.add(item.rtnOdrAmt));
@@ -228,7 +228,7 @@ let mobPopObj = {
 			this.rows = gridRows;
 			$.each(gridRows, function (i, item) {
 				$('#ITP_POP_MRTNMNG04010_LIST_SPPLY_AREA .panel-group').append($('#ITP_POP_MRTNMNG04010_LIST_SPPLY_ROWCOPY').html());
-				var $li = $('#ITP_POP_MRTNMNG04010_LIST_SPPLY_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_POP_MRTNMNG04010_LIST_SPPLY_AREA .panel-group > .item-row:last');
 				$li.find('.fnSpplyNm').text(item.spplyNm);
 				$li.find('.fnStNm').text($li.find('.fnStNm').text().replace('$', item.stNm));
 				$li.find('.fnSpplyId').data('item-key', item.spplyId);
@@ -294,7 +294,7 @@ let mobPopObj = {
 			this.rows = gridRows;
 			$.each(gridRows, function (i, item) {
 				$('#ITP_LIST_MRTNMNG04010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MRTNMNG04010_POP_WHS_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MRTNMNG04010_POP_WHS_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_LIST_MRTNMNG04010_POP_WHS_AREA .panel-group > .item-row:last');
 				$li.find('.fnWhsNm').text(item.whsNm);
 				$li.find('.fnLocationNm').text(item.locationNm);
 				$li.find('.fnWhsId').data('whs-id', item.whsId);