juney лет назад: 2
Родитель
Сommit
da01e550b5

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

@@ -28,7 +28,7 @@
28 28
 											<button type="button" id="ITP_FORM_OPER01010_DELETE_AFFL_SHOP" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
29 29
 						                </div>
30 30
 										<div class="col-xs-2 itp_ip itp_noMar">
31
-											<select id="ITP_FORM_OPER01010_SEARCH_BRAND_TYPE" class="form-control itp_input" name="sBrandType"></select>
31
+											<select id="ITP_FORM_OPER01010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId"></select>
32 32
 										</div>									
33 33
 									</div>
34 34
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
@@ -51,7 +51,7 @@
51 51
 											<select id="ITP_FORM_OPER01010_SEARCH_USER_STAT_CD" class="form-control itp_input" name="suserStatCd"></select>
52 52
 										</div>
53 53
 										<div class="col-xs-2 itp_ip itp_noMar">
54
-											<select id="ITP_FORM_OPER01010_SEARCH_USER_TYPE_CD" class="form-control itp_input" name="suserTypeCd"></select>
54
+											<select id="ITP_FORM_OPER01010_SEARCH_AUTH_TP_CD" class="form-control itp_input" name="sauthTpCd"></select>
55 55
 										</div>
56 56
 									</div>
57 57
 								</form>

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

@@ -21,14 +21,14 @@
21 21
 									<input type="hidden" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_ID" name="afflShopId" value="">
22 22
 									<div class="form-group">
23 23
 										<div class="col-xs-2 itp_ip itp_noMar">
24
-											<input type="text" id="ITP_FORM_OPER01010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="sAfflShopNm" value="가맹점" />
24
+											<input type="text" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="sAfflShopNm" value="가맹점" />
25 25
 										</div>
26 26
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
27
-											<button type="button" id="ITP_BTN_OPER01010_SEARCH_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
28
-											<button type="button" id="ITP_BTN_OPER01010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
29
-						                </div>
27
+											<button type="button" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
28
+											<button type="button" id="ITP_FORM_OPER02010_DELETE_AFFL_SHOP" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
29
+										</div>
30 30
 										<div class="col-xs-2 itp_ip itp_noMar">
31
-											<select id="ITP_FORM_OPER01010_SEARCH_BRAND_TYPE" class="form-control itp_input" name="sBrandType"></select>
31
+											<select id="ITP_FORM_OPER02010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId"></select>
32 32
 										</div>									
33 33
 									</div>
34 34
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
@@ -45,7 +45,7 @@
45 45
 											</div>
46 46
 										</div>
47 47
 										<div class="col-xs-5 itp_ip">
48
-											<input type="text" id="ITP_FORM_OPER02010_SEARCH_SNTICE_TKTL" class="form-control itp_input" name="sNticeTitl" placeholder="공지사항 검색" />
48
+											<input type="text" id="ITP_FORM_OPER02010_SEARCH_SNTICE_TKTL" class="form-control itp_input" name="snticeTitl" placeholder="공지사항 검색" />
49 49
 										</div>
50 50
 									</div>
51 51
 								</form>

+ 2 - 1
src/main/webapp/bootstrap/js/.jshintrc

@@ -11,5 +11,6 @@
11 11
   "nonbsp"   : true,
12 12
   "strict"   : true,
13 13
   "undef"    : true,
14
-  "unused"   : true
14
+  "unused"   : true,
15
+  "esversion": 6
15 16
 }

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

@@ -198,7 +198,7 @@ let pageObj = {
198 198
 			// 공통코드 표시
199 199
 			fn_make_select(CODE_LIST, 'USER_STAT_CD', 'ITP_FORM_OPER01010_SEARCH_USER_STAT_CD');
200 200
 			fn_make_select(CODE_LIST, 'USER_STAT_CD', 'ITP_FORM_OPER01010_DETAIL_USER_STAT_CD', true, '선택');
201
-			fn_make_select(CODE_LIST, 'USER_TYPE_CD', 'ITP_FORM_OPER01010_SEARCH_USER_TYPE_CD');
201
+			fn_make_select(CODE_LIST, 'AUTH_TP_CD', 'ITP_FORM_OPER01010_SEARCH_AUTH_TP_CD');
202 202
 
203 203
 			// 조회일자 지정
204 204
 			$('#ITP_TAB_OPER01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);

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

@@ -346,7 +346,8 @@ let afflShopObj = {
346 346
 				$('#ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_NM').val(rowDataPop.AFFL_SHOP.afflShopNm);
347 347
 			}
348 348
 			if(rowDataPop.AFFL_BRAND) {
349
-				fn_make_select_brand(rowDataPop.AFFL_BRAND, 'ITP_FORM_OPER02010_SEARCH_BRAND_ID');
349
+				fn_make_select_brand(rowDataPop.AFFL_BRAND, 'ITP_FORM_OPER02010_SEARCH_BRAND_ID', true, '선택');
350
+				// fn_make_select_brand(rowDataPop.AFFL_BRAND, 'ITP_FORM_OPER02010_SEARCH_BRAND_ID');
350 351
 			}
351 352
 		},
352 353
 		create: function(rowDataPop) {