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

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

@@ -66,7 +66,7 @@
             <div>검색된 데이터가 없습니다.</div>
          </div>
         <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display: none;">
-          <li class="list-row">
+          <li class="list-row item-row">
             <div class="left_info">
               <div class="check_box">
                 <input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />

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

@@ -1,10 +1,10 @@
 <section id="ITP_MOBILE_MPOMNG02010">
   <div id="ITP_AJAX_MPOMNG02010_LIST_CONTAINER" style="display: none;">
-    <div class="content">
-	    <div class="content_fix">
-	      <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="">
+     <form id="ITP_FORM_MPOMNG02010_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">
+    	  <div class="content_fix">
 	   	    <div class="line header">
 				<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">구매요청현황</div>
 	      	</div>
@@ -45,9 +45,8 @@
 	      <div class="table_header">
 	        <h1><구매 요청 내역></h1>
 	      </div>
-        </form>
+        </div>
       </div>
-    </div>
     <div id="ITP_LIST_MPOMNG02010_ITEM_AREA" class="scroll_area row-2">
       <ul id="ITP_LIST_MPOMNG02010_ITEM_ROWS" class="mb_0 panel-group"></ul>
       <div id="ITP_LIST_MPOMNG02010_ITEM_ROWCOPY" style="display: none;">
@@ -101,85 +100,88 @@
           </div>
         </li>
       </div>
-    </div>
+   	  </div>
+    </form>
   </div>
   <div id="ITP_AJAX_MPOMNG02010_VIEW_CONTAINER" style="display: none;">
-    <div class="content">
-	    <div class="content_fix">
-		  <div class="line header">
-			<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">구매요청현황</div>
-	   	  </div>
-	      <div class="line">
-	        <label>납기요청일</label>
-	        <div class="line_right">
-	          <div class="fnDlvReqDt"></div>
-	        </div>      
-	      </div>
-	      <div class="line">
-	        <label>구매요청금액</label>
-	        <div class="line_right">
-	          <div class="fnPchReqTotalAmt">원</div>
-	        </div>
-	      </div>
-	      <div class="line">
-	        <label>납품장소</label>
-	        <div class="line_right">
-	          <div class="fnLocationNm"></div>
-	        </div>
-	      </div>
-	      <div class="line">
-	        <label>요청상태</label>
-	        <div class="line_right">
-	          <div class="fnPchReqStnm"></div>
-	        </div>
-	      </div>
-	      <div class="line">
-	        <label>반려일자</label>
-	        <div class="line_right">
-	          <div class="fnPchReqRjctDt"></div>
-	        </div>
-	      </div>
-	      <div class="line">
-	        <label>반려담당자명</label>
-	        <div class="line_right">
-	          <div class="fnPchReqMgrNm"></div>
-	        </div>
+	  <form id="ITP_FORM_MPOMNG02010_VIEW" class="put_btn form-horizontal" onsubmit="return false;">
+	    <div class="content">
+		    <div class="content_fix">
+			  <div class="line header">
+				<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">구매요청현황</div>
+		   	  </div>
+		      <div class="line">
+		        <label>납기요청일</label>
+		        <div class="line_right">
+		          <div class="fnDlvReqDt"></div>
+		        </div>      
+		      </div>
+		      <div class="line">
+		        <label>구매요청금액</label>
+		        <div class="line_right">
+		          <div class="fnPchReqTotalAmt">원</div>
+		        </div>
+		      </div>
+		      <div class="line">
+		        <label>납품장소</label>
+		        <div class="line_right">
+		          <div class="fnLocationNm"></div>
+		        </div>
+		      </div>
+		      <div class="line">
+		        <label>요청상태</label>
+		        <div class="line_right">
+		          <div class="fnPchReqStnm"></div>
+		        </div>
+		      </div>
+		      <div class="line">
+		        <label>반려일자</label>
+		        <div class="line_right">
+		          <div class="fnPchReqRjctDt"></div>
+		        </div>
+		      </div>
+		      <div class="line">
+		        <label>반려담당자명</label>
+		        <div class="line_right">
+		          <div class="fnPchReqMgrNm"></div>
+		        </div>
+		      </div>
+		      <div class="table_header">
+		        <h1><구매 품목></h1>
+		      </div>
 	      </div>
-	      <div class="table_header">
-	        <h1><구매 품목></h1>
+	    </div>
+	    <div id="ITP_LIST_MPOMNG02010_VIEW_AREA" class="scroll_area row-3">
+	      <ul id="ITP_LIST_MPOMNG02010_VIEW_ROWS" class="mb_0 panel-group"></ul>
+	      <div id="ITP_LIST_MPOMNG02010_VIEW_ROWCOPY" style="display: none;">
+	        <li class="history_list5 item-row">
+	          <div class="left">
+	            <div class="nomal">
+	              	<label class="col_3">품목명</label>
+	                <span>:</span>
+	                <div class="full fnItemNm"></div>
+	              </div>
+	           </div>   
+	           <div class="left">
+	            <div class="nomal">
+	              	<label class="col_3">요청수량</label>
+	                <span>:</span>
+	                <div class="fnPchReqQty"></div>
+	                <label class="col_3">요청금액</label>
+	                <span>:</span>
+	                <div class="col_10 fnPchReqAmt"></div>
+	              </div>
+	           </div>   
+	        </li>
 	      </div>
-      </div>
-    </div>
-    <div id="ITP_LIST_MPOMNG02010_VIEW_AREA" class="scroll_area row-3">
-      <ul id="ITP_LIST_MPOMNG02010_VIEW_ROWS" class="mb_0 panel-group"></ul>
-      <div id="ITP_LIST_MPOMNG02010_VIEW_ROWCOPY" style="display: none;">
-        <li class="history_list5 item-row">
-          <div class="left">
-            <div class="nomal">
-              	<label class="col_3">품목명</label>
-                <span>:</span>
-                <div class="full fnItemNm"></div>
-              </div>
-           </div>   
-           <div class="left">
-            <div class="nomal">
-              	<label class="col_3">요청수량</label>
-                <span>:</span>
-                <div class="fnPchReqQty"></div>
-                <label class="col_3">요청금액</label>
-                <span>:</span>
-                <div class="col_10 fnPchReqAmt"></div>
-              </div>
-           </div>   
-        </li>
-      </div>
-    </div>
-    <div class="button_bar">
-      <button id="ITP_BTN_MPOMNG02010_VIEW_CANCEL_LIST" class="col_12 btn-gray CLB">취소</button>
-    </div>
+	    </div>
+	    <div class="button_bar">
+	      <button id="ITP_BTN_MPOMNG02010_VIEW_CANCEL_LIST" class="col_12 btn-gray CLB">취소</button>
+	    </div>
+    </form>
   </div>
   <div id="ITP_AJAX_MPOMNG02010_MODIFY_CONTAINER" style="display: none;">
-    <form id="ITP_FORM_MPOMNG02010_MODIFY" class="form-horizontal" onsubmit="return false;">
+    <form id="ITP_FORM_MPOMNG02010_MODIFY" class="put_btn form-horizontal" onsubmit="return false;">
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_VIEW_CD" name="viewCd" value="U">
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_BRAND_ID" name="brandId" value="">
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_STORE_ID" name="storeId" value="">
@@ -242,7 +244,7 @@
         <ul id="ITP_LIST_MPOMNG02010_MODIFY_ROWS" class="mb_0 panel-group"></ul>
         <div id="ITP_LIST_MPOMNG02010_MODIFY_ROWCOPY" style="display: none;"><!-- display:grid -->
           <li class="item-row">
-            <div class="left_info">
+            <div class="left_info item">
               <div class="check_box">
                 <input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
               </div>

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

@@ -453,15 +453,16 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li.list-row2 {height:130px; padding-top:8px;}
 
 .scroll_area li .left_info {width: calc(100% - 66px); float:left;}
+.scroll_area li .left_info.item {width: calc(100% - 110px); float:left;}
 .scroll_area li .left_info div {display: inline-block; font-size:14pt;}
 .scroll_area li .left_info span {font-size: 14pt;}
-.scroll_area li .left_info label{font-size: 14pt; font-weight:100; margin-left:10px; margin-top:5px;}
+.scroll_area li .left_info label{width:60px; font-size: 14pt; font-weight:100; margin-top:5px;}
 .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:60%; top:7px; text-align:left; position:relative;}
+.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 .itp_amt {color:#b88278; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:auto; top: 7px; position:relative; text-align:left;}
+.scroll_area li .left_info .thick .itp_amt {color:#b88278; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width: calc(100% - 81px); top: 7px; position:relative; text-align:left;}
 .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.history_list {height: 140px; padding-top:8px;}
@@ -544,11 +545,11 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .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 div.full{width:240px;}
+.scroll_area li .left .nomal div.full{width:calc(100% - 85px);}
 .scroll_area li .left .nomal div.full_s{width:200px;}
 
 
-.scroll_area li .right {margin: 22px 10px 22px 0; position: relative; display: flex; height:30px; font-size: 1.4rem; font-weight: 700; float: right;}
+.scroll_area li .right {margin: 22px 0px 22px 0; position: relative; display: flex; width:110px; height:30px; font-size: 1.4rem; font-weight: 700; float: right;}
 .scroll_area li .right .num {padding:2px 22px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB; background:#fff; font-size:14pt;}
 .scroll_area li .right .fnnum {margin:5px 30px; font-size:14pt;}
 .scroll_area li .right button {background:#e1cac1; color:#fff; border:1px solid #E0B8AB; padding:0px 7px; font-size: 16px; border-radius: 0px;}