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

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

@@ -30,7 +30,7 @@
 	<header>
 		<div class="header_wrap">
 			<div class="menu_logo">
-				<button id="ITP_MOBILE_BTN_MENU" style="margin-left:20px;"><img src="../img/menu.png" alt=""></button>
+				<button id="ITP_MOBILE_BTN_MENU" style="margin-left:15px;"><img src="../img/menu.png" alt=""></button>
 				<button id="ITP_MOBILE_BTN_HOME"><img src="../img/home.png" alt=""></button>
 			</div>
 			<div class="name_info">

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

@@ -17,7 +17,9 @@
 				<div class="line">
 					<label>반품요청금액</label>
 					<div class="float_left">
-						<input type="text" id="ITP_FORM_MRTNMNG01010_DETAIL_RTN_REQ_AMT" name="rtnReqAmt" class="itp_input" data-check-required="empty" readonly>
+						<div class="input_text">
+							<div class="fnRtnReqAmt">1,000,000원</div>
+						</div>
 					</div>
 				</div>
 				<div class="line">
@@ -127,7 +129,7 @@
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MRTNMNG01010_POP_WHS_NM" class="btn_blue">반품장소 <img src="../img/arrow_down.png"></button>
+				<button id="ITP_BTN_MRTNMNG01010_POP_WHS_NM" class="btn_red">반품장소 <img src="../img/arrow_down.png"></button>
 			</div>
 			<div id="ITP_LIST_MRTNMNG01010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG01010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
@@ -164,7 +166,8 @@
 					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
 				</div>
 				<div class="select_btn">
-					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_NM" class="btn_blue">품목명 <img src="../img/arrow_down.png"></button>
+					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_ADD_BTN" class="btn_blue ">추가</button>
+					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_NM" class="btn_red">품목명 <img src="../img/arrow_down.png"></button>
 				</div>
 			</form>
 			<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_AREA" class="popup_scroll">

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

@@ -7,7 +7,7 @@
 			  	<div class="line header">
 					<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품요청현황</div>
 		      	</div>
-				<div class="line">
+				<div class="line mt5">
 					<label>반품요청일</label>
 					<div class="input-group date_to date">
 						<input type="text" id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
@@ -36,7 +36,7 @@
 						<button id="ITP_BTN_MRTNMNG02010_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_MRTNMNG02010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
 					</div>
@@ -52,35 +52,29 @@
 				<li class="history_list5">
 					<div class="left">
 						<div class="nomal">
-							<label>반품요청일 </label>
+							<label class="col_1">요청일 </label>
 							<span>:</span>
 							<div class="history">
-								<div class="fnRtnReqDt">asdf</div>
-								(<div class="fnRtnReqMgrNm">asdf</div>)
+								<div class="fnRtnReqDt">2022.10.10 </div>
 							</div>
-						</div>
-					</div>
-					<div class="left">
-						<div class="nomal">
-							<label>반품상태</label>
+							<label class="col_1">상태</label>
 							<span>:</span>
 							<div class="history">
-								<div class="fnRtnReqStNm"></div>
-							</div>
-							<label>수거장소명  :</label>
-							<div class="history">
-								<div class="fnRtnWhsNm"></div>
+								<div class="fnRtnReqStNm">임시저장</div>
 							</div>
 						</div>
 					</div>
 					<div class="left">
 						<div class="nomal">
-							<label>반품요청 정보</label>
+							<label class="col_1">금액</label>
+							<span>:</span>
+							<div class="history">
+								<div class="fnRtnReqAmt">1,000,000</div>
+							</div>
+							<label class="col_1">품목수 </label>
 							<span>:</span>
 							<div class="history">
-								<div class="fnRtnReqItemQty"></div>
-								<i>- </i>
-								<div class="fnRtnReqAmt"></div> 원
+								<div class="fnRtnReqItemQty">1,000,000</div>
 							</div>
 						</div>
 					</div>
@@ -96,19 +90,37 @@
 			<div class="line">
 				<label>반품요청일</label>
 				<div class="line_right">
-					<div class="fnRtnReqDt"></div>
+					<div class="fnRtnReqDt">2022.10.10</div>
 				</div>
 			</div>
 			<div class="line">
 				<label>반품요청금액</label>
 				<div class="line_right">
-					<div class="fnRtnReqAmt"></div>
+					<div class="fnRtnReqAmt">1,000,000</div>
 				</div>
 			</div>
 			<div class="line">
 				<label>반품장소</label>
 				<div class="line_right">
-					<div class="fnRtnWhsNm"></div>
+					<div class="fnRtnWhsNm">누리 테스트 창고이름 어쩌고</div>
+				</div>
+			</div>
+			<div class="line">
+				<label>반려일자</label>
+				<div class="line_right">
+					<div class="fnRjctDt">2022.20.10</div>
+				</div>
+			</div>
+			<div class="line">
+				<label>반려담당자</label>
+				<div class="line_right">
+					<div class="fnRjctMgrNm">홍길동</div>
+				</div>
+			</div>
+			<div class="line">
+				<label>반려사유</label>
+				<div class="line_right">
+					<div class="fnRjctRsn">물이 새고 색이 마음에 안들고</div>
 				</div>
 			</div>
 			<div class="table_header">
@@ -123,12 +135,12 @@
 						<div class="thick">
 			              	<label>품목명</label>
 			                <span>:</span>
-			                <div class="itp_item fnItemNm"></div>
+			                <div class="itp_item fnItemNm">테스트용 길다란 품목명 제목</div>
 	                	</div>
 		                <div class="thick">
 		              		<label>구매가</label>
 		                	<span>:</span>
-		                	<div class="itp_amt fnRtnAmt"></div>
+		                	<div class="itp_amt fnRtnAmt">10,000,000</div>
 		                </div>
 					</div>
 					<div class="right">
@@ -160,8 +172,8 @@
 				</div>
 				<div class="line">
 					<label>반품요청금액</label>
-					<div class="line_right">
-						<div class="fnRtnReqAmtTot">0원</div>
+					<div class="input_text">
+						<div class="fnRtnReqAmt">1,000,000원</div>
 					</div>
 				</div>
 				<div class="line">
@@ -200,7 +212,7 @@
 			              	<div class="thick">
 				              	<label>구매가</label>
 				                <span>:</span>
-				                <div class="itp_amt fnUnitAmt"></div>
+				                <div class="itp_amt fnUnitAmt">10,000,000</div>
 			             	 </div>
 						</div>
 						<div class="right">
@@ -212,7 +224,7 @@
 				</div>
 			</div>
 			<div class="button_bar">
-				<button id="ITP_BTN_MRTNMNG02010_MODIFY_REQ_ORDER" class="col_3 btn-primary REQ">구매요청</button>
+				<button id="ITP_BTN_MRTNMNG02010_MODIFY_REQ_ORDER" class="col_3 btn-primary REQ">반품요청</button>
 				<button id="ITP_BTN_MRTNMNG02010_MODIFY_TEMP_SAVE" class="col_3 btn-gray TSA">임시저장</button>
 				<button id="ITP_BTN_MRTNMNG02010_MODIFY_CANCEL" class="col_3 btn-gray CLB">취소</button>
 			</div>
@@ -270,15 +282,15 @@
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_blue">납품장소 <img src="../img/arrow_down.png"></button>
+				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
 			</div>
 			<div id="ITP_LIST_MRTNMNG02010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWCOPY" style="display: none;">
 					<li class="row_2">
 						<div class="scroll_left">
-							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>
-							<div class="con_2 sub fnLocationNm">(상세위치내용)</div>
+							<div class="fnWhsNm">브랜드 창고 명A</div>
+							<div class="sub fnLocationNm">(상세위치내용)</div>
 						</div>
 						<div class="scroll_right">
 							<button id="ITP_BTN_MRTNMNG02010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
@@ -314,7 +326,7 @@
 				<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_ROWCOPY" style="display: none;">
 					<li class="row_2">
 						 <div class="scroll_left">
-                            <div class="fnItemNm">fdssfd</div>
+                            <div class="fnItemNm"></div>
                             <div class="mg_0">
 				                 <div class="sub fnKg"></div>
 				                 <div class="type_hide">/</div>

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

@@ -16,8 +16,8 @@ body{background: #fff; position: relative; width: 100%; height: auto; font-famil
 body .login {position:fixed;}
 .color-gray {color:#aaa;}
 /* 팝업 */
-section .popup {position: absolute; top:0; width: 100%; height: 100%; background: transparent; z-index: 11;}
-section .popup .pop {position: absolute; top: 45%; left: 50%; transform: translate(-50%,-50%); width: 70%; height: 360px; padding-top: 20px; background: #fff; border: 2px solid #000; border-top-left-radius: 10px; border-top-right-radius: 10px;}
+section .popup {position: absolute; top:0; width: 100%; height: 100vh; background: transparent; z-index: 11;}
+section .popup .pop {position: absolute; top: 50%; left: 50%; transform: translate(-50%,-50%); width: 70%; height: 360px; padding-top: 20px; background: #fff; border: 2px solid #000; border-top-left-radius: 10px; border-top-right-radius: 10px;}
 section .popup .pop.short {height:260px;}
 section .popup .pop label.pop_label {position:relative; top:10px; font-size: 16px;}
 section .popup .pop div.pop_msg {padding:0 5%; text-align:left; position:relative; top:10px; font-size: 16px;}
@@ -28,7 +28,7 @@ section .popup .pop .pop_line .itp_label_area label {margin:0;font-size: 14px; t
 section .popup .pop .pop_line .itp_info_area {width:calc(100% - 100px); margin:0; padding:6px;}
 section .popup .pop .pop_line div {text-align: right; float: right; font-size: 16px; margin-right: 10px; width: auto;}
 section .popup .pop .popup_btn { position: absolute; background-color: #ccc; bottom: 0; width: 100%; height: 40px; border-top: 2px solid #000;}
-section .popup .pop .popup_btn button { position: relative; float: left; width: 100%; height: 38px; margin:0; font-size: 18px; font-weight: 100; border-radius: 0px; border: none;}
+section .popup .pop .popup_btn button { position: relative; float: left; width: 100%; height: 38px; margin:0; font-size: 14px; font-weight: 100; border-radius: 0px; border: none;}
 section .popup .pop .popup_btn button.ok { width: 64%; border-left: 2px solid #000;}
 section .popup .pop .popup_btn button.cancel {width: 36%;}
 
@@ -40,20 +40,22 @@ section .popup2 .barcode_area {width: 300px; height: 300px; margin: auto; backgr
 section .popup2 .barcode h1{text-align: left; width: 85%; font-size: 16px; margin:auto; margin-top: 10%;}
 section .popup2 .btn_barcode {margin-top: 20%;}
 section .popup2 .btn_barcode button {width: 35%; height: 40px; font-size: 15px; font-weight:100;}
-section .popup2 .pop { position: absolute; top: 40%; left: 50%; transform: translate(-50%,-50%); width: 95%; height: 70%; background: #fff; border: 1px solid #000; border-radius:10px;}
+section .popup2 .pop { position: absolute; top: 50%; left: 50%; transform: translate(-50%,-50%); width: 95%; height: 70%; background: #fff; border: 1px solid #000; border-radius:10px;}
 section .popup2 .pop .header {position: relative; height: 40px; background: #f0831e; color:#eee; border-bottom: 1px solid #000; border-top-right-radius: 10px; border-top-left-radius: 10px;}
 section .popup2 .pop .header .header_left {padding-top: 12px;}
 section .popup2 .pop .header .header_left label {font-size: 16px; font-weight:100;} 
 section .popup2 .pop .header .header_right {float: right; padding-right: 10px; position:relative; top:-44px;}
 section .popup2 .pop .header .header_right button {border: none; background: transparent; margin:3px -5px;}
 section .popup2 .pop .header .header_right button img {width:22px;}
-section .popup2 .pop .select_btn {position:relative; top:-25px; left:55px; width:100%; height: 20px;}
-section .popup2 .pop .select_btn button.btn_blue {float: right; width: 90px; height: 25px; background:#d9baaf; color: #fff; font-size: 12px; padding-top:4px; border: 1px solid #cca597;}
+section .popup2 .pop .select_btn {position:relative; width:100%; height: 63px;}
+section .popup2 .pop .select_btn button.btn_red {float: right; width: 90px; height: 25px; margin:0 7px; background:#d9baaf; color: #fff; font-size: 12px; padding-top:4px; border: 1px solid #cca597;}
+section .popup2 .pop .select_btn button.btn_blue {float: right; width: 90px; height: 25px; margin:0 7px; background:#8f9fc6; color: #fff; font-size: 12px; padding-top:4px; border: 1px solid #cacfe3;}
+section .popup2 .pop .select_btn button.btn_blue:active{background-color: #708cd1;}
 section .popup2 .pop .select_btn img {width:12px;}
-section .popup2 .pop .search_bar {width: 100%; height: 60px; padding:10px;}
-section .popup2 .pop .search_bar input {width: 90%; margin:0 5%; height: 27px; position:relative; top:-37px; font-size:14px;}
-section .popup2 .pop .search_bar button {position:relative; width:27px; height:27px; top:-38px; background:transparent; margin-right:5%; float: right; border: 1px solid #aaa; border-radius:4px; padding-top:3px;}
-section .popup2 .pop .search_bar button img {width: 18px;}
+section .popup2 .pop .search_bar {width: 90%; height: 60px; margin:0 auto; padding:10px;}
+section .popup2 .pop .search_bar input {width: 80%; height: 27px; position:relative; font-size:14px;}
+section .popup2 .pop .search_bar button {position:relative; width:27px; height:27px; background:transparent; margin-right:0%; margin-top:3px; border: 1px solid #aaa; border-radius:4px; padding:0px;}
+section .popup2 .pop .search_bar button img {width: 17px; 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;}
@@ -91,13 +93,13 @@ section .popup2 .pop .popup_scroll li .left .thick {float: left; margin: 12px 0
 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; display:grid;}
-section .popup2 .pop .popup_scroll li .scroll_left div {text-align:left; float: left; font-size: 18px; font-weight: 100; width: auto; margin:8px 6px -6px 10px;}
-section .popup2 .pop .popup_scroll li .scroll_left .con_2 {padding-top:3px;}
+section .popup2 .pop .popup_scroll li .scroll_left {float: left; display:grid; width:50%;}
+section .popup2 .pop .popup_scroll li .scroll_left div {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; text-align:left; float: left; font-size: 18px; font-weight: 100; width: 100%; margin:8px 6px -6px 10px;}
+section .popup2 .pop .popup_scroll li .scroll_left .con_2 {padding-top:0px;}
 section .popup2 .pop .popup_scroll li .scroll_left .mg_0 {margin:0;}
-section .popup2 .pop .popup_scroll li .scroll_left .mg_0 div {margin:0; padding: 8px 8px 0px 2px;}
-.type_hide {display:block;}
-section .popup2 .pop .popup_scroll li .scroll_left .sub{font-size:14pt; color:gray;}
+section .popup2 .pop .popup_scroll li .scroll_left .mg_0 div {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:46%; margin:0; padding: 8px 2px 0px 2px;}
+section .popup2 .pop .popup_scroll li .scroll_left .mg_0 .type_hide {width:auto;}
+section .popup2 .pop .popup_scroll li .scroll_left .sub{font-size:14pt; color:gray; width:auto !important;}
 section .popup2 .pop .popup_scroll li .scroll_left .amt{font-size:14pt; color:#b88278;}
 section .popup2 .pop .popup_scroll li .scroll_right {float: right;}
 section .popup2 .pop .popup_scroll li .scroll_right input[type=checkbox]{width:27px; margin:18px 11px 0 11px;}
@@ -239,7 +241,7 @@ body.eee {height: 700px; background: #eee;}
 input {font-size:14px; margin-top: 3px; border: 1px solid #aaa; border-radius:4px; height: 34px;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 15px;}
+select {border: 1px solid #aaa; border-radius:5px; height: 35px; font-size: 12px; text-align: left; padding:0 10px;}
 input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 
 /* 공통화면 */
@@ -310,12 +312,14 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 /* 컨텐츠 화면 */
 
 
-.fix {
+#ITP_CONTAINER.fix {
+  position:fixed;
   width: 100%;
-  padding-top: 45px;
+  padding-top: 49px;
   font-size: 16px;
 }
-.content {position:relative; z-index: 10; width:100%; background: #f4f5f4; border-bottom:1px solid #E0B8AB;}
+.content {position: fixed; z-index: 10; width:100%; 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.mt5 {margin-top:5px;}
@@ -327,27 +331,28 @@ 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:11px 10px 5px 10px; text-align: left; color:#b88278;border-bottom: 1px solid #aaa;font-size:14pt;}
+.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 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: 9px; font-weight:100;}
+.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.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:98px; height:27px; color:#666; font-size: 14px; float: left;  margin:0 2.5px; font-weight:100; border:1px solid #aaa; border-radius:5px;}
-.content .line .float_left {float: left; margin-top:2px; width:168px;;}
+.content .line .float_left {float: left; width:168px;;}
 .content .line .float_left.name {width:60%;}
-.content .line .float_left button {float:right; left:-2px; position:relative; background:transparent; border:none; width:34px; height:34px; padding:0;} 
+.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 input {width:100%; font-size:14pt;}
 .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: 1rem; margin-top: 8px;}
+.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 .itp_input_btn {top:5px; margin:0; position:absolute; width:168px;}
-.content .line .float_right_btn {float: left; margin-top: 5px; margin-left: 5px;}
+.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: 27px; border: 1px solid #aaa; border-radius:5px; font-size: 14px;}
-.content .line .line_right {font-size: 2rem; float: left; margin-right: 0%; width:57%}
-.content .line .line_right div {float: right; font-size: 16px; margin-top: 12px; margin-right:3%; color:#555;}
+.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 .line_right {float: left; margin-right: 0%; width:57%}
+.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;}
 .content .line .line_right input {position: relative; text-align: right; margin-right: 84px;}
 .content .line .line_right input.m9 {margin-right:93px;}
 .content .line .line_right input.left {text-align: left;}
@@ -356,8 +361,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .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.full {width: 100%;}
-.content .line div.date_to {display:flex; width:60%; height:27px; float: left; margin-right:0px;}
-.content .line div.date_to input {font-weight:100; width:47%; height:27px; font-size:14px; margin:0;}
+.content .line div.date_to {display:flex; width:60%; 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 div.at {width: 6%;  font-size: 16px; padding-top:12px; float: right;}
 .content .line .search {width: 100%; height: 50px; padding-top:12px;}
@@ -407,7 +412,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 } */
 
 .button_bar {width: 100%; height: 47px; background: #ccc; position: fixed; bottom: 0px; z-index: 10;}
-.button_bar button.col_3{float: left; height: 47px; font-size: 14px; margin: 0; width: 33.3%; font-weight: 100; border: none;}
+.button_bar button.col_3{float: left; height: 47px; font-size: 14px; margin: 0; width: 33.3%; font-weight: 100; border: 1px solid #aaa;}
 .button_bar button.btn-gray {border-radius: 0px; background-color: #858076; color: #eee;}
 .button_bar button.btn-gray:active {border:3px solid #858076; background-color: #fff; color:#B7B8B8;}
 .button_bar button.btn-w-gray{border-radius: 0px; background-color: #b6b8b8; color: #eee;}
@@ -417,8 +422,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .button_bar button.btn_col_3 {width: 35%;}
 .button_bar button.btn_col_6 {width: 65%;}
 .button_bar button.btn_col_3,
-.button_bar button.btn_col_6 {border: 1px solid #000; float: left; height: 40px; font-size: 15px; font-weight: 100; border-radius: 0px;}
-.button_bar button.col_12 {font-weight:100; width: 100%; height: 40px; font-size: 16px;}
+.button_bar button.btn_col_6 {border: 1px solid #000; float: left; height: 47px; font-size: 14pt; font-weight: 100; border-radius: 0px;}
+.button_bar button.col_12 {font-weight:100; width: 100%; height: 47px; font-size: 14pt;}
 
 /* scroll_area 조정 */
 .scroll_area {position: relative; top:0; width: 100%; height: 456px;border-bottom:2px solid #000; margin-bottom:47px; overflow: auto; background: #fff;}
@@ -433,18 +438,19 @@ 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.check {background:#E6EFF4;}
+.scroll_area li {margin:0; list-style: none; width: 100%; height: 85px; border-bottom: 1px solid #ccc; background-color: #fff;}
+.scroll_area li.check {background:#f5f6f6;}
 .scroll_area li.list-row {display: inline-flex; height:76px;}
 .scroll_area li.list-row2 {height:130px; padding-top:8px;}
 
-.scroll_area li .left_info {width: calc(100% - 100px); float:left; margin-top:4px;}
+.scroll_area li .left_info {width: calc(100% - 66px); float:left;}
 .scroll_area li .left_info div {display: inline-block; font-size:14pt;}
 .scroll_area li .left_info span {font-size: 14pt;}
 .scroll_area li .left_info label{font-size: 14pt; font-weight:100; margin-left:10px;}
 .scroll_area li .left_info .check_box {padding-top:8px; height:50px; float:left; width:22px;}
-.scroll_area li .left_info .thick {float:left; margin-top: 6px; font-size: 18px; text-align: left; width: 200px; height:20px; font-weight: 100;}
-.scroll_area li .left_info .thick .itp_item {color:gray;}
+.scroll_area li .left_info .check_box input[type=checkbox] {width:15px; margin:10px 0 0 7px;}
+.scroll_area li .left_info .thick {float:left; text-align: left; width: 90%; height:36px; font-weight: 100;}
+.scroll_area li .left_info .thick .itp_item {color:gray;text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:60%; top:7px; text-align:left; position:relative;}
 .scroll_area li .left_info .thick .itp_gram {color:#aaa; font-size:14pt;}
 .scroll_area li .left_info .thick .itp_amt {color:#b88278; margin-top: 4px;}
 .scroll_area li .left_info .history {font-weight: 700; font-size: 1.1rem; margin-top:-2px;}
@@ -463,7 +469,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li.history_list3 {height: 160px; padding-top:5px;}
 .scroll_area li.history_list3 .btn_check {height:158px; margin-top:-5px; width:90%; float:right; padding-top:7px; }
 .scroll_area li.history_list4 {height: 150px;}
-.scroll_area li.history_list5 {height: 100px; padding-top:5px;}
+.scroll_area li.history_list5 {height: 65px; padding-top:5px;}
 .scroll_area li.history_list6 {height: 110px; padding-top:5px;}
 .scroll_area li.history_list7 {height: 120px; padding-top:5px;}
 .scroll_area li .history_info {width: auto;}
@@ -486,7 +492,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .detail_right .detail_info label {margin: 5px 30px; font-size: 2rem;}
 .scroll_area li .detail_right .detail_info div {width: auto; font-size: 14px; font-weight: 100;}
 .scroll_area li .detail_right .detail_info i {width: auto; font-size: 1rem; margin: 0 20px;}
-.scroll_area li .left .nomal  {width: 100%; float:left; text-align: left; font-size: 1.2rem;}
+.scroll_area li .left .nomal  {position:relative; left:50%; transform: translateX(-50%); width: auto; float:left; text-align: left; font-size: 1.2rem;}
 .scroll_area li .left .nomal .half {float:left;}
 .scroll_area li .left .nomal .half label {min-width:auto;}
 .scroll_area li .left .nomal .half div {min-width:auto; margin-right:5px; margin-top:0;}
@@ -502,21 +508,21 @@ 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 label{position:relative; margin-left: 10px; font-size:14px; font-weight:100; min-width:81px; text-align:left;}
+.scroll_area li .left .nomal label{position:relative; margin-left: 10px; font-size:12pt; font-weight:100; min-width:81px; text-align:left;}
 .scroll_area li .left .nomal label.sub_info{min-width: auto; display: inline-flex;}
 .scroll_area li .left .nomal label.col_0{min-width: auto;}
 .scroll_area li .left .nomal label.col_1{min-width: 45px;}
-.scroll_area li .left .nomal label.col_3{min-width: 70px;}
+.scroll_area li .left .nomal label.col_3{min-width: 65px;}
 .scroll_area li .left .nomal label.col_2{width: 95px;}
 
 .scroll_area li .left .nomal i{width: 50px; text-align: center;}
-.scroll_area li .left .nomal div{display: inline-flex; font-weight: 700; font-size: 15px;}
+.scroll_area li .left .nomal div{display: inline-flex; font-weight: 700; font-size: 12pt; min-width:75px;}
 .scroll_area li .left .nomal .col_5{min-width:50px;}
 
 .scroll_area li .right {margin: 22px 10px 22px 0; position: relative; display: flex; height:30px; font-size: 1.4rem; font-weight: 700; float: right;}
-.scroll_area li .right .num {padding:6px 22px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB; background:#fff;}
-.scroll_area li .right .fnnum {margin:10px 30px;}
-.scroll_area li .right button {background:#e1cac1; color:#fff; border:1px solid #E0B8AB; padding:0px 7px; font-size: 1.5rem; border-radius: 0px;}
+.scroll_area li .right .num {padding:2px 22px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB; background:#fff; font-size:14pt;}
+.scroll_area li .right .fnnum {margin:5px 30px; font-size:14pt;}
+.scroll_area li .right button {background:#e1cac1; color:#fff; border:1px solid #E0B8AB; padding:0px 7px; font-size: 16px; border-radius: 0px;}
 .scroll_area li .right button:hover {background:#FCD5C1;}
 
 /* ITP_FOOTER */
@@ -560,14 +566,14 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 	.content .line .search_wrap select {width:78%;}	
 	
 }
-@media screen and (min-width: 650px) {
-	.content .line {margin:-6px 140px; }
+@media screen and (min-width: 500px) {
+	.content .line {margin:-4px 0px; width:625px;}
 }
 @media screen and (max-width: 380px) {
 	section .popup2 .barcode_area {width: 250px; height: 250px;}
-	section .popup2 .pop .popup_scroll li .scroll_left .mg_0 {margin:0; width:100px;}
+/* 	section .popup2 .pop .popup_scroll li .scroll_left .mg_0 {margin:0; width:100px;}
 	.type_hide {display:none;}
-	section .popup2 .pop .popup_scroll li .scroll_left .mg_0 div {margin:0; padding: 4px 8px 0px 2px;}
+	section .popup2 .pop .popup_scroll li .scroll_left .mg_0 div {margin:0; padding: 4px 8px 0px 2px;} */
 }
 @media screen and (max-height: 720px) {
 	#ITP_LOGIN {position:fixed; top:80px; max-width: 500px; margin: 0 auto;}

src/main/webapp/mobile/js/app/login.js

@@ -102,7 +102,10 @@ function itp_fn_login_info() {
 function itp_fn_login_proc() {
 	var callbackFn = function(result) {
 		var hashed = fnHashed(result.hashed);
-		$('#userId').val(CryptoJS.AES.encrypt($('#ITP_FORM_LOGIN_USER_ID').val(), hashed));
+		var userId = $('#ITP_FORM_LOGIN_USER_ID').val();
+		userId = userId.length === 1 ? 'BRD22120000' + userId : userId.toUpperCase();
+		$('#userId').val(CryptoJS.AES.encrypt(userId, hashed));
+		// $('#userId').val(CryptoJS.AES.encrypt($('#ITP_FORM_LOGIN_USER_ID').val(), hashed));
 		$('#password').val(CryptoJS.AES.encrypt($('#ITP_FORM_LOGIN_USER_PW').val(), hashed));
 	    var loginFn = function(result) {
 			sessionStorage.setItem('itp_login_info', JSON.stringify({
@@ -124,5 +127,6 @@ function appCallFnLoginInfo(strInfo) {
 	$('#deviId').val(appInfo.deviId);
 	$('#deviOsVer').val(appInfo.deviOsVer);
 	$('#deviTpCd').val(appInfo.deviTpCd);
+	CommonObj.appInfo.set(strInfo);
 	itp_fn_login_proc();
 }

src/main/webapp/mobile/js/app/main.js

@@ -10,12 +10,15 @@ require(['config'], function() {
 	});
 });
 
+let MOBILE_APP_VERSION = '';
+
 var mobMainObj = {
 	init: function () {
 	},
 
 };
 
-function jsAppBackPressed() {
-	appCallFunction.backPressed();
+function appCallFnVersion(version) {
+	MOBILE_APP_VERSION = version;
+	console.log(MOBILE_APP_VERSION);
 }

src/main/webapp/mobile/js/app/popup/biz/ITP_BIZPOP_PO_PAYMENT.js

@@ -308,8 +308,8 @@ function f_mobile_cert() {
 	// 	$('#ITP_BIZPOP_PO_PAYMENT').modal('hide'); // 팝업닫기
 	// }, 200);
 	var param = $('#frm_pay').serializeObject();
-	$(location).attr('href', MOBILE_CONTEXTPATH + '/app/payment.html?' + $.param(param));
-	// itp_fn_call_app.payment($.param(param));
+	// $(location).attr('href', MOBILE_CONTEXTPATH + '/app/payment.html?' + $.param(param));
+	itp_fn_call_app.payment($.param(param));
 }
 
 /* 모바일 승인 요청 */

src/main/webapp/mobile/js/app/setting/ITP_SETTING01010.js

@@ -8,7 +8,7 @@ require(['config'], function() {
 
 var mobPageObj = {
 	init: function () {
-		console.log('upgrade popPageObj');
+		console.log('upgrade mobPageObj ===> ' + CommonObj.appInfo.get('appVer'));
 	},
 
 };

src/main/webapp/mobile/js/config.js

@@ -651,7 +651,6 @@ let itp_fn_form_event = {
 				if($(this).val().length > 13) return;
 				value = $(this).val().replace(/[^0-9]/g, "")
 					.replace(/(^[0-9]{6})([0-9]+)?([0-9]{7})$/,"######-#######")
-				// .replace(/(\d{6})(\d{7})/, '######-#######')
 			}
 			if ($.inArray('tel', arry) > -1) {
 				value = ($(this).val().startsWith('0')) ? $(this).val().replace(/[^0-9]/g, "")
@@ -707,7 +706,7 @@ let itp_fn_payment = {
 
 let itp_fn_call_app = {
 	barcode: function() {
-
+		location.replace('app:barcode');
 	},
 	payment: function(param) {
 		location.replace('app:payment:' + param);
@@ -834,6 +833,17 @@ let CommonObj = {
 	schWhsDvsn: function(isEmpty) {
 		return (fn_make_user_info.get('authTpCd') === '50') ? 'W02' : isEmpty ? '' : 'W01';
 	},
+	appInfo: {
+		object: function() {
+			return JSON.parse(sessionStorage.getItem('itp_manage_app_info'));
+		},
+		set: function(strInfo) {
+			sessionStorage.setItem('itp_manage_app_info', strInfo);
+		},
+		get: function(key) {
+			return (key === undefined || key === null) ? '' : this.appInfo.object()[key];
+		}
+	},
 	isApp: (/oqpo_android|oqpo_ios/).test(navigator.userAgent.toLowerCase())
 };