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

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_COL_PLACE" name="sDlvPlace" type="text" placeholder="수거장소">
+					<input id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH_COL_PLACE" name="sDlvPlace" type="text" placeholder="">
 					<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>

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

@@ -12,7 +12,7 @@
 			   <div class="line">
 				  <label>수거장소</label>
 				   <div class="float_left">
-					   <input id="ITP_FORM_MCOLLMNG02010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="수거장소">
+					   <input id="ITP_FORM_MCOLLMNG02010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="">
 					   <input type="hidden" id="ITP_FORM_MCOLLMNG02010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="srtnWhsId"/>
 					   <div class="itp_input_btn">
 					   		<button type="button" id="ITP_BTN_MCOLLMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>

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

@@ -13,7 +13,7 @@
 				<div class="line">
 				  <label>수거장소</label>
 					<div class="float_left">
-						<input id="ITP_FORM_MCOLLMNG03010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="수거장소">
+						<input id="ITP_FORM_MCOLLMNG03010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="">
 						<input type="hidden" id="ITP_FORM_MCOLLMNG03010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
 						<div class="itp_input_btn">
 							<button type="button" id="ITP_BTN_MCOLLMNG03010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>

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

@@ -14,7 +14,7 @@
 				<div class="line">
 				  <label>납품장소</label>
 				  <div class="float_left">
-					  <input id="ITP_FORM_MORDMNG01010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="납품장소">
+					  <input id="ITP_FORM_MORDMNG01010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="">
 					  <input type="hidden" id="ITP_FORM_MORDMNG01010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
    					  <div class="itp_input_btn">
 						  <button type="button" id="ITP_BTN_MORDMNG01010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>

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

@@ -13,7 +13,7 @@
 			   <div class="line">
 				  <label>납품장소</label>
 				   <div class="float_left">
-					   <input id="ITP_FORM_MORDMNG02010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="납품장소">
+					   <input id="ITP_FORM_MORDMNG02010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="">
 					   <input type="hidden" id="ITP_FORM_MORDMNG02010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
 	       			   <div class="itp_input_btn">
 		   			  		<button type="button" id="ITP_BTN_MORDMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>

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

@@ -12,7 +12,7 @@
 					<div class="line">
 						<label>납품장소</label>
 						<div class="float_left">
-							<input id="ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="납품장소">
+							<input id="ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="">
 							<input type="hidden" id="ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
 							<div class="itp_input_btn">
 								<button type="button" id="ITP_BTN_MORDMNG03010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>

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

@@ -83,7 +83,7 @@ section .popup2 .pop .table_tr .table_td div {text-overflow:ellipsis; overflow:h
 section .popup2 .pop .table_tr .table_td .chkItem {margin-top:-5px; width:15px; left:50%; position:relative; transform:translateX(-50%);}
 
 section .popup2 .pop .popup_scroll ul.mb_0 {margin-bottom:0 !important;}
-section .popup2 .pop .popup_scroll {position: relative; top:-25px; width: 100%;height: 70%; overflow: auto; border-top:1px solid #E0B8AB;}
+section .popup2 .pop .popup_scroll {position: relative; top:-25px; width: 100%;height: 70%; overflow: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
 section .popup2 .pop .popup_scroll li {list-style: none; width: 100%; height: 50px; border-bottom: 1px solid #E0B8AB;}
 section .popup2 .pop .popup_scroll li.row_2 {height: 70px; display:flex;}
 
@@ -355,7 +355,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .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; text-overflow:ellipsis; padding-right:22px;}
+.content .line .float_left input {width:100%; font-size:12pt; text-overflow:ellipsis; padding-right:22px;}
+.content .line .float_left input::placeholder {color:#bbb; font-size:10pt;}
 .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;}