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/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');

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');

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

@@ -203,9 +203,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

@@ -348,6 +348,135 @@ const gridColModel = {
     ]
 };
 
+
+var itemClassLevel = {
+    level: 1,
+    levelID: '',
+    data: [],
+    itemMode: '',
+    eventCheck: false,
+    keys: function() {
+        var keys = {sBrandId:fn_make_user_info.get('brandId'), sItemLevel: this.level};
+        for(var i=1; i<=this.level; i++) {
+            var key = 'sItemClass' + i;
+            var id = '#' + this.levelID + i;
+            keys[key] = $(id + ' option:selected').val();
+        }
+        return keys;
+    },
+    addEditData: function(node) {
+        this.initData();
+        this.data.push(node.itemClass1);
+        this.data.push(node.itemClass2);
+        this.data.push(node.itemClass3);
+        this.data.push(node.itemClass4);
+        console.log("edit add data ===> ", this.data);
+    },
+    setComboEvent() {
+        if(this.eventCheck) return;
+        const me=this;
+        $('#ITP_FORM_STINFO04010_DETAIL_ITEM_CLASS1').off('change').on('change', function() {
+            ($(this).val() === '') ? me.clear(2): me.change(2);
+        });
+        $('#ITP_FORM_STINFO04010_DETAIL_ITEM_CLASS2').off('change').on('change', function() {
+            ($(this).val() === '') ? me.clear(3): me.change(3);
+        });
+        $('#ITP_FORM_STINFO04010_DETAIL_ITEM_CLASS3').off('change').on('change', function() {
+            ($(this).val() === '') ? me.clear(4): me.change(4);
+        });
+        this.eventCheck=true;
+    },
+    initData: function() {
+        this.data=[];
+    },
+    switchScreen: function(mode) {
+        this.itemMode=mode;
+        this.levelID = (mode === 'LIST' ? 'ITP_FORM_STINFO04010_SEARCH_ITEM_CLASS' : 'ITP_FORM_STINFO04010_DETAIL_ITEM_CLASS');
+        
+        if(this.data.length && mode!='MODIFY') {
+            this.initData();
+        }
+        if(mode=='MODIFY'|| mode=='ADD' ) {
+            this.setComboEvent();
+            this.setComboData(1);
+        }
+    },
+    setComboData: function(level) {
+        var _this=this, mode=this.itemMode, id=this.levelID + level;
+        if(level==1) this.clear(1);
+        var callbackFn = function(result) {
+            var titleVal='품목분류Level' + level, nextLevel=0;  
+            fn_make_select_item_class(result.searchList, id, true, titleVal);
+            if(mode=='MODIFY') { 
+                let idx=level-1, ok=false;
+                if( idx<_this.data.length ) { 
+                    const val=_this.data[idx++];
+                    $('#'+id).val(val);
+                    if(idx<_this.data.length ) {
+                        ok=true;
+                    }
+                }
+                if(ok) {
+                    _this.setComboData(level+1);
+                } else {
+                    _this.initData();
+                }
+            }
+        };
+        var keys = {sBrandId:fn_make_user_info.get('brandId'), sItemLevel: level};
+        for(var i=1; i<=level; i++) {
+            var idx=i-1;
+            var key = 'sItemClass' + i;
+            keys[key] = this.data[idx];
+        } 
+        fn_ajax_call(API_ITEM_CLASS_LEVEL, $.param(keys), callbackFn, 'GET');
+    },
+    make: function(level, mode) {
+        this.level = level;
+        this.startLevel= level;
+        this.levelID = (mode === 'LIST' ? 'ITP_FORM_STINFO04010_SEARCH_ITEM_CLASS' : 'ITP_FORM_STINFO04010_DETAIL_ITEM_CLASS');
+        if(mode !== 'MODIFY') {
+            this.data.length = 0;
+            this.clear(1);
+        }
+        this.call($.param(this.keys()), mode === 'MODIFY');
+    },
+    change: function(level) {
+        if(this.data.length>0 ) return;
+        this.level = level;
+        this.clear(level);
+        this.call($.param(this.keys()), false);
+    },
+    call: function(param, isModify) {
+        
+        var _this = this;
+        var callbackFn = function(result) {
+            var id = _this.levelID + _this.level;
+            fn_make_select_item_class(result.searchList, id, true, _this.emptyText());
+            if(isModify) {
+                $('#' + id).val(_this.data[ _this.level - 1]);
+                if(_this.level < _this.data.length) {
+                    if(_this.data[_this.level] !== '') {
+                        _this.level++;
+                        _this.call( $.param(_this.keys()), isModify);
+                    }
+                }
+            }
+        };
+        fn_ajax_call(API_ITEM_CLASS_LEVEL, param, callbackFn, 'GET');
+    },
+    emptyText: function() {
+        return '품목분류Level' + this.level;
+    },
+    clear: function(level) {
+         if(this.data.length>0 ) return;
+        for(var i=level; i<5; i++) {
+            $('#' + (this.levelID + i)).find('option:not(:first)').remove();
+        }
+    }
+};
+
+
 /*화면공통 Object*/
 let pageObj = {
     init: function () {
@@ -1043,7 +1172,7 @@ let createObj = {
 							gridInsertData.push(value);
 						});
 						
-						let param = $(formId).serializeObject();
+						let param = $(formId).serializeObject();                        
 						param.list = gridInsertData;
 						
 						var searhFn = function() {
@@ -1057,9 +1186,14 @@ let createObj = {
 				
 			} else {
 				const formId = '#ITP_FORM_STINFO04010_DETAIL';
-	            itp_fn_form_clear_validate(null, formId);
-	
+	            itp_fn_form_clear_validate(null, formId); 
 	            if (itp_fn_form_event.isValid(formId)) {
+                    // 박스수량, 유통기간 체크
+                    var eid='#ITP_FORM_STINFO04010_DETAIL_ONE_BOX_QTY';
+                    $(eid).val($(eid).val().replace(/[^0-9]/g, ''));
+                    eid='#ITP_FORM_STINFO04010_DETAIL_EXPRY_PERIOD';
+                    $(eid).val($(eid).val().replace(/[^0-9]/g, ''));
+
 	                let param = $(formId).serializeObject();
 	                // console.log(JSON.stringify(param));
 	                var searhFn = function() {
@@ -1073,133 +1207,6 @@ let createObj = {
     }
 };
 
-var itemClassLevel = {
-    level: 1,
-    levelID: '',
-    data: [],
-    itemMode: '',
-    eventCheck: false,
-    keys: function() {
-        var keys = {sBrandId:fn_make_user_info.get('brandId'), sItemLevel: this.level};
-        for(var i=1; i<=this.level; i++) {
-            var key = 'sItemClass' + i;
-            var id = '#' + this.levelID + i;
-            keys[key] = $(id + ' option:selected').val();
-        }
-        return keys;
-    },
-    addEditData: function(node) {
-        this.initData();
-        this.data.push(node.itemClass1);
-        this.data.push(node.itemClass2);
-        this.data.push(node.itemClass3);
-        this.data.push(node.itemClass4);
-        console.log("edit add data ===> ", this.data);
-    },
-    setComboEvent() {
-        if(this.eventCheck) return;
-        const me=this;
-        $('#ITP_FORM_STINFO04010_DETAIL_ITEM_CLASS1').off('change').on('change', function() {
-            ($(this).val() === '') ? me.clear(2): me.change(2);
-        });
-        $('#ITP_FORM_STINFO04010_DETAIL_ITEM_CLASS2').off('change').on('change', function() {
-            ($(this).val() === '') ? me.clear(3): me.change(3);
-        });
-        $('#ITP_FORM_STINFO04010_DETAIL_ITEM_CLASS3').off('change').on('change', function() {
-            ($(this).val() === '') ? me.clear(4): me.change(4);
-        });
-        this.eventCheck=true;
-    },
-    initData: function() {
-        this.data=[];
-    },
-    switchScreen: function(mode) {
-        this.itemMode=mode;
-        this.levelID = (mode === 'LIST' ? 'ITP_FORM_STINFO04010_SEARCH_ITEM_CLASS' : 'ITP_FORM_STINFO04010_DETAIL_ITEM_CLASS');
-        
-        if(this.data.length && mode!='MODIFY') {
-            this.initData();
-        }
-        if(mode=='MODIFY'|| mode=='ADD' ) {
-            this.setComboEvent();
-            this.setComboData(1);
-        }
-    },
-    setComboData: function(level) {
-        var _this=this, mode=this.itemMode, id=this.levelID + level;
-        if(level==1) this.clear(1);
-        var callbackFn = function(result) {
-            var titleVal='품목분류Level' + level, nextLevel=0;  
-            fn_make_select_item_class(result.searchList, id, true, titleVal);
-            if(mode=='MODIFY') { 
-                let idx=level-1, ok=false;
-                if( idx<_this.data.length ) { 
-                    const val=_this.data[idx++];
-                    $('#'+id).val(val);
-                    if(idx<_this.data.length ) {
-                        ok=true;
-                    }
-                }
-                if(ok) {
-                    _this.setComboData(level+1);
-                } else {
-                    _this.initData();
-                }
-            }
-        };
-        var keys = {sBrandId:fn_make_user_info.get('brandId'), sItemLevel: level};
-        for(var i=1; i<=level; i++) {
-            var idx=i-1;
-            var key = 'sItemClass' + i;
-            keys[key] = this.data[idx];
-        } 
-        fn_ajax_call(API_ITEM_CLASS_LEVEL, $.param(keys), callbackFn, 'GET');
-    },
-    make: function(level, mode) {
-        this.level = level;
-        this.startLevel= level;
-        this.levelID = (mode === 'LIST' ? 'ITP_FORM_STINFO04010_SEARCH_ITEM_CLASS' : 'ITP_FORM_STINFO04010_DETAIL_ITEM_CLASS');
-        if(mode !== 'MODIFY') {
-            this.data.length = 0;
-            this.clear(1);
-        }
-        this.call($.param(this.keys()), mode === 'MODIFY');
-    },
-    change: function(level) {
-        if(this.data.length>0 ) return;
-        this.level = level;
-        this.clear(level);
-        this.call($.param(this.keys()), false);
-    },
-    call: function(param, isModify) {
-        
-        var _this = this;
-        var callbackFn = function(result) {
-            var id = _this.levelID + _this.level;
-            fn_make_select_item_class(result.searchList, id, true, _this.emptyText());
-            if(isModify) {
-                $('#' + id).val(_this.data[ _this.level - 1]);
-                if(_this.level < _this.data.length) {
-                    if(_this.data[_this.level] !== '') {
-                        _this.level++;
-                        _this.call( $.param(_this.keys()), isModify);
-                    }
-                }
-            }
-        };
-        fn_ajax_call(API_ITEM_CLASS_LEVEL, param, callbackFn, 'GET');
-    },
-    emptyText: function() {
-        return '품목분류Level' + this.level;
-    },
-    clear: function(level) {
-         if(this.data.length>0 ) return;
-        for(var i=level; i<5; i++) {
-            $('#' + (this.levelID + i)).find('option:not(:first)').remove();
-        }
-    }
-};
-
 
 function fileUploadInfo4010() {
 	//파일업로드(등록/수정화면)

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'));