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

src/main/webapp/main.html

@@ -376,7 +376,7 @@
 									</div>
 									<div class="col_4">
 										<div class="itp_header_label">
-										발주완료
+										납품완료
 										</div>
 										<div class="itp_header_result fnPoEndCount">
 										10건

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

@@ -159,21 +159,21 @@
 					</div>
 					<div class="itp_oper_info">
 						<label class="col_6">구매요청건수</label>
-						<div class="full fnPr20Count">2 건</div>
+						<div class="full fnPr20Count"></div>
 					</div>
 				</div>
 				<div id="ITP_MAIN_HEADER_STORE" class="itp_oper_info_area" style="display: none;">
 					<div class="itp_oper_info">
 						<label class="col_6">구매요청</label>
-						<div class="col_6 fnPr20Count">2 건</div>
+						<div class="col_6 fnPr20Count"></div>
 						<label>발주진행</label>
-						<div class="fnPo30Count">12,000,000원</div>
+						<div class="fnPo30Count"></div>
 					</div>
 					<div class="itp_oper_info">
 						<label class="col_6">구매가능금액</label>
-						<div class="col_6 fnPoPsblAmt">1,000원</div>
-						<label>발주완료</label>
-						<div class="fnPoEndCount">1,000원</div>
+						<div class="col_6 fnPoPsblAmt"></div>
+						<label>납품완료</label>
+						<div class="fnPoEndCount"></div>
 					</div>
 				</div>
 				<div id="ITP_MAIN_HEADER_SPPLY" class="itp_oper_info_area" style="display: none;">
@@ -181,11 +181,11 @@
 						<label>수주건수</label>
 						<div class="fnOrdersCount">2 건</div>
 						<label>수주금액</label>
-						<div class="fnOrdersAmt">12,000,000원</div>
+						<div class="fnOrdersAmt"></div>
 					</div>
 					<div class="itp_oper_info">
 						<label class="col_6">정산요청금액</label>
-						<div class="full fnSttlReqAmt">1,000원</div>
+						<div class="full fnSttlReqAmt"></div>
 					</div>
 				</div>
 				<div id="ITP_MAIN_DRAW_CHART_REQ" class="itp_graph_area">

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

@@ -51,7 +51,7 @@
 				</div>
 		      <div class="line">
 		        <label>품목명</label>
-		        <div class="float_left">
+		        <div class="float_left name">
 		          <input id="ITP_FORM_MPOMNG07010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="">
 		        </div>
 		      </div>

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

@@ -50,7 +50,7 @@
 					</div>
 					<div class="line">
 						<label>품목명</label>
-						<div class="float_left">
+						<div class="float_left name">
 							<input id="ITP_FORM_MRTNMNG06010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="">
 						</div>
 					</div>

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

@@ -133,7 +133,7 @@
 		</div>
 	</div>
 	<div id="ITP_POP_MSTOCKMNG01010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: none;">
-		<div class="pop" style="height:480px;">
+		<div class="pop" style="height:390px;">
 			<div class="header">
 				<div class="header_left">
 					<label>재고처리</label>
@@ -222,7 +222,7 @@
 						<label>이동 수량</label>
 					</div>
 					<div class="line_right">
-						<input name="moveQty" id="ITP_FORM_MSTOCKMNG01010_POP_QTY" type="text" placeholder="0" data-check-required="empty" data-key-up="number">
+						<input type="number" name="moveQty" id="ITP_FORM_MSTOCKMNG01010_POP_QTY" placeholder="0" pattern="[0-9]*">
 					</div>
 				</div>
 			    <div class="search">

src/main/webapp/mobile/app/popup/biz/BIZPOP_PO_WHS_QTY.html

@@ -40,7 +40,7 @@
 									</div>
 									<div class="info_box">
 			              				<button id="ITP_BTN_PO_WHS_QTY_POPUP_ITEM_MINUS">-</button>
-										<input type="number" id="ITP_POP_FORM_PO_WHS_QTY" maxlength="5" class="itp_input" name="whsQty" placeholder="0" />
+										<input type="number" id="ITP_POP_FORM_PO_WHS_QTY" maxlength="5" class="itp_input" name="whsQty" placeholder="0" pattern="[0-9]*" />
 										<button id="ITP_BTN_PO_WHS_QTY_POPUP_ITEM_PLUS">+</button>
 									</div>
 								</div>

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

@@ -121,11 +121,11 @@ section .popup2 .pop .popup_scroll li .add button{float: right; width: 60px; hei
 section .popup2 .pop .popup_scroll li .right input {width:43px; height:27px; margin:0; padding:3px; text-align:center; border-radius:0px; border:1px solid #E0B8AB;}
 section .popup2 .pop .popup_scroll li .right input:focus {outline:none;}
 section .popup2 .pop .content .line button {width: 35%; height: 35px;font-size: 14px; font-weight:100; padding-top: 7px; margin: 0 10px;}
-section .popup2	.list_line {width:98%; float:left; height:40px;display: inline-flex; margin:0 1%; font-size:12px;}
+section .popup2	.list_line {width:98%; float:left; height:30px;display: inline-flex; margin:0 1%; font-size:12px;}
 section .popup2 .border {border-bottom: 1px solid #000 !important;}
-section .popup2 .list_line .list_label {width:30%;border:1px solid #000; height:40px; padding-top:10px; border-bottom:none; background:#eee;}
+section .popup2 .list_line .list_label {width:30%;border:1px solid #000; height:30px; padding-top:4px; border-bottom:none; background:#eee;}
 section .popup2 .list_line .list_label label{font-size:12pt;}
-section .popup2 .list_line .list_info {width:70%;height:40px; border:1px solid #000; padding-top:10px; border-left:none; border-bottom:none;}
+section .popup2 .list_line .list_info {width:70%;height:30px; border:1px solid #000; padding-top:4px; border-left:none; border-bottom:none;}
 section .popup2 .list_line .list_info input{width:90%;}
 section .popup2 .list_line .mail input {width:30%;}
 section .popup2 .list_line .mail select {width:30%;}
@@ -135,7 +135,7 @@ section .popup_scroll li .right button {background:#e1cac1; color:#fff; border:1
 section .popup_scroll li .right button:hover {background:#FCD5C1;}
 section .popup_scroll li .right button:checked {background:#ccc;}
 section .popup2 .list_line .line_right {float:right; width:70%;}
-section .popup2 .list_line .line_right select {width:200px; float:right; height:34px; margin-top:4px;}
+section .popup2 .list_line .line_right select {width:200px; float:right; height:26px; margin-top:4px;}
 section .popup2 .list_line .line_right input {width:200px; float:right; text-align:right;}
 section .popup2 .list_line .info{width:30%; padding-top:8px; padding-left:20px; text-align:left; font-size:12pt;}
 
@@ -252,7 +252,7 @@ body.eee {height: 700px; background: #eee;}
 .main .wicon .icon_left {float: left;}
 
 
-input {font-size:14px; margin-top: 3px; border: 1px solid #aaa; border-radius:4px; height: 34px;text-align: left; padding:0 10px;}
+input {font-size:14px; margin-top: 3px; border: 1px solid #aaa; border-radius:4px; height: 26px;text-align: left; padding:0 10px;}
 input[type="date"]::-webkit-calendar-picker-indicator {display:none;}
 
 select {border: 1px solid #aaa; border-radius:5px; height: 35px; font-size: 12px; text-align: left; padding:0 10px;}
@@ -337,7 +337,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .content_fix {background: #f5f6f6; border-bottom:1px solid #E0B8AB;}
 .content .content_inside {background: #f5f6f6; border-bottom:1px solid #E0B8AB;}
 .content .header {width:100% !important; margin:0 !important;}
-.content .line {position: relative; display: inline-block; width: 332px; margin:0 auto; height: 40px; margin-bottom: -10px;}
+.content .line {position: relative; display: inline-block; width: 332px; margin:0 auto; height: 30px; margin-bottom: -10px;}
 .content .line.shot{height:30px;}
 .content .line.mt5 {margin-top:5px;}
 .content .line.top6 {top:6px;}
@@ -348,44 +348,44 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line .pop_right div {float:right; margin-right:10px; padding-top:8px; text-align:right; font-size:16px;}
 .content .line .search_wrap input {float:right; width:50%; margin-right:10px;}
 .content .line .search_wrap select {float:right; width:50%; height:27px; margin-right:10px;}
-.content .line div.itp_search_header {height:40px; font-weight:100;padding:8px 10px 5px 10px; text-align: left; color:#b88278;border-bottom: 1px solid #aaa;font-size:14pt;}
+.content .line div.itp_search_header {height:32px; font-weight:100;padding:5px 10px 5px 10px; text-align: left; color:#b88278;border-bottom: 1px solid #aaa;font-size:12pt;}
 .content .line div.itp_search_header img{width:14px; top:-2px; position:relative;}
-.content .line label {min-width:125px; color:#898989; font-size: 14pt; float: left; text-align: left; margin-top: 7px; font-weight:100;}
+.content .line label {min-width:125px; color:#898989; font-size: 12pt; float: left; text-align: left; margin-top: 7px; font-weight:100;}
 .content .line label.pay_label {margin:20px 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 .itp_label_select {padding:0;width:120px; height:34px; color:#666; font-size: 14pt; float: left;  margin:3px 5px 3px 0; font-weight:100; border:1px solid #aaa; border-radius:5px;}
+.content .line .itp_label_select {padding:0;width:120px; height:26px; color:#666; font-size: 12pt; float: left;  margin:3px 5px 3px 0; font-weight:100; border:1px solid #aaa; border-radius:5px;}
 .content .line .float_left {float: left; width:168px;;}
-.content .line .float_left.name {width:62%;}
-.content .line .float_left button {float:right; left:-2px; top:-2px; position:relative; background:transparent; border:none; width:34px; height:34px; padding:0;} 
-.content .line .float_left button img {width:18px;}
+.content .line .float_left.name {width:60%; margin-top:1px;}
+.content .line .float_left button {float:right; left:-2px; top:-2px; position:relative; background:transparent; border:none; width:26px; height:26px; padding:0;} 
+.content .line .float_left button img {width:16px;}
 .content .line .float_left input {width:100%; font-size:12pt; text-overflow:ellipsis; padding-right:22px;}
 .content .line .float_left input::placeholder {color:#bbb; font-size:10pt;}
 .content .line .float_left.note {width: 100%; padding: 10px;}
 .content .line .float_left.note textarea {width: 100%; height: 100px; border: 1px solid #aaa; text-align: left; font-size:14px;}
-.content .line .float_left div {font-size: 14pt; margin-top: 4px; margin-right:8px; text-align:right; font-weight:100;}
-.content .line .float_left .input_text {background: #fff; width: 100%; height: 34px; border: 1px solid #aaa; margin-top: 3px; border-radius: 4px;}
+.content .line .float_left div {font-size: 12pt; margin-top: 4px; margin-right:8px; text-align:right; font-weight:100;}
+.content .line .float_left .input_text {background: #fff; width: 100%; height: 26px; border: 1px solid #aaa; margin-top: 3px; border-radius: 4px;}
 .content .line .float_left .itp_input_btn {top:5px; margin:0; position:absolute; width:168px;}
 .content .line .float_right_btn {float: left; margin-top: 3px; margin-left: 5px;}
-.content .line .float_right_btn button {padding:0; width:34px; height:34px; border-radius:5px; border:1px solid #aaa;}
-.content .line .float_right_btn button img {width:18px; height:18px;}
-.content .line .float_left select {float: left; width: 100%; height: 34px; margin-top:3px; border: 1px solid #aaa; border-radius:5px; font-size: 14pt; font-weight:100;}
+.content .line .float_right_btn button {padding:0; width:26px; height:26px; border-radius:5px; border:1px solid #aaa;}
+.content .line .float_right_btn button img {width:16px; height:16px;}
+.content .line .float_left select {float: left; width: 100%; height: 26px; margin-top:3px; border: 1px solid #aaa; border-radius:5px; font-size: 12pt; font-weight:100;}
 .content .line .line_right {float: right; margin-right: 0%; width:200px;}
-.content .line .line_right div {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:100%; text-align:right; float: right; font-size: 14pt; margin-top: 7px; margin-right:0%; color:#555;padding-right:5px;}
+.content .line .line_right div {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:100%; text-align:right; float: right; font-size: 12pt; margin-top: 7px; margin-right:0%; color:#555;padding-right:5px;}
 .content .line .line_right input {position: relative; text-align: center; font-size:12pt; width:100%;}
 .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 input.date{width:194px; margin-right:132px; height:35px; margin-left:3px;} 
 .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: 168px; height: 34px; float: left; text-align:center; font-size:14pt; background: url(../img/calender.png) 95%/18px no-repeat white}
+.content .line input.date {width: 168px; height: 26px; float: left; text-align:center; font-size:12pt; background: url(../img/calender.png) 95%/18px no-repeat white}
 .content .line input.full {width: 100%;}
-.content .line div.date_to {display:flex; width:62%; height:34px; float: left; margin-right:0px; margin-top:3px;}
-.content .line div.date_to input {font-weight:100; width:47%; height:34px; font-size:11pt; padding:0 24px 0 3px; margin:0;}
+.content .line div.date_to {display:flex; width:62%; height:26px; float: left; margin-right:0px; margin-top:3px;}
+.content .line div.date_to input {font-weight:100; width:47%; height:26px; font-size:11pt; padding:0 24px 0 3px; margin:0;}
 
 .content .line div.date_to div.at {width: 6%;  font-size: 16px; padding-top:12px; float: right;}
 .content .line .search {width: 100%; height: 50px; padding-top:6px;}
-.content .line .search button {width: 40%; height: 34px; font-size: 12pt; font-weight:100; padding: 0;}
-.content .line .search button.col_3 {width: 25%; height:34px; margin:0 10px;}
+.content .line .search button {width: 40%; height: 26px; font-size: 12pt; font-weight:100; padding: 0;}
+.content .line .search button.col_3 {width: 25%; height:26px; margin:0 10px;}
 .content .list_line {width:98%; float:left; height:50px;display: inline-flex; margin:0 1%; font-size:12px;}
 .content .border {border-bottom: 1px solid #000 !important;}
 .content .list_line .list_label {width:30%;border:1px solid #000; height:50px; padding-top:14px; border-bottom:none; background:#eee;}
@@ -398,10 +398,10 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .list_line .mail select {width:30%; height:34px; font-size:14px; border: 1px solid #aaa;border-radius: 5px;}
 .content .list_line .list_info .pay_info {text-align:left; padding-left:17px; font-size:12pt;}
 .content .table_header {margin-top: 6px; width: 100%; height: 20px;}
-.content .table_btn {margin-top: 6px; width: 100%; height: 38px;}
+.content .table_btn {margin-top: 6px; width: 100%; height: 30px;}
 .content .table_header h1 {margin-left: 15px; margin-top:0px; margin-bottom:0; font-size: 13px; float: left; color: #000; font-weight: 100;}
-.content .table_btn h1 {margin-left: 15px; margin-top:16px; margin-bottom:0; font-size: 13px; float: left; color: #000; font-weight: 100;}
-.content .table_btn button {float: right; width: 75px; height:34px; font-size: 10pt; font-weight: 100; padding:0px; margin: 0px 12px 6px 0; border-radius:15px;}
+.content .table_btn h1 {margin-left: 15px; margin-top:10px; margin-bottom:0; font-size: 13px; float: left; color: #000; font-weight: 100;}
+.content .table_btn button {float: right; width: 75px; height:26px; font-size: 10pt; font-weight: 100; padding:0px; margin: 0px 12px 0px 0; border-radius:15px;}
 .detail_content {top: 0px; position: fixed; display:contents; z-index: 10; width:100%; background: #fff;}
 .detail_content .detail_content_fix {background: #f5f6f6; border-bottom:1px solid #E0B8AB;}
 .detail_content .detail_header {width: 330px; height: 50px; margin:0; left:50%; position:relative; transform:translateX(-50%);}