Browse Source

달력오류 수정

isna 2 years ago
parent
commit
747acc2edc

+ 1 - 1
src/main/webapp/js/app/collmng/ITP_COLLMNG02010.js

@@ -596,7 +596,7 @@ let modifyObj = {
596
 		$('#ITP_FORM_COLLMNG02010_DETAIL #ITP_FORM_COLLMNG02010_DETAIL_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
596
 		$('#ITP_FORM_COLLMNG02010_DETAIL #ITP_FORM_COLLMNG02010_DETAIL_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
597
 		$('#ITP_FORM_COLLMNG02010_DETAIL .fnBrandNm').text(result.brandNm);										// 브랜드
597
 		$('#ITP_FORM_COLLMNG02010_DETAIL .fnBrandNm').text(result.brandNm);										// 브랜드
598
 		$('#ITP_FORM_COLLMNG02010_DETAIL #ITP_FORM_COLLMNG02010_DETAIL_BRAND_ID').val(result.brandId);			// 
598
 		$('#ITP_FORM_COLLMNG02010_DETAIL #ITP_FORM_COLLMNG02010_DETAIL_BRAND_ID').val(result.brandId);			// 
599
-		$('#ITP_FORM_COLLMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_COL_SCH_DT').val(result.colReqDt);			// 
599
+		$('#ITP_FORM_COLLMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_COL_SCH_DT').datepicker('setDate',result.colReqDt);			// 
600
 		$('#ITP_FORM_COLLMNG02010_DETAIL #ITP_FORM_COLLMNG02010_DETAIL_RTN_WHS_ID').val(result.rtnWhsId);			//
600
 		$('#ITP_FORM_COLLMNG02010_DETAIL #ITP_FORM_COLLMNG02010_DETAIL_RTN_WHS_ID').val(result.rtnWhsId);			//
601
 		$('#ITP_FORM_COLLMNG02010_DETAIL #ITP_FORM_COLLMNG02010_DETAIL_RTN_lOCATION').val(result.rtnLocation);			//
601
 		$('#ITP_FORM_COLLMNG02010_DETAIL #ITP_FORM_COLLMNG02010_DETAIL_RTN_lOCATION').val(result.rtnLocation);			//
602
 		$('#ITP_FORM_COLLMNG02010_DETAIL .fnColAmt').text(result.rtnDodrTotalAmt);			//
602
 		$('#ITP_FORM_COLLMNG02010_DETAIL .fnColAmt').text(result.rtnDodrTotalAmt);			//

+ 3 - 8
src/main/webapp/js/app/ordmng/ITP_ORDMNG02010.js

@@ -139,13 +139,8 @@ let pageObj = {
139
 					fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
139
 					fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
140
 				}
140
 				}
141
 			});
141
 			});
142
-			// 조회일자 지정	
143
-			var now = new Date();
144
-			var fromDate = new Date(now);
145
-			fromDate.setDate(now.getDate() - 7);
146
-			var toDate = new Date(now);
147
-			toDate.setDate(now.getDate() + 7);
148
-			$('#ITP_FORM_ORDMNG02010_SEARCH_FROM_DT').val(itp_fn_get_before_month() );
142
+			// 조회일자 지정	 
143
+			$('#ITP_FORM_ORDMNG02010_SEARCH_FROM_DT').val(itp_fn_date_add('D',-7) );
149
 			$('#ITP_FORM_ORDMNG02010_SEARCH_TO_DT').val(itp_fn_get_today_ko() );
144
 			$('#ITP_FORM_ORDMNG02010_SEARCH_TO_DT').val(itp_fn_get_today_ko() );
150
 			$('#ITP_TAB_ORDMNG02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
145
 			$('#ITP_TAB_ORDMNG02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
151
 			$('#ITP_FORM_ORDMNG02010_SEARCH_FROM_DT').datepicker();
146
 			$('#ITP_FORM_ORDMNG02010_SEARCH_FROM_DT').datepicker();
@@ -472,7 +467,7 @@ let modifyObj = {
472
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDlvRegDt').text(result.dlvReqDt);									// 납품서생성일자
467
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDlvRegDt').text(result.dlvReqDt);									// 납품서생성일자
473
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnWhsNm').text(result.whsNm);											// 발주총금액
468
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnWhsNm').text(result.whsNm);											// 발주총금액
474
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDeliTelNo').text(result.deliTelNo);									// 납품장소연락처
469
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDeliTelNo').text(result.deliTelNo);									// 납품장소연락처
475
-		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT').val(result.dlvReqDt);			// 납품예정일
470
+		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT').datepicker('setDate',result.dlvReqDt);			// 납품예정일
476
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDlvRegDt').text(result.dlvReqDt);									// 납품요청일
471
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDlvRegDt').text(result.dlvReqDt);									// 납품요청일
477
 
472
 
478
 		shmtQtyValue = function(value, colname) {
473
 		shmtQtyValue = function(value, colname) {

+ 5 - 8
src/main/webapp/js/app/ordmng/ITP_ORDMNG03010.js

@@ -169,15 +169,12 @@ let pageObj = {
169
 			// 버튼 권한설정
169
 			// 버튼 권한설정
170
 			fn_proc_btn_auth('ORDMNG03010');
170
 			fn_proc_btn_auth('ORDMNG03010');
171
 			// 조회일자 지정	
171
 			// 조회일자 지정	
172
-			var now = new Date();
173
-			var fromDate = new Date(now);
174
-			fromDate.setDate(now.getDate() - 7);
175
-			var toDate = new Date(now);
176
-			$('#ITP_FORM_ORDMNG03010_SEARCH_FROM_DT').val(itp_fn_get_before_month() );
177
-			$('#ITP_FORM_ORDMNG03010_SEARCH_TO_DT').val(itp_fn_get_today_ko() );
172
+ 
173
+			$('#ITP_FORM_ORDMNG03010_SEARCH_DLV_REQ_DT').val(itp_fn_date_add('D',-7) );
174
+			$('#ITP_FORM_ORDMNG03010_SEARCH_DLV_CMPLT_DT').val(itp_fn_get_today_ko() );
178
 			$('#ITP_TAB_ORDMNG03010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
175
 			$('#ITP_TAB_ORDMNG03010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
179
-			$('#ITP_FORM_ORDMNG03010_SEARCH_FROM_DT').datepicker();
180
-			$('#ITP_FORM_ORDMNG03010_SEARCH_TO_DT').datepicker();
176
+			$('#ITP_FORM_ORDMNG03010_SEARCH_DLV_REQ_DT').datepicker();
177
+			$('#ITP_FORM_ORDMNG03010_SEARCH_DLV_CMPLT_DT').datepicker();
181
 		}
178
 		}
182
 	},
179
 	},
183
 	event: {
180
 	event: {

+ 3 - 2
src/main/webapp/js/app/stinfo/ITP_STINFO02011.js

@@ -279,11 +279,12 @@ let modifyObj = {
279
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_MBL_NO').val(result.telNo);
279
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_MBL_NO').val(result.telNo);
280
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_EMAL_ADDR').val(result.emalAddr);
280
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_EMAL_ADDR').val(result.emalAddr);
281
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_AREA_CD').val(result.areaCd);
281
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_AREA_CD').val(result.areaCd);
282
-		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_FROM_DT').val(result.openDt);
283
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_ZIPNO').val(result.zipNo);
282
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_ZIPNO').val(result.zipNo);
284
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_ADRES').val(result.addr1);
283
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_ADRES').val(result.addr1);
285
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_ADRES_DTL').val(result.addr2);
284
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_ADRES_DTL').val(result.addr2);
286
-
285
+		console.log('xxxxx xxxxx', result)
286
+		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_FROM_DT').val(result.openDt);
287
+		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_FROM_DT').datepicker('setDate', result.openDt);
287
 		var cmpyAdres = result.addr1/* + ' ' + result.addr*/;
288
 		var cmpyAdres = result.addr1/* + ' ' + result.addr*/;
288
 		kakaoMap.init('ITP_FORM_STINFO02011_DETAIL', cmpyAdres);
289
 		kakaoMap.init('ITP_FORM_STINFO02011_DETAIL', cmpyAdres);
289
 
290
 

+ 5 - 2
src/main/webapp/js/app/vsettmng/ITP_VSETTMNG01010.js

@@ -336,6 +336,8 @@ let pageObj = {
336
 			$('#ITP_TAB_VSETTMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
336
 			$('#ITP_TAB_VSETTMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
337
 			$('#ITP_FORM_VSETTMNG01010_SEARCH_FROM_DT').datepicker();
337
 			$('#ITP_FORM_VSETTMNG01010_SEARCH_FROM_DT').datepicker();
338
 			$('#ITP_FORM_VSETTMNG01010_SEARCH_TO_DT').datepicker();
338
 			$('#ITP_FORM_VSETTMNG01010_SEARCH_TO_DT').datepicker();
339
+
340
+			$('#ITP_FORM_VSETTMNG01010_DETAIL_STTL_REQ_DT').datepicker({language: 'ko-GB'});
339
 			
341
 			
340
 			// 권한에 따라 매장값 설정
342
 			// 권한에 따라 매장값 설정
341
 			$('#ITP_FORM_VSETTMNG01010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
343
 			$('#ITP_FORM_VSETTMNG01010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
@@ -651,13 +653,14 @@ let modifyObj = {
651
 		
653
 		
652
 		$('#ITP_FORM_VSETTMNG01010_DETAIL .fnBrandNm').text(result.brandNm);
654
 		$('#ITP_FORM_VSETTMNG01010_DETAIL .fnBrandNm').text(result.brandNm);
653
 		$('#ITP_FORM_VSETTMNG01010_DETAIL .fnSpplyNm').text(result.spplyNm);
655
 		$('#ITP_FORM_VSETTMNG01010_DETAIL .fnSpplyNm').text(result.spplyNm);
654
-		$('#ITP_FORM_VSETTMNG01010_DETAIL_STTL_REQ_DT').val(result.sttlReqDt);
656
+		$('#ITP_FORM_VSETTMNG01010_DETAIL_STTL_REQ_DT').datepicker('setDate',result.sttlReqDt);
655
 		$('#ITP_FORM_VSETTMNG01010_DETAIL .fnSttlStNm').text(result.sttlStNm);
657
 		$('#ITP_FORM_VSETTMNG01010_DETAIL .fnSttlStNm').text(result.sttlStNm);
656
 		$('#ITP_FORM_VSETTMNG01010_DETAIL .fnSttlReqAmt').text(itp_fn_number_comma(result.sttlReqAmt));
658
 		$('#ITP_FORM_VSETTMNG01010_DETAIL .fnSttlReqAmt').text(itp_fn_number_comma(result.sttlReqAmt));
657
 		$('#ITP_FORM_VSETTMNG01010_DETAIL .fnAcctBal').text(itp_fn_number_comma(result.acctBal));
659
 		$('#ITP_FORM_VSETTMNG01010_DETAIL .fnAcctBal').text(itp_fn_number_comma(result.acctBal));
658
 		$('#ITP_FORM_VSETTMNG01010_DETAIL .fnSysRegDttm').text(result.sysRegDttm);
660
 		$('#ITP_FORM_VSETTMNG01010_DETAIL .fnSysRegDttm').text(result.sysRegDttm);
659
 		$('#ITP_FORM_VSETTMNG01010_DETAIL .fnSysRegNm').text(result.sysRegNm);
661
 		$('#ITP_FORM_VSETTMNG01010_DETAIL .fnSysRegNm').text(result.sysRegNm);
660
-
662
+ 
663
+		
661
 		// 리스트 조회
664
 		// 리스트 조회
662
 		modifyObj.grid.init();
665
 		modifyObj.grid.init();
663
 	},
666
 	},