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

src/main/webapp/js/app/popup/biz/ITP_BIZPOP_WHS_LOCATION.js

@@ -107,7 +107,7 @@ function itp_fn_BIZPOP_WHS_LOCATION(parentPopFn, args, returnType) {
 			},
 			{
 				index: 'LOCATION_NM', name: 'locationNm',
-				label: 'LOCATION명', //
+				label: '로케이션명', //
 				width: '6', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},

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>