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

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

@@ -80,12 +80,9 @@
 						</div>
 						<div class="left">
 							<div class="nomal">
-								<label class="col_3">납품자명</label>
+								<label class="col_3">납품장소</label>
 								<span>:</span>
-								<div class="fnDlvNm"></div>
-								<label class="col_3">입고확인자</label>
-								<span>:</span>
-								<div class="fnWhsCnfmNm"></div>
+								<div class="full fnWhsNm"></div>
 							</div>
 						</div>
 						<div class="left">
@@ -93,7 +90,7 @@
 								<label class="col_3">납품요청일</label>
 								<span>:</span>
 								<div class="col_75 fnDlvReqDt"></div>
-								<label class="col_3">납품완료일</label>
+								<label class="col_3">납품예정일</label>
 								<span>:</span>
 								<div class="fnDlvSchDt"></div>
 							</div>
@@ -103,7 +100,7 @@
 								<label class="col_3">납품단가</label>
 								<span>:</span>
 								<div class="col_8 fnUnitAmt"></div>
-								<label class="col_3">입고금액</label>
+								<label class="col_3">납품금액</label>
 								<span>:</span>
 								<div class="col_10 fnWhsAmt"></div>
 							</div>

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

@@ -78,9 +78,12 @@
 				</div>
 				<div class="left">
 					<div class="nomal">
-						<label class="col_3">납품장소</label>
+						<label class="col_3">납품자명</label>
 						<span>:</span>
-						<div class="full fnWhsNm"></div>
+						<div class="fnDlvNm"></div>
+						<label class="col_3">입고확인자</label>
+						<span>:</span>
+						<div class="fnWhsCnfmNm"></div>
 					</div>
 				</div>
 				<div class="left">
@@ -88,17 +91,17 @@
 						<label class="col_3">납품요청일</label>
 						<span>:</span>
 						<div class="col_75 fnDlvReqDt"></div>
-						<label class="col_3">납품예정일</label>
+						<label class="col_3">납품완료일</label>
 						<span>:</span>
 						<div class="fnDlvSchDt"></div>
 					</div>
 				</div>
 				<div class="left">
 					<div class="nomal">
-						<label class="col_3">납품단가</label>
+						<label class="col_3">발주수량</label>
 						<span>:</span>
-						<div class="col_8 fnUnitAmt"></div>
-						<label class="col_3">납품금액</label>
+						<div class="col_8 fnPodrQty"></div>
+						<label class="col_3">입고금액</label>
 						<span>:</span>
 						<div class="col_10 fnWhsAmt"></div>
 					</div>
@@ -110,7 +113,7 @@
 						<div class="col_8 fnDlvQty"></div>
 						<label class="col_3">입고수량</label>
 						<span>:</span>
-						<div class="col_8 fnWhsQty"></div>
+						<div class="col_10 fnWhsQty"></div>
 					</div>
 				</div>
 			</li>