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

src/main/webapp/main.html

@@ -395,7 +395,7 @@
 									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_DELI_CHART">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">입고</div>
-											<select id="ITP_FORM_MAIN_SEARCH_PR_TYPE" name="prType">
+											<select id="ITP_FORM_MAIN_SEARCH_PO_TYPE" name="prType">
 												<option value="A">당일</option>
 												<option value="B">1주일</option>
 												<option value="C">15일</option>
@@ -408,7 +408,7 @@
 									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_ORDERS_CHART">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">수주내역</div>
-											<select id="ITP_FORM_MAIN_SEARCH_PR_TYPE" name="prType">
+											<select id="ITP_FORM_MAIN_SEARCH_ITEM_CNT_TYPE" name="prType">
 												<option value="A">당일</option>
 												<option value="B">1주일</option>
 												<option value="C">15일</option>
@@ -421,7 +421,7 @@
 									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_RELEASE_CHART">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">출고</div>
-											<select id="ITP_FORM_MAIN_SEARCH_PR_TYPE" name="prType">
+											<select id="ITP_FORM_MAIN_SEARCH_DELI_TYPE" name="prType">
 												<option value="A">당일</option>
 												<option value="B">1주일</option>
 												<option value="C">15일</option>
@@ -434,7 +434,7 @@
 									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_CHART_PODR">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">구매발주</div>
-											<select id="ITP_FORM_MAIN_SEARCH_PR_TYPE" name="prType">
+											<select id="ITP_FORM_MAIN_SEARCH_RELEASE_TYPE" name="prType">
 												<option value="A">당일</option>
 												<option value="B">1주일</option>
 												<option value="C">15일</option>
@@ -447,7 +447,7 @@
 									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_CHART_REQ_UP">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">매출순위</div>
-											<select id="ITP_FORM_MAIN_SEARCH_PR_TYPE" name="prType">
+											<select id="ITP_FORM_MAIN_SEARCH_ORDERS_TYPE" name="prType">
 												<option value="A">당일</option>
 												<option value="B">1주일</option>
 												<option value="C">15일</option>

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

@@ -55,7 +55,7 @@
 					  <label>매장명</label>
 					  <span>:</span>
 					  <div class="fnStoreNm"></div>
-					  <label>정산타입</label>
+					  <label class="col_4">정산타입</label>
 					  <span>:</span>
 					  <div class="fnLoanDvsnNm"></div>
 					</div>
@@ -75,7 +75,7 @@
 					  <label>가수금금액</label>
 					  <span>:</span>
 					  <div class="fnTmpRcvAcctTotal"></div>
-					  <label>사용금액</label>
+					  <label class="col_4">사용금액</label>
 					  <span>:</span>
 					  <div class="fnUseAmtTotal"></div>
 					</div>

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

@@ -368,7 +368,7 @@ 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:34px; float: left; margin-right:0px; margin-top:3px;}
+.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 div.at {width: 6%;  font-size: 16px; padding-top:12px; float: right;}
@@ -435,7 +435,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .button_bar button.col_12 {font-weight:100; width: 100%; height: 47px; font-size: 14pt;}
 
 /* scroll_area 조정 */
-.scroll_area {position: relative; top:0; flex:1; width: 100%; height: 456px;border-bottom:1px solid #aaa;overflow: auto; background: #fff;}
+.scroll_area {position: relative; top:0; flex:1; width: 100%; height: 456px; overflow: auto; background: #fff;}
 .scroll_area ul {display:grid;}
 
 
@@ -447,7 +447,7 @@ 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-bottom: 1px solid #ccc; background-color: #fff;}
+.scroll_area li {margin:0; list-style: none; width: 100vw; 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;}
@@ -462,7 +462,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left_info .thick {float:left; text-align: left; width: 90%; height:38px; font-weight: 100;}
 .scroll_area li .left_info .thick .itp_item {color:gray;text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:calc(100% - 81px); top:7px; text-align:left; position:relative;}
 .scroll_area li .left_info .thick .itp_gram {position:relative; top:7px; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; color:#aaa; font-size:14pt; text-align:right; width: 85px;}
-.scroll_area li .left_info .thick .itp_amt {color:#b88278; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width: calc(100% - 81px); top: 7px; position:relative; text-align:left;}
+.scroll_area li .left_info .thick .itp_amt {color:#b88278; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width: calc(100% - 105px); top: 7px; position:relative; text-align:left;}
 .scroll_area li .left_info .history {font-weight: 700; font-size: 1.1rem; margin-top:-2px;}
 .scroll_area li .left_info .history input{width: 150px;}
 .scroll_area li.history_list {height: 140px; padding-top:8px;}
@@ -521,7 +521,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .scroll_btn input:checked ~ .scroll_btn {background:#eee;}
 .scroll_area li .left .nomal .lit{font-size:11pt;}
 .scroll_area li .left .nomal div.lit {padding-right:2px;}
-.scroll_area li .left .nomal span {position:relative; width:5px; font-size:15px; font-weight:700;}
+.scroll_area li .left .nomal span {position:relative; width:10px; font-size:15px; font-weight:700;}
 .scroll_area li .left .nomal span.mg0 {margin:0;}
 
 .scroll_area li .left .nomal .btn_bar{position: relative; width: auto; font-size: 2.2rem;}
@@ -533,29 +533,29 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal .m_btn_bar button div{position:relative; width:10px; top:-2px; left:2px;}
 .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;}
 
-.scroll_area li .left .nomal label{position:relative; font-size:12pt; font-weight:100; min-width:80px; padding-left:5px; text-align:left;}
+.scroll_area li .left .nomal label{position:relative; font-size:12pt; font-weight:100; min-width:70px; padding-left:5px; text-align:left;}
 .scroll_area li .left .nomal label.sub_info{min-width: auto; display: inline-flex;}
 
 .scroll_area li .left .nomal label.col_1{min-width: 45px;}
 .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_4{min-width: 57px;}
+.scroll_area li .left .nomal label.col_6{min-width: 83px;}
 .scroll_area li .left .nomal label.col_7{min-width: 105px;}
 .scroll_area li .left .nomal label.col_8{min-width: 115px;}
 .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 .text_two{width:calc(50% - 56px);}
+.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% - 80px);}
+.scroll_area li .left .nomal div.text_6{width:calc(50% - 108px);}
+.scroll_area li .left .nomal div.text_4{width:calc(50% - 69px);}
+.scroll_area li .left .nomal div.text_btn{width:calc(50% - 56px);}
+.scroll_area li .left .nomal div.text_two{width:calc(50% - 56px);}
 
-.scroll_area li .left .nomal div.full{width:calc(100% - 85px);}
+.scroll_area li .left .nomal div.full{width:calc(100% - 90px);}
 .scroll_area li .left .nomal div.full_s{width:calc(100% - 45px);}
 .scroll_area li .left .nomal div.auto{width:auto;}
 
 
-.scroll_area li .right {margin: 22px 0px 22px 0; position: relative; display: flex; width:110px; height:30px; font-size: 1.4rem; font-weight: 700; float: right;}
+.scroll_area li .right {margin: 22px 10px 22px 0; position: relative; display: flex; width:110px; height:30px; font-size: 1.4rem; font-weight: 700; float: right;}
 .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;}