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

src/main/webapp/app/pomng/POMNG01010.html

@@ -92,7 +92,7 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">비고</label>
-											<div class="col-xs-10 itp_ip">
+											<div class="col-xs-10 itp_ip" style="padding-top: 0px;">
 												<input type="text" id="ITP_FORM_POMNG01010_DETAIL_NOTE" class="form-control itp_input" name="note" value="" maxlength="300"/>
 											</div>
 										</div>

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

@@ -55,20 +55,20 @@ const gridColModel = {
 		{
 			index: 'UNIT', name: 'unit',
 			label: ITP_MSG_LOCALE.label.unit,
-			width: '10', fixed: false, align: 'center',
+			width: '7', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text'
 		},
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt,
-			width: '6', fixed: false, align: 'right',
+			width: '11', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PCH_REQ_QTY', name: 'pchReqQty',
 			label: ITP_MSG_LOCALE.label.pchReqQty, //수량
-			width: '14', fixed: false, align: 'right',
+			width: '11', fixed: false, align: 'right',
 			sortable: false, editable: true, edittype: 'text',
 			classes: 'input_color',
 			editoptions: {"onKeyup": "this.value=this.value.replace(/[^0-9]/g,'');", maxlength: 10}, 
@@ -77,7 +77,7 @@ const gridColModel = {
 		{
 			index: 'PCH_REQ_AMT', name: 'pchReqAmt',
 			label: ITP_MSG_LOCALE.label.pchReqAmt,
-			width: '14', fixed: false, align: 'right',
+			width: '11', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},

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

@@ -97,25 +97,25 @@ function itp_fn_BIZPOP_ITEM(parentPopFn, args, returnType) {
 			{
 				index: 'ITEM_NM', name: 'itemNm',
 				label: '품목명', //
-				width: '9', fixed: false, align: 'left',
+				width: '8', fixed: false, align: 'left',
 				sortable: false, hidden: false, classes: 'ui-ellipsis'
 			},
 			{
 				index: 'UNIT', name: 'unit',
 				label: '단위', //
-				width: '6', fixed: false, align: 'center',
+				width: '4', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
 				index: 'UNIT_AMT', name: 'unitAmt',
 				label: '단가', //
-				width: '6', fixed: false, align: 'right',
+				width: '10', fixed: false, align: 'right',
 				sortable: false, hidden: false,
 				formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 			},
 			{
 				index: 'PODR_PSSBL_DVSN_NM', name: 'podrPssblDvsnNm',
-				label: '발주가능여부명', //
+				label: '발주여부', //
 				width: '6', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
@@ -159,8 +159,8 @@ function itp_fn_BIZPOP_ITEM(parentPopFn, args, returnType) {
 			{
 				index: 'SPPLY_NM', name: 'spplyNm',
 				label: '공급업체명', //
-				width: '10', fixed: false, align: 'left',
-				sortable: false, hidden: false
+				width: '8', fixed: false, align: 'left',
+				sortable: false, hidden: false, classes: 'ui-ellipsis'
 			}
 		],
 		loadBeforeSend: function(jqXHR) {

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

@@ -73,14 +73,14 @@ function itp_fn_BIZPOP_PO_STOCK_HIST(parentPopFn, args, returnType) {
 		colModel: [
 			{
 				index: 'INOUT_NM', name: 'inoutNm',
-				label: '입출고구분', // 
-				width: '10', fixed: false, align: 'center',
+				label: '입출고', // 
+				width: '6', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
 				index: 'SYS_REG_DTTM', name: 'sysRegDttm',
 				label: '발생일자', //
-				width: '12', fixed: false, align: 'center',
+				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
@@ -99,7 +99,7 @@ function itp_fn_BIZPOP_PO_STOCK_HIST(parentPopFn, args, returnType) {
 			{
 				index: 'RELATION_NO', name: 'relationNo',
 				label: '관련번호', //
-				width: '10', fixed: false, align: 'center',
+				width: '16', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			}
 		],

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

@@ -84,8 +84,8 @@ function itp_fn_BIZPOP_WHS_LOCATION(parentPopFn, args, returnType) {
 			{
 				index: 'BRAND_NM', name: 'brandNm',
 				label: '브랜드명', //
-				width: '12', fixed: false, align: 'left',
-				sortable: false, hidden: false
+				width: '14', fixed: false, align: 'left',
+				sortable: false, hidden: false, classes: 'ui-ellipsis'
 			},
 			{
 				index: 'WHS_ID', name: 'whsId',
@@ -96,8 +96,8 @@ function itp_fn_BIZPOP_WHS_LOCATION(parentPopFn, args, returnType) {
 			{
 				index: 'WHS_NM', name: 'whsNm',
 				label: '창고명', //
-				width: '6', fixed: false, align: 'right',
-				sortable: false, hidden: false
+				width: '12', fixed: false, align: 'right',
+				sortable: false, hidden: false, classes: 'ui-ellipsis'
 			},
 			{
 				index: 'LOCATION', name: 'location',
@@ -108,7 +108,7 @@ function itp_fn_BIZPOP_WHS_LOCATION(parentPopFn, args, returnType) {
 			{
 				index: 'LOCATION_NM', name: 'locationNm',
 				label: '로케이션명', //
-				width: '6', fixed: false, align: 'center',
+				width: '5', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
@@ -119,8 +119,8 @@ function itp_fn_BIZPOP_WHS_LOCATION(parentPopFn, args, returnType) {
 			},
 			{
 				index: 'STCK_DVSN_NM', name: 'stckDvsnNm',
-				label: '창고구분명', //
-				width: '10', fixed: false, align: 'center',
+				label: '창고상태', //
+				width: '4', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			}
 		],

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

@@ -76,7 +76,7 @@
 			<div id="ITP_LIST_MPOMNG05010_LIST_ITEM_AREA" class="scroll_area row-5">
 				<ul id="ITP_LIST_MPOMNG05010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
 				<div id="ITP_LIST_MPOMNG05010_LIST_ITEM_ROWCOPY" style="display: none;">
-					<li class="history_list4 item-row">
+					<li class="history_list13 item-row">
 						<div class="left">
 							<div class="nomal">
 								<label>납품번호 </label>
@@ -88,7 +88,7 @@
 							<div class="nomal">
 								<label class="">발주생성일</label>
 								<span>:</span>
-								<div class="fnPodrReqDt"></div>
+								<div class="fnPodrRegDt"></div>
 								<label class="">납품요청일</label>
 								<span>:</span>
 								<div class="fnDlvReqDt"></div>
@@ -101,7 +101,7 @@
 								<div class="fnDlvSchDt"></div>
 								<label class="">완료일자</label>
 								<span>:</span>
-								<div class="fnCmltDt"></div>
+								<div class="fnDlvCmltDt"></div>
 							</div>
 						</div>
 						<div class="left">

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

@@ -501,6 +501,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li.history_list9 {height: 170px;}
 .scroll_area li.history_list11 {height: 230px; padding-top:5px;}
 .scroll_area li.history_list12 {height: 170px; padding-top:4px;}
+.scroll_area li.history_list13 {height: 200px; padding-top:4px;}
 
 .scroll_area li .history_info {width: auto;}
 .scroll_area li .left {width:100%; height:28px; margin-top:0px;}