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

src/main/webapp/app/loanmng/LOANMNG02010.html

@@ -36,7 +36,7 @@
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<select id="ITP_FORM_LOANMNG02010_SEARCH_" class="form-control itp_input" >
-												<option value="">입금상태</option>
+												<option value="">입금일자</option>
 											</select>	
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">

src/main/webapp/app/loanmng/LOANMNG03010.html

@@ -70,6 +70,7 @@
 				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_DPST_ST_CD" value="">
 				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_RCPT_YN" value="">
 				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_UNPAID_AMT" value="">
+				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_ACCT_BAL" value="">
 				    
 				                <section class="itp_form_sec">
 				                    <div class="itp_form_in border-top">

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

@@ -204,7 +204,7 @@
 									</div>
 									<div class="itp_form_in">	
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">요청부서(매장/부서)</label>
+											<label class="col-xs-2 itp_lb">구매요청자</label>
 											<div class="col-xs-4 itp_ip pchReqMgrNm"></div>
 											<label class="col-xs-2 itp_lb">구매요청금액</label>
 											<div class="col-xs-4 itp_ip fnPchReqTotalAmt"></div>

src/main/webapp/app/settmng/SETTMNG03010.html

@@ -68,6 +68,7 @@
 								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_STTL_MGNT_UNQ_NO" name="sttlMgntUnqNo" value="">
 								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_ACCT_BAL" name="acctBal" value="">
 								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_STTL_REQ_AMT" name="sttlReqAmt" value="">
+								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_RCPT_YN" name="rcptYn" value="">
 					
 								<section class="itp_form_sec">
 									<div class="itp_form_in border-top">

src/main/webapp/js/app/collmng/ITP_COLLMNG01010.js

@@ -169,11 +169,12 @@ let pageObj = {
 			});
 			// 조회일자 지정	
 			var now = new Date();
-			var defaultToDate = new Date(now);
-			defaultToDate.setDate(now.getDate()+7);
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
 			$('#ITP_TAB_COLLMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_COLLMNG01010_SEARCH_FROM_DT').datepicker('setDate', now);
-			$('#ITP_FORM_COLLMNG01010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
+			$('#ITP_FORM_COLLMNG01010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_COLLMNG01010_SEARCH_TO_DT').datepicker('setDate', toDate);
 		},
 		grid: function() {
 			//itp_fn_jqgrid_resize(COLLMNG01010_GRID_ID, COLLMNG01010_GRID_LIST, 'lg');

src/main/webapp/js/app/collmng/ITP_COLLMNG02010.js

@@ -225,12 +225,15 @@ let pageObj = {
 					fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
 				}
 			});
-
-			// 조회일자 지정
+			// 조회일자 지정	
 			var now = new Date();
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
+			toDate.setDate(now.getDate() + 7);
 			$('#ITP_TAB_COLLMNG02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_COLLMNG02010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setDate(now.getDate())));
-			$('#ITP_FORM_COLLMNG02010_SEARCH_TO_DT').datepicker('setDate', new Date(now.setDate(now.getDate() + 30)));
+			$('#ITP_FORM_COLLMNG02010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_COLLMNG02010_SEARCH_TO_DT').datepicker('setDate', toDate);
 			
 			$('#ITP_FORM_COLLMNG02010_SEARCH #ITP_FORM_COLLMNG02010_SEARCH_SSPPLY_ID').val(fn_make_user_info.get('spplyId'));
 		},

src/main/webapp/js/app/collmng/ITP_COLLMNG03010.js

@@ -163,11 +163,12 @@ let pageObj = {
 			});
 			// 조회일자 지정	
 			var now = new Date();
-			var defaultToDate = new Date(now);
-			defaultToDate.setDate(now.getDate() + 7);
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
 			$('#ITP_TAB_COLLMNG03010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_COLLMNG03010_SEARCH_FROM_DT').datepicker('setDate', now);
-			$('#ITP_FORM_COLLMNG03010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
+			$('#ITP_FORM_COLLMNG03010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_COLLMNG03010_SEARCH_TO_DT').datepicker('setDate', toDate);
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(COLLMNG03010_GRID_ID, COLLMNG03010_GRID_LIST, 'lg');

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG01010.js

@@ -347,12 +347,15 @@ let pageObj = {
 					fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
 				}
 			});
-
-			// 조회일자 지정
+			// 조회일자 지정	
 			var now = new Date();
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
+			toDate.setDate(now.getDate() + 7);
 			$('#ITP_TAB_INOUTMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_INOUTMNG01010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setDate(now.getDate())));
-			$('#ITP_FORM_INOUTMNG01010_SEARCH_TO_DT').datepicker('setDate', new Date(now.setDate(now.getDate() + 30)));
+			$('#ITP_FORM_INOUTMNG01010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_INOUTMNG01010_SEARCH_TO_DT').datepicker('setDate', toDate);
 		},
 		form: function() {
 			itp_fn_form_event.onKeyup('#ITP_FORM_INOUTMNG01010_DETAIL');

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG02010.js

@@ -163,11 +163,12 @@ let pageObj = {
 			});
 			// 조회일자 지정	
 			var now = new Date();
-			var defaultToDate = new Date(now);
-			defaultToDate.setDate(now.getDate() + 7);
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
 			$('#ITP_TAB_INOUTMNG02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_INOUTMNG02010_SEARCH_FROM_DT').datepicker('setDate', now);
-			$('#ITP_FORM_INOUTMNG02010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
+			$('#ITP_FORM_INOUTMNG02010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_INOUTMNG02010_SEARCH_TO_DT').datepicker('setDate', toDate);
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(INOUTMNG02010_GRID_ID, INOUTMNG02010_GRID_LIST, 'lg');

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG03010.js

@@ -335,12 +335,15 @@ let pageObj = {
 					fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
 				}
 			});
-
-			// 조회일자 지정
+			// 조회일자 지정	
 			var now = new Date();
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
+			toDate.setDate(now.getDate() + 7);
 			$('#ITP_TAB_INOUTMNG03010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_INOUTMNG03010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setDate(now.getDate())));
-			$('#ITP_FORM_INOUTMNG03010_SEARCH_TO_DT').datepicker('setDate', new Date(now.setDate(now.getDate() + 30)));
+			$('#ITP_FORM_INOUTMNG03010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_INOUTMNG03010_SEARCH_TO_DT').datepicker('setDate', toDate);
 		},
 		form: function() {
 			itp_fn_form_event.onKeyup('#ITP_FORM_INOUTMNG03010_DETAIL');

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG04010.js

@@ -169,11 +169,12 @@ let pageObj = {
 			});
 			// 조회일자 지정	
 			var now = new Date();
-			var defaultToDate = new Date(now);
-			defaultToDate.setDate(now.getDate() + 7);
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
 			$('#ITP_TAB_INOUTMNG04010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_INOUTMNG04010_SEARCH_FROM_DT').datepicker('setDate', now);
-			$('#ITP_FORM_INOUTMNG04010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
+			$('#ITP_FORM_INOUTMNG04010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_INOUTMNG04010_SEARCH_TO_DT').datepicker('setDate', toDate);
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(INOUTMNG04010_GRID_ID, INOUTMNG04010_GRID_LIST, 'lg');

src/main/webapp/js/app/loanmng/ITP_LOANMNG01010.js

@@ -122,8 +122,8 @@ const gridColModel = {
 			sortable: false, hidden: true
 		},		
 		{
-			index: 'LOAN_REG_DT', name: 'loanRegDt',
-			label: "발생일자",
+			index: 'LOAN_REG_DTM', name: 'loanRegDtm',
+			label: "거래일자",
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text'
 		},
@@ -467,7 +467,7 @@ let viewObj = {
 		load : function() {
 			let param = $('#ITP_FORM_LOANMNG01010_VIEW_SEARCH').serializeObject();
 			param.gridSize = $.jgrid.defaults.rowNum;
-			param.pagingYn = false; // 페이징안함
+			param.pagingYn = true; // 페이징
 
 			var option = {
 				gridId: LOANMNG01010_VIEW_GRID_ID,

src/main/webapp/js/app/loanmng/ITP_LOANMNG02010.js

@@ -180,12 +180,14 @@ let pageObj = {
 		            fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
 		        }
 		    });
-
-			// 조회일자 지정
+			// 조회일자 지정	
 			var now = new Date();
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
 			$('#ITP_TAB_LOANMNG02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);			
-			$('#ITP_FORM_LOANMNG02010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
-			$('#ITP_FORM_LOANMNG02010_SEARCH_TO_DT').datepicker('setDate', new Date());
+			$('#ITP_FORM_LOANMNG02010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_LOANMNG02010_SEARCH_TO_DT').datepicker('setDate', toDate);
 			
 			// 권한에 따라 매장값 설정
 			$('#ITP_FORM_LOANMNG02010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));

src/main/webapp/js/app/loanmng/ITP_LOANMNG03010.js

@@ -255,12 +255,14 @@ let pageObj = {
 		            fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
 		        }
 		    });
-
-			// 조회일자 지정
+			// 조회일자 지정	
 			var now = new Date();
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
 			$('#ITP_TAB_LOANMNG03010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);			
-			$('#ITP_FORM_LOANMNG03010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
-			$('#ITP_FORM_LOANMNG03010_SEARCH_TO_DT').datepicker('setDate', new Date());
+			$('#ITP_FORM_LOANMNG03010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_LOANMNG03010_SEARCH_TO_DT').datepicker('setDate', toDate);
 			
 			// 권한에 따라 매장값 설정
 			$('#ITP_FORM_LOANMNG03010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
@@ -493,11 +495,16 @@ let viewObj = {
 			};			
 			// 결제 팝업
 			// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제))			
+			
+			var acctVal = $('#ITP_FORM_LOANMNG03010_VIEW_ACCT_BAL').val();
+			var unpaidAmt = $('#ITP_FORM_LOANMNG03010_VIEW_UNPAID_AMT').val();
+			var goodsAmt = parseInt(unpaidAmt) - parseInt(acctVal);  
+			
 			var args = {'payTpCd': '20', 
 				'brandId': $('#ITP_FORM_LOANMNG03010_VIEW_BRAND_ID').val(), 
 				'storeId': $('#ITP_FORM_LOANMNG03010_VIEW_STORE_ID').val(), 
 				'sttlMgntUnqNoList': $('#ITP_FORM_LOANMNG03010_VIEW_STTL_MGNT_UNQ_NO').val(), 
-				'goodsAmt': $('#ITP_FORM_LOANMNG03010_VIEW_UNPAID_AMT').val() }; 
+				'goodsAmt': goodsAmt }; 
 			fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'S');
 		}, 
 		deposit: function() {
@@ -509,13 +516,17 @@ let viewObj = {
 				return;
 			}
 			
+			var acctVal = $('#ITP_FORM_LOANMNG03010_VIEW_ACCT_BAL').val();
+			var unpaidAmt = $('#ITP_FORM_LOANMNG03010_VIEW_UNPAID_AMT').val();
+			var goodsAmt = parseInt(unpaidAmt) - parseInt(acctVal);
+			
 			var args = {'payTpCd': '20', 
 				'brandId': $('#ITP_FORM_LOANMNG03010_VIEW_BRAND_ID').val(), 
 				'brandNm': $('#ITP_FORM_LOANMNG03010_VIEW .fnBrandNm').text(), 
 				'storeId': $('#ITP_FORM_LOANMNG03010_VIEW_STORE_ID').val(), 
 				'storeNm': $('#ITP_FORM_LOANMNG03010_VIEW .fnStoreNm').text(), 
 				'sttlMgntUnqNo': $('#ITP_FORM_LOANMNG03010_VIEW_STTL_MGNT_UNQ_NO').val(), 
-				'goodsAmt': $('#ITP_FORM_LOANMNG03010_VIEW_UNPAID_AMT').val() };
+				'goodsAmt': goodsAmt };
 				
 			fn_call_popup('biz', 'BIZPOP_DSPT_INFO_REG', '#ITP_ASIDE', function(result) {				
 				// console.log('>>>>> 팝업결과 : ' + JSON.stringify(result));
@@ -533,7 +544,8 @@ let viewObj = {
 		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_STORE_ID').val(result.storeId);
 		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_STTL_MGNT_UNQ_NO').val(result.sttlMgntUnqNo);
 		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_RCPT_YN').val(result.rcptYn);
-		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_UNPAID_AMT').val(result.unpaidAmt);
+		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_UNPAID_AMT').val(result.unpaidAmt); 	// 미납금액
+		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_ACCT_BAL').val(result.acctBal); 		// 계좌잔액
 		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_DSPT_MGNT_NO').val(result.dsptMgntNo);
 		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_DPST_ST_CD').val(result.dpstStCd);
 		

src/main/webapp/js/app/loanmng/ITP_LOANMNG04010.js

@@ -35,21 +35,21 @@ const gridColModel = {
 			sortable: false, hidden: true
 		},
 		{
-			index: 'LOAN_REG_DT', name: 'loanRegDt',
-			label: ITP_MSG_LOCALE.label.loanRegDt,				// 발행일자
+			index: 'LOAN_REG_DTM', name: 'loanRegDtm',
+			label: '거래일자',				// 발행일자
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'DPST_PAY_DVSN_NM', name: 'dpstPayDvsnNm',
 			label: ITP_MSG_LOCALE.label.dpstPayDvsnNm,			// 입지구분
-			width: '7', fixed: false, align: 'left',
+			width: '7', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'MEDIA_DVSN_NM', name: 'mediaDvsnNm',
 			label: ITP_MSG_LOCALE.label.mediaDvsnNm,			// 매체구분
-			width: '7', fixed: false, align: 'left',
+			width: '7', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
@@ -234,7 +234,7 @@ let viewObj = {
 		load: function() {
 			let param = $('#ITP_FORM_LOANMNG04010_VIEW_SEARCH').serializeObject();
 			param.gridSize = $.jgrid.defaults.rowNum;
-			param.pagingYn = false; // 페이징안함
+			param.pagingYn = true; // 페이징안함
 			var option = {
 				gridId: LOANMNG04010_VIEW_GRID_ID,
 				colModel: gridColModel.view,

src/main/webapp/js/app/ordmng/ITP_ORDMNG01010.js

@@ -178,11 +178,12 @@ let pageObj = {
 			});
 			// 조회일자 지정	
 			var now = new Date();
-			var defaultToDate = new Date(now);
-			defaultToDate.setDate(now.getDate()+7);
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
 			$('#ITP_TAB_ORDMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_ORDMNG01010_SEARCH_FROM_DT').datepicker('setDate', now);
-			$('#ITP_FORM_ORDMNG01010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
+			$('#ITP_FORM_ORDMNG01010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_ORDMNG01010_SEARCH_TO_DT').datepicker('setDate', toDate);
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(ORDMNG01010_GRID_ID, ORDMNG01010_GRID_LIST, 'lg');

src/main/webapp/js/app/ordmng/ITP_ORDMNG02010.js

@@ -138,11 +138,13 @@ let pageObj = {
 			});
 			// 조회일자 지정	
 			var now = new Date();
-			var defaultToDate = new Date(now);
-			defaultToDate.setDate(now.getDate() + 7);
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
+			toDate.setDate(now.getDate() + 7);
 			$('#ITP_TAB_ORDMNG02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_ORDMNG02010_SEARCH_FROM_DT').datepicker('setDate', now);
-			$('#ITP_FORM_ORDMNG02010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
+			$('#ITP_FORM_ORDMNG02010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_ORDMNG02010_SEARCH_TO_DT').datepicker('setDate', toDate);
 		},
 		form: function() {
 			itp_fn_form_event.onKeyup('#ITP_FORM_ORDMNG02010_DETAIL');
@@ -462,10 +464,8 @@ let modifyObj = {
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDlvRegDt').text(result.dlvReqDt);									// 납품서생성일자
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnWhsNm').text(result.whsNm);											// 발주총금액
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDeliTelNo').text(result.deliTelNo);									// 납품장소연락처
-		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT').val(result.dlvSchDt);			// 납품예정일
+		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT').val(result.dlvReqDt);			// 납품예정일
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDlvRegDt').text(result.dlvReqDt);									// 납품요청일
-		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_MGR_NM').val(result.dlvMgrNm);			// 납품담당자
-		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_MGR_TEL_NO').val(result.dlvMgrTelNo);	// 납품담당자연락처
 
 		shmtQtyValue = function(value, colname) {
 			var selectedIds = $(ORDMNG02010_DETAIL_GRID_ID).getGridParam('selarrrow');

src/main/webapp/js/app/ordmng/ITP_ORDMNG03010.js

@@ -168,11 +168,14 @@ let pageObj = {
 		view: function() {
 			// 버튼 권한설정
 			fn_proc_btn_auth('ORDMNG03010');
-			// 조회일자 달력 팝업 불러오기
+			// 조회일자 지정	
 			var now = new Date();
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
 			$('#ITP_TAB_ORDMNG03010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_ORDMNG03010_SEARCH_DLV_REQ_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
-			$('#ITP_FORM_ORDMNG03010_SEARCH_DLV_CMPLT_DT').datepicker('setDate', new Date());
+			$('#ITP_FORM_ORDMNG03010_SEARCH_DLV_REQ_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_ORDMNG03010_SEARCH_DLV_CMPLT_DT').datepicker('setDate', toDate);
 		}
 	},
 	event: {

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

@@ -332,9 +332,13 @@ let pageObj = {
 
 			// 조회일자 지정
 			var now = new Date();
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
+			toDate.setDate(now.getDate() + 5);
 			$('#ITP_TAB_POMNG03010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_POMNG03010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
-			$('#ITP_FORM_POMNG03010_SEARCH_TO_DT').datepicker('setDate', new Date());
+			$('#ITP_FORM_POMNG03010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_POMNG03010_SEARCH_TO_DT').datepicker('setDate', toDate);
 			
 		},
 		grid: function() {

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

@@ -195,13 +195,12 @@ let pageObj = {
 			});
 			// 조회일자 지정	
 			var now = new Date();
-			var defaultToDate1 = new Date(now);
-			var defaultToDate2 = new Date(now);
-			defaultToDate1.setDate(now.getDate() - 30);
-			defaultToDate2.setDate(now.getDate() + 30);
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
 			$('#ITP_TAB_POMNG04010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_POMNG04010_SEARCH_FROM_DT').datepicker('setDate', defaultToDate1);
-			$('#ITP_FORM_POMNG04010_SEARCH_TO_DT').datepicker('setDate', defaultToDate2);
+			$('#ITP_FORM_POMNG04010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_POMNG04010_SEARCH_TO_DT').datepicker('setDate', toDate);
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(POMNG04010_GRID_ID, POMNG04010_GRID_LIST, 'lg');
@@ -538,7 +537,7 @@ let modifyObj = {
 		$('#ITP_FORM_POMNG04010_DETAIL #ITP_FORM_POMNG04010_DETAIL_AFFL_SHOP_ID').val(result.afflShopId);
 		$('#ITP_FORM_POMNG04010_DETAIL .fnBrandNm').text(result.brandNm);				
 		$('#ITP_FORM_POMNG04010_DETAIL .fnPchPodrUnqNo').text(result.pchPodrUnqNo);
-		$('#ITP_FORM_POMNG04010_DETAIL .fnSpplyNm').text(result.spplyId);
+		$('#ITP_FORM_POMNG04010_DETAIL .fnSpplyNm').text(result.spplyNm);
 		$('#ITP_FORM_POMNG04010_DETAIL .fnPodrDt').text(result.podrDt);
 		$('#ITP_FORM_POMNG04010_DETAIL .fnPchOdrStCd').text(result.pchOdrStNm);
 		$('#ITP_FORM_POMNG04010_DETAIL .fnPodrTotalAmt').text(result.podrTotalAmt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','));

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

@@ -40,7 +40,7 @@ const gridColModel = {
 			index: 'Brand_Nm', name: 'brandNm',			
 			label: ITP_MSG_LOCALE.label.brandNm, 		//브랜드이름
 			width: '20', fixed: false, align: 'left',	
-			minwidth:150,
+			minwidth:140,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
@@ -75,7 +75,7 @@ const gridColModel = {
 			index: 'WHS_NM', name: 'whsNm',				
 			label: '입고처', 			//납품장소
 			width: '20', fixed: false, align: 'left',	
-			minwidth:220,
+			minwidth:170,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
@@ -124,56 +124,52 @@ const gridColModel = {
 			index: 'ITEM_NM', name: 'itemNm',			
 			label: ITP_MSG_LOCALE.label.itemNm, 		//품목명
 			width: '10', fixed: false, align: 'left',	
-			minwidth:180,
+			minwidth:120,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'PODR_QTY', name: 'podrQty',			
 			label: ITP_MSG_LOCALE.label.podrQty, 		//수주수량
-			width: '6', fixed: false, align: 'right',	
-			minwidth:80,
+			width: '24', fixed: false, align: 'right',	
 			sortable: false, hidden: false				
 		},
 		{
 			index: 'DLV_QTY', name: 'dlvQty',			
 			label: ITP_MSG_LOCALE.label.dlvQty, 		//납품수량
-			width: '6', fixed: false, align: 'right',	
-			minwidth:80,
+			width: '24', fixed: false, align: 'right',	
 			sortable: false, hidden: false				
 		},
 		{
 			index: 'UNIT', name: 'unit',				
 			label: ITP_MSG_LOCALE.label.unit, 			//단가
-			width: '6', fixed: false, align: 'right',	
+			width: '16', fixed: false, align: 'right',	
 			sortable: false, hidden: true				
 		},
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',			
 			label: ITP_MSG_LOCALE.label.unitAmt, 		//단가
-			width: '6', fixed: false, align: 'right',	
-			minwidth:80,
+			width: '24', fixed: false, align: 'right',	
 			sortable: false, hidden: false,
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }				
 		},
 		{
 			index: 'DLV_MGR_NM', name: 'dlvMgrNm',		
 			label: ITP_MSG_LOCALE.label.dlvMgrNm, 		//납품담당자
-			width: '8', fixed: false, align: 'left',	
-			minwidth:100,
+			width: '8', fixed: false, align: 'center',	
+			minwidth:80,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'DLV_MGR_TEL_NO', name: 'dlvMgrTelNo',	
 			label: ITP_MSG_LOCALE.label.dlvMgrTelNo, 	//납품담당연락처
-			width: '10', fixed: false, align: 'center',	
-			minwidth:120,
+			width: '25', fixed: false, align: 'center',	
 			sortable: false, hidden: false				
 		},
 		{
 			index: 'WHS_DVSN_NM', name: 'whsDvsnNm',	
 			label: ITP_MSG_LOCALE.label.whsDvsnNm, 	//창고구분
-			width: '10', fixed: false, align: 'center',	
-			minwidth:100,
+			width: '16', fixed: false, align: 'center',
+			minwidth:70,
 			sortable: false, hidden: false				
 		}
 	]
@@ -203,9 +199,12 @@ let pageObj = {
 			});
 			// 조회일자 지정
 			var now = new Date();
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
 			$('#ITP_TAB_POMNG05010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_POMNG05010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
-			$('#ITP_FORM_POMNG05010_SEARCH_TO_DT').datepicker('setDate', new Date());
+			$('#ITP_FORM_POMNG05010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_POMNG05010_SEARCH_TO_DT').datepicker('setDate', toDate);
 			
 			$('#ITP_BTN_POMNG05010_EXCEL').show();
 		},

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

@@ -215,11 +215,15 @@ let listObj = {
 				fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
 			}
 		});
-
+		// 조회일자 지정	
 		var now = new Date();
+		var fromDate = new Date(now);
+		fromDate.setDate(now.getDate() - 7);
+		var toDate = new Date(now);
+		toDate.setDate(now.getDate() + 7);
 		$('#ITP_TAB_POMNG06010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-		$('#ITP_FORM_POMNG06010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setDate(now.getDate())));
-		$('#ITP_FORM_POMNG06010_SEARCH_TO_DT').datepicker('setDate', new Date(now.setDate(now.getDate() + 30)));
+		$('#ITP_FORM_POMNG06010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+		$('#ITP_FORM_POMNG06010_SEARCH_TO_DT').datepicker('setDate', toDate);
 
 		$('#ITP_BTN_POMNG06010_EXCEL').show();
 	},

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

@@ -177,18 +177,17 @@ let pageObj = {
 			});
 			// 조회일자 지정	
 			var now = new Date();
-			var defaultToDate = new Date(now);
-			defaultToDate.setDate(now.getDate() + 5);
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
 			$('#ITP_TAB_POMNG07010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_POMNG07010_SEARCH_FROM_DT').datepicker('setDate', now);
-			$('#ITP_FORM_POMNG07010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
-			
+			$('#ITP_FORM_POMNG07010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_POMNG07010_SEARCH_TO_DT').datepicker('setDate', toDate);
 			$('#ITP_BTN_POMNG07010_EXCEL').show();
 			
 			if (fn_make_user_info.get('storeId') != '') {
 				$('.brandSearchCond').hide();	
 			}
-			
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(POMNG07010_GRID_ID, POMNG07010_GRID_LIST, 'lg');

src/main/webapp/js/app/rtnmng/ITP_RTNMNG02010.js

@@ -292,10 +292,14 @@ let pageObj = {
 			$('#ITP_FORM_RTNMNG02010_SEARCH_SBRAND_ID').val(fn_make_user_info.get('brandId'));
 			$('#ITP_FORM_RTNMNG02010_SEARCH_SSTORE_ID').val(fn_make_user_info.get('storeId'));
 			
+			// 조회일자 지정	
 			var now = new Date();
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
 			$('#ITP_TAB_RTNMNG02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_RTNMNG02010_SEARCH_FROM_DT').datepicker('setDate', now);
-			$('#ITP_FORM_RTNMNG02010_SEARCH_TO_DT').datepicker('setDate', new Date(now.setDate(now.getDate()+30)));			
+			$('#ITP_FORM_RTNMNG02010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_RTNMNG02010_SEARCH_TO_DT').datepicker('setDate', toDate);			
 			
 		},
 		grid: function() {

src/main/webapp/js/app/rtnmng/ITP_RTNMNG03010.js

@@ -421,11 +421,15 @@ let pageObj = {
 			$('#ITP_FORM_RTNMNG03010_SEARCH_SBRAND_ID').val(fn_make_user_info.get('brandId'));
 			$('#ITP_FORM_RTNMNG03010_SEARCH_SSTORE_ID').val(fn_make_user_info.get('storeId'));
 
-			// 조회일자 지정
+			// 조회일자 지정	
 			var now = new Date();
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
+			toDate.setDate(now.getDate() + 5);
 			$('#ITP_TAB_RTNMNG03010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_RTNMNG03010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
-			$('#ITP_FORM_RTNMNG03010_SEARCH_TO_DT').datepicker('setDate', new Date());
+			$('#ITP_FORM_RTNMNG03010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_RTNMNG03010_SEARCH_TO_DT').datepicker('setDate', toDate);
 			
 		},
 		grid: function() {

src/main/webapp/js/app/rtnmng/ITP_RTNMNG04010.js

@@ -188,11 +188,12 @@ let pageObj = {
 			});
 			// 조회일자 지정	
 			var now = new Date();
-			var defaultToDate = new Date(now);
-			defaultToDate.setDate(now.getDate() + 10);
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
 			$('#ITP_TAB_RTNMNG04010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_RTNMNG04010_SEARCH_FROM_DT').datepicker('setDate', now);
-			$('#ITP_FORM_RTNMNG04010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
+			$('#ITP_FORM_RTNMNG04010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_RTNMNG04010_SEARCH_TO_DT').datepicker('setDate', toDate);
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(RTNMNG04010_GRID_ID, RTNMNG04010_GRID_LIST, 'lg');

src/main/webapp/js/app/rtnmng/ITP_RTNMNG05010.js

@@ -222,11 +222,15 @@ let listObj = {
 				fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
 			}
 		});
-
+		// 조회일자 지정	
 		var now = new Date();
+		var fromDate = new Date(now);
+		fromDate.setDate(now.getDate() - 7);
+		var toDate = new Date(now);
+		toDate.setDate(now.getDate() + 7);
 		$('#ITP_TAB_RTNMNG05010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-		$('#ITP_FORM_RTNMNG05010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setDate(now.getDate())));
-		$('#ITP_FORM_RTNMNG05010_SEARCH_TO_DT').datepicker('setDate', new Date(now.setDate(now.getDate() + 30)));
+		$('#ITP_FORM_RTNMNG05010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+		$('#ITP_FORM_RTNMNG05010_SEARCH_TO_DT').datepicker('setDate', toDate);
 		
 		$('#ITP_FORM_RTNMNG05010_SEARCH_SRTN_WHS_ID').val('xxx'); // 임시
 		

src/main/webapp/js/app/rtnmng/ITP_RTNMNG06010.js

@@ -135,11 +135,12 @@ let pageObj = {
 			});
 			// 조회일자 지정	
 			var now = new Date();
-			var defaultToDate = new Date(now);
-			defaultToDate.setDate(now.getDate() + 5);
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 7);
+			var toDate = new Date(now);
 			$('#ITP_TAB_RTNMNG06010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_RTNMNG06010_SEARCH_FROM_DT').datepicker('setDate', now);
-			$('#ITP_FORM_RTNMNG06010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
+			$('#ITP_FORM_RTNMNG06010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_RTNMNG06010_SEARCH_TO_DT').datepicker('setDate', toDate);
 			
 			$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SRTN_WHS_NM').show();
 			$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SSPPLY_NM').show();

src/main/webapp/js/app/salesmng/ITP_SALESMNG01010.js

@@ -140,12 +140,14 @@ let pageObj = {
 		            fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
 		        }
 		    });
-
-			// 조회일자 지정
+			// 조회일자 지정	
 			var now = new Date();
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 30);
+			var toDate = new Date(now);
 			$('#ITP_TAB_SALESMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);			
-			$('#ITP_FORM_SALESMNG01010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
-			$('#ITP_FORM_SALESMNG01010_SEARCH_TO_DT').datepicker('setDate', new Date());
+			$('#ITP_FORM_SALESMNG01010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_SALESMNG01010_SEARCH_TO_DT').datepicker('setDate', toDate);
 			
 			// 권한에 따라 매장값 설정
 			$('#ITP_FORM_SALESMNG01010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));

src/main/webapp/js/app/salesmng/ITP_SALESMNG02010.js

@@ -146,12 +146,14 @@ let pageObj = {
 		            fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
 		        }
 		    });
-
-			// 조회일자 지정
+			// 조회일자 지정	
 			var now = new Date();
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 30);
+			var toDate = new Date(now);
 			$('#ITP_TAB_SALESMNG02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);			
-			$('#ITP_FORM_SALESMNG02010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
-			$('#ITP_FORM_SALESMNG02010_SEARCH_TO_DT').datepicker('setDate', new Date());
+			$('#ITP_FORM_SALESMNG02010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_SALESMNG02010_SEARCH_TO_DT').datepicker('setDate', toDate);
 			
 			// 권한에 따라 매장값 설정
 			$('#ITP_FORM_SALESMNG02010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));

src/main/webapp/js/app/settmng/ITP_SETTMNG01010.js

@@ -323,12 +323,14 @@ let pageObj = {
 		            fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
 		        }
 		    });
-
-			// 조회일자 지정
+			// 조회일자 지정	
 			var now = new Date();
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 30);
+			var toDate = new Date(now);
 			$('#ITP_TAB_SETTMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);			
-			$('#ITP_FORM_SETTMNG01010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
-			$('#ITP_FORM_SETTMNG01010_SEARCH_TO_DT').datepicker('setDate', new Date());
+			$('#ITP_FORM_SETTMNG01010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_SETTMNG01010_SEARCH_TO_DT').datepicker('setDate', toDate);
 			
 			// 권한에 따라 매장값 설정
 			$('#ITP_FORM_SETTMNG01010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));

src/main/webapp/js/app/settmng/ITP_SETTMNG02010.js

@@ -257,11 +257,14 @@ let pageObj = {
 		            fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
 		        }
 		    });
-			// 조회일자 지정
+			// 조회일자 지정	
 			var now = new Date();
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 30);
+			var toDate = new Date(now);
 			$('#ITP_TAB_SETTMNG02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);			
-			$('#ITP_FORM_SETTMNG02010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
-			$('#ITP_FORM_SETTMNG02010_SEARCH_TO_DT').datepicker('setDate', new Date());
+			$('#ITP_FORM_SETTMNG02010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_SETTMNG02010_SEARCH_TO_DT').datepicker('setDate', toDate);
 			
 			// 권한에 따라 매장값 설정
 			$('#ITP_FORM_SETTMNG02010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));

src/main/webapp/js/app/settmng/ITP_SETTMNG03010.js

@@ -260,12 +260,14 @@ let pageObj = {
 		            fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
 		        }
 		    });
-
-			// 조회일자 지정
+			// 조회일자 지정	
 			var now = new Date();
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 30);
+			var toDate = new Date(now);
 			$('#ITP_TAB_SETTMNG03010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);			
-			$('#ITP_FORM_SETTMNG03010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
-			$('#ITP_FORM_SETTMNG03010_SEARCH_TO_DT').datepicker('setDate', new Date());
+			$('#ITP_FORM_SETTMNG03010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_SETTMNG03010_SEARCH_TO_DT').datepicker('setDate', toDate);
 			
 			// 권한에 따라 매장값 설정
 			$('#ITP_FORM_SETTMNG03010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
@@ -518,8 +520,9 @@ let modifyObj = {
 			};
 			var sttlReqAmt =  parseInt($('#ITP_FORM_SETTMNG03010_DETAIL_STTL_REQ_AMT').val());
 			var acctBal =  parseInt($('#ITP_FORM_SETTMNG03010_DETAIL_ACCT_BAL').val());
+			var rcptYn =  $('#ITP_FORM_SETTMNG03010_DETAIL_RCPT_YN').val();
 			
-			if(acctBal > 0) {
+			if(acctBal > 0 && rcptYn != 'Y') {
 				if(acctBal >= sttlReqAmt) {
 					itp_fn_modal_confirm('계좌잔액에서 지급처리가 진행됩니다.\n정산 확정하시겠습니까?', confirmFn, null);						
 				} else {
@@ -541,6 +544,7 @@ let modifyObj = {
 		$('#ITP_FORM_SETTMNG03010_DETAIL_STTL_MGNT_UNQ_NO').val(result.sttlMgntUnqNo);
 		$('#ITP_FORM_SETTMNG03010_DETAIL_ACCT_BAL').val(result.acctBal); // 계좌잔액
 		$('#ITP_FORM_SETTMNG03010_DETAIL_STTL_REQ_AMT').val(result.sttlReqAmt); // 정산요청금액
+		$('#ITP_FORM_SETTMNG03010_DETAIL_RCPT_YN').val(result.rcptYn); // 수납여부
 		
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnBrandNm').text(result.brandNm);
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnStoreNm').text(result.storeNm);

src/main/webapp/js/app/stinfo/ITP_STINFO04010.js

@@ -855,16 +855,16 @@ let modifyObj = {
         //$('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_SALE_UNIT').val(result.saleUnit);
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_BARCODE').val(result.barcode);
         //$('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_STCK_UNIT').val(result.stckUnit);
-        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WEIGHT').val(result.weight);
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WEIGHT').val(result.weight.toFixed(2));
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WEIGHT_UNIT').val(result.weightUnit);
         $('#ITP_FORM_STINFO04010_DETAIL .item_unit').text(result.unit);
-        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_VOLUME').val(result.volume);
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_VOLUME').val(result.volume.toFixed(2));
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_VOLUME_UNIT').val(result.volumeUnit);        
-        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WIDTH').val(result.width);
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WIDTH').val(result.width.toFixed(2));
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WIDTH_UNIT').val(result.widthUnit);
-        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HEIGHT').val(result.height);
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HEIGHT').val(result.height.toFixed(2));
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HEIGHT_UNIT').val(result.heightUnit);
-        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HIGH').val(result.high);
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HIGH').val(result.high.toFixed(2));
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HIGH_UNIT').val(result.highUnit);
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_ONE_BOX_QTY').val(itp_fn_number_comma(result.oneBoxQty));
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_EXPRY_YN').val(result.expryYn);

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

@@ -109,11 +109,12 @@ let pageObj = {
 			});
 			// 조회일자 지정	
 			var now = new Date();
-			var defaultToDate = new Date(now);
-			defaultToDate.setDate(now.getDate()+7);
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 30);
+			var toDate = new Date(now);
 			$('#ITP_TAB_VENDINFO03010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_VENDINFO03010_SEARCH_FROM_DT').datepicker('setDate', now);
-			$('#ITP_FORM_VENDINFO03010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
+			$('#ITP_FORM_VENDINFO03010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_VENDINFO03010_SEARCH_TO_DT').datepicker('setDate', toDate);
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(VENDINFO03010_GRID_ID, VENDINFO03010_GRID_LIST, 'lg');

src/main/webapp/js/app/vsettmng/ITP_VSETTMNG01010.js

@@ -317,12 +317,14 @@ let pageObj = {
 		            fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
 		        }
 		    });
-
-			// 조회일자 지정
+			// 조회일자 지정	
 			var now = new Date();
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 30);
+			var toDate = new Date(now);
 			$('#ITP_TAB_VSETTMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);			
-			$('#ITP_FORM_VSETTMNG01010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
-			$('#ITP_FORM_VSETTMNG01010_SEARCH_TO_DT').datepicker('setDate', new Date());
+			$('#ITP_FORM_VSETTMNG01010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_VSETTMNG01010_SEARCH_TO_DT').datepicker('setDate', toDate);
 			
 			// 권한에 따라 매장값 설정
 			$('#ITP_FORM_VSETTMNG01010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));

src/main/webapp/js/app/vsettmng/ITP_VSETTMNG02010.js

@@ -263,12 +263,14 @@ let pageObj = {
 		            fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
 		        }
 		    });
-
-			// 조회일자 지정
+			// 조회일자 지정	
 			var now = new Date();
+			var fromDate = new Date(now);
+			fromDate.setDate(now.getDate() - 30);
+			var toDate = new Date(now);
 			$('#ITP_TAB_VSETTMNG02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);			
-			$('#ITP_FORM_VSETTMNG02010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
-			$('#ITP_FORM_VSETTMNG02010_SEARCH_TO_DT').datepicker('setDate', new Date());
+			$('#ITP_FORM_VSETTMNG02010_SEARCH_FROM_DT').datepicker('setDate', fromDate);
+			$('#ITP_FORM_VSETTMNG02010_SEARCH_TO_DT').datepicker('setDate', toDate);
 			
 			// 권한에 따라 매장값 설정
 			$('#ITP_FORM_VSETTMNG02010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));

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

@@ -215,7 +215,7 @@
 					  <div class="nomal">
 						<label class="col_4">비고</label>
 						<span>:</span>
-					    <input id="ITP_FORM_MORDMNG02010_VIEW_DELI_DESC" type="text" name="deliDesc">
+					    <input id="ITP_FORM_MORDMNG02010_VIEW_DELI_DESC" class="full" type="text" name="deliDesc">
 					  </div>
 					</div>
 			  	</li>

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

@@ -50,10 +50,10 @@
 	              <button id="ITP_BTN_MPOMNG01010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 	            </div>
 	        </div>
-	        <div class="table_header line">
+	        <div class="table_btn line">
 	          <div >
 	            <h1><구매품목></h1>
-	            <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
+	            <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_DELROW" class="btn-danger btn-sm ADB">품목삭제</button>
 	            <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MPOMNG01010_ITEM_AREA">품목추가</button>
 	          </div>
 	        </div>

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

@@ -262,7 +262,7 @@
             </div>
             <div class="right">
               <button id="ITP_BTN_MPOMNG02010_MODIFY_MINUS">-</button>
-			  <input id="ITP_MPOMNG02010_MODIFY_NUM" class="">
+			  <input type="number" id="ITP_MPOMNG02010_MODIFY_NUM" class="" value="1" maxlength="5" data-brandUnitUnqNo="">
               <button id="ITP_BTN_MPOMNG02010_MODIFY_PLUS">+</button>
             </div>
           </li>
@@ -399,7 +399,7 @@
            	 <div class="itp_num_set">
                 <div class="right">
 				    <button id="ITP_BTN_MPOMNG02010_POP_ITEM_MINUS">-</button>
-    			    <input id="ITP_BTN_MPOMNG02010_POP_NUM" class="">
+					<input type="number" id="ITP_BTN_MPOMNG02010_POP_NUM" class="" value="1" maxlength="5">
 				    <button id="ITP_BTN_MPOMNG02010_POP_ITEM_PLUS">+</button>
 			    </div>
 		    </div>

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

@@ -37,7 +37,7 @@
 							<button id="ITP_BTN_MRTNMNG01010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 						</div>
 					</div>
-					<div class="table_header">
+					<div class="table_btn>
 						<h1><반품 품목></h1>
 						<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
 						<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MRTNMNG01010_ITEM_AREA">품목추가</button>

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

@@ -193,7 +193,7 @@
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 						</div>
 					</div>
-					<div class="table_header">
+					<div class="table_btn">
 						<h1><반품 품목></h1>
 						<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_DEL_ROW" class="btn-primary btn-sm ADB">품목삭제</button>
 						<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_ADD_ROW" class="btn-primary btn-sm ADB">품목추가</button>
@@ -271,7 +271,7 @@
 		<div class="pop">
 			<div class="header">
 				<div class="header_left">
-					<label>납품장소</label>
+					<label>반품장소</label>
 				</div>
 				<div class="header_right">
 					<button type="button" id="ITP_BTN_MRTNMNG02010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
@@ -281,12 +281,12 @@
 				<form id="ITP_FORM_MRTNMNG02010_POP_WHS" class="form-horizontal" onsubmit="return false;">
 					<input type="hidden" id="ITP_FORM_MRTNMNG02010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
 					<input type="hidden" id="ITP_FORM_MRTNMNG02010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
-					<input id="ITP_FORM_MRTNMNG02010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
+					<input id="ITP_FORM_MRTNMNG02010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="창고명">
 					<button id="ITP_BTN_MRTNMNG02010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
+				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_red">반품장소 <img src="../img/arrow_down.png"></button>
 			</div>
 			<div id="ITP_LIST_MRTNMNG02010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>

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

@@ -119,8 +119,7 @@
 				</div>
 			</div>
 			<div class="button_bar">
-				<button id="ITP_BTN_MRTNMNG05010_LIST_MODIFY" class="btn_col_6 btn-m-orange INPS">반품처리</button>
-				<button id="ITP_BTN_MRTNMNG05010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>
+				<button id="ITP_BTN_MRTNMNG05010_LIST_CANCEL" class="col_12 btn-gray CLB">취소</button>
 			</div>
 		</form>
 	</div>

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

@@ -104,7 +104,7 @@
 								<label>발주수량</label>
 								<span>:</span>
 								<div class="fnColReqQty"></div>
-								<label class="sub_info">입고수량</label>
+								<label class="sub_info">수거수량</label>
 								<span>:</span>
 								<div class="fnRodrQty"></div>
 							</div>

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

@@ -102,7 +102,7 @@
 		<div class="pop">
 			<div class="header">
 				<div class="header_left">
-					<label>창고</label>
+					<label>창고정보</label>
 				</div>
 				<div class="header_right">
 					<button type="button" id="ITP_BTN_MSTOCKMNG01010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>

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

@@ -79,7 +79,7 @@
 						  <button class="DETAIL_ITEM_MINUS">
 						  	<div>-</div>
 						  </button>
-   			    		  <input id="ITP_MSTOCKMNG02010_DETAIL_NUM" class="">
+						  <input type="number" id="ITP_MSTOCKMNG02010_DETAIL_NUM" class="" value="1" maxlength="5">
 						  <button class="DETAIL_ITEM_PLUS">
 						  	<div style="left:-1px;">+</div>
 						  </button>
@@ -111,7 +111,7 @@
 		<div class="pop">
 			<div class="header">
 				<div class="header_left">
-					<label>납품장소</label>
+					<label>창고정보</label>
 				</div>
 				<div class="header_right">
 					<button type="button" id="ITP_BTN_MSTOCKMNG02010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
@@ -121,12 +121,12 @@
 				<form id="ITP_FORM_MSTOCKMNG02010_POP_WHS" class="form-horizontal" onsubmit="return false;">
 					<input type="hidden" id="ITP_FORM_MSTOCKMNG02010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
 					<input type="hidden" id="ITP_FORM_MSTOCKMNG02010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
-					<input id="ITP_FORM_MSTOCKMNG02010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
+					<input id="ITP_FORM_MSTOCKMNG02010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="창고명">
 					<button id="ITP_BTN_MSTOCKMNG02010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MSTOCKMNG02010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
+				<button id="ITP_BTN_MSTOCKMNG02010_POP_WHS_NM" class="btn_red">창 고 <img src="../img/arrow_down.png"></button>
 			</div>
 			<div id="ITP_LIST_MSTOCKMNG02010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MSTOCKMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>

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

@@ -383,8 +383,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line div.date_to input {font-weight:100; width:47%; height:34px; font-size:11pt; padding:0 24px 0 3px; margin:0;}
 
 .content .line div.date_to div.at {width: 6%;  font-size: 16px; padding-top:12px; float: right;}
-.content .line .search {width: 100%; height: 50px; padding-top:12px;}
-.content .line .search button {width: 40%; height: 27px; font-size: 12px; font-weight:100; padding: 0;}
+.content .line .search {width: 100%; height: 50px; padding-top:6px;}
+.content .line .search button {width: 40%; height: 34px; font-size: 12pt; font-weight:100; padding: 0;}
 .content .line .search button.col_3 {width: 25%; height:30px; margin:0 10px;}
 .content .list_line {width:98%; float:left; height:50px;display: inline-flex; margin:0 1%; font-size:12px;}
 .content .border {border-bottom: 1px solid #000 !important;}
@@ -397,9 +397,11 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .list_line .mail input {width:30%;}
 .content .list_line .mail select {width:30%; height:34px; font-size:14px; border: 1px solid #aaa;border-radius: 5px;}
 .content .list_line .list_info .pay_info {text-align:left; padding-left:17px; font-size:12pt;}
-.content .table_header {margin-top: 6px; width: 100%; height: 36px;}
-.content .table_header h1 {margin-left: 15px; margin-top:16px; margin-bottom:0; font-size: 13px; float: left; color: #000; font-weight: 100;}
-.content .table_header button {float: right; width: 68px; height:26px; font-size: 12px; font-weight: 100; padding:0px; margin: 4px 12px 6px 0; border-radius:15px;}
+.content .table_header {margin-top: 6px; width: 100%; height: 20px;}
+.content .table_btn {margin-top: 6px; width: 100%; height: 38px;}
+.content .table_header h1 {margin-left: 15px; margin-top:0px; margin-bottom:0; font-size: 13px; float: left; color: #000; font-weight: 100;}
+.content .table_btn h1 {margin-left: 15px; margin-top:16px; margin-bottom:0; font-size: 13px; float: left; color: #000; font-weight: 100;}
+.content .table_btn button {float: right; width: 75px; height:34px; font-size: 10pt; font-weight: 100; padding:0px; margin: 0px 12px 6px 0; border-radius:15px;}
 .detail_content {top: 0px; position: fixed; display:contents; z-index: 10; width:100%; background: #fff;}
 .detail_content .detail_content_fix {background: #f5f6f6; border-bottom:1px solid #E0B8AB;}
 .detail_content .detail_header {width: 330px; height: 50px; margin:0; left:50%; position:relative; transform:translateX(-50%);}
@@ -532,6 +534,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal .half label {min-width:auto;}
 .scroll_area li .left .nomal .half div {min-width:auto; margin-right:5px; margin-top:0;}
 .scroll_area li .left .nomal  input{ width:calc(50% - 85px);height:28px; top:-5px; position:relative;}
+.scroll_area li .left .nomal  input.full {width:calc(100% - 90px); margin-top:4px;}
 .scroll_area li .left .nomal  button {width:60px; margin-left:5px; height:26px; padding:0;border-radius:5px;}
 .scroll_area li .left .nomal  select{ width:calc(50% - 85px); height:28px; top:-5px; position:relative;}
 
@@ -700,7 +703,7 @@ button.close {-webkit-appearance: none; padding: 0; cursor: pointer; background:
 #ITP_MAIN_CONTAINER .itp_graph_area {width:98%; height:300px; border:1px solid #aaa; margin:5px 1%;}
 #ITP_MAIN_CONTAINER .itp_graph_area .itp_graph_header {width:160px; margin:5px;}
 #ITP_MAIN_CONTAINER .itp_graph_area .itp_graph_header label {width:80px; font-size:14pt; text-align:left; float:left;}
-#ITP_MAIN_CONTAINER .itp_graph_area .itp_graph_header select {}
+#ITP_MAIN_CONTAINER .itp_graph_area .itp_graph_header select {height:24px;}
 #ITP_MAIN_CONTAINER .mb_0 {margin-bottom:0;}
 #ITP_MAIN_CONTAINER #ITP_GRAPH_INFO {height:265px;}
 /* 공지사항 팝업추가 */

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

@@ -471,12 +471,6 @@ let mobPopObj = {
 	}
 };
 
-function chkMaxLength(object) {
-	if (object.value.length > object.maxLength) {
-		object.value = object.value.slice(0, object.maxLength);
-	}
-}
-
 function appCallFnConnKey(connKey) {
 	if(connKey) {
 		sessionStorage.setItem('itp_login_info', JSON.stringify({

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

@@ -129,11 +129,12 @@ let mobContObj = {
 					var $li = $('#ITP_LIST_MPOMNG01010_ITEM_AREA .panel-group > .list-row:last');
 					$li.find('.fnBrandUnitUnqNo').val(item.brandUnitUnqNo);
 					$li.find('.fnItemNm').text(item.itemNm);
-					$li.find('.fnPchReqQty').text(item.pchReqQty);
+					$li.find('#ITP_MPOMNG01010_DETAIL_NUM').val(item.pchReqQty);
 					$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
 					$li.find('.fnOrdAmt').text(CommonObj.currency.add(Number(item.unitAmt) * Number(item.pchReqQty)));
 					$('.list-row #ITP_BTN_MPOMNG01010_DETAIL_PLUS')[$li.index()].addEventListener('click', function() { _this.actPlus(this); });
 					$('.list-row #ITP_BTN_MPOMNG01010_DETAIL_MINUS')[$li.index()].addEventListener('click', function() { _this.actMinus(this); });
+					$('.item-row #ITP_MPOMNG01010_DETAIL_NUM')[$li.index()].addEventListener('input', function() { _this.actInput(this); });
 					_this.pchReqAmtTot();
 				}
 			});
@@ -160,26 +161,36 @@ let mobContObj = {
 			this.empty();
 		},
 		actPlus: function(elem) {
-			var $li = $(elem).closest('li');
-			var num = Number($li.find('.fnPchReqQty').text());
-			var calcNum = num + 1;
-			$($li).find('.fnPchReqQty').text(calcNum.toString());
-			this.rows[$li.index()]['pchReqQty'] = calcNum;
-			this.pchReqAmtUnit(elem, calcNum);
-			this.pchReqAmtTot();
+			var elQty = $(elem).prev();
+			var num = Number($(elQty).val());
+			if(num < 100000) {
+				var calcNum = num + 1;
+				$(elQty).val(calcNum.toString());
+				this.rows[elQty.parents('li').index()]['pchReqQty'] = calcNum;
+				this.pchReqAmtUnit(elem,  calcNum);
+				this.pchReqAmtTot();
+			}
 		},
 		actMinus: function(elem) {
-			var $div = $(elem).siblings('div');
-			var num = Number($div.text());
-			if(num <= 1) {
-				itp_fn_modal_alert('수량을 확인하세요.');
-			} else {
-				$($div).text((num - 1).toString());
-				this.rows[$div.parents('li').index()]['pchReqQty'] = $($div).text();
-				this.pchReqAmtUnit(elem,  $($div).text());
+			var elQty = $(elem).next();
+			var num = Number($(elQty).val());
+			if(num > 1) {
+				var calcNum = num - 1;
+				$(elQty).val(calcNum.toString());
+				this.rows[elQty.parents('li').index()]['pchReqQty'] = calcNum;
+				this.pchReqAmtUnit(elem,  calcNum);
 				this.pchReqAmtTot();
 			}
 		},
+		actInput: function(elem) {
+			var _this = this;
+			var index = $(elem).parents('li').index();
+			CommonObj.chkMaxLength(elem, function(qty) {
+				mobContObj.list.rows[index]['pchReqQty'] = qty;
+				mobContObj.list.pchReqAmtUnit(elem, qty);
+				mobContObj.list.pchReqAmtTot();
+			});
+		},
 		pchReqAmtUnit: function(elem, qty) {
 			var $div = $(elem).parent().prev();
 			var unitAmt = CommonObj.onlyNumber($div.find('.fnUnitAmt').text());
@@ -259,21 +270,27 @@ let mobPopObj = {
 						}
 						return false;
 					});
+					$('input[id="ITP_MPOMNG01010_POP_NUM"]').off('input').on('input', function() {
+						var _this = this;
+						CommonObj.chkMaxLength(this, function(qty) { mobPopObj.popItem.addRow.button.reqAmtUnit(_this, qty) });
+					});
 				},
 				actPlus: function(elem) {
-					var $div = $(elem).siblings('div');
-					var num = Number($div.text());
-					$($div).text((num + 1).toString());
-					this.reqAmtUnit(elem, $($div).text());
+					var elQty = $(elem).prev();
+					var num = Number($(elQty).val());
+					if(num < 100000) {
+						var calcNum = num + 1;
+						$(elQty).val(calcNum.toString());
+						this.reqAmtUnit(elem, calcNum);
+					}
 				},
 				actMinus: function(elem) {
-					var $div = $(elem).siblings('div');
-					var num = Number($div.text());
-					if(num <= 1) {
-						itp_fn_modal_alert('수량을 확인하세요.');
-					} else {
-						$($div).text((num - 1).toString());
-						this.reqAmtUnit(elem, $($div).text());
+					var elQty = $(elem).next();
+					var num = Number($(elQty).val());
+					if(num > 1) {
+						var calcNum = num - 1;
+						$(elQty).val(calcNum.toString());
+						this.reqAmtUnit(elem, calcNum);
 					}
 				},
 				reqAmtUnit: function(elem, qty) {
@@ -296,7 +313,7 @@ let mobPopObj = {
 						if($(this).is(':checked')) {
 							var index = $(this).closest('li').index();
 							var item = mobPopObj.popItem.rows[index];
-							item['pchReqQty'] = $(this).closest('li').find('.fnPchReqQty').html();
+							item['pchReqQty'] = $(this).closest('li').find('#ITP_MPOMNG01010_POP_NUM').val();
 							items.push(item);
 						}
 					});

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

@@ -306,11 +306,13 @@ let mobContObj = {
 						var $li = $('#ITP_LIST_MPOMNG02010_MODIFY_AREA .panel-group > .item-row:last');
 						$li.find('.fnBrandUnitUnqNo').val(item.brandUnitUnqNo);
 						$li.find('.fnItemNm').text(item.itemNm);
-						$li.find('.fnPchReqQty').text(item.pchReqQty);
+						$li.find('#ITP_MPOMNG02010_MODIFY_NUM').val(item.pchReqQty);
+						$li.find('#ITP_MPOMNG02010_MODIFY_NUM').data('brandUnitUnqNo', item.brandUnitUnqNo);
 						$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
 						$li.find('.fnOrdAmt').text(CommonObj.currency.add(Number(item.unitAmt) * Number(item.pchReqQty)));
 						$('.item-row #ITP_BTN_MPOMNG02010_MODIFY_PLUS')[$li.index()].addEventListener('click', function() { _this.actPlus(this); });
 						$('.item-row #ITP_BTN_MPOMNG02010_MODIFY_MINUS')[$li.index()].addEventListener('click', function() { _this.actMinus(this); });
+						$('.item-row #ITP_MPOMNG02010_MODIFY_NUM')[$li.index()].addEventListener('input', function() { _this.actInput(this); });
 						_this.pchReqAmtTot();
 					}
 				});
@@ -339,26 +341,45 @@ let mobContObj = {
 				}
 			},
 			actPlus: function(elem) {
-				var $li = $(elem).closest('li');
-				var num = Number($li.find('.fnPchReqQty').text());
-				var calcNum = num + 1;
-				$($li).find('.fnPchReqQty').text(calcNum.toString());
-				this.rows[$li.index()]['pchReqQty'] = calcNum;
-				this.pchReqAmtUnit(elem, calcNum);
-				this.pchReqAmtTot();
+				var elQty = $(elem).prev();
+				var num = Number($(elQty).val());
+				if(num < 100000) {
+					var calcNum = num + 1;
+					$(elQty).val(calcNum.toString());
+					this.rows[this.itemIndex($(elQty).data('brandUnitUnqNo'))]['pchReqQty'] = calcNum;
+					this.pchReqAmtUnit(elem,  calcNum);
+					this.pchReqAmtTot();
+				}
 			},
 			actMinus: function(elem) {
-				var $div = $(elem).siblings('div');
-				var num = Number($div.text());
-				if(num <= 1) {
-					itp_fn_modal_alert('수량을 확인하세요.');
-				} else {
-					$($div).text((num - 1).toString());
-					this.rows[$div.parents('li').index()]['pchReqQty'] = $($div).text();
-					this.pchReqAmtUnit(elem,  $($div).text());
+				var elQty = $(elem).next();
+				var num = Number($(elQty).val());
+				if(num > 1) {
+					var calcNum = num - 1;
+					$(elQty).val(calcNum.toString());
+					this.rows[this.itemIndex($(elQty).data('brandUnitUnqNo'))]['pchReqQty'] = calcNum;
+					this.pchReqAmtUnit(elem,  calcNum);
 					this.pchReqAmtTot();
 				}
 			},
+			actInput: function(elem) {
+				var index = this.itemIndex($(elem).data('brandUnitUnqNo'));
+				CommonObj.chkMaxLength(elem, function(qty) {
+					mobContObj.modify.list.rows[index]['pchReqQty'] = qty;
+					mobContObj.modify.list.pchReqAmtUnit(elem, qty);
+					mobContObj.modify.list.pchReqAmtTot();
+				});
+			},
+			itemIndex: function(brandUnitUnqNo) {
+				var choiceIndex = -1;
+				$.each(this.rows, function(index, item) {
+					if(brandUnitUnqNo === item.brandUnitUnqNo) {
+						choiceIndex = index;
+						return false;
+					}
+				});
+				return choiceIndex;
+			},
 			pchReqAmtUnit: function(elem, qty) {
 				var $div = $(elem).parent().prev();
 				var unitAmt = CommonObj.onlyNumber($div.find('.fnUnitAmt').text());
@@ -442,21 +463,27 @@ let mobPopObj = {
 						}
 						return false;
 					});
+					$('input[id="ITP_BTN_MPOMNG02010_POP_NUM"]').off('input').on('input', function() {
+						var _this = this;
+						CommonObj.chkMaxLength(this, function(qty) { mobPopObj.popItem.addRow.button.reqAmtUnit(_this, qty) });
+					});
 				},
 				actPlus: function(elem) {
-					var $div = $(elem).siblings('div');
-					var num = Number($div.text());
-					$($div).text((num + 1).toString());
-					this.reqAmtUnit(elem, $($div).text());
+					var elQty = $(elem).prev();
+					var num = Number($(elQty).val());
+					if(num < 100000) {
+						var calcNum = num + 1;
+						$(elQty).val(calcNum.toString());
+						this.reqAmtUnit(elem, calcNum);
+					}
 				},
 				actMinus: function(elem) {
-					var $div = $(elem).siblings('div');
-					var num = Number($div.text());
-					if(num <= 1) {
-						itp_fn_modal_alert('수량을 확인하세요.');
-					} else {
-						$($div).text((num - 1).toString());
-						this.reqAmtUnit(elem, $($div).text());
+					var elQty = $(elem).next();
+					var num = Number($(elQty).val());
+					if(num > 1) {
+						var calcNum = num - 1;
+						$(elQty).val(calcNum.toString());
+						this.reqAmtUnit(elem, calcNum);
 					}
 				},
 				reqAmtUnit: function(elem, qty) {
@@ -481,7 +508,7 @@ let mobPopObj = {
 							var index = $(this).closest('li').index();
 							var item = mobPopObj.popItem.rows[index];
 							item['viewCd'] = 'C';
-							item['pchReqQty'] = $(this).closest('li').find('.fnPchReqQty').html();
+							item['pchReqQty'] = $(this).closest('li').find('#ITP_BTN_MPOMNG02010_POP_NUM').val();
 							items.push(item);
 						}
 					});

src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG01010.js

@@ -198,7 +198,6 @@ let mobContObj = {
 				var amt = item.unitAmt;
 				reqAmt += Number(qty) * amt;
 			});
-			console.log(reqAmt);
 			$('#ITP_AJAX_MRTNMNG01010_DETAIL_CONTAINER').find('.fnRtnReqAmt').text(CommonObj.currency.add(reqAmt));
 		}
 	},
@@ -422,7 +421,6 @@ let mobPopObj = {
 		var _this = this;
 		$('button[id$="CLOSE"]').off('click').on('click', function() {
 			var id = $(this).attr('id');
-			console.log('id ===> ' + id);
 			if($(this).hasClass('btn-pop-close')) {
 				_this.hide(id);
 			}

src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG02010.js

@@ -292,11 +292,13 @@ let mobContObj = {
 						var $li = $('#ITP_LIST_MRTNMNG02010_MODIFY_AREA .mb_0 > .item-row:last');
 						$li.find('.fnBrandUnitUnqNo').val(item.brandUnitUnqNo);
 						$li.find('.fnItemNm').text(item.itemNm);
-						$li.find('.fnRtnQty').text(item.rtnQty);
+						$li.find('#ITP_MRTNMNG02010_MODIFY_NUM').val(item.rtnQty);
+						$li.find('#ITP_MRTNMNG02010_MODIFY_NUM').data('brandUnitUnqNo', item.brandUnitUnqNo);
 						$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
 						$li.find('.fnOrdAmt').text(CommonObj.currency.add(Number(item.unitAmt) * Number(item.rtnQty)));
 						$('.item-row .DETAIL_ITEM_PLUS')[$li.index()].addEventListener('click', function() { _this.actPlus(this); });
 						$('.item-row .DETAIL_ITEM_MINUS')[$li.index()].addEventListener('click', function() { _this.actMinus(this); });
+						$('.item-row #ITP_MRTNMNG02010_MODIFY_NUM')[$li.index()].addEventListener('input', function() { _this.actInput(this); });
 						_this.rtnReqAmtTot();
 					}
 				});
@@ -325,26 +327,45 @@ let mobContObj = {
 				}
 			},
 			actPlus: function(elem) {
-				var $li = $(elem).closest('li');
-				var num = Number($li.find('.fnRtnQty').text());
-				var calcNum = num + 1;
-				$($li).find('.fnRtnQty').text(calcNum.toString());
-				this.rows[$li.index()]['rtnQty'] = calcNum;
-				this.rtnReqAmtUnit(elem, calcNum);
-				this.rtnReqAmtTot();
+				var elQty = $(elem).prev();
+				var num = Number($(elQty).val());
+				if(num < 100000) {
+					var calcNum = num + 1;
+					$(elQty).val(calcNum.toString());
+					this.rows[this.itemIndex($(elQty).data('brandUnitUnqNo'))]['rtnQty'] = calcNum;
+					this.rtnReqAmtUnit(elem,  calcNum);
+					this.rtnReqAmtTot();
+				}
 			},
 			actMinus: function(elem) {
-				var $div = $(elem).siblings('div');
-				var num = Number($div.text());
-				if(num <= 1) {
-					itp_fn_modal_alert('수량을 확인하세요.');
-				} else {
-					$($div).text((num - 1).toString());
-					this.rows[$div.parents('li').index()]['rtnQty'] = $($div).text();
-					this.rtnReqAmtUnit(elem, $($div).text());
+				var elQty = $(elem).next();
+				var num = Number($(elQty).val());
+				if(num > 1) {
+					var calcNum = num - 1;
+					$(elQty).val(calcNum.toString());
+					this.rows[this.itemIndex($(elQty).data('brandUnitUnqNo'))]['rtnQty'] = calcNum;
+					this.rtnReqAmtUnit(elem,  calcNum);
 					this.rtnReqAmtTot();
 				}
 			},
+			actInput: function(elem) {
+				var index = this.itemIndex($(elem).data('brandUnitUnqNo'));
+				CommonObj.chkMaxLength(elem, function(qty) {
+					mobContObj.modify.list.rows[index]['rtnQty'] = qty;
+					mobContObj.modify.list.rtnReqAmtUnit(elem, qty);
+					mobContObj.modify.list.rtnReqAmtTot();
+				});
+			},
+			itemIndex: function(brandUnitUnqNo) {
+				var choiceIndex = -1;
+				$.each(this.rows, function(index, item) {
+					if(brandUnitUnqNo === item.brandUnitUnqNo) {
+						choiceIndex = index;
+						return false;
+					}
+				});
+				return choiceIndex;
+			},
 			rtnReqAmtUnit: function(elem, qty) {
 				var $div = $(elem).parent().prev();
 				var unitAmt = CommonObj.onlyNumber($div.find('.fnUnitAmt').text());
@@ -428,21 +449,27 @@ let mobPopObj = {
 						}
 						return false;
 					});
+					$('input[id="ITP_MRTNMNG02010_POP_NUM"]').off('input').on('input', function() {
+						var _this = this;
+						CommonObj.chkMaxLength(this, function(qty) { mobPopObj.popItem.addRow.button.reqAmtUnit(_this, qty) });
+					});
 				},
 				actPlus: function(elem) {
-					var $div = $(elem).siblings('div');
-					var num = Number($div.text());
-					$($div).text((num + 1).toString());
-					this.reqAmtUnit(elem, $($div).text());
+					var elQty = $(elem).prev();
+					var num = Number($(elQty).val());
+					if(num < 100000) {
+						var calcNum = num + 1;
+						$(elQty).val(calcNum.toString());
+						this.reqAmtUnit(elem, calcNum);
+					}
 				},
 				actMinus: function(elem) {
-					var $div = $(elem).siblings('div');
-					var num = Number($div.text());
-					if(num <= 1) {
-						itp_fn_modal_alert('수량을 확인하세요.');
-					} else {
-						$($div).text((num - 1).toString());
-						this.reqAmtUnit(elem, $($div).text());
+					var elQty = $(elem).next();
+					var num = Number($(elQty).val());
+					if(num > 1) {
+						var calcNum = num - 1;
+						$(elQty).val(calcNum.toString());
+						this.reqAmtUnit(elem, calcNum);
 					}
 				},
 				reqAmtUnit: function(elem, qty) {
@@ -467,7 +494,7 @@ let mobPopObj = {
 							var index = $(this).closest('li').index();
 							var item = mobPopObj.popItem.rows[index];
 							item['viewCd'] = 'C';
-							item['rtnQty'] = $(this).closest('li').find('.fnRtnQty').html();
+							item['rtnQty'] = $(this).closest('li').find('#ITP_MRTNMNG02010_POP_NUM').val();
 							items.push(item);
 						}
 					});

src/main/webapp/mobile/js/app/mstockmng/ITP_MSTOCKMNG02010.js

@@ -111,31 +111,38 @@ let mobContObj = {
 				$li.find('.fnItemId').text(item.itemId);
 				$li.find('.fnItemNm').text(item.itemNm);
 				$li.find('.fnUnit').text(item.unit);
-				$li.find('.fnCddQty').text(item.cddQty);
 				$li.find('.fnStckQty').text(CommonObj.currency.add(item.stckQty, '개'));
+				$li.find('#ITP_MSTOCKMNG02010_DETAIL_NUM').val('1');
 				item['cddQty'] = 1;
 				item['normalYn'] = (item.itemId && item.itemId !== '') ? 'Y' : 'N';
+				$('.item-row #ITP_MSTOCKMNG02010_DETAIL_NUM')[$li.index()].addEventListener('input', function() { _this.actInput(this); });
 				mobContObj.list.rows.push(item);
 			});
 		},
 		actPlus: function(elem) {
-			var $div = $(elem).siblings('div');
-			var index = $div.parents('li').index();
-			var num = Number($div.text());
-			$($div).text((num + 1).toString());
-			this.rows[index]['cddQty'] = $($div).text();
+			var elQty = $(elem).prev();
+			var num = Number($(elQty).val());
+			if(num < 100000) {
+				var calcNum = num + 1;
+				$(elQty).val(calcNum.toString());
+				this.rows[$(elQty).parents('li').index()]['cddQty'] = calcNum;
+			}
 		},
 		actMinus: function(elem) {
-			var $div = $(elem).siblings('div');
-			var num = Number($div.text());
-			if(num <= 1) {
-				itp_fn_modal_alert('수량을 확인하세요.');
-			} else {
-				var index = $div.parents('li').index();
-				$($div).text((num - 1).toString());
-				this.rows[index]['cddQty'] = $($div).text();
+			var elQty = $(elem).next();
+			var num = Number($(elQty).val());
+			if(num > 1) {
+				var calcNum = num - 1;
+				$(elQty).val(calcNum.toString());
+				this.rows[$(elQty).parents('li').index()]['cddQty'] = calcNum;
 			}
 		},
+		actInput: function(elem) {
+			var index = $(elem).parents('li').index();
+			CommonObj.chkMaxLength(elem, function(qty) {
+				mobContObj.list.rows[index]['cddQty'] = qty;
+			});
+		},
 		validClear: function() {
 			var formId = '#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH';
 			itp_fn_form_clear_validate(null, formId);