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

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

@@ -48,55 +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">
+				<li class="history_list2 item-row">
 					<div class="left">
-					  <div class="nomal">
-						<label>창고번호 </label>
-						<span>:</span>
-					    <div class="fnWhsId"></div>
-						<label class="col_0">창고명</label>
+					  <div class="nomal over">
+						<label class="col_3">창고명</label>
 						<span>:</span>
-					    <div class="col_10 fnWhsNm"></div>
+					    <div class="col_0 fnWhsNm"></div>
+					    <div class="col_0 fnLocationNm"></div>
 					  </div>
 					</div>
 				    <div class="left">
 					  <div class="nomal">
-						  <label>품목번호</label>
+						  <label class="col_3">품목번호</label>
 						  <span>:</span>
-						  <div class="fnItemId"></div>
-						  <label class="col_0">품목명</label>
-						  <span>:</span>
-				  		  <div class="col_10 fnItemNm"></div>
+						  <div class="full fnItemId"></div>
 					  </div>
 				    </div>
 					<div class="left">
 					  <div class="nomal">
-						<label>단위</label>
-						<span>:</span>
-					    <div class="fnUnit"></div>
-						<label class="col_0">단위수량</label>
-						<span>:</span>
-					    <div class="fnUnitQty"></div>
+				    	<label class="col_3">품목명</label>
+				    	<span>:</span>
+		  		  		<div class="full fnItemNm"></div>
 					  </div>
 					</div>
 					<div class="left">
 					  <div class="nomal">
-						<label>현재고수량</label>
+						<label class="col_3">단위</label>
 						<span>:</span>
-					    <div class="col_6 fnStckQty"></div>
-						<label>적정재고수량</label>
+					    <div class="fnUnit"></div>
+						<label>현재고수량</label>
 						<span>:</span>
-					    <div class="fnPrpStckQty"></div>
+					    <div class="col_9 fnStckQty"></div>
 					  </div>
 					</div>
 					<div class="left">
 					  <div class="nomal">
-						<label>안전재고비율</label>
+						<label>적정재고수량</label>
 						<span>:</span>
-					    <div class="col_6 fnSftStckRt">%</div>
-						<label class="col_0">Location</label>
+					    <div class="fnPrpStckQty"></div>
+						<label>안전재고비율(%)</label>
 						<span>:</span>
-					    <div class="fnLocationNm"></div>
+					    <div class="col_2 fnSftStckRt"></div>
 					  </div>
 					</div>
 				</li>
@@ -129,7 +121,7 @@
 			<div id="ITP_LIST_MSTOCKMNG01010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MSTOCKMNG01010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MSTOCKMNG01010_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/MSTOCKMNG02010.html

@@ -58,20 +58,14 @@
 					  <div class="nomal">
 						<label class="col_3">품목번호</label>
 						<span>:</span>
-					    <div class="fnItemId" data-normal-yn="Y"></div>
-						<label class="col_0">품목명</label>
-						<span>:</span>
-					    <div class="col_10 fnItemNm"></div>
+					    <div class="full fnItemId" data-normal-yn="Y"></div>
 					  </div>
 					</div>
 					<div class="left">
 					  <div class="nomal">
-						<label class="col_3">단위</label>
-						<span>:</span>
-					    <div class="fnUnit"></div>
-						<label class="col_0">단위수량</label>
+						<label class="col_3">품목명</label>
 						<span>:</span>
-					    <div class="fnCddQty"></div>
+					    <div class="full fnItemNm"></div>
 					  </div>
 					</div>
 					<div class="left">
@@ -137,7 +131,7 @@
 			<div id="ITP_LIST_MSTOCKMNG02010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MSTOCKMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MSTOCKMNG02010_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/css/style.css

@@ -70,7 +70,7 @@ section .popup2 .pop .table .table_tr {display:flex;}
 section .popup2 .pop .table .table_tr .tabel_th{width:23%;; height:30px; border-left:1px solid #aaa; background:#eee;}
 section .popup2 .pop .table .table_tr .tabel_th label {font-size:14px; padding-top:5px; font-weight:100;}
 section .popup2 .pop .table .table_tr .tabel_th .chkAll {margin:-5px; width:15px;}
-section .popup2 .pop .m_table_body{width:98%; height:333px; margin:0 auto; overflow:auto;}
+section .popup2 .pop .m_table_body{width:100%; height:333px; margin:0 auto; overflow:auto;}
 section .popup2 .pop .m_table_body .table_body{}
 section .popup2 .pop .m_table_body .table_body::-webkit-scrollbar {
     display: none; /* Chrome, Safari, Opera*/
@@ -536,13 +536,14 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal label.col_5{min-width: 51px;}
 .scroll_area li .left .nomal label.col_3{min-width: 60px;}
 .scroll_area li .left .nomal label.col_2{width: 95px;}
-
+.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:73px;}
 
 .scroll_area li .left .nomal .full{width:240px;}
 .scroll_area li .left .nomal .full_s{width:200px;}
 .scroll_area li .left .nomal .col_0{width:auto;}
+.scroll_area li .left .nomal .col_2{width: 25px;}
 .scroll_area li .left .nomal div.col_5{width:56px;}
 .scroll_area li .left .nomal .col_6{width:60px;}
 .scroll_area li .left .nomal .col_64{width:64px;}