Browse Source

20221110 오류사항 수정

juney 2 years ago
parent
commit
cbe87488ef

+ 9 - 1
src/main/webapp/app/oper/OPER02010.html

@@ -223,11 +223,19 @@
223 223
 												</div>
224 224
 											</div>
225 225
 										</div>
226
-										<div class="form-group border">
226
+										<div class="form-group">
227 227
 											<label class="col-xs-2 itp_lb">공지대상</label>
228 228
 											<div class="col-xs-10 itp_ip fnTargetNm"></div>
229 229
 										</div>
230 230
 									</div>
231
+									<div class="itp_form_in">
232
+										<div class="form-group border">
233
+											<label class="col-xs-2 itp_lb">등록자 아이디</label>
234
+											<div class="col-xs-4 itp_ip fnAddId"></div>
235
+											<label class="col-xs-2 itp_lb">등록자명</label>
236
+											<div class="col-xs-4 itp_ip fnAddNm"></div>
237
+										</div>
238
+									</div>
231 239
 								</section>
232 240
 							</form>
233 241
 						</div>

+ 4 - 2
src/main/webapp/app/oper/OPER03010.html

@@ -84,12 +84,14 @@
84 84
 											</div>
85 85
 											<label class="col-xs-2 itp_lb">가맹점 KEY *<br>사용자 계정 추가-3자리</label>
86 86
 											<div class="col-xs-4 itp_ip">
87
-												<div class="col-xs-4 itp_in">
87
+												<div class="col-xs-12 itp_in">
88 88
 													<div class="input-group">
89 89
 														<input type="text" id="ITP_FORM_OPER03010_DETAIL_AFFL_SHOP_KEY" data-check-required="empty" class="form-control itp_input" name="afflAbbr" value="" maxlength="3" readonly>
90 90
 														<span class="input-group-btn">
91 91
 															<button id="ITP_BTN_OPER03010_DETAIL_AFFL_SHOP_KEY" class="btn btn-default btn-sm itp_btn SHOW" type="button" disabled><i class="glyphicon glyphicon-ok"></i></button>
92 92
 														</span>
93
+														<label class="col-xs-8 itp_in">(가맹점코드 중복체크를 해주세요)</label>
94
+
93 95
 													</div>
94 96
 												</div>
95 97
 											</div>
@@ -124,7 +126,7 @@
124 126
 											<label class="col-xs-2 itp_lb">법인번호</label>
125 127
 											<div class="col-xs-4 itp_ip">
126 128
 												<div class="col-xs-6 itp_in">
127
-													<input type="text" id="ITP_FORM_OPER03010_DETAIL_CORP_REG_NO" data-key-up="corpNo" class="form-control itp_input" name="corpRegNo" value="" maxlength="13">
129
+													<input type="text" id="ITP_FORM_OPER03010_DETAIL_CORP_REG_NO" data-key-up="corpNo" class="form-control itp_input" name="corpRegNo" value="" maxlength="14">
128 130
 												</div>
129 131
 												<div class="col-xs-3 itp_in">
130 132
 

+ 1 - 1
src/main/webapp/app/oper/OPER04010.html

@@ -136,7 +136,7 @@
136 136
 												<label class="col-xs-2 itp_lb">비밀번호(*)</label>
137 137
 												<div class="col-xs-4 itp_ip">
138 138
 													<div class="col-xs-7 itp_in">
139
-														<input type="password" id="ITP_FORM_OPER04010_DETAIL_PW" data-check-required="empty" class="form-control itp_input" name="pswd" value="">
139
+														<input type="password" id="ITP_FORM_OPER04010_DETAIL_USER_PW" data-check-required="empty" class="form-control itp_input" name="pswd" value="">
140 140
 													</div>
141 141
 												</div>
142 142
 												<label class="col-xs-2 itp_lb">이메일(*)</label>

+ 4 - 4
src/main/webapp/app/oper/OPER06010.html

@@ -102,13 +102,13 @@
102 102
 											<label class="col-xs-2 itp_lb">사업자번호 *</label>
103 103
 											<div class="col-xs-4 itp_ip">
104 104
 												<div class="col-xs-7 itp_in">
105
-													<input type="text" id="ITP_FORM_OPER06010_DETAIL_BSNS_REG_NO" data-check-required="empty" class="form-control itp_input" name="bsnsRegNo" value="" maxlength="20">
105
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_BSNS_REG_NO" data-check-required="empty" data-key-up="regNo" class="form-control itp_input" name="bsnsRegNo" value="" maxlength="20">
106 106
 												</div>
107 107
 											</div>
108 108
 											<label class="col-xs-2 itp_lb">법인번호</label>
109 109
 											<div class="col-xs-4 itp_ip">
110 110
 												<div class="col-xs-8 itp_in">
111
-													<input type="text" id="ITP_FORM_OPER06010_DETAIL_CORP_REG_NO" class="form-control itp_input" name="corpRegNo" value="" maxlength="20">
111
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_CORP_REG_NO" data-key-up="corpNo" class="form-control itp_input" name="corpRegNo" value="" maxlength="20">
112 112
 												</div>
113 113
 											</div>
114 114
 										</div>
@@ -146,7 +146,7 @@
146 146
 											<label class="col-xs-2 itp_lb">전화번호 *</label>
147 147
 											<div class="col-xs-4 itp_ip">
148 148
 												<div class="col-xs-7 itp_in">
149
-													<input type="text" id="ITP_FORM_OPER06010_DETAIL_TEL_NO" data-check-required="empty" class="form-control itp_input" name="telNo" value="">
149
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_TEL_NO" data-check-required="empty" data-key-up="tel" class="form-control itp_input" name="telNo" value="">
150 150
 												</div>
151 151
 												<!-- <button type="button" id="ITP_BTN_OPER06010_RESET_PW" class="btn btn-danger btn-xs PWC" style="margin: 3px 0px 0px 3px;">비밀번호 초기화</button> -->
152 152
 											</div>
@@ -158,7 +158,7 @@
158 158
 											<label class="col-xs-2 itp_lb">FAX</label>
159 159
 											<div class="col-xs-4 itp_ip">
160 160
 												<div class="col-xs-7 itp_in">
161
-													<input type="text" id="ITP_FORM_OPER06010_DETAIL_FAX_NO" class="form-control itp_input" name="faxNo" value="">
161
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_FAX_NO" data-key-up="tel" class="form-control itp_input" name="faxNo" value="">
162 162
 												</div>
163 163
 											</div>
164 164
 											<label class="col-xs-2 itp_lb" style="border-top:none;">로고</label>

+ 1 - 1
src/main/webapp/app/stinfo/STINFO02010.html

@@ -203,7 +203,7 @@
203 203
 											<div class="col-xs-5 itp_ip">
204 204
 												<div class="col-xs-7 itp_in">
205 205
 													<div class="input-daterange input-group date itp_in">
206
-														<input type="text" id="ITP_FORM_STINFO02010_DETAIL_FROM_DT" class="form-control itp_input" name="openDt" value="2022.08.10">
206
+														<input type="text" id="ITP_FORM_STINFO02010_DETAIL_FROM_DT" class="form-control itp_input" name="openDt" value="">
207 207
 													</div>
208 208
 												</div>
209 209
 											</div>

+ 13 - 6
src/main/webapp/js/app/config.js

@@ -2886,11 +2886,21 @@ function itp_fn_date_format(date, type) {
2886 2886
 		return date.getFullYear() + '.' + month + '.' + day;	
2887 2887
 	} else if(type && type == 3) {
2888 2888
 		return date.getFullYear() + '' + month + '' + day;
2889
+	} else if(type && type == 4) {
2890
+		return date.getFullYear() + '-' + month + '-' + day;
2889 2891
 	} else {
2890 2892
 		return date.getFullYear() + month + day + hour + minute + second;
2891 2893
 	}
2892 2894
 }
2893 2895
 
2896
+function itp_fn_date_add(type, iAdd) {
2897
+	var date = new Date();
2898
+	if(type === 'Y') date.setFullYear(date.getFullYear() + iAdd);
2899
+	else if(type === 'M') date.setMonth(iAdd);
2900
+	else if(type === 'D') date.setDate(iAdd);
2901
+	return itp_fn_date_format(date, 2);
2902
+}
2903
+
2894 2904
 // 쿠키 가져오기
2895 2905
 var itp_fn_get_cookie = function (cname) {
2896 2906
     var name = cname + "=";
@@ -2996,18 +3006,15 @@ let itp_fn_form_event = {
2996 3006
 			}
2997 3007
 			if ($.inArray('regNo', arry) > -1) {
2998 3008
 				value = $(this).val().replace(/[^0-9]/g, "")
2999
-					.replace(/(^[0-9]{3}|^0[0-9]{2})([0-9]+)?([0-9]{5})$/,"$1-$2-$3")
3009
+					.replace(/(^[0-9]{3}|^0[0-9]{2})([0-9]+)?([0-9]{5})$/,"$1-$2-$3");
3000 3010
 			}
3001 3011
 			if ($.inArray('corpNo', arry) > -1) {
3002
-				if($(this).val().length > 13) return;
3003 3012
 				value = $(this).val().replace(/[^0-9]/g, "")
3004
-					.replace(/(^[0-9]{6})([0-9]+)?([0-9]{7})$/,"######-#######")
3005
-					// .replace(/(\d{6})(\d{7})/, '######-#######')
3013
+					.replace(/(^[0-9]{6})?([0-9]{7})$/,"$1-$2");
3006 3014
 			}
3007 3015
 			if ($.inArray('tel', arry) > -1) {
3008 3016
 				value = ($(this).val().startsWith('0')) ? $(this).val().replace(/[^0-9]/g, "")
3009
-					.replace(/(^02|^0505|^1[0-9]{3}|^0[0-9]{2})([0-9]+)?([0-9]{4})$/,"$1-$2-$3")
3010
-					.replace("--", "-") : '';
3017
+					.replace(/(^02|^0505|^1[0-9]{3}|^0[0-9]{2})([0-9]+)?([0-9]{4})$/,"$1-$2-$3") : '';
3011 3018
 			}
3012 3019
 			$(this).val(value);
3013 3020
 		});

+ 31 - 25
src/main/webapp/js/app/kakao.map.js

@@ -1,7 +1,7 @@
1 1
 let kakaoMap = {
2
-    init: function(id, locate) {
2
+    init: function(id, locate, latX, longY) {
3 3
         this.formId = id;
4
-        this.load(locate);
4
+        this.load(locate, latX, longY);
5 5
     },
6 6
     geocoder: null,
7 7
     schDetailAddrFromCoords: function(coords, callback) {
@@ -39,36 +39,42 @@ let kakaoMap = {
39 39
             map: map // 마커를 표시할 지도 객체
40 40
         });
41 41
     },
42
-    load: function(locate) {
42
+    load: function(locate, latX, longY) {
43 43
         var _this = this;
44 44
         kakao.maps.load(function() {
45 45
             var map = _this.getMap(_this.formId + '_MAP');
46 46
             // 주소-좌표 변환 객체를 생성합니다
47 47
             _this.geocoder = new kakao.maps.services.Geocoder();
48
-            if( !locate || locate.length == 0 ) {
49
-                // 지도에 마커를 생성하고 표시한다
50
-                _this.marker(map, new kakao.maps.LatLng(37.56684, 126.97865));
51
-            } else {
52
-                // 주소로 좌표를 검색합니다
53
-                _this.geocoder.addressSearch(locate, function(result, status) {
54
-                    // 정상적으로 검색이 완료됐으면
55
-                    if (status === kakao.maps.services.Status.OK) {
48
+            var mapMoveFn = function(result) {
49
+                var coords = new kakao.maps.LatLng(result.y, result.x);
50
+                if(_this.formId.lastIndexOf('DETAIL') > -1) {
51
+                    document.getElementById(_this.formId + '_LAT').value = result.y;
52
+                    document.getElementById(_this.formId + '_LNG').value = result.x;
53
+                }
56 54
 
57
-                        var coords = new kakao.maps.LatLng(result[0].y, result[0].x);
58
-                        if(_this.formId.lastIndexOf('DETAIL') > -1) {
59
-                            document.getElementById(_this.formId + '_LAT').value = result[0].y;
60
-                            document.getElementById(_this.formId + '_LNG').value = result[0].x;
61
-                        }
55
+                // 결과값으로 받은 위치를 마커로 표시합니다
56
+                _this.marker(map, coords);
62 57
 
63
-                        // 결과값으로 받은 위치를 마커로 표시합니다
64
-                        _this.marker(map, coords);
65
-
66
-                        // 지도의 중심을 결과값으로 받은 위치로 이동시킵니다
67
-                        map.setCenter(coords);
68
-                    } else {
69
-                        _this.marker(map, new kakao.maps.LatLng(37.56684, 126.97865));
70
-                    }
71
-                });
58
+                // 지도의 중심을 결과값으로 받은 위치로 이동시킵니다
59
+                map.setCenter(coords);
60
+            };
61
+            if((latX && longY) && (latX !== '' && longY !== '')) {
62
+                mapMoveFn({'x':longY, 'y':latX});
63
+            } else {
64
+                if(!locate || locate.length == 0 ) {
65
+                    // 지도에 마커를 생성하고 표시한다
66
+                    _this.marker(map, new kakao.maps.LatLng(37.56684, 126.97865));
67
+                } else {
68
+                    // 주소로 좌표를 검색합니다
69
+                    _this.geocoder.addressSearch(locate, function(result, status) {
70
+                        // 정상적으로 검색이 완료됐으면
71
+                        if (status === kakao.maps.services.Status.OK) {
72
+                            mapMoveFn(result[0]);
73
+                        } else {
74
+                            _this.marker(map, new kakao.maps.LatLng(37.56684, 126.97865));
75
+                        }
76
+                    });
77
+                }
72 78
             }
73 79
 
74 80
             if(_this.formId.lastIndexOf('DETAIL') > -1) {

+ 4 - 4
src/main/webapp/js/app/oper/ITP_OPER01010.js

@@ -82,7 +82,7 @@ const gridColModel = {
82 82
 		},
83 83
 		{
84 84
 			index: 'TEL_NO', name: 'telNo',
85
-			label: ITP_MSG_LOCALE.label.telNo, //휴대폰 번호
85
+			label: ITP_MSG_LOCALE.label.telephone, //휴대폰 번호
86 86
 			width: '10', fixed: false, align: 'center',
87 87
 			sortable: false, hidden: false
88 88
 		},
@@ -548,8 +548,8 @@ let createObj = {
548 548
 	button: {
549 549
 		duplicate: function() {
550 550
 			const formId = '#ITP_FORM_OPER01010_DETAIL';
551
-			itp_fn_form_clear_validate(null, formId + '_DETAIL');
552
-			var vali_userId = itp_fn_form_validate(formId + '_DETAIL', formId + '_USER_ID', ['empty'], undefined);
551
+			itp_fn_form_clear_validate(null, formId);
552
+			var vali_userId = itp_fn_form_validate(formId, formId + '_USER_ID', ['empty'], undefined);
553 553
 			if (vali_userId) {
554 554
 				var dupFn = function(result) {
555 555
 					if (result.code == 'N') {
@@ -734,7 +734,7 @@ let afflShopObj = {
734 734
 				$('#ITP_FORM_OPER01010_DETAIL_SEARCH_AFFL_SHOP_NM').val(rowDataPop.AFFL_SHOP.afflShopNm);
735 735
 			}
736 736
 			if(rowDataPop.AFFL_BRAND) {
737
-				fn_make_select_brand(rowDataPop.AFFL_BRAND, 'ITP_FORM_OPER01010_DETAIL_BRAND_NM', true, '선택');
737
+				fn_make_select_brand(rowDataPop.AFFL_BRAND, 'ITP_FORM_OPER01010_DETAIL_BRAND_ID', true, '선택');
738 738
 			}
739 739
 		}
740 740
 	}

+ 49 - 36
src/main/webapp/js/app/oper/ITP_OPER02010.js

@@ -60,7 +60,7 @@ const gridColModel = {
60 60
 		{
61 61
 			index: 'TARGET_NM', name: 'targetNm',
62 62
 			label: ITP_MSG_LOCALE.label.targetNm, //공지대상
63
-			width: '10', fixed: false, align: 'center',
63
+			width: '8', fixed: false, align: 'center',
64 64
 			sortable: false, hidden: false
65 65
 		},
66 66
 		{
@@ -72,7 +72,7 @@ const gridColModel = {
72 72
 		{
73 73
 			index: 'NOTI_ST_DAY', name: 'notiStDay',
74 74
 			label: ITP_MSG_LOCALE.label.viewDt, //노출일
75
-			width: '10', fixed: false, align: 'center',
75
+			width: '12', fixed: false, align: 'center',
76 76
 			sortable: false, hidden: false
77 77
 		},
78 78
 		{
@@ -150,10 +150,11 @@ let pageObj = {
150 150
 	pageMode: '',
151 151
 	ui: {
152 152
 		init: function () {
153
-			this.button();
153
+			this.view();
154
+			this.view();
154 155
 			this.ready();
155 156
 		},
156
-		button: function () {
157
+		view: function () {
157 158
 			// 버튼 권한설정
158 159
 			fn_proc_btn_auth('OPER02010');
159 160
 
@@ -173,7 +174,7 @@ let pageObj = {
173 174
 		afflInfo: {
174 175
 			init: function() {
175 176
 				this.authTpCd 		= fn_make_user_info.get('authTpCd');
176
-				if(this.authTpCd === '30' || this.authTpCd === '40') {
177
+				if(this.authTpCd === '30' || this.authTpCd === '40' || this.authTpCd === '50') {
177 178
 					this.afflShopId 	= fn_make_user_info.get('afflShopId');
178 179
 					this.afflShopNm 	= fn_make_user_info.get('afflShopNm');
179 180
 					this.brandId 		= fn_make_user_info.get('brandId');
@@ -183,8 +184,10 @@ let pageObj = {
183 184
 			},
184 185
 			setAffl: function() {
185 186
 				var _this = this;
186
-				var afflShopId = '#ITP_FORM_OPER02010_' + (pageObj.pageMode === 'ADD' ? 'DETAIL' : 'SEARCH') + '_AFFL_SHOP_ID';
187
-				var afflShopNm = '#ITP_FORM_OPER02010_' + (pageObj.pageMode === 'ADD' ? 'DETAIL' : 'SEARCH') + '_AFFL_SHOP_NM';
187
+				var afflShopId = '#ITP_FORM_OPER02010_' + (pageObj.pageMode === 'LIST' ? 'SEARCH' : 'DETAIL') + '_AFFL_SHOP_ID';
188
+				var afflShopNm = '#ITP_FORM_OPER02010_' + (pageObj.pageMode === 'LIST' ? 'SEARCH' : 'DETAIL') + '_AFFL_SHOP_NM';
189
+				// var afflShopId = '#ITP_FORM_OPER02010_' + (pageObj.pageMode === 'ADD' ? 'DETAIL' : 'SEARCH') + '_AFFL_SHOP_ID';
190
+				// var afflShopNm = '#ITP_FORM_OPER02010_' + (pageObj.pageMode === 'ADD' ? 'DETAIL' : 'SEARCH') + '_AFFL_SHOP_NM';
188 191
 				$(afflShopId).val(_this.afflShopId);
189 192
 				$(afflShopNm).val(_this.afflShopNm);
190 193
 				$(afflShopNm).attr('readonly', true);
@@ -207,9 +210,8 @@ let pageObj = {
207 210
 			},
208 211
 			setBrand: function(AFFL_BRAND) {
209 212
 				var _this = this;
210
-				console.log(AFFL_BRAND);
211 213
 				if(AFFL_BRAND.length > 0) {
212
-					var brandId = 'ITP_FORM_OPER02010_' + (pageObj.pageMode === 'ADD' ? 'DETAIL' : 'SEARCH') + '_BRAND_ID';
214
+					var brandId = 'ITP_FORM_OPER02010_' + (pageObj.pageMode === 'LIST' ? 'SEARCH' : 'DETAIL') + '_BRAND_ID';
213 215
 					console.log(brandId);
214 216
 					(_this.authTpCd === '30') ?  fn_make_select_brand(AFFL_BRAND, brandId, true, '선택') : fn_make_select_brand(AFFL_BRAND, brandId, false);
215 217
 				} else {
@@ -244,6 +246,9 @@ let pageObj = {
244 246
 				});
245 247
 			});
246 248
 
249
+		},
250
+		notiTarget: function(isDisabled) {
251
+			$('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_TARGET_CD').attr('disabled', isDisabled);
247 252
 		}
248 253
 	},
249 254
 	fileUpload: function() {
@@ -294,13 +299,16 @@ let pageObj = {
294 299
 			$('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_FILE_NO').val('');
295 300
 
296 301
 			pageObj.ui.afflInfo.init();
302
+			pageObj.event.notiTarget(fn_make_user_info.get('authTpCd') === '10');
297 303
 		} else if(mode === 'MODIFY') { // 수정
298 304
 			$('#ITP_AJAX_OPER02010_DETAIL_CONTAINER').show();
299 305
 			fn_show_btn_auth_array(['#ITP_BTN_OPER02010_CANCELLIST', '#ITP_BTN_OPER02010_SAVE', '#ITP_BTN_OPER02010_RESET_PW']);
300 306
 			$('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_AFFL_SHOP_NM').prop('readonly', true);
307
+			if(fn_make_user_info.get('authTpCd') === '30') {
308
+				pageObj.ui.afflInfo.init();
309
+			}
301 310
 		} else if(mode === 'VIEW') { // 보기
302 311
 			$('#ITP_AJAX_OPER02010_VIEW_CONTAINER').show();
303
-			fn_show_btn_auth_array(['#ITP_BTN_OPER02010_MODIFY', '#ITP_BTN_OPER02010_CANCELLIST']);
304 312
 		}
305 313
 	}/*,
306 314
 	grid: {
@@ -508,10 +516,19 @@ let viewObj = {
508 516
 		$('#ITP_FORM_OPER02010_VIEW .fnNticeDesc').html(result.nticeDesc.replace(/(\n|\r\n)/g, '<br>'));
509 517
 		$('#ITP_FORM_OPER02010_VIEW .fnTargetNm').text(result.targetNm);
510 518
 		$('#ITP_FORM_OPER02010_VIEW_FILE_NO').val(result.fileNo); //파일번호 셋팅
519
+		$('#ITP_FORM_OPER02010_VIEW .fnAddId').text(result.addId);
520
+		$('#ITP_FORM_OPER02010_VIEW .fnAddNm').text(result.addNm);
511 521
 
512 522
 		itp_fn_attach_file.view('ITP_OPER02010_VIEW_UPLOAD', result.fileNoList
513 523
 			, 'form-control itp_input', 'border:none; top:0px; left:12px; height:100px; width:125px; position:absolute;');
514 524
 
525
+		// if(result.addId === fn_make_user_info.get('userId')) {
526
+		if(fn_make_user_info.get('authTpCd') === '10' || result.addId === fn_make_user_info.get('userId')) {
527
+			fn_show_btn_auth_array(['#ITP_BTN_OPER02010_MODIFY', '#ITP_BTN_OPER02010_CANCELLIST']);
528
+		} else {
529
+			fn_show_btn_auth_array(['#ITP_BTN_OPER02010_CANCELLIST']);
530
+		}
531
+
515 532
 		// 권한정보 리스트 조회
516 533
 		// pageObj.grid.init('VIEW');
517 534
 	}
@@ -544,30 +561,33 @@ let modifyObj = {
544 561
 		$('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DEL_YN').val(result.delYn);
545 562
 		$('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_NTICE_DESC').val(result.nticeDesc);
546 563
 		$('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_TARGET_CD').val(result.targetCd);
547
-		$('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_BRAND').prop('checked', result.brandChk === 'Y');
548
-		$('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_STORE').prop('checked', result.shopChk === 'Y');
549
-		$('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_SPPLY').prop('checked', result.supplyChk === 'Y');
550
-		$('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_BRAND_CHK').val(result.brandChk);
551
-		$('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_STORE_CHK').val(result.shopChk);
552
-		$('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_SPPLY_CHK').val(result.supplyChk);
564
+		// $('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_BRAND').prop('checked', result.brandChk === 'Y');
565
+		// $('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_STORE').prop('checked', result.shopChk === 'Y');
566
+		// $('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_SPPLY').prop('checked', result.supplyChk === 'Y');
567
+		// $('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_BRAND_CHK').val(result.brandChk);
568
+		// $('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_STORE_CHK').val(result.shopChk);
569
+		// $('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_SPPLY_CHK').val(result.supplyChk);
553 570
 		$('#ITP_FORM_OPER02010_DETAIL_FILE_NO').val(result.fileNo); //파일번호 셋팅
554 571
 
555 572
 		// 가맹점 셋팅
556
-		$('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_SEARCH_AFFL_SHOP_ID').val(result.afflShopId);
557
-		$('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_SEARCH_AFFL_SHOP_NM').val(result.afflShopNm);
573
+		$('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_AFFL_SHOP_ID').val(result.afflShopId);
574
+		$('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_AFFL_SHOP_NM').val(result.afflShopNm);
558 575
 		// $('#ITP_FORM_OPER02010_DETAIL_SEARCH_AFFL_SHOP').attr('disabled', true);
559 576
 		// $('#ITP_FORM_OPER02010_DETAIL_DELETE_AFFL_SHOP').attr('disabled', true);
560 577
 		// $('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_SEARCH_AFFL_SHOP_NM').attr('readonly', true);
561 578
 		// $('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_SEARCH_BRAND_ID').attr('readonly', true);
562
-		if(result.brandId && result.brandId != '') {
579
+
580
+		pageObj.ui.afflInfo.init();
581
+		if(result.brandId && result.brandId !== '') {
563 582
 			var brandList = [{'brandId':result.brandId, 'brandNm':result.brandNm}];
564 583
 			fn_make_select_brand(brandList, 'ITP_FORM_OPER02010_DETAIL_SEARCH_BRAND_ID');
565 584
 		}
566 585
 
567
-		if(result.targetCd && result.targetCd != '') {
568
-			$('#ITP_BTN_OPER02010_DETAIL_ADDROW').attr('disabled', false);
569
-			$('#ITP_BTN_OPER02010_DETAIL_DELROW').attr('disabled', false);
570
-		}
586
+		pageObj.event.notiTarget(result.afflShopId === '');
587
+		// if(result.targetCd && result.targetCd != '') {
588
+		// 	$('#ITP_BTN_OPER02010_DETAIL_ADDROW').attr('disabled', false);
589
+		// 	$('#ITP_BTN_OPER02010_DETAIL_DELROW').attr('disabled', false);
590
+		// }
571 591
 
572 592
 		//파일업로드(수정화면)
573 593
 		pageObj.fileUpload();
@@ -623,6 +643,10 @@ let createObj = {
623 643
 			const formId = '#ITP_FORM_OPER02010_DETAIL';
624 644
 			itp_fn_form_clear_validate(null, formId);
625 645
 
646
+			$('#ITP_FORM_OPER02010_DETAIL_TARGET_CD').attr('disabled', false);
647
+			if(fn_make_user_info.get('authTpCd') === '30') {
648
+				$('#ITP_FORM_OPER02010_DETAIL_TARGET_CD').val('A');
649
+			}
626 650
 			if (itp_fn_form_event.isValid(formId)) {
627 651
 				// let gridInsertData = [];
628 652
 				// let gridUpdateData = [];
@@ -641,7 +665,6 @@ let createObj = {
641 665
 				// 		}
642 666
 				// 	}
643 667
 				// });
644
-				$('#ITP_FORM_OPER02010_DETAIL_TARGET_CD').attr('disabled', false);
645 668
 				let param = $(formId).serializeObject();
646 669
 				// param.gridInsertData = gridInsertData;
647 670
 				// param.gridUpdateData = gridUpdateData;
@@ -664,7 +687,6 @@ let createObj = {
664 687
 /*가맹점 조회 Object*/
665 688
 let afflShopObj = {
666 689
 	init: function() {
667
-		// (LOGIN_USER_INFO.authTpCd === '10' || (LOGIN_USER_INFO.authTpCd === '20') ? this.action() : this.make();
668 690
 		this.action();
669 691
 	},
670 692
 	button: function() {
@@ -690,19 +712,9 @@ let afflShopObj = {
690 712
 			$('select#ITP_FORM_OPER02010_DETAIL_BRAND_ID option').remove();
691 713
 			$('#ITP_FORM_OPER02010_DETAIL_TARGET_CD option:eq(0)').prop('selected', true);
692 714
 			// $('#ITP_FORM_OPER02010_DETAIL_TARGET_CD').trigger('change');
715
+			pageObj.event.notiTarget(true);
693 716
 		});
694 717
 	},
695
-	make: function() {
696
-		$('#ITP_FORM_OPER02010_SEARCH_AFFL_SHOP').hide();
697
-		$('#ITP_FORM_OPER02010_DELETE_AFFL_SHOP').hide();
698
-		if(AFFL_SHOP_LIST) {
699
-			$('#ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_ID').val(AFFL_SHOP_LIST[0].afflShopId);
700
-			$('#ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_NM').val(AFFL_SHOP_LIST[0].afflShopNm);
701
-		}
702
-		if(AFFL_BRAND_LIST) {
703
-			fn_make_select_brand(AFFL_BRAND_LIST, 'ITP_FORM_OPER02010_SEARCH_BRAND_ID');
704
-		}
705
-	},
706 718
 	action: function() {
707 719
 		this.button();
708 720
 	},
@@ -715,6 +727,7 @@ let afflShopObj = {
715 727
 			if(rowDataPop.AFFL_SHOP) {
716 728
 				$('#'+ id + '_AFFL_SHOP_ID').val(rowDataPop.AFFL_SHOP.afflShopId);
717 729
 				$('#'+ id + '_AFFL_SHOP_NM').val(rowDataPop.AFFL_SHOP.afflShopNm);
730
+				if(view === 'C') pageObj.event.notiTarget(false);
718 731
 			}
719 732
 			if(rowDataPop.AFFL_BRAND) {
720 733
 				fn_make_select_brand(rowDataPop.AFFL_BRAND, id + '_BRAND_ID', true, '선택');

+ 6 - 4
src/main/webapp/js/app/oper/ITP_OPER03010.js

@@ -272,6 +272,8 @@ let pageObj = {
272 272
 			$('.fnAfflShopId').text('(자동부여)');
273 273
 			$('#ITP_FORM_OPER03010_DETAIL .itp_form_info').hide();
274 274
 
275
+			$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_SEARCH_JOIN_STT_DT').datepicker('setDate', new Date());
276
+			$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_SEARCH_JOIN_END_DT').datepicker('setDate', itp_fn_date_add('Y', 1));
275 277
 		} else if(mode === 'MODIFY') { // 수정
276 278
 			$('#ITP_AJAX_OPER03010_DETAIL_CONTAINER').show();
277 279
 			fn_show_btn_auth_array(['#ITP_BTN_OPER03010_CANCELLIST', '#ITP_BTN_OPER03010_SAVE', '#ITP_BTN_OPER03010_RESET_PW']);
@@ -492,7 +494,7 @@ let viewObj = {
492 494
 			, 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
493 495
 
494 496
 		let locate = result.addr1 + ' ' + result.addr2;
495
-		kakaoMap.init('ITP_FORM_OPER03010_VIEW', locate);
497
+		kakaoMap.init('ITP_FORM_OPER03010_VIEW', locate, result.latX, result.longY);
496 498
 
497 499
 		// 영업담당자정보  리스트 조회
498 500
 		pageObj.grid.init('VIEW', result.saleList);
@@ -534,8 +536,8 @@ let modifyObj = {
534 536
 		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_OWNER_NM').val(result.ownerNm);
535 537
 		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CTGR_BSNS').val(result.ctgrBsns);
536 538
 		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_OWNER_TEL_NO').val(result.ownerTelNo);
537
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_SEARCH_JOIN_STT_DT').val(result.joinSttDt);
538
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_SEARCH_JOIN_END_DT').val(result.joinEndDt);
539
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_SEARCH_JOIN_STT_DT').val(result.joinSttDt === '' ? today : result.joinSttDt);
540
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_SEARCH_JOIN_END_DT').val(result.joinEndDt === '' ? today : result.joinEndDt);
539 541
 		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_ZIPNO').val(result.zipNo);
540 542
 		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_ADRES').val(result.addr1);
541 543
 		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_ADRES_DTL').val(result.addr2);
@@ -548,7 +550,7 @@ let modifyObj = {
548 550
 		itp_fn_attach_file.view('ITP_OPER03010_DETAIL_LOGO_FILE', result.fileLogNoList
549 551
 			, 'form-control itp_input', 'border:none; top:12px; left:12px; height:70px; width:85px; position:absolute;');
550 552
 
551
-		kakaoMap.init('ITP_FORM_OPER03010_DETAIL', $('#ITP_FORM_OPER03010_DETAIL_ADRES').val());
553
+		kakaoMap.init('ITP_FORM_OPER03010_DETAIL', $('#ITP_FORM_OPER03010_DETAIL_ADRES').val(), result.latX, result.longY);
552 554
 
553 555
 		// 권한정보 리스트 조회
554 556
 		pageObj.grid.init('MODIFY', result.saleList);

+ 4 - 4
src/main/webapp/js/app/oper/ITP_OPER03011.js

@@ -316,7 +316,7 @@ let viewObj = {
316 316
 			, 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
317 317
 
318 318
 		let locate = result.addr1 + ' ' + result.addr2;
319
-		kakaoMap.init('ITP_FORM_OPER03011_VIEW', locate);
319
+		kakaoMap.init('ITP_FORM_OPER03011_VIEW', locate, result.latX, result.longY);
320 320
 
321 321
 		// 영업담당자정보  리스트 조회
322 322
 		pageObj.grid.init('VIEW', result.saleList);
@@ -434,8 +434,8 @@ let modifyObj = {
434 434
 		$('#ITP_FORM_OPER03011_DETAIL #ITP_FORM_OPER03011_DETAIL_OWNER_NM').val(result.ownerNm);
435 435
 		$('#ITP_FORM_OPER03011_DETAIL #ITP_FORM_OPER03011_DETAIL_CTGR_BSNS').val(result.ctgrBsns);
436 436
 		$('#ITP_FORM_OPER03011_DETAIL #ITP_FORM_OPER03011_DETAIL_OWNER_TEL_NO').val(result.ownerTelNo);
437
-		$('#ITP_FORM_OPER03011_DETAIL #ITP_FORM_OPER03011_SEARCH_JOIN_STT_DT').val(result.joinSttDt);
438
-		$('#ITP_FORM_OPER03011_DETAIL #ITP_FORM_OPER03011_SEARCH_JOIN_END_DT').val(result.joinEndDt);
437
+		$('#ITP_FORM_OPER03011_DETAIL #ITP_FORM_OPER03011_SEARCH_JOIN_STT_DT').val(result.joinSttDt === '' ? today : result.joinSttDt);
438
+		$('#ITP_FORM_OPER03011_DETAIL #ITP_FORM_OPER03011_SEARCH_JOIN_END_DT').val(result.joinEndDt === '' ? today : result.joinEndDt);
439 439
 		$('#ITP_FORM_OPER03011_DETAIL #ITP_FORM_OPER03011_DETAIL_ZIPNO').val(result.zipNo);
440 440
 		$('#ITP_FORM_OPER03011_DETAIL #ITP_FORM_OPER03011_DETAIL_ADRES').val(result.addr1);
441 441
 		$('#ITP_FORM_OPER03011_DETAIL #ITP_FORM_OPER03011_DETAIL_ADRES_DTL').val(result.addr2);
@@ -446,7 +446,7 @@ let modifyObj = {
446 446
 		itp_fn_attach_file.view('ITP_FORM_OPER03011_DETAIL_LOGO_FILE', result.fileLogNoList
447 447
 			, 'form-control itp_input', 'border:none; top:12px; left:12px; height:70px; width:85px; position:absolute;');
448 448
 
449
-		kakaoMap.init('ITP_FORM_OPER03011_DETAIL', $('#ITP_FORM_OPER03011_DETAIL_ADRES').val());
449
+		kakaoMap.init('ITP_FORM_OPER03011_DETAIL', $('#ITP_FORM_OPER03011_DETAIL_ADRES').val(), result.latX, result.longY);
450 450
 
451 451
 		// 권한정보 리스트 조회
452 452
 		pageObj.grid.init('MODIFY', result.saleList);

+ 11 - 5
src/main/webapp/js/app/oper/ITP_OPER04010.js

@@ -171,7 +171,7 @@ let pageObj = {
171 171
                 }
172 172
             });
173 173
 
174
-            $('#ITP_FORM_OPER04010_DETAIL_PW').data('check-required', 'empty');
174
+            $('#ITP_FORM_OPER04010_DETAIL_USER_PW').data('check-required', 'empty');
175 175
             $('#ITP_FORM_OPER04010_DETAIL_USER_PW_CONFIRM').data('check-required', 'empty');
176 176
             $('#ITP_FORM_OPER04010_DETAIL_EMAL_ADDR').data('check-required', 'empty');
177 177
         } else if(mode == 'MODIFY') { // 수정
@@ -185,7 +185,7 @@ let pageObj = {
185 185
             $('#ITP_FORM_OPER04010_DETAIL_SALE_MGR_ID').attr('readonly', true);
186 186
             $('#ITP_FORM_OPER04010_DETAIL_DUP').attr('disabled', true);
187 187
 
188
-            $('#ITP_FORM_OPER04010_DETAIL_PW').data('check-required', '');
188
+            $('#ITP_FORM_OPER04010_DETAIL_USER_PW').data('check-required', '');
189 189
             $('#ITP_FORM_OPER04010_DETAIL_USER_PW_CONFIRM').data('check-required', '');
190 190
             $('#ITP_FORM_OPER04010_DETAIL_EMAL_ADDR').data('check-required', '');
191 191
         } else if(mode == 'VIEW') { // 보기
@@ -379,8 +379,8 @@ let createObj = {
379 379
     button: {
380 380
         duplicate: function() {
381 381
             const formId = '#ITP_FORM_OPER04010_DETAIL';
382
-            itp_fn_form_clear_validate(null, formId + '_DETAIL');
383
-            var vali_salesUserId = itp_fn_form_validate(formId + '_DETAIL', formId + '_TMP_SALE_MGR_ID', ['empty'], undefined);
382
+            itp_fn_form_clear_validate(null, formId);
383
+            var vali_salesUserId = itp_fn_form_validate(formId, formId + '_TMP_SALE_MGR_ID', ['empty'], undefined);
384 384
             if (vali_salesUserId) {
385 385
                 var dupFn = function(result) {
386 386
                     if (result.code == 'N') {
@@ -428,7 +428,13 @@ let createObj = {
428 428
             itp_fn_form_clear_validate(null, formId);
429 429
 
430 430
             if (itp_fn_form_event.isValid(formId)) {
431
-
431
+                if($(formId + ' #ITP_FORM_OPER04010_DETAIL_USER_PW').val() !== $(formId + ' #ITP_FORM_OPER04010_DETAIL_USER_PW_CONFIRM').val()) {
432
+                    var element = '#ITP_FORM_OPER04010_DETAIL_USER_PW';
433
+                    $(element).closest('.itp_ip').addClass('has-error');
434
+                    var error_msg = $('<span class="help-block">' + ITP_MSG_LOCALE.message.form.wrongPwd + '</span>');
435
+                    error_msg.insertAfter($(element));
436
+                    return;
437
+                }
432 438
                 if (ITP_FORM_OPER04010_DETAIL_IS_DUPLICATE) {
433 439
                     itp_fn_modal_duplicate('영업담당자 ID 중복체크를 해주세요.', formId + '_SALES_USER_ID');
434 440
                 } else {

+ 16 - 12
src/main/webapp/js/app/oper/ITP_OPER06010.js

@@ -129,6 +129,16 @@ let pageObj = {
129 129
                     $(this).data('alert-msg', ITP_MSG_LOCALE.message.form.emptyAddr);
130 130
                 }
131 131
             });
132
+
133
+            itp_fn_form_event.onKeyup('#ITP_FORM_OPER03010_DETAIL');
134
+            //pg사아이디 선택시 보이게함
135
+            $('#ITP_FORM_OPER06010_DETAIL_PG_ID').on('change', function() {
136
+                if($(this).val() === '') {
137
+                    $('#ITP_FORM_OPER06010_DETAIL .itp_form_pg').hide();
138
+                } else {
139
+                    $('#ITP_FORM_OPER06010_DETAIL .itp_form_pg').show();
140
+                }
141
+            });
132 142
         },
133 143
         grid: function() {
134 144
             itp_fn_jqgrid_resize(OPER06010_GRID_ID, OPER06010_GRID_LIST, 'lg');
@@ -221,16 +231,8 @@ let pageObj = {
221 231
             $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
222 232
 
223 233
             $('.fnBrandId').text('(자동부여)');
224
-            
225
-            //pg사아이디 선택시 보이게함
226
-            $('#ITP_FORM_OPER06010_DETAIL_PG_ID').on('change', function() {
227
-            	if($(this).val() === '') {
228
-                	$('#ITP_FORM_OPER06010_DETAIL .itp_form_pg').show();
229
-            	} else {
230
-                    $('#ITP_FORM_OPER06010_DETAIL .itp_form_pg').hide();
231
-            	}
232
-            });
233
-			
234
+
235
+            $('#ITP_FORM_OPER06010_DETAIL_PG_ID').trigger('change');
234 236
         } else if(mode == 'MODIFY') { // 수정
235 237
             $('#ITP_AJAX_OPER06010_DETAIL_CONTAINER').show();
236 238
             fn_show_btn_auth_array(['#ITP_BTN_OPER06010_CANCELLIST', '#ITP_BTN_OPER06010_SAVE']);
@@ -404,7 +406,7 @@ let viewObj = {
404 406
             , 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
405 407
 
406 408
         let locate = result.addr1 + ' ' + result.addr2;
407
-        kakaoMap.init('ITP_FORM_OPER06010_VIEW', locate);
409
+        kakaoMap.init('ITP_FORM_OPER06010_VIEW', locate, result.latX, result.longY);
408 410
 
409 411
     }
410 412
 };
@@ -456,13 +458,15 @@ let modifyObj = {
456 458
         $('#ITP_FORM_OPER06010_DETAIL .fnAddDt').text(result.sysRegDttm);
457 459
         $('#ITP_FORM_OPER06010_DETAIL .fnChgDt').text(result.sysChgDttm);
458 460
 
461
+        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_PG_ID').trigger('change');
462
+
459 463
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_FILE_NO').val(result.brandLogoFileNo);
460 464
         pageObj.fileUpload();
461 465
         itp_fn_attach_file.view('ITP_OPER06010_DETAIL_LOGO_FILE', result.fileLogNoList
462 466
             , 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
463 467
 
464 468
         let locate = result.addr1 + ' ' + result.addr2;
465
-        kakaoMap.init('ITP_FORM_OPER06010_DETAIL', locate);
469
+        kakaoMap.init('ITP_FORM_OPER06010_DETAIL', locate, result.latX, result.longY);
466 470
 
467 471
     }
468 472
 };

+ 2 - 2
src/main/webapp/js/app/stinfo/ITP_STINFO01011.js

@@ -199,7 +199,7 @@ let viewObj = {
199 199
             , 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
200 200
 
201 201
         let locate = result.addr1 + ' ' + result.addr2;
202
-        kakaoMap.init('ITP_FORM_STINFO01011_VIEW', locate);
202
+        kakaoMap.init('ITP_FORM_STINFO01011_VIEW', locate, result.latX, result.longY);
203 203
 
204 204
     }
205 205
 };
@@ -280,7 +280,7 @@ let modifyObj = {
280 280
             , 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
281 281
 
282 282
         let locate = result.addr1 + ' ' + result.addr2;
283
-        kakaoMap.init('ITP_FORM_STINFO01011_DETAIL', locate);
283
+        kakaoMap.init('ITP_FORM_STINFO01011_DETAIL', locate, result.latX, result.longY);
284 284
 
285 285
     }
286 286
 };

+ 4 - 3
src/main/webapp/js/app/stinfo/ITP_STINFO02010.js

@@ -165,6 +165,7 @@ let pageObj = {
165 165
 			$('#ITP_TAB_STINFO02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
166 166
 			$('#ITP_FORM_STINFO02010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
167 167
 			$('#ITP_FORM_STINFO02010_SEARCH_TO_DT').datepicker('setDate', new Date());
168
+			// $('#ITP_FORM_STINFO02010_DETAIL_FROM_DT').datepicker('setDate', new Date());
168 169
 
169 170
 			// form alert message 주입
170 171
 			$('input[data-alert-required="ONLYCHK"]').each(function() {
@@ -248,8 +249,8 @@ let pageObj = {
248 249
 				if($(this).data('check-required')) $(this).data('check-required', 'empty');
249 250
 				$(this).attr('disabled', false);
250 251
 			});
251
-			// $('#ITP_BTN_STINFO02010_RESET_PW').hide();
252
-
252
+			$('#ITP_FORM_STINFO02010_DETAIL_FROM_DT').datepicker('setDate', new Date());
253
+			// $('#ITP_FORM_STINFO02010_DETAIL_FROM_DT').val(itp_fn_date_format(new Date(), 4));
253 254
 		} else if(mode == 'MODIFY') { // 수정
254 255
 			$('#ITP_AJAX_STINFO02010_DETAIL_CONTAINER').show();
255 256
 			fn_show_btn_auth_array(['#ITP_BTN_STINFO02010_CANCELLIST', '#ITP_BTN_STINFO02010_SAVE', '#ITP_BTN_STINFO02010_RESET_PW']);
@@ -460,7 +461,7 @@ let modifyObj = {
460 461
 		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_BSNS_CNDT').val(result.bsnsCndt);
461 462
 		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_BSNS_REG_NO').val(result.bsnsRegNo);
462 463
 		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_CTGR_BSNS').val(result.ctgrBsns);
463
-		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_CORP_REG_NO').val(result.bsnsRegNo);
464
+		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_CORP_REG_NO').val(result.corpRegNo);
464 465
 		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_TEL_NO').val(result.telNo);
465 466
 		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_OWNER_NM').val(result.ownerNm);
466 467
 		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_FAX_NO').val(result.faxNo);

+ 1 - 1
src/main/webapp/js/app/stinfo/ITP_STINFO02011.js

@@ -250,7 +250,7 @@ let modifyObj = {
250 250
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_BSNS_CNDT').val(result.bsnsCndt);
251 251
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_BSNS_REG_NO').val(result.bsnsRegNo);
252 252
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_CTGR_BSNS').val(result.ctgrBsns);
253
-		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_CORP_REG_NO').val(result.bsnsRegNo);
253
+		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_CORP_REG_NO').val(result.corpRegNo);
254 254
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_TEL_NO').val(result.telNo);
255 255
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_OWNER_NM').val(result.ownerNm);
256 256
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_FAX_NO').val(result.faxNo);

+ 4 - 2
src/main/webapp/js/app/stinfo/ITP_STINFO05010.js

@@ -258,6 +258,8 @@ let pageObj = {
258 258
 			$('#ITP_FORM_STINFO05010_DETAIL .itp_form_change').show();
259 259
 			
260 260
 			$('#ITP_FORM_STINFO05010_DETAIL .fnStoreNm').text('(자동부여)');
261
+			$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_CONT_STT_DT').datepicker('setDate', new Date());
262
+			$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_CONT_END_DT').datepicker('setDate', itp_fn_date_add('Y', 1));
261 263
 		} else if(mode == 'MODIFY') { // 수정
262 264
 			$('#ITP_AJAX_STINFO05010_DETAIL_CONTAINER').show();
263 265
 			fn_show_btn_auth_array(['#ITP_BTN_STINFO05010_CANCELLIST', '#ITP_BTN_STINFO05010_SAVE', '#ITP_BTN_STINFO05010_RESET_PW']);
@@ -470,8 +472,8 @@ let modifyObj = {
470 472
 		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_SPPLY_ID').val(result.spplyId);
471 473
 		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_SPPLY_NM').val(result.spplyNm);
472 474
 		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_SPPLY_ITEM_ID').val(result.spplyItemId);
473
-		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_CONT_STT_DT').val(result.contSttDt);
474
-		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_CONT_END_DT').val(result.contEndDt);
475
+		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_CONT_STT_DT').val(result.contSttDt === '' ? today : result.contSttDt);
476
+		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_CONT_END_DT').val(result.contEndDt === '' ? today : result.contEndDt);
475 477
 		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_LEAD_TIME').val(result.leadTime);
476 478
 		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_UNIT').val(result.unit);
477 479
 		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_STDD_QYT').val(result.stddQty);

+ 4 - 0
src/main/webapp/js/app/stinfo/ITP_STINFO06010.js

@@ -301,6 +301,8 @@ let pageObj = {
301 301
 			$('#ITP_BTN_STINFO06010_DETAIL_DELETE_STORE').removeAttr('disabled');
302 302
 			// 가맹점 정보 설정
303 303
 			$('#ITP_FORM_STINFO06010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
304
+			$('#ITP_FORM_STINFO06010_DETAIL #ITP_FORM_STINFO06010_DETAIL_FROM_DT').datepicker('setDate', new Date());
305
+			$('#ITP_FORM_STINFO06010_DETAIL #ITP_FORM_STINFO06010_DETAIL_TO_DT').datepicker('setDate', itp_fn_date_add('Y', 1));
304 306
 		} else if(mode == 'MODIFY') { // 수정
305 307
 			$('#ITP_AJAX_STINFO06010_DETAIL_CONTAINER').show();
306 308
 			if(fn_make_user_info.get('authTpCd') === '50') {
@@ -589,6 +591,8 @@ let createObj = {
589 591
 					console.log(data);
590 592
 					createObj.rows = data.gridRows;
591 593
 					itp_fn_grid_load_complete(data, STINFO06010_DETAIL_GRID_ID, false, 'number', 'STINFO06010', modifyObj.itp_STINFO06010_search, modifyObj.empty, true, data.gridRecords, true);
594
+					$('#ITP_FORM_STINFO06010_DETAIL_FROM_DT').datepicker().trigger('changeDate');
595
+					$('#ITP_FORM_STINFO06010_DETAIL_TO_DT').datepicker().trigger('changeDate');
592 596
 				},
593 597
 				onCellSelect: function(rowid, cellIdx, cellValue) {
594 598
 					STINFO06010_GRID_LAST_ROW_ID = itp_fn_set_data_editable(rowid, cellIdx, STINFO06010_GRID_LAST_ROW_ID, STINFO06010_DETAIL_GRID_ID, ['actionId']);