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

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

@@ -7,7 +7,7 @@
 		  <div class="content">
 		     <div class="content_fix">
 	 	 	   <div class="line header">
-				 <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">납품서생성</div>
+				 <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">수거서작성</div>
 	      	   </div>
 			   <div class="line">
 				  <label>수거장소</label>
@@ -76,7 +76,7 @@
 						<label class="col_4">수거장소</label>
 						<span>:</span>
 					    <div class="fnRtnWhsNm"></div>
-						<label class="col_4">품목번호</label>
+						<label class="">품목번호</label>
 						<span>:</span>
 					    <div class="fnItemId"></div>
 					  </div>
@@ -86,7 +86,7 @@
 						<label class="col_4">품목명</label>
 						<span>:</span>
 					    <div class="fnItemNm"></div>
-						<label class="col_4">수거수량</label>
+						<label class="">수거수량</label>
 						<span>:</span>
 					    <div class="fnRtnDodrItemQty"></div>
 					  </div>
@@ -96,7 +96,7 @@
 						<label class="col_4">단가금액</label>
 						<span>:</span>
 					    <div class="fnUnitAmt"></div>
-						<label class="col_4">수거금액</label>
+						<label class="">수거금액</label>
 						<span>:</span>
 					    <div class="fnRtnDodrTotalAmt"></div>
 					  </div>

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

@@ -59,14 +59,14 @@
 		  <div id="ITP_LIST_MORDMNG01010_LIST_ITEM_AREA" class="scroll_area row-3">
 			  <ul id="ITP_LIST_MORDMNG01010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
 			  <div id="ITP_LIST_MORDMNG01010_LIST_ITEM_ROWCOPY" style="display: none;">
-				<li class="history_list list-row">
+				<li class="history_list7 item-row ">
 				  <div class="btn_check">
 					<div class="left">
 					  <div class="nomal">
-						<label class="col_4">브랜드명</label>
+						<label class="">브랜드명</label>
 						<span>:</span>
 					    <div class="fnBrandNm"></div>
-						<label>발주번호</label>
+						<label class="col_4">발주번호</label>
 						<span>:</span>
 					    <div class="fnPchPodrUnqNo"></div>
 					  </div>

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

@@ -343,12 +343,12 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .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:120px; height:34px; color:#666; font-size: 14pt; float: left;  margin:3px 2.5px; font-weight:100; border:1px solid #aaa; border-radius:5px;}
+.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 .float_left {float: left; width:168px;;}
-.content .line .float_left.name {width:60%;}
+.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 input {width:100%; font-size:14pt;}
+.content .line .float_left input {width:100%; font-size:14pt; text-overflow:ellipsis; padding-right:22px;}
 .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;}
@@ -453,7 +453,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li.list-row2 {height:130px; padding-top:8px;}
 
 .scroll_area li .left_info {width: calc(100% - 66px); float:left;}
-.scroll_area li .left_info.item {width: calc(100% - 110px); float:left;}
+.scroll_area li .left_info.item {width: calc(100% - 120px); 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{width:60px; font-size: 14pt; font-weight:100; margin-top:5px;}
@@ -540,15 +540,15 @@ 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: 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 label.col_7{min-width: 91px;}
+.scroll_area li .left .nomal label.col_8{min-width: 107px;}
 .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% - 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.text_two{width:calc(50% - 12px);}
 
 .scroll_area li .left .nomal div.full{width:calc(100% - 90px);}
 .scroll_area li .left .nomal div.full_s{width:calc(100% - 45px);}