품목 팝업 추가

.gitignore

@@ -27,6 +27,7 @@ target/
 /nbdist/
 /.nb-gradle/
 build/
+bin/
 out/
 !**/src/main/**/build/
 !**/src/test/**/build/

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

@@ -179,9 +179,6 @@
 			</div>
 			<div id="ITP_CONTAINER" class="fix">
 				<div class="itp_mobile_contents">
-				<section>
-				  
-				</section>
 
 				</div>
 			</div>

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

@@ -1,20 +1,21 @@
-<link rel="stylesheet" href="/style.css">
 <section>
-  <div id="ITP_AJAX_MLOANMNG03010_VIEW" style="display: none;">
+  <div id="ITP_AJAX_MLOANMNG03010_VIEW" style="display: block;">
     <div class="content">
       <div class="line">
         <label>매장선택</label>
-        <div class="float_left">
-          <input id="ITP_FORM_MLOANMNG03010_VIEW" type="text" placeholder="A매장명">
-        </div>
-        <div class="float_left_btn">
-          <button id="ITP_BTN_MLOANMNG03010"><img src="/img/search.png" alt=""></button>
-          <button id="ITP_BTN_MLOANMNG03010"><img src="/img/delete.png" alt=""></button>
+        <div class="search_wrap">
+	        <div class="float_left">
+	          <input id="ITP_FORM_MLOANMNG03010_VIEW" type="text" placeholder="A매장명">
+	        </div>
+	        <div class="float_left_btn">
+	          <button id="ITP_BTN_MLOANMNG03010"><img src="../img/search.png" alt=""></button>
+	          <button id="ITP_BTN_MLOANMNG03010"><img src="../img/delete.png" alt=""></button>
+	        </div>
         </div>
       </div>
       <div class="line">
         <label>정산상태</label>
-        <div class="float_left">
+        <div class="line_right">
           <select name="" id="ITP_FORM_MLOANMNG03010_VIEW">
             <option value=""></option>
           </select>
@@ -28,7 +29,7 @@
           <input id="ITP_FORM_MLOANMNG03010_VIEW" class="year" type="date">
         </div>
       </div>
-      <div class="line">
+      <div class="line" style="height:45px;"">
         <div class="search">
           <button id="ITP_BTN_MLOANMNG03010" class="btn-primary btn-sm ADB">검색</button>
         </div>
@@ -78,42 +79,42 @@
       </li>
     </div>
   </div>
-  <div id="ITP_AJAX_MLOANMNG03010_DETAIL" style="display: block;">
+  <div id="ITP_AJAX_MLOANMNG03010_DETAIL" style="display: none;">
     <div class="content">
       <div class="line">
         <label>매장명</label>
-        <div class="line_right">
+        <div class="search_wrap">
           <input id="ITP_FORM_MLOANMNG03010_DETAIL" type="text" placeholder="A매장명">
         </div>      
       </div>
       <div class="line">
         <label class="col_6">정산일자</label>
-        <div class="line_right">
+        <div class="search_wrap">
           <input id="ITP_FORM_MLOANMNG03010_DETAIL" type="text" >
         </div>
       </div>
       <div class="line">
         <label>정산상태</label>
-        <div class="line_right">
+        <div class="search_wrap">
           <input id="ITP_FORM_MLOANMNG03010_DETAIL" type="text" >
         </div>
       </div>
       <div class="line">
         <label>정산금액</label>
-        <div class="line_right">
+        <div class="search_wrap">
           <input id="ITP_FORM_MLOANMNG03010_DETAIL" type="text" >
         </div>
       </div>
       <div class="line">
         <label>잔액</label>
-        <div class="line_right">
+        <div class="search_wrap">
           <input id="ITP_FORM_MLOANMNG03010_DETAIL" type="text" >
         </div>
       </div>
       <div class="line">
         <label>정산등록일자</label>
-        <div class="line_right">
-          <input id="ITP_FORM_MLOANMNG03010_DETAIL" type="date" style="width:443px;">
+        <div class="search_wrap">
+          <input id="ITP_FORM_MLOANMNG03010_DETAIL" type="date" style="width:178px;">
         </div>
       </div>
       <div class="table_header">
@@ -150,8 +151,8 @@
           <div class="left">
             <div class="nomal">
               <label class="col_0">발주(납품)수량 &nbsp;:</label>
-              <div style="min-width: 70px;">
-                <div class="fn" style="min-width: 70px;">10</div>
+              <div style="min-width:0px;">
+                <div class="fn" style="min-width:0px;">100</div>
               </div>
               <label class="col_0">입고(수거)일자&nbsp;:</label>
               <div>
@@ -162,8 +163,8 @@
           <div class="left">
             <div class="nomal">
               <label class="col_0">입고(수거)수량 &nbsp;:</label>
-              <div style="min-width: 70px;">
-                <div class="fn"style="min-width: 70px;" >10</div>
+              <div style="min-width:0px;">
+                <div class="fn"style="min-width:0px;" >100</div>
               </div>
               <label class="col_0">입고(수거)금액&nbsp;:</label>
               <div class="fn">

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

@@ -64,7 +64,50 @@
       </div>
     </div>
   </div>
-
+  <div id="ITP_POP_MPOMNG01010_ITEM_NM" class="popup2 mobile-pop-close" style="display: none;">
+    <div class="pop">
+      <div class="header">
+        <div class="header_left">
+          <label>> 품목 검색</label>
+        </div>
+        <div class="header_right">
+          <button id="ITP_BTN_MSTOCKMNG01010"><img src="../img/close.png"></button>
+        </div>
+      </div>
+      <div class="search_bar">
+        <form id="ITP_FORM_MPOMNG01010_POPUP" class="form-horizontal" onsubmit="return false;">
+          <input id="ITP_FORM_MPOMNG01010_POP_KEYWORD" type="text" placeholder="품목명/품목번호">
+          <button id="ITP_BTN_MPOMNG01010_POP_SEARCH"><img src="../img/search.png"></button>
+        </form>
+      </div>
+       <div class="search_bar">
+        <button id="ITP_BTN_MPOMNG01010_POP_ITEM_NM" class="btn_blue">품목명▼</button>
+      </div>
+      <div class="popup_scroll">
+        <li class="row_2">
+          <div class="left" style="width:190px;">
+            <div class="thick">
+              <div class="fn">품목명</div>
+              <div>-</div>
+              <div class="fn">2EA</div>
+            </div>
+            <div class="nomal">
+              <div class="space">구매가 :</div>
+              <div class="fn">1,120,000</div>
+            </div>
+          </div>
+          <div class="right">
+            <button id="ITP_BTN_MSTOCKMNG01010"><</button>
+            <div class="num">2</div>
+            <button id="ITP_BTN_MSTOCKMNG01010">></button>
+          </div>
+          <div class="add">
+            <button id="ITP_BTN_MSTOCKMNG01010">추가</button>
+          </div>
+        </li>
+      </div>
+    </div>
+  </div>	
   <div id="ITP_AJAX_MPOMNG01010_VIEW_CONTAINER">
     <form id="ITP_FORM_MPOMNG01010_DETAIL" class="form-horizontal" onsubmit="return false;">
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_VIEW_CD" name="viewCd" value="C">

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

@@ -1,5 +1,3 @@
-<link rel="stylesheet" href="/style.css">
-
 <section id="MSTOCK01010">
   <div class="popup2" style="display: none;">
     <div class="pop">
@@ -8,18 +6,18 @@
           <label>> 품목 검색</label>
         </div>
         <div class="header_right">
-          <button id="ITP_BTN_MSTOCKMNG01010"><img src="/img/close.png"></button>
+          <button id="ITP_BTN_MSTOCKMNG01010"><img src="../img/close.png"></button>
         </div>
       </div>
       <div class="search_bar">
         <input id="ITP_FORM_MSTOCKMNG01010" style="width:100%" type="text" placeholder="품목명/품목번호">
       </div>
-      <div class="search_bar">
+      <div class="search_bar" style="padding:0;">
         <button id="ITP_BTN_MSTOCKMNG01010" class="search btn-primary">검색</button>
       </div>
       <div class="popup_scroll">
         <li class="row_2">
-          <div class="left">
+          <div class="left" style="width:190px;">
             <div class="thick">
               <div class="fn">품목명</div>
               <div>-</div>
@@ -46,17 +44,19 @@
     <div class="content">
       <div class="line">
         <label>창고선택</label>
-        <div class="float_left">
-          <input id="ITP_FORM_MSTOCKMNG01010_VIEW" type="text" placeholder="A매장명">
-        </div>
-        <div class="float_left_btn">
-          <button id="ITP_BTN_MSTOCKMNG01010"><img src="/img/search.png" alt=""></button>
-          <button id="ITP_BTN_MSTOCKMNG01010"><img src="/img/delete.png" alt=""></button>
+        <div class="search_wrap">
+	        <div class="float_left">
+	          <input id="ITP_FORM_MSTOCKMNG01010_VIEW" type="text" placeholder="A매장명">
+	        </div>
+	        <div class="float_left_btn">
+	          <button id="ITP_BTN_MSTOCKMNG01010"><img src="../img/search.png" alt=""></button>
+	          <button id="ITP_BTN_MSTOCKMNG01010"><img src="../img/delete.png" alt=""></button>
+	        </div>
         </div>
       </div>
       <div class="line">
         <label>Location</label>
-        <div class="float_left">
+        <div class="line_right">
           <select name="" id="ITP_FORM_MSTOCKMNG01010_VIEW">
             <option value=""></option>
           </select>
@@ -64,11 +64,11 @@
       </div>
       <div class="line">
         <label>품목명</label>
-        <div class="float_left">
-          <input id="ITP_FORM_MSTOCKMNG01010_VIEW" style="width: 600px;" type="text" placeholder="A매장명">
+        <div class="search_wrap">
+          <input id="ITP_FORM_MSTOCKMNG01010_VIEW" style="width: 262px;" type="text" placeholder="A매장명">
         </div>
       </div>
-      <div class="line">
+      <div class="line" style="height:45px;">
         <div class="search">
           <button id="ITP_BTN_MSTOCKMNG01010" class="btn-primary btn-sm ADB">검색</button>
         </div>
@@ -107,11 +107,11 @@
           </div>
           <div class="left">
             <div class="nomal">
-              <label class="col_6">현재고수량 &nbsp;:</label>
-              <div class="fn">
-                <div class="fn">100Kg</div>
+              <label>현재고수량 &nbsp;:</label>
+              <div class="col_5 fn">
+                <div class="col_5 fn">100Kg</div>
               </div>
-              <label class="col_7">적정재고수량&nbsp;:</label>
+              <label>적정재고수량&nbsp;:</label>
               <div class="fn">
                 <div class="fn">50Kg</div>
               </div>
@@ -119,9 +119,9 @@
           </div>
           <div class="left">
             <div class="nomal">
-              <label class="col_7">안전재고비율 &nbsp;:</label>
-              <div class="fn">
-                <div class="fn">40%</div>
+              <label>안전재고비율 &nbsp;:</label>
+              <div class="col_5 fn">
+                <div class="col_5 fn">40%</div>
               </div>
               <label class="col_0">Location&nbsp;:</label>
               <div class="fn">

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

@@ -1,7 +1,5 @@
-<link rel="stylesheet" href="/style.css">
-
 <section id="MSTOCK02010">
-  <div class="popup2" style="display: none;">
+  <div class="popup2" style="display: block;">
     <div class="barcode">
       <h1>바코드를 스캔 하시면 재고  실사 목록에 스캔한<br>바코드의품목이 추가 되고 실사 수량을 입력<br>하시기 바랍니다.</h1>
     </div>
@@ -16,29 +14,31 @@
     <div class="content">
       <div class="line">
         <label>재고실사일자</label>
-        <div class="float_left">
-          <input id="ITP_FORM_MSTOCK02010_VIEW" style="width: 400px;" type="date">
+        <div class="line_right">
+          <input id="ITP_FORM_MSTOCK02010_VIEW" class="date" type="date">
         </div>
       </div>
       <div class="line">
         <label>재고실사일자</label>
-        <div class="float_left">
-          <input id="ITP_FORM_MSTOCK02010_VIEW" type="text" placeholder="A매장명">
-        </div>
-        <div class="float_left_btn">
-          <button id="ITP_BTN_MSTOCK02010"><img src="/img/search.png" alt=""></button>
-          <button id="ITP_BTN_MSTOCK02010"><img src="/img/delete.png" alt=""></button>
+        <div class="search_wrap">
+	        <div class="float_left">
+	          <input id="ITP_FORM_MSTOCK02010_VIEW" type="text" placeholder="A매장명">
+	        </div>
+	        <div class="float_left_btn">
+	          <button id="ITP_BTN_MSTOCK02010"><img src="../img/search.png" alt=""></button>
+	          <button id="ITP_BTN_MSTOCK02010"><img src="../img/delete.png" alt=""></button>
+	        </div>
         </div>
       </div>
       <div class="line">
         <label>Location</label>
-        <div class="float_left">
+        <div class="line_right">
           <select name="" id="ITP_FORM_MSTOCK02010_VIEW">
             <option value=""></option>
           </select>
         </div>
       </div>
-      <div class="line">
+      <div class="line" style="height:45px;">
         <div class="search">
           <button id="ITP_BTN_MSTOCK02010" class="btn-primary btn-sm ADB">대상 검색</button>
         </div>
@@ -49,7 +49,7 @@
       </div>
     </div>
     <div class="scroll_area row-2">
-      <li class="history_list1">
+      <li class="history_list">
         <div>
           <div class="left">
             <div class="nomal">

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

@@ -19,11 +19,11 @@ section .popup .pop .popup_btn button.cancel {width: 36%;}
 section .popup2 {position: fixed; width: 100%; height: 100%; background: rgba(200, 200,200, 0.8); z-index: 11;}
 section .popup2 .content {position: fixed; z-index: 10; width:100%; background: #fff;}
 section .popup2 .barcode {width: 100%;}
-section .popup2 .barcode_area {width: 70%; height: 35%; margin: auto; background: #fff; border: 1px solid #000; margin-top: 5%;}
-section .popup2 .barcode h1{text-align: left; width: 85%; font-size: 2.6rem; margin:auto; margin-top: 30%;}
+section .popup2 .barcode_area {width: 300px; height: 300px; margin: auto; background: #fff; border: 1px solid #000; margin-top: 5%;}
+section .popup2 .barcode h1{text-align: left; width: 85%; font-size: 1.6rem; margin:auto; margin-top: 5%;}
 section .popup2 .btn_barcode {margin-top: 20%;}
-section .popup2 .btn_barcode button {width: 35%; height: 100px; font-size: 2.2rem;}
-section .popup2 .pop { position: absolute; top: 45%; left: 50%; transform: translate(-50%,-50%); width: 90%; height: 85%; background: #fff; border: 2px solid #000;}
+section .popup2 .btn_barcode button {width: 35%; height: 50px; font-size: 1rem;}
+section .popup2 .pop { position: absolute; top: 45%; left: 50%; transform: translate(-50%,-50%); width: 95%; height: 85%; background: #fff; border: 2px solid #000;}
 section .popup2 .pop .header {position: relative; height: 50px; background: rgb(204, 225, 240); border-bottom: 1px solid #000;}
 section .popup2 .pop .header .header_left {float: left; padding-top: 5px; padding-left: 15px;}
 section .popup2 .pop .header .header_left label {font-size: 1.4rem;} 
@@ -34,27 +34,27 @@ section .popup2 .pop .search_bar {width: 100%; height: 50px; padding: 10px;}
 section .popup2 .pop .search_bar input {width: 80%; height: 40px; float: left;}
 section .popup2 .pop .search_bar button {float: right; border: none; padding-top:3px;}
 section .popup2 .pop .search_bar button img {width: 30px; height: 30px;}
-section .popup2 .pop .search_bar button.search {float: none; width: 50%; height: 70px; background:rgb(46, 46, 248); color: #fff; font-size: 2rem; padding: 0; border: 1px solid #000; margin: 0 auto;}
+section .popup2 .pop .search_bar button.search {float: none; width: 50%; height: 35px; background:rgb(46, 46, 248); color: #fff; font-size: 1rem; padding: 0; border: 1px solid #000; margin: 0 auto;}
 section .popup2 .pop .search_bar button.btn_blue {float: right; width: 100px; height: 35px; background:rgb(46, 46, 248); color: #fff; font-size: 1rem; padding: 0; border: 1px solid #000;}
 
 section .popup2 .pop .popup_scroll {position: relative; width: 100%;height: 720px; overflow: auto;}
 section .popup2 .pop .popup_scroll li {list-style: none; width: 99%; height: 50px; border: 1px solid #000; margin: 0 auto;}
-section .popup2 .pop .popup_scroll li.row_2 {height: 140px;}
+section .popup2 .pop .popup_scroll li.row_2 {height: 80px;}
 section .popup2 .pop .popup_scroll li .left {position: relative; float: left;}
 section .popup2 .pop .popup_scroll li .left div {display: inline-block;}
 section .popup2 .pop .popup_scroll li .left label{font-size: 2.5rem;}
-section .popup2 .pop .popup_scroll li .left .thick {float: left; margin: 10px 20px; font-size: 2rem; text-align: left; width: 50%; font-weight: 600;}
-section .popup2 .pop .popup_scroll li .left .nomal {float: left; margin: 10px 20px 10px 40px; font-size: 1.8rem; text-align: left; width: 50%;}
+section .popup2 .pop .popup_scroll li .left .thick {float: left; margin: 10px 0 0 10px; font-size: 1rem; text-align: left; width: 100%; font-weight: 600;}
+section .popup2 .pop .popup_scroll li .left .nomal {float: left; margin: 15px 0px 0px 15px; font-size: 1.2rem; text-align: left; width: 100%;}
 section .popup2 .pop .popup_scroll li .left .history {font-weight: 700; font-size: 2.4rem; margin-left: 20px;}
 section .popup2 .pop .popup_scroll li .left .history input{width: 150px;}
 section .popup2 .pop .popup_scroll li .scroll_left {float: left;}
 section .popup2 .pop .popup_scroll li .scroll_left div {float: left; font-size: 0.8rem; font-weight: 700; width: auto; margin: 15px 10px;}
 section .popup2 .pop .popup_scroll li .scroll_right {float: right;}
 section .popup2 .pop .popup_scroll li .scroll_right button {width: 60px; height: 40px; padding: 0; background: rgb(198, 170, 250); border-radius: 10px; font-size: 0.8rem; margin:4px 10px;}
-section .popup2 .pop .popup_scroll li .right {margin: 40px 0; position: relative; display: flex; font-size: 2rem; font-weight: 700; float: left;}
-section .popup2 .pop .popup_scroll li .right .num {margin: 0 40px; width: auto;}
-section .popup2 .pop .popup_scroll li .right button {margin: -12px; padding: 20px; font-size: 1.5rem; border-radius: 0px;}
-section .popup2 .pop .popup_scroll li .add button{float: right; width: 120px; height: 120px; margin: 10px 20px; border-radius: 30px; font-size: 2rem; background: rgb(198, 170, 250);}
+section .popup2 .pop .popup_scroll li .right {position: relative; display: flex; font-size: 1.6rem; font-weight: 700; float: left; top:20px;}
+section .popup2 .pop .popup_scroll li .right .num {margin: 0 20px; width: auto;}
+section .popup2 .pop .popup_scroll li .right button {padding: 5px; font-size: 1rem; border-radius: 0px;}
+section .popup2 .pop .popup_scroll li .add button{float: right; width: 60px; height: 55px; margin: 10px 10px; border-radius: 10px; font-size: 1rem; background: rgb(198, 170, 250);}
 section .popup2 .pop .content .line button {width: 40%; height: 35px;font-size: 1rem; padding: 0; margin: 0 10px;}
 
 section .popup3 { position: fixed; width: 100%; height: 100%; background: transparent; z-index: 11;}
@@ -214,6 +214,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line .line_right input {position: relative; text-align: right; margin-right: 84px;}
 .content .line .line_right input.left {text-align: left;}
 .content .line .line_right input.mg0 {margin-right:10px;}
+.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: 40%; margin: 10px; height: 40px; float: right; margin-right: 3%;}
 .content .line input.date2 {width: 140px; height: 30px; margin-right:133px;}
@@ -292,7 +293,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left_info .history input{width: 150px;}
 .scroll_area li.history_list {height: 140px; padding-top:8px;}
 .scroll_area li.history_list .button_right {float: right; display: grid;}
-.scroll_area li.history_list .button_right button {width: 70px; height: 70px; font-size: 1rem; margin: 0; border-radius: 0;}
+.scroll_area li.history_list .button_right button {width: 65px; height: 70px; font-size: 1rem; margin: 0; border-radius: 0;}
 .scroll_area li.history_list1 {height: 230px;}
 .scroll_area li.history_list2 {height: 160px; padding-top:5px;}
 .scroll_area li.history_list2 label{min-width:95px; display:inline-flex;}
@@ -300,7 +301,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li.history_list4 {height: 150px;}
 .scroll_area li .history_info {width: auto;}
 .scroll_area li .left {width:100%; height:30px; margin-top:0px;}
-.scroll_area li .btn {width:calc(100% - 70px); padding-top:12px;}
+.scroll_area li .btn {width:calc(100% - 65px); padding-top:12px;}
 .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;}
@@ -328,13 +329,13 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal span {margin:0 10px;}
 
 .scroll_area li .left .nomal .btn_bar{position: relative; width: auto; font-size: 2.2rem;}
-.scroll_area li .left .nomal .btn_bar button{width: 50px; height: 70px; font-size: 2rem; padding: 0;}
-.scroll_area li .left .nomal .btn_bar .col_0{min-width: auto; margin: 0 50px;}
+.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 .space{ margin-left: 30px; min-width: 100px;}
 .scroll_area li .left .nomal .space0{ margin-left: 30px; width: auto;}
 .scroll_area li .left .nomal .space1{ margin-left: 0px; width: 200px;}
-.scroll_area li .left .nomal .space2 {width: 120px; display: inline-flex; font-size: 2.4rem; margin-right: 30px; font-weight: 700;}
+.scroll_area li .left .nomal .space2 {display: inline-flex; font-size: 1.4rem; font-weight: 700;}
 .scroll_area li .left .nomal label{position:relative; margin-left: 10px;}
 .scroll_area li .left .nomal label.sub_info{min-width: 70px; display: inline-flex;}
 .scroll_area li .left .nomal label.col_0{width: auto;}