dwkim пре 2 година
родитељ
комит
e9b33e19e6

+ 2 - 2
src/main/webapp/app/oper/OPER02010.html

@@ -40,8 +40,8 @@
40 40
 										<div class="col-xs-3 itp_ip">
41 41
 											<div class="input-daterange input-group date">
42 42
 												<input type="text" id="ITP_FORM_OPER02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
43
-												<span class="input-group-addon itp_date_to">~</span>
44
-												<input type="text" id="ITP_FORM_OPER02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
43
+												<!-- <span class="input-group-addon itp_date_to">~</span>
44
+												<input type="text" id="ITP_FORM_OPER02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly> -->
45 45
 											</div>
46 46
 										</div>
47 47
 										<div class="col-xs-5 itp_ip">

+ 2 - 2
src/main/webapp/js/app/oper/ITP_OPER02010.js

@@ -167,8 +167,8 @@ let pageObj = {
167 167
 			// 조회일자 지정
168 168
 			var now = new Date();
169 169
 			$('#ITP_TAB_OPER02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
170
-			$('#ITP_FORM_OPER02010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
171
-			$('#ITP_FORM_OPER02010_SEARCH_TO_DT').datepicker('setDate', new Date());
170
+			$('#ITP_FORM_OPER02010_SEARCH_FROM_DT').datepicker('setDate', new Date(now));
171
+			//$('#ITP_FORM_OPER02010_SEARCH_TO_DT').datepicker('setDate', new Date());
172 172
 		},
173 173
 		afflInfo: {
174 174
 			init: function() {

+ 7 - 10
src/main/webapp/js/app/pomng/ITP_POMNG01010.js

@@ -178,20 +178,17 @@ let pageObj = {
178 178
 			});
179 179
 
180 180
 			// 조회일자 지정
181
+			//var now = new Date(date.getDate() + 5);
181 182
 			var now = new Date();
182
-			$('#ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT').datepicker('dlvReqDt', new Date(now.setDate(now.getDate() + 5)));
183
+			$('#ITP_TAB_POMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
184
+			$('#ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT').datepicker('setDate', new Date(now.setDate(now.getDate() + 5)));
185
+			
186
+			
183 187
 			
184 188
 			//납품장소 필드 readonly
185 189
 			$('#ITP_FORM_POMNG01010_DETAIL_WHS_NM').attr('readonly', true);
186 190
 			$('#ITP_FORM_POMNG01010_DETAIL_LOCATION_NM').attr('readonly', true);
187
-			// form alert message 주입
188
-			/*
189
-			$('input[data-alert-required="ONLYCHK"]').each(function() {
190
-				if($(this).data('alert-msg') === 'address') {
191
-					$(this).data('alert-msg', ITP_MSG_LOCALE.message.form.emptyAddr);
192
-				}
193
-			});
194
-			*/
191
+			
195 192
 		},
196 193
 		grid: function() {
197 194
 			itp_fn_jqgrid_resize(POMNG01010_DETAIL_GRID_ID, POMNG01010_DETAIL_GRID_LIST, 'lg');
@@ -261,7 +258,7 @@ let pageObj = {
261 258
 			delRow: function() {
262 259
 				itp_fn_grid_del_row(POMNG01010_DETAIL_GRID_ID);
263 260
 				// 그리드 포문으로 금액 재계산후 구매요청금액에 넣어줌
264
-				this.load.recal();  //==>dwkim 왜 호출이 안될까요
261
+				pageObj.grid.recal();  //==>dwkim 왜 호출이 안될까요
265 262
 			}
266 263
 		},
267 264
 		load: function(gridData) {  // ==>dwkim  오픈시 데이타 가져오는 부분 넣으면 되는건지 여부 gird가 아님

+ 6 - 18
src/main/webapp/js/app/popup/biz/ITP_BIZPOP_WHS_LOCATION.js

@@ -37,27 +37,16 @@ function itp_fn_BIZPOP_WHS_LOCATION(parentPopFn, args, returnType) {
37 37
 	});
38 38
 	
39 39
 	$('#ITP_BIZPOP_WHS_LOCATION_BTN_SELECT').on('click', function() {		
40
-		
41 40
 		const rowKey = $(THIS_GIRD_ID).getGridParam('selrow');
42
-	    if (!rowKey) {
43
-	    	return;
41
+		if (!rowKey) {
42
+			return;
44 43
 	    }
45
-
46
-		var list = [];
47
-	    var selectedIds = $(THIS_GIRD_ID).getGridParam('selarrrow');
48
-		
49
-		/*
50
-		if(selectedIds.length != 1) { // 1개만 선택
51
-			 itp_fn_modal_alert('하나의 창고만 선택해주세요!');
52
-			 return;
53
-		}
54
-		*/
44
+		const selRow = $(THIS_GIRD_ID).getRowData(rowKey);
45
+		console.log(selRow);
55 46
 		
56
-	    for (var i=selectedIds.length-1; i>=0; i--) {
57
-			list.push($(THIS_GIRD_ID).jqGrid('getRowData', selectedIds[i]));	
58
-		}
59
-		parentPopFn(list);
47
+		parentPopFn(selRow);
60 48
 		$('#ITP_BIZPOP_WHS_LOCATION').modal('hide'); // 팝업닫기
49
+		
61 50
 	});
62 51
 
63 52
 	$('#ITP_BIZPOP_WHS_LOCATION_jqGridEmpty').on('click', function() {
@@ -140,7 +129,6 @@ function itp_fn_BIZPOP_WHS_LOCATION(parentPopFn, args, returnType) {
140 129
 		url: DOMAIN + API_POP_GRID_LIST,
141 130
 		pager: THIS_GIRD_PAGER,
142 131
 		multiselect: false,
143
-		rownumbers: false,
144 132
 		loadComplete: function(data) {
145 133
 			console.log(data);
146 134
 			itp_fn_grid_load_complete(data, THIS_GIRD_ID, true, undefined, 'BIZPOP_WHS_LOCATION', itp_BIZPOP_WHS_LOCATION_search, itp_fn_BIZPOP_WHS_LOCATION_empty, true, data.gridRecords, false);