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

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

@@ -1,6 +1,6 @@
 <section id="ITP_MOBILE_MLOANMNG02010">
 	<div id="ITP_AJAX_MLOANMNG02010_LIST_CONTAINER" style="display: none;">
-		<form id="ITP_FORM_MLOANMNG02010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
+		<form id="ITP_FORM_MLOANMNG02010_LIST_SEARCH" class="area_full form-horizontal" onsubmit="return false;">
 		  <input type="hidden" id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
 		  <input type="hidden" id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
 		  <input type="hidden" id="ITP_FORM_LOANMNG02010_SEARCH_STORE_LOAN_DVSN" name="loanDvsn" value="">
@@ -58,60 +58,60 @@
 					<button id="ITP_BTN_MLOANMNG02010_LIST_REJECT" class="btn-danger RJT">반려</button>
 				  </div>
 				  <div class="left btn_list">
-					<div class="nomal btn">
-					  <label class="col_5">매장명</label>
+					<div class="nomal">
+					  <label class="col_4">매장명</label>
 					  <span>:</span>
-					  <div class="full_s fnStoreNm"></div>
+					  <div class="full_s fnStoreNm">fasdfsdfssfdsfadfsadfsadfasdsfdsfd</div>
 					</div>
 				  </div>
 				  <div class="left btn_list">
-					<div class="nomal btn">
+					<div class="nomal">
 					  <label class="sub_info">정산타입</label>
 					  <span>:</span>
 					  <div class="fnLoanDvsnNm"></div>
 				      <label class="sub_info">요청일자</label>
 					  <span>:</span>
-					  <div class="fnReqDt"></div>
+					  <div class="text_btn fnReqDt">2020.20.20</div>
 					</div>
 				  </div>
 				  <div class="left btn_list">
-					<div class="nomal btn">
+					<div class="nomal">
 					  <label class="sub_info">입금일자</label>
 					  <span>:</span>
 					  <div class="fnDpstDt"></div>
 					  <label class="sub_info">입금금액</label>
 					  <span>:</span>
-					  <div class="fnDpstAmt"></div>
+					  <div class="text_btn fnDpstAmt">12,000,00000</div>
 					</div>
 				  </div>
 				  <div class="left btn_list">
-					<div class="nomal btn">
+					<div class="nomal">
 					  <label class="sub_info">입금상태</label>
 					  <span>:</span>
 					  <div class="fnDpstStNm"></div>
-					  <label class="col_5">입금자</label>
+					  <label class="col_4">입금자</label>
 					  <span>:</span>
-					  <div class="fnDpstNm"></div>
+					  <div class="text_btn fnDpstNm"></div>
 					</div>
 				  </div>
 				  <div class="left btn_list">
-					<div class="nomal btn">
+					<div class="nomal">
 					  <label class="sub_info">승인일자</label>
 					  <span>:</span>
 					  <div class="fnDpstAuthDt"></div>
 					  <label class="sub_info">반려일자</label>
 					  <span>:</span>
-					  <div class="fnDpstRjctDt"></div>
+					  <div class="text_btn fnDpstRjctDt"></div>
 					</div>
 				  </div>
 				  <div class="left btn_list">
-					<div class="nomal btn">
+					<div class="nomal">
 					  <label class="sub_info">입금은행</label>
 					  <span>:</span>
 					  <div class="fnDpstBnkNm"></div>
 					  <label class="sub_info">계좌번호</label>
 					  <span>:</span>
-					  <div class="fnRcvAcctNo"></div>
+					  <div class="text_btn fnRcvAcctNo"></div>
 					</div>
 				  </div>
 				</li>
@@ -240,7 +240,7 @@
 			<div id="ITP_LIST_MLOANMNG02010_POP_STORE_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MLOANMNG02010_POP_STORE_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MLOANMNG02010_POP_STORE_ROWCOPY" style="display: none;">
-					<li class="row_2">
+					<li class="row_2 item-row">
 						<div class="scroll_left">
 							<div class="con_2 fnStoreNm"></div>
 							<div class="con_2 wichi fnStoreStNm"></div>

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

@@ -1,6 +1,6 @@
 <section id="ITP_MOBILE_MLOANMNG03010">
 	<div id="ITP_AJAX_MLOANMNG03010_LIST_CONTAINER" style="display: none;">
-		 <form id="ITP_FORM_MLOANMNG03010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
+		 <form id="ITP_FORM_MLOANMNG03010_LIST_SEARCH" class="area_full form-horizontal" onsubmit="return false;">
 			 <input type="hidden" id="ITP_FORM_MLOANMNG03010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
 			 <input type="hidden" id="ITP_FORM_MLOANMNG03010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
 		  <div class="content">
@@ -42,13 +42,6 @@
 			  <ul id="ITP_LIST_MLOANMNG03010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
 			  <div id="ITP_LIST_MLOANMNG03010_LIST_ITEM_ROWCOPY" style="display: none;">
 				<li class="history_list7 item-row">
-				  <!-- <div class="left">hidden 처리
-					<div class="nomal">
-				      <label class="history_label">정산번호 </label>
-					  <span>:</span>
-					  <div class="full fnSttlMgntUnqNo">12121212121212121</div>
-					</div>
-				  </div> -->
 				  <div class="left">
 					<div class="nomal">
 					  <label>매장명</label>
@@ -92,112 +85,112 @@
 	  </form>
 	</div>
 	<div id="ITP_AJAX_MLOANMNG03010_VIEW_CONTAINER" style="display: none;">
-		<form id="ITP_FORM_MLOANMNG03010_VIEW" class="form-horizontal" onsubmit="return false;">
+		<form id="ITP_FORM_MLOANMNG03010_VIEW" class="put_btn form-horizontal" onsubmit="return false;">
 			<input type="hidden" id="ITP_FORM_MLOANMNG03010_VIEW_BRAND_ID" name="brandId" value="">
 			<input type="hidden" id="ITP_FORM_MLOANMNG03010_VIEW_STORE_ID" name="storeId" value="">
 			<input type="hidden" id="ITP_FORM_MLOANMNG03010_VIEW_STTL_MGNT_UNQ_NO" name="sttlMgntUnqNo" value="">
 			<input type="hidden" id="ITP_FORM_MLOANMNG03010_VIEW_UNPAID_AMT" name="goodsAmt" value="">
 			<input type="hidden" id="ITP_FORM_MLOANMNG03010_VIEW_RCPT_YN" value="">
-		</form>
-		  <div class="content">
-			  <div class="content_fix">
-				<div class="line">
-				  <label>매장명</label>
-				  <div class="line_right">
-				  	<div class="fnStoreNm"></div>
-				  </div>      
-				</div>
-				<div class="line">
-				  <label>정산상태</label>
-				  <div class="line_right">
-	  			  	<div class="fnSttlStNm"></div>
-				  </div>
-				</div>
-				<div class="line">
-				  <label>정산요청일자</label>
-				  <div class="line_right">
-				  	<div class="fnSttlReqDt"></div>
-				  </div>
-				</div>
-				<div class="line">
-				  <label>정산확정일자</label>
-				  <div class="line_right">
-				  	<div class="fnSttlDt"></div>
-				  </div>
-				</div>
-				<div class="line">
-				  <label>정산요청금액</label>
-				  <div class="line_right">
-				  	<div class="fnSttlReqAmt"></div>
-				  </div>
-				</div>
-				<div class="line">
-				  <label>미납금액</label>
-				  <div class="line_right">
-				  	<div class="fnUnpaidAmt"></div>
-				  </div>
-				</div>
-				<div class="line">
-				  <label>사용가능금액</label>
-				  <div class="line_right">
-				  	<div class="fnUseAmtTotal"></div>
-				  </div>
-				</div>
-				<div class="table_header">
-				  <h1><정산 상세 내역></h1>
-				</div>
-			</div>
-		  </div>
-		  <div id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_AREA" class="scroll_area row-4-1">
-			  <ul id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
-			  <div id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_ROWCOPY" style="display: none;"><!-- style="display: grid;" -->
-				<li class="history_list7 item-row">
-				  <div>
-					<div class="left">
-					  <div class="nomal">
-						<label class="col_5">품목명</label>
-						<span>:</span>
-					    <div class="full fnItemNm"></div>
+			  <div class="content">
+				  <div class="content_fix">
+					<div class="line">
+					  <label>매장명</label>
+					  <div class="line_right">
+					  	<div class="fnStoreNm"></div>
+					  </div>      
+					</div>
+					<div class="line">
+					  <label>정산상태</label>
+					  <div class="line_right">
+		  			  	<div class="fnSttlStNm"></div>
 					  </div>
 					</div>
-					<div class="left">
-					  <div class="nomal">
-						<label class="col_5">단가금액</label>
-						<span>:</span>
-					    <div class="col_82 lit fnUnitAmt"></div>
-						<label class="col_0">정산구분</label>
-						<span>:</span>
-					    <div class="fnSttlDvsnNm"></div>
+					<div class="line">
+					  <label>정산요청일자</label>
+					  <div class="line_right">
+					  	<div class="fnSttlReqDt"></div>
 					  </div>
 					</div>
-					<div class="left">
-					  <div class="nomal">
-						<label class="col_5">발주수량</label>
-						<span>:</span>
-					    <div class="col_82 lit fnPodrQyt"></div>
-						<label class="lit">입고(수거)일자</label>
-						<span>:</span>
-					    <div class="lit col_64 fnWhsColDt"></div>
+					<div class="line">
+					  <label>정산확정일자</label>
+					  <div class="line_right">
+					  	<div class="fnSttlDt"></div>
 					  </div>
 					</div>
-					<div class="left">
-					  <div class="nomal">
-						<label class="lit">입고(수거)수량</label>
-						<span>:</span>
-					    <div class="col_5 lit fnWhsColQty"></div>
-						<label class="lit">입고(수거)금액</label>
-						<span>:</span>
-					    <div class="col_8 lit fnWhsColAmt"></div>
+					<div class="line">
+					  <label>정산요청금액</label>
+					  <div class="line_right">
+					  	<div class="fnSttlReqAmt"></div>
 					  </div>
 					</div>
-				  </div>
-				</li>
+					<div class="line">
+					  <label>미납금액</label>
+					  <div class="line_right">
+					  	<div class="fnUnpaidAmt"></div>
+					  </div>
+					</div>
+					<div class="line">
+					  <label>사용가능금액</label>
+					  <div class="line_right">
+					  	<div class="fnUseAmtTotal"></div>
+					  </div>
+					</div>
+					<div class="table_header">
+					  <h1><정산 상세 내역></h1>
+					</div>
+				</div>
+			  </div>
+			  <div id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_AREA" class="scroll_area row-4-1">
+				  <ul id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
+				  <div id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_ROWCOPY" style="display: none;"><!-- style="display: grid;" -->
+					<li class="history_list7 item-row">
+					  <div>
+						<div class="left">
+						  <div class="nomal">
+							<label class="col_4">품목명</label>
+							<span>:</span>
+						    <div class="full fnItemNm"></div>
+						  </div>
+						</div>
+						<div class="left">
+						  <div class="nomal">
+							<label class="col_4">단가금액</label>
+							<span>:</span>
+						    <div class="col_82 lit fnUnitAmt"></div>
+							<label class="col_7">정산구분</label>
+							<span>:</span>
+						    <div class="fnSttlDvsnNm"></div>
+						  </div>
+						</div>
+						<div class="left">
+						  <div class="nomal">
+							<label class="col_4">발주수량</label>
+							<span>:</span>
+						    <div class="col_82 lit fnPodrQyt"></div>
+							<label class="col_7">입고(수거)일자</label>
+							<span>:</span>
+						    <div class="lit col_64 fnWhsColDt"></div>
+						  </div>
+						</div>
+						<div class="left">
+						  <div class="nomal">
+							<label class="col_7">입고(수거)수량</label>
+							<span>:</span>
+						    <div class="col_5 lit fnWhsColQty"></div>
+							<label class="col_7">입고(수거)금액</label>
+							<span>:</span>
+						    <div class="col_8 lit fnWhsColAmt"></div>
+						  </div>
+						</div>
+					  </div>
+					</li>
+				</div>
+			  </div>
+			<div class="button_bar">
+				<button id="ITP_BTN_MLOANMNG03010_VIEW_PAYMENT" class="btn_col_6 btn-m-orange PAY">결제</button>
+				<button id="ITP_BTN_MLOANMNG03010_VIEW_CANCEL_LIST" class="btn_col_3 btn-gray CLB">취소</button>
 			</div>
-		  </div>
-		<div class="button_bar">
-			<button id="ITP_BTN_MLOANMNG03010_VIEW_PAYMENT" class="btn_col_6 btn-m-orange PAY">결제</button>
-			<button id="ITP_BTN_MLOANMNG03010_VIEW_CANCEL_LIST" class="btn_col_3 btn-gray CLB">취소</button>
-		</div>
+		</form>
 	</div>
 	<div id="ITP_AJAX_MLOANMNG03010_PAY_CONTAINER" style="display: none;">
 		<form id="ITP_FORM_MLOANMNG03010_PAY" class="form-horizontal" onsubmit="return false;">
@@ -319,7 +312,7 @@
 			<div id="ITP_LIST_MLOANMNG03010_POP_STORE_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MLOANMNG03010_POP_STORE_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MLOANMNG03010_POP_STORE_ROWCOPY" style="display: none;">
-					<li class="row_2">
+					<li class="row_2 item-row">
 						<div class="scroll_left">
 							<div class="con_2 fnStoreNm"></div>
 							<div class="con_2 wichi fnStoreStNm"></div>

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

@@ -488,7 +488,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 
 .scroll_area li .history_info {width: auto;}
 .scroll_area li .left {width:100%; height:28px; margin-top:0px;}
-.scroll_area li .left.btn_list{position:relative; left:-7px;}
+.scroll_area li .left.btn_list{width:calc(100% - 45px);}
 .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;}
@@ -540,14 +540,16 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal label.col_3{min-width: 50px;}
 .scroll_area li .left .nomal label.col_4{min-width: 65px;}
 .scroll_area li .left .nomal label.col_6{min-width: 95px;}
+.scroll_area li .left .nomal label.col_7{min-width: 105px;}
 .scroll_area li .left .nomal.over{text-overflow:ellipsis; overflow:hidden; white-space:nowrap;}
 .scroll_area li .left .nomal i{width: 50px; text-align: center;}
 .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 .text_4{width:calc(50% - 69px);}
+.scroll_area li .left .nomal .text_btn{width:calc(50% - 56px);}
 
 .scroll_area li .left .nomal div.full{width:calc(100% - 85px);}
-.scroll_area li .left .nomal div.full_s{width:200px;}
+.scroll_area li .left .nomal div.full_s{width:calc(100% - 45px);}
 .scroll_area li .left .nomal div.auto{width:auto;}