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

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

@@ -177,9 +177,7 @@
 										<div class="form-group border">
 											<label class="col-xs-2 itp_lb">품목이미지</label>
 											<div class="col-xs-12 itp_ip colspan">
-												<div class="col-xs-1 itp_in" style="width:auto;">
-													<img src="" alt="로고 샘플" id="ITP_FORM_STINFO04010_DETAIL "style="top:12px; left:12px; height:150px; width:412px; " class="form-control itp_input" name="" >
-												</div>
+												<div class="col-xs-1 itp_in fnItemImage" style="width:auto;"></div>
 											</div>
 										</div>
 									</div>

src/main/webapp/js/app/pomng/ITP_POMNG02010.js

@@ -511,7 +511,6 @@ let pageObj = {
 				gridId: _this.gridId,
 				colModel: gridColModel.detail,
 				data: gridRows,
-				multiselect: true,
 				//cellEdit: (mode !== 'VIEW'),
 				loadComplete: function(data) {
 					//console.log(data);
@@ -629,7 +628,6 @@ let listObj = {
 				param: param,
 				url: DOMAIN + API_DETAIL_GRID_LIST,
 				pager: POMNG02010_GRID_PAGER,
-				multiselect: true,
 				rownumbers: false,
 				onCellSelect: function(rowId, cellIdx, cellValue) {
 					var cm = $(this).jqGrid('getGridParam', 'colModel');

src/main/webapp/js/app/pomng/ITP_POMNG04010.js

@@ -121,7 +121,7 @@ const gridColModel = {
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, 			// 품목명
 			width: '6', fixed: false, align: 'left',
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',

src/main/webapp/js/app/vendinfo/ITP_VENDINFO02010.js

@@ -325,7 +325,7 @@ let viewObj = {
 		
 		//#ITP_FORM_VENDINFO02010_VIEW 안에 있는 fnItemImage에  API데이터를 이미지 경로로 넣기
 		$.each(result.imageFileNoList, function(index, item) {
-			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemImage').append('<img src=" + item.filePath +" />');
+			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemImage').append('<img src=' + item.filePath +' style="width: 30%"/>');
 		});
 	}
 };

src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG05010.js

@@ -120,13 +120,17 @@ let mobContObj = {
 					$('#ITP_LIST_MPOMNG05010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG05010_LIST_ITEM_ROWCOPY').html());
 					var $li = $('#ITP_LIST_MPOMNG05010_LIST_ITEM_AREA .panel-group > .item-row:last');
 					$li.find('.fnDlvSttmtUnqNo').text(item.dlvSttmtUnqNo);
+					$li.find('.fnPodrRegDt').text(item.podrRegDt);
 					$li.find('.fnDlvReqDt').text(item.dlvReqDt);
 					$li.find('.fnDlvSchDt').text(item.dlvSchDt);
+					$li.find('.fnDlvCmltDt').text(item.dlvCmpltDt);
 					$li.find('.fnSpplyNm').text(item.spplyNm);
 					$li.find('.fnWhsNm').text(item.whsNm);
 					$li.find('.fnItemNm').text(item.itemNm);
 					$li.find('.fnPodrQty').text(CommonObj.comma.set(item.podrQty + ' ' + item.unit));
 					$li.find('.fnDlvQty').text(CommonObj.comma.set(item.dlvQty + ' ' + item.unit));
+					$li.find('.fnDlvStNm').text(item.dlvStNm);
+					$li.find('.fnWhsDvsnNm').text(item.whsDvsnNm);
 					mobContObj.list.rows.push(item);
 				});
 			};