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

src/main/webapp/app/vendinfo/VENDINFO01010.html

@@ -134,11 +134,10 @@
 								                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_EMAL_ADDR" class="form-control itp_input" name="mgrEmal" value="" maxlength="50">
 												</div>
 											</div>
-											<label class="col-xs-2 itp_lb">은행</label>
+											<label class="col-xs-2 itp_lb">팩스</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-6 itp_in">
-				                             	<select id="ITP_FORM_VENDINFO01010_DETAIL_BNK_CD" data-select-code="BNK_CD" class="form-control itp_input" name="bnkCd">
-												</select>
+				                             	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_FAX_NO" data-key-up="tel" class="form-control itp_input" name="faxNo" value="" maxlength="13">
 												</div>
 											</div>
 										</div>
@@ -152,8 +151,13 @@
 													</select>												
 												</div>
 											</div>
-											<label class="col-xs-2 itp_lb"></label>
-											<div class="col-xs-4 itp_ip"></div>
+											<label class="col-xs-2 itp_lb">은행</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-6 itp_in">
+				                             	<select id="ITP_FORM_VENDINFO01010_DETAIL_BNK_CD" data-select-code="BNK_CD" class="form-control itp_input" name="bnkCd">
+												</select>
+												</div>
+											</div>
 										</div>
 									</div>
 									<div class="itp_form_in">

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

@@ -40,7 +40,7 @@
 			margin-left: 8px;
 		}
 		.noti_text  {
-			width: calc(100vw - 70px);
+			width: calc(100vw - 82px);
 			text-overflow: ellipsis;
 			overflow: hidden;
 			text-align: left;
@@ -349,7 +349,7 @@
 	<aside id="ITP_ASIDE"></aside>
 	<section>
 		<div id="ITP_POP_NOTICE" class="popup2 mobile-pop-close" style="display: none;">
-			<div class="pop" style="height:350px;">
+			<div class="pop" style="height:380px;">
 				<div class="header">
 					<div class="header_left">
 						<label>공지내용</label>

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

@@ -96,7 +96,10 @@
 					<div class="nomal">
 					  <label class="col_4">공급업체</label>
 					  <span>:</span>
-					  <div class="full fnSpplyNm"></div>
+					  <div class="fnSpplyNm"></div>
+				      <label class="col_4">발주구분</label>
+					  <span>:</span>
+					  <div class="fnDlvDvsnNm"></div>
 					</div>
 				  </div>
 				</li>