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

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

@@ -11,7 +11,7 @@
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_MALL_ID" name="mallId" value="">
       <div class="content">
       	<div class="line header">
-			<div class="itp_search_header fnMenuNm">구매요청생성</div>
+			<div class="itp_search_header">구매요청생성</div>
       	</div>
         <div class="line">
           <label>납기요청일</label>
@@ -66,7 +66,6 @@
               </div>
               <div class="thick">
                 <div class="itp_item fnItemNm">품목명</div>
-                <div class="itp_item fnUnit"></div>
               </div>
               <div class="thick">
                 <div class="itp_gram fnUnitAmt"></div>

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

@@ -36,7 +36,7 @@
           <button id="ITP_BTN_MPOMNG02010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
         </div>
       </div>
-      <div class="line" style="height:50px;">
+      <div class="line">
         <div class="search">
           <button id="ITP_BTN_MPOMNG02010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
         </div>
@@ -139,7 +139,6 @@
           <div class="left_info">
              <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>
@@ -171,7 +170,7 @@
       <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 class="itp_search_header">구매요청현황</div>
       	</div>
         <div class="line">
           <label>납기요청일</label>
@@ -221,7 +220,6 @@
               </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>

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

@@ -3,7 +3,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_MPOMNG03010_POP_SPPLY_CLOSE"><img src="../img/close.png"></button>
@@ -17,16 +17,17 @@
 				<button id="ITP_BTN_MPOMNG03010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
 			</form>
 		</div>
-		<div class="search_bar">
-			<button id="ITP_BTN_MPOMNG03010_POP_SPPLY_NM" class="btn_blue">공급업체▼</button>
+		<div class="select_btn">
+			<button id="ITP_BTN_MPOMNG03010_POP_SPPLY_NM" class="btn_blue">공급업체 ▼</button>
 		</div>
 		<div id="ITP_POP_MPOMNG03010_SPPLY_LIST_AREA" class="popup_scroll">
-			<ul id="ITP_POP_MPOMNG03010_SPPLY_LIST_ROWS" class="panel-group itp_nav"></ul>
+			<ul id="ITP_POP_MPOMNG03010_SPPLY_LIST_ROWS" class="mb_0 itp_nav"></ul>
 			<div id="ITP_POP_MPOMNG03010_SPPLY_LIST_ROWCOPY" style="display: block;">
-				<li>
+				<li class="row_2">
 					<div class="scroll_left">
 						<div class="fnSpplyNm">공급업체 명A</div>
-						<div class="fnLocationNm">(상세위치내용)</div>
+						<div class="sub fnLocationNm">서울특별시 동대문구 서울 시립대로 12길</div>
+						<div class="sub fnLocationNm">누리자 B/D</div>
 					</div>
 					<div class="scroll_right">
 						<button id="ITP_BTN_MPOMNG03010_POP_SPPLY_CHOICE" class="fnSpplyId">선택</button>
@@ -40,7 +41,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_MPOMNG03010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
@@ -54,16 +55,17 @@
 					<button id="ITP_BTN_MPOMNG03010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="search_bar">
+			<div class="select_btn">
 				<button id="ITP_BTN_MPOMNG03010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
 			</div>
 			<div id="ITP_LIST_MPOMNG03010_POP_WHS_AREA" class="popup_scroll">
-				<ul id="ITP_LIST_MPOMNG03010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
-				<div id="ITP_LIST_MPOMNG03010_POP_WHS_ROWCOPY" style="display:none;">
+				<ul id="ITP_LIST_MPOMNG03010_POP_WHS_ROWS" class="mb_0 itp_nav"></ul>
+				<div id="ITP_LIST_MPOMNG03010_POP_WHS_ROWCOPY" style="display: block;">
 					<li class="row_2">
 						<div class="scroll_left">
 							<div class="fnWhsNm">브랜드 창고 명A</div>
-							<div class="fnLocationNm">(상세위치내용)</div>
+						    <div class="sub fnLocationNm">서울특별시 동대문구 서울 시립대로 12길</div>
+							<div class="sub fnLocationNm">누리자 B/D</div>
 						</div>
 						<div class="scroll_right">
 							<button id="ITP_BTN_MPOMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
@@ -73,40 +75,41 @@
 			</div>
 		</div>
 	</div>
-  <div id="ITP_AJAX_MPOMNG03010_LIST_CONTAINER" style="display: block;">
+  <div id="ITP_AJAX_MPOMNG03010_LIST_CONTAINER" style="display: none;">
       <form id="ITP_FORM_MPOMNG03010_LIST" class="form-horizontal" onsubmit="return false;">
       <input type="hidden" id="ITP_FORM_MPOMNG03010_DETAIL_VIEW_CD" name="viewCd" value="C">
 	    <div class="content">
+    	  <div class="line header">
+			<div class="itp_search_header">구매발주현황</div>
+      	  </div>
 	      <div class="line">
 	        <label>발주일자</label>
-	        <div class="date_to">
-	          <input id="ITP_FORM_MPOMNG03010_LIST_SEARCH_FROM_DT" name="fromDt" class="year" type="date">
+	        <div class="date_to date">
+	          <input id="ITP_FORM_MPOMNG03010_LIST_SEARCH_FROM_DT" name="fromDt" type="date">
 	          <div class="at">~</div>
-	          <input id="ITP_FORM_MPOMNG03010_LIST_SEARCH_TO_DT" name="toDt" class="year" type="date">
+	          <input id="ITP_FORM_MPOMNG03010_LIST_SEARCH_TO_DT" name="toDt" type="date">
 	        </div>
 	      </div>
 	      <div class="line">
 	        <label>발주상태</label>
-	        <div class="search_wrap">
-		        <div class="line_right">
-		          <select name="spchOdrStCd" class="m9" id="ITP_FORM_MPOMNG03010_LIST_SEARCH_PCH_ORD_ST_CD">
-		            <option value=""></option>
-		          </select>
-		        </div>
+	        <div class="float_left">
+	          <select name="spchOdrStCd" id="ITP_FORM_MPOMNG03010_LIST_SEARCH_PCH_ORD_ST_CD">
+	            <option value=""></option>
+	          </select>
 	      	</div>   
 	      </div>
 	      <div class="line">
 	        <label>공급업체</label>
-	        <div class="search_wrap">
-		        <div class="float_left">
-		          <input type="text" id="ITP_FORM_MPOMNG03010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" placeholder="A공급업체명">
-				  <input type="hidden" id="ITP_FORM_MPOMNG03010_LIST_SEARCH_SPPLY_ID" class="" name="sspplyId" />
-		        </div>
-		        <div class="float_left_btn">
-		          <button id="ITP_BTN_MPOMNG03010_LIST_SEARCH_SPPLY_NM"><img src="../img/search.png" alt=""></button>
-		          <button id="ITP_BTN_MPOMNG03010_LIST_DELETE_SPPLY_NM"><img src="../img/delete.png" alt=""></button>
-		        </div>
-	        </div> 
+	        <div class="float_left">
+	          <input type="text" id="ITP_FORM_MPOMNG03010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" placeholder="A공급업체명">
+			  <input type="hidden" id="ITP_FORM_MPOMNG03010_LIST_SEARCH_SPPLY_ID" class="" name="sspplyId" />
+              <div class="itp_input_btn">
+	         	 <button id="ITP_BTN_MPOMNG03010_LIST_SEARCH_SPPLY_NM"><img src="../img/search.png" alt=""></button>
+      		  </div>
+	        </div>
+	        <div class="float_right_btn">
+	          <button id="ITP_BTN_MPOMNG03010_LIST_DELETE_SPPLY_NM"><img src="../img/delete.png" alt=""></button>
+	        </div>
 	      </div>
 	      <div class="line">
           	<label>납품장소</label>
@@ -114,9 +117,11 @@
 	            <div class="float_left">
 	              <input type="text" id="ITP_FORM_MPOMNG03010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" />
 				  <input type="hidden" id="ITP_FORM_MPOMNG03010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
+           		  <div class="itp_input_btn">
+	              	<button id="ITP_BTN_MPOMNG03010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
+				  </div>
 	            </div>
-	            <div class="float_left_btn">
-	              <button id="ITP_BTN_MPOMNG03010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
+	            <div class="float_right_btn">
 	              <button id="ITP_BTN_MPOMNG03010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 	            </div>
           	</div>
@@ -127,13 +132,13 @@
 	        </div>
 	      </div>
 	      <div class="table_header">
-	        <h1>> 발주 내역</h1>
+	        <h1><발주 내역></h1>
 	      </div>
 	    </div>
       <div id="ITP_LIST_MPOMNG03010_LIST_ITEM_AREA" class="scroll_area row-3">
-        <ul id="ITP_LIST_MPOMNG03010_LIST_ITEM_ROWS" class="panel-group"></ul>
+        <ul id="ITP_LIST_MPOMNG03010_LIST_ITEM_ROWS" class="mb_0"></ul>
         	<div id="ITP_LIST_MPOMNG03010_LIST_ITEM_ROWCOPY" style="display: block;">
-		      <li class="list-row">
+		      <li class="list-row2">
 		        <div class="left">
 		          <div class="nomal">
 		            <label>발주일자 &nbsp;:</label>
@@ -211,34 +216,37 @@
 	      </div>
 	    </div>
       <div id="ITP_LIST_MPOMNG03010_VIEW_ITEM_AREA" class="scroll_area row-2">
-        <ul id="ITP_LIST_MPOMNG03010_VIEW_ITEM_ROWS" class="panel-group"></ul>
+        <ul id="ITP_LIST_MPOMNG03010_VIEW_ITEM_ROWS" class="mb_0"></ul>
         	<div id="ITP_LIST_MPOMNG03010_VIEW_ITEM_ROWCOPY" style="display:block;">
-			  <li class="list-row">
+			  <li>
 		        <div>
 		          <div class="left_info col-4">
 		            <div class="thick">
+             		  <label>품목명</label>
+             		  <span>:</span>
 		              <div class="fnItemNm">품목명</div>
-		              <i>-</i>
-		              <div class="fnUnit">2EA</div>
 		            </div>
 		          </div>
 		          <div class="left_info col-6">
 		            <div class="thick">
-		              <label>수량/금액</label>
-		              <div class="fnQty">2</div>
-		              <i>/</i>
-		              <div class="fnAmt">24,000</div>
+		              <label>수량/금액</label> 
+		              <span>:</span>
+		              <div class="fnQty">200</div>
+		              <span>/</span>
+		              <div class="fnAmt">1,224,000</div>
 		            </div>
 		          </div>
 		          <div class="left_info col-4">
 		            <div class="thick">
-		              <label style="margin:0;">구매가 :</label>
+		              <label>구매가 </label>
+		              <span>:</span>
 		              <div class="fnPchActAmt">12,000</div>
 		            </div>
 		          </div>
 		          <div class="left_info col-6">
 		            <div class="thick">
-		              <label>납기요청일&nbsp;:&nbsp;</label>
+		              <label>납기요청일</label>
+		              <span>:</span>
 		              <div class="fnDlvReqDt">2022.10.01</div>
 		            </div>
 		          </div>

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

@@ -6,7 +6,7 @@
 			<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_IDX" name="sidx" value="0">
 			<div class="content">
 				<div class="line">
-					<select name="dtlGubun" id="ITP_FORM_MPOMNG05010_LIST_DTL_GUBUN">
+					<select class="itp_label_select" name="dtlGubun" id="ITP_FORM_MPOMNG05010_LIST_DTL_GUBUN">
 						<option value="1">발주생성일</option>
 						<option value="2">납품요청일</option>
 						<option value="3">납품예정일</option>
@@ -20,13 +20,11 @@
 				</div>
 				<div class="line">
 					<label>납품상태</label>
-					<div class="search_wrap">
-						<div class="line_right">
-							<select id="ITP_FORM_MPOMNG04010_LIST_SEARCH_DLV_ST_CD" data-select-code="DLV_ST_CD" class="stcd" name="sdlvStCd">
-							<select name="dlvStCd" id="ITP_FORM_MPOMNG05010_LIST_DLV_ST_CD">
-								<option value=""></option>
-							</select>
-						</div>
+					<div class="float_left">
+						<select id="ITP_FORM_MPOMNG04010_LIST_SEARCH_DLV_ST_CD" data-select-code="DLV_ST_CD" class="stcd" name="sdlvStCd">
+						<select name="dlvStCd" id="ITP_FORM_MPOMNG05010_LIST_DLV_ST_CD">
+							<option value=""></option>
+						</select>
 					</div>
 				</div>
 				<div class="line">
@@ -35,9 +33,11 @@
 						<div class="float_left">
 							<input type="text" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" placeholder="A공급업체명" readonly>
 							<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_SPPLY_ID" class="" name="sspplyId" />
+	           				<div class="itp_input_btn">
+								<button id="ITP_BTN_MPOMNG05010_LIST_SEARCH_SPPLY_NM"><img src="../img/search.png" alt=""></button>
+							</div>
 						</div>
-						<div class="float_left_btn">
-							<button id="ITP_BTN_MPOMNG05010_LIST_SEARCH_SPPLY_NM"><img src="../img/search.png" alt=""></button>
+						<div class="float_right_btn">
 							<button id="ITP_BTN_MPOMNG05010_LIST_DELETE_SPPLY_NM"><img src="../img/delete.png" alt=""></button>
 						</div>
 					</div>
@@ -48,9 +48,11 @@
 						<div class="float_left">
 							<input type="text" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" readonly />
 							<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
+	           				<div class="itp_input_btn">
+								<button id="ITP_BTN_MPOMNG05010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
+							</div>
 						</div>
-						<div class="float_left_btn">
-							<button id="ITP_BTN_MPOMNG05010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
+						<div class="float_right_btn">
 							<button id="ITP_BTN_MPOMNG05010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 						</div>
 					</div>

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

@@ -272,7 +272,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .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 .itp_label_select {min-width:110px; color:#666; font-size: 18px; float: left; margin-top: 3px; font-weight:100;}
 .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;}
@@ -291,14 +291,12 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line .line_right input.m9 {margin-right:93px;}
 .content .line .line_right input.left {text-align: left;}
 .content .line .line_right input.mg0 {margin-right:10px;}
-.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: 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 {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; padding-top:8px;}
 .content .line .search button {width: 50%; height: 35px; font-size: 1rem; padding: 0;}
@@ -361,7 +359,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .row-1-1{top:364px;}
 .row-2{top: 300px;}
 
-.row-3{top: 363px;}
+.row-3{top: 395px;}
 .row-4{top: 377px;}
 .row-5{top: 418px;}
 .row-6{top: 468px;}
@@ -373,12 +371,16 @@ 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: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.list-row2 {height:130px; padding-top:8px;}
+
+.scroll_area li .left_info {float:left; margin-top:6px;}
+.scroll_area li .left_info div {display: inline-block; font-size:14px;}
+.scroll_area li .left_info span {font-size: 14px;}
+.scroll_area li .left_info label{font-size: 16px; font-weight:100; margin-left:10px;}
 .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 {float:left;  margin: 2px 0 0 8px; font-size: 18px; text-align: left; width: 110%; 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;}