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

src/main/webapp/js/app/loanmng/ITP_LOANMNG02010.js

@@ -66,13 +66,13 @@ const gridColModel = {
 		{
 			index: 'STORE_NM', name: 'storeNm',
 			label: "매장명", 
-			width: '12', fixed: false, align: 'left',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'LOAN_DVSN_NM', name: 'loanDvsnNm',
 			label: "정산타입", 
-			width: '10', fixed: false, align: 'center',
+			width: '9', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
@@ -84,7 +84,7 @@ const gridColModel = {
 		{
 			index: 'DPST_AMT', name: 'dpstAmt',
 			label: "입금금액", 
-			width: '10', fixed: false, align: 'right',
+			width: '11', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -116,7 +116,7 @@ const gridColModel = {
 		{
 			index: 'RCV_ACCT_NO', name: 'rcvAcctNo',
 			label: "입금계좌번호", 
-			minwidth: 140,
+			minwidth: 150,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},

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

@@ -12,7 +12,7 @@
 				<div class="line">
 				  <label>수거장소</label>
 				  <div class="float_left">
-					<input id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="수거장소(매장/창고)">
+					<input id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text">
 					<input type="hidden" id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
 					<div class="itp_input_btn">
 						<button id="ITP_BTN_MCOLLMNG01010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
@@ -220,7 +220,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_MCOLLMNG01010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
@@ -230,13 +230,10 @@
 				<form id="ITP_FORM_MCOLLMNG01010_POP_WHS" class="form-horizontal" onsubmit="return false;">
 					<input type="hidden" id="ITP_FORM_MCOLLMNG01010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
 					<input type="hidden" id="ITP_FORM_MCOLLMNG01010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
-					<input id="ITP_FORM_MCOLLMNG01010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
+					<input id="ITP_FORM_MCOLLMNG01010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="수거장소명">
 					<button id="ITP_BTN_MCOLLMNG01010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MCOLLMNG01010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_LIST_MCOLLMNG01010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MCOLLMNG01010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MCOLLMNG01010_POP_WHS_ROWCOPY" style="display: none;">

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

@@ -240,7 +240,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_MCOLLMNG02010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
@@ -250,13 +250,10 @@
 				<form id="ITP_FORM_MCOLLMNG02010_POP_WHS" class="form-horizontal" onsubmit="return false;">
 					<input type="hidden" id="ITP_FORM_MCOLLMNG02010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
 					<input type="hidden" id="ITP_FORM_MCOLLMNG02010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
-					<input id="ITP_FORM_MCOLLMNG02010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
+					<input id="ITP_FORM_MCOLLMNG02010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="수거장소명">
 					<button id="ITP_BTN_MCOLLMNG02010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MCOLLMNG02010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_LIST_MCOLLMNG02010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MCOLLMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MCOLLMNG02010_POP_WHS_ROWCOPY" style="display: none;">

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

@@ -270,7 +270,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_MCOLLMNG03010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
@@ -280,13 +280,10 @@
 				<form id="ITP_FORM_MCOLLMNG03010_POP_WHS" class="form-horizontal" onsubmit="return false;">
 					<input type="hidden" id="ITP_FORM_MCOLLMNG03010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
 					<input type="hidden" id="ITP_FORM_MCOLLMNG03010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
-					<input id="ITP_FORM_MCOLLMNG03010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
+					<input id="ITP_FORM_MCOLLMNG03010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="수거장소명">
 					<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_LIST_MCOLLMNG03010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MCOLLMNG03010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MCOLLMNG03010_POP_WHS_ROWCOPY" style="display: none;">

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

@@ -131,7 +131,7 @@
 						  <div class="fnUseAmtTotal">0원</div>
 					  </div>
 				  </div>
-				<div class="line top6">
+				<div class="line">
 				  <label>거래일자</label>
 				  <div class="date_to">
 					  <input type="text" id="ITP_FORM_MLOANMNG01010_VIEW_SEARCH_FROM_DT" name="fromDt" class="itp_input date">

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

@@ -45,7 +45,7 @@
 				  </div>
 				</div>
 				<div class="table_header">
-				  <h1><입금 요청 내역></h1>
+				  <h1 style="margin-top:3px;" ><입금 요청 내역></h1>
 				</div>
 			</div>
 		  </div>

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

@@ -20,7 +20,7 @@
 						<button id="ITP_BTN_MLOANMNG03010_LIST_DELETE_STORE_NM"><img src="../img/delete.png" alt=""></button>
 					</div>
 				</div>
-				<div class="line top9">
+				<div class="line">
 				  <label>정산요청일</label>
 				  <div class="date_to">
 					  <input type="text" id="ITP_FORM_MLOANMNG03010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
@@ -28,7 +28,7 @@
 					  <input type="text" id="ITP_FORM_MLOANMNG03010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date">
 				  </div>
 				</div>
-				<div class="line top6">
+				<div class="line">
 				  <div class="search">
 					<button id="ITP_BTN_MLOANMNG03010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
 				  </div>

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

@@ -240,9 +240,6 @@
 					<button id="ITP_BTN_MORDMNG01010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MORDMNG01010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_LIST_MORDMNG01010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MORDMNG01010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MORDMNG01010_POP_WHS_ROWCOPY" style="display: none;">

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

@@ -246,9 +246,6 @@
           <button id="ITP_BTN_MORDMNG02010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
         </form>
       </div>
-      <div class="select_btn">
-        <button id="ITP_BTN_MORDMNG02010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
-      </div>
       <div id="ITP_LIST_MORDMNG02010_POP_WHS_AREA" class="popup_scroll">
         <ul id="ITP_LIST_MORDMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
         <div id="ITP_LIST_MORDMNG02010_POP_WHS_ROWCOPY" style="display: none;">

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

@@ -285,9 +285,6 @@
 					<button id="ITP_BTN_MORDMNG03010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MORDMNG03010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
-			</div>
 			<div id="ITP_LIST_MORDMNG03010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MORDMNG03010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MORDMNG03010_POP_WHS_ROWCOPY" style="display: none;">

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

@@ -119,8 +119,8 @@
 				</div>
 			</div>
 			<div class="button_bar">
-				<button id="ITP_BTN_MPOMNG06010_LIST_SAVE" class="btn_col_6 btn-m-orange INPS">입고처리</button>
-				<button id="ITP_BTN_MPOMNG06010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>
+				<!-- <button id="ITP_BTN_MPOMNG06010_LIST_SAVE" class="btn_col_6 btn-m-orange INPS">입고처리</button> -->
+				<button id="ITP_BTN_MPOMNG06010_LIST_CANCEL" class="col_12 btn-gray CLB">취소</button>
 			</div>
 		</form>
 	</div>

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

@@ -40,7 +40,7 @@
 					<button id="ITP_BTN_MSTOCKMNG01010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
 				  </div>
 				</div>
-				<div class="table_header">
+				<div class="table_btn line">
 				  <h1><재고 목록></h1>
 				  <button type="button" id="ITP_BTN_MSTOCKMNG01010_LIST_ADD_STCK" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MSTOCKMNG01010_STCK_AREA">재고처리</button>
 				</div>
@@ -116,9 +116,6 @@
 					<button id="ITP_BTN_MSTOCKMNG01010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MSTOCKMNG01010_POP_WHS_NM" class="btn_red">창 고<img src="../img/arrow_down.png"></button>
-			</div>
 			<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;">
@@ -230,10 +227,10 @@
 				</div>
 			    <div class="search">
 	 				<div class="left">
-	 					<button id="ITP_BTN_MSTOCKMNG01010_POP_PROC_STCK_CANCEL" class="col_3 btn-danger btn-sm CLB">취소</button>
+	 					<button id="ITP_BTN_MSTOCKMNG01010_POP_PROC_STCK_CANCEL" style="float:right; margin-right:5px;" class="col_3 btn-danger btn-sm CLB">취소</button>
 	 				</div>
 					<div class="right">				  		
-			  			<button id="ITP_BTN_MSTOCKMNG01010_POP_PROC_STCK_REQ" class="col_3 btn-primary btn-sm ">저장</button>
+			  			<button id="ITP_BTN_MSTOCKMNG01010_POP_PROC_STCK_REQ" style="float:left; margin-left:5px;" class="col_3 btn-primary btn-sm ">저장</button>
 					</div>			  		
 			    </div>
 			</div>

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

@@ -44,7 +44,7 @@
 					<button id="ITP_BTN_MSTOCKMNG02010_LIST_SEARCH" class="btn-primary btn-sm ADB">대상 검색</button>
 				  </div>
 				</div>
-				<div class="table_header">
+				<div class="table_btn line">
 				  <h1><실사 목록></h1>
 				  <button id="ITP_BTN_MSTOCKMNG02010_LIST_BARCODE" class="btn-primary btn-sm ADB">바코드</button>
 				</div>
@@ -125,9 +125,6 @@
 					<button id="ITP_BTN_MSTOCKMNG02010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MSTOCKMNG02010_POP_WHS_NM" class="btn_red">창 고 <img src="../img/arrow_down.png"></button>
-			</div>
 			<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;">

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

@@ -60,12 +60,12 @@ section .popup2 .pop .search_bar button {position:relative; width:34px; height:3
 section .popup2 .pop .search_bar button img {width: 18px; position:relative; top:-1px;}
 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_item_bar {width:98%;margin:5px auto; position: relative; top:-40px; display:flex;}
-section .popup2 .pop .search_item_bar input {width:40%; height:27px; border-radius:5px; margin:0; font-size:12px;}
-section .popup2 .pop .search_item_bar select {width:22%; height:27px; padding:0; border-radius:5px; margin-right:5px;}
+section .popup2 .pop .search_item_bar input {width:40%; height:34px; border-radius:5px; margin:0; font-size:12px;}
+section .popup2 .pop .search_item_bar select {width:22%; height:34px; padding:0; border-radius:5px; margin-right:5px;}
 section .popup2 .pop .search_btn_bar {width:100%; height:50px; margin-top:-30px; margin-right:10px;}
 section .popup2 .pop .search_btn_bar .btn_right {float:right; margin-right:10px;}
 section .popup2 .pop .search_btn_bar .btn_right button img{width:18px; height:18px; margin-right:2px;}
-section .popup2 .pop .search_btn_bar .btn_right button {height:30px; padding:5px 12px; font-size:12px; font-weight:100; border-radius:3px; border:1px solid #333;}
+section .popup2 .pop .search_btn_bar .btn_right button {height:34px; padding:5px 12px; font-size:12pt; font-weight:100; border-radius:3px; border:1px solid #333;}
 section .popup2 .pop .table>tbody>tr {border-bottom:1px solid #ddd;}
 section .popup2 .pop .table{width:98%; margin:0 auto; border:1px solid #aaa; border-bottom:none; border-left:none; border-right:none;}
 section .popup2 .pop .table .table_tr {display:flex;}
@@ -136,14 +136,14 @@ 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 input {width:200px; float:right;}
+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;}
 
-section .popup2 .search .left {width:20%; float:left; margin:20px;}
-section .popup2 .search .right {width:20%; float:right; margin:20px;}
+section .popup2 .search .left {width:50%; float:left;}
+section .popup2 .search .right {width:50%; float:right;}
 
 section .popup2 .search .left button,
-section .popup2 .search .right button {width:100%;}
+section .popup2 .search .right button {width:70px; height:34px; font-size:12pt;}
 section .popup2 .content .line .search_wrap input {float:right; width:50%; margin-right:0px; margin-top:0;}
 section .popup2 .content .line.mt_5 {margin-top:5px; width:300px;}
 section .popup2 .content .line.ml_10 {}
@@ -301,7 +301,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 #ITP_SIDEBAR .itp_nav.panel-group .panel+.panel {margin-top:0;}
 #ITP_SIDEBAR .itp_nav .panel-heading {padding:0;}
 #ITP_SIDEBAR .itp_nav .panel-title {line-height:1.1; border-bottom:1px solid #ddd;}
-#ITP_SIDEBAR .itp_nav .panel-title a {font-size:20px; display:block; padding:13px 15px; color:#333; text-decoration: none;}
+#ITP_SIDEBAR .itp_nav .panel-title a {font-size:20px; display:block; padding:13px 15px; color:#333; text-decoration: none; text-align:left;}
 #ITP_SIDEBAR .itp_nav .panel-title a .glyphicon {font-size:12px;}
 #ITP_SIDEBAR .itp_nav .panel-default {margin-bottom:0; border:none;}
 #ITP_SIDEBAR .itp_nav * {border-radius:0; border-width:1px 0 1px 0;}
@@ -309,7 +309,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 #ITP_SIDEBAR .itp_nav .itp_svgs_body {padding:0; border-top:0; border-bottom:1px solid #ddd;}
 #ITP_SIDEBAR .itp_nav .itp_svgs {display:flex; align-content:flex-start; flex-direction:column; flex-wrap:wrap; overflow:auto;}
 #ITP_SIDEBAR .itp_nav .itp_svgs .itp_svg_in {position:relative;}
-#ITP_SIDEBAR .itp_nav .itp_svgs li {width:100%; height:40px; border-top: 1px solid #ddd;}
+#ITP_SIDEBAR .itp_nav .itp_svgs li {width:100%; height:40px; border-top: 1px solid #ddd; padding-left:15px;}
 #ITP_SIDEBAR .itp_nav .itp_svgs li:first-child {border-top:none;}
 #ITP_SIDEBAR .itp_nav .itp_svgs li a {display:block; width:100%; color:#333; padding:10px 10px 5px 17px;}
 #ITP_SIDEBAR .itp_nav .itp_svgs li:first-child a {padding-top:11px;}
@@ -385,7 +385,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .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:30px; margin:0 10px;}
+.content .line .search button.col_3 {width: 25%; height:34px; 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;}
@@ -551,7 +551,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .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 .m_btn_bar{position: relative; display:inline-flex; width:90px; height:25px; font-size: 12pt; margin-left:10px;}
+.scroll_area li .left .nomal .m_btn_bar{position: relative; top:-1px; display:inline-flex; width:90px; height:25px; font-size: 12pt; margin-left:10px;}
 .scroll_area li .left .nomal .m_btn_bar button{width: 25px; height: 25px; font-size: 12pt; padding: 0; margin:0; border:1px solid #E0B8AB; border-radius:0; background: #e1cac1; color:#fff;}
 .scroll_area li .left .nomal .m_btn_bar button div{position:relative; width:10px; top:0px; left:1px;}
 .scroll_area li .left .nomal .m_btn_bar .col_0{width: 40px; text-align:center; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}