Home Explore Help
Register Sign In
orderqueen
/
oqpo-view
Watch 3
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

브랜드관리 신규등록 수정

juney 2 years ago
parent
a0e146f361
commit
241dcd08ff
8 changed files with 55 additions and 41 deletions
Unified View Show Diff Stats
  1. 1 1
      src/main/webapp/app/oper/OPER06010.html
  2. 9 3
      src/main/webapp/js/app/oper/ITP_OPER06010.js
  3. 1 0
      src/main/webapp/js/app/popup/biz/ITP_BIZPOP_AFFL_SHOP.js
  4. 2 2
      src/main/webapp/main.html
  5. 17 4
      src/main/webapp/mobile/app/main.html
  6. 1 19
      src/main/webapp/mobile/js/app/login.js
  7. 16 11
      src/main/webapp/mobile/js/app/main.js
  8. 8 1
      src/main/webapp/mobile/js/config.js

+ 1 - 1
src/main/webapp/app/oper/OPER06010.html
View File 

@@ -113,7 +113,7 @@
113 
 											</div>
 113 
 											</div>
114 
 										</div>
 114 
 										</div>
115 
 									</div>
 115 
 									</div>
116 
-									<div class="itp_form_info">
116 
+									<div>
117 
 										<div class="itp_form_in">
 117 
 										<div class="itp_form_in">
118 
 											<div class="form-group">
 118 
 											<div class="form-group">
119 
 												<label class="col-xs-2 itp_lb">대표자명</label>
 119 
 												<label class="col-xs-2 itp_lb">대표자명</label>

+ 9 - 3
src/main/webapp/js/app/oper/ITP_OPER06010.js
View File 

@@ -214,11 +214,12 @@ let pageObj = {
214 
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_change').show();
 214 
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_change').show();
215
215
216 
             $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_AFFL_SHOP_ID').val(fn_make_user_info.get('afflShopId'));
 216 
             $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_AFFL_SHOP_ID').val(fn_make_user_info.get('afflShopId'));
217 
+            $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
217
218
218 
             $('.fnBrandId').text('(자동부여)');
 219 
             $('.fnBrandId').text('(자동부여)');
219 
         } else if(mode == 'MODIFY') { // 수정
 220 
         } else if(mode == 'MODIFY') { // 수정
220 
             $('#ITP_AJAX_OPER06010_DETAIL_CONTAINER').show();
 221 
             $('#ITP_AJAX_OPER06010_DETAIL_CONTAINER').show();
221 
-            fn_show_btn_auth_array(['#ITP_BTN_OPER06010_CANCELLIST', '#ITP_BTN_OPER06010_SAVE', '#ITP_BTN_OPER06010_RESET_PW']);
222 
+            fn_show_btn_auth_array(['#ITP_BTN_OPER06010_CANCELLIST', '#ITP_BTN_OPER06010_SAVE']);
222
223
223 
             $('#ITP_FORM_OPER06010_DETAIL_BRAND_ID').attr('readonly', true);
 224 
             $('#ITP_FORM_OPER06010_DETAIL_BRAND_ID').attr('readonly', true);
224 
             $('#ITP_FORM_OPER06010_DETAIL_BRAND_NM').attr('readonly', true);
 225 
             $('#ITP_FORM_OPER06010_DETAIL_BRAND_NM').attr('readonly', true);
 
@@ -230,8 +231,8 @@ let pageObj = {
230 
             $('#ITP_FORM_OPER06010_DETAIL_DELETE_AFFL_SHOP').hide();
 231 
             $('#ITP_FORM_OPER06010_DETAIL_DELETE_AFFL_SHOP').hide();
231 
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_info').show();
 232 
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_info').show();
232 
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_change').hide();
 233 
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_change').hide();
233 
-
234 
-			$('#ITP_BTN_OPER06010_RESET_PW').show();
234 
+
235 
+            $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
235 
         } else if(mode == 'VIEW') { // 보기
 236 
         } else if(mode == 'VIEW') { // 보기
236 
             $('#ITP_AJAX_OPER06010_VIEW_CONTAINER').show();
 237 
             $('#ITP_AJAX_OPER06010_VIEW_CONTAINER').show();
237 
             fn_show_btn_auth_array(['#ITP_BTN_OPER06010_MODIFY', '#ITP_BTN_OPER06010_CANCELLIST']);
 238 
             fn_show_btn_auth_array(['#ITP_BTN_OPER06010_MODIFY', '#ITP_BTN_OPER06010_CANCELLIST']);
 
@@ -257,6 +258,10 @@ let listObj = {
257 
             $(OPER06010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
 258 
             $(OPER06010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
258 
         },
 259 
         },
259 
         create: function() {
 260 
         create: function() {
261 
+            if($('#ITP_FORM_OPER06010_DETAIL_AFFL_SHOP_ID').val() === '') {
262 
+                itp_fn_modal_alert('가맹점 정보가 존재하지 않습니다.');
263 
+                return;
264 
+            }
260 
             pageObj.switchScreen('ADD');
 265 
             pageObj.switchScreen('ADD');
261 
             itp_fn_form_clear_validate(null, '#ITP_FORM_OPER06010_DETAIL');
 266 
             itp_fn_form_clear_validate(null, '#ITP_FORM_OPER06010_DETAIL');
262 
             // 권한정보 리스트 조회
 267 
             // 권한정보 리스트 조회
 
@@ -528,6 +533,7 @@ let afflShopObj = {
528 
             var _this = this;
 533 
             var _this = this;
529 
             this.afflShopId 	= fn_make_user_info.get('afflShopId');
 534 
             this.afflShopId 	= fn_make_user_info.get('afflShopId');
530 
             this.afflShopNm 	= fn_make_user_info.get('afflShopNm');
 535 
             this.afflShopNm 	= fn_make_user_info.get('afflShopNm');
536 
+            $('#ITP_FORM_OPER06010_DETAIL_AFFL_SHOP_ID').val(_this.afflShopId);
531 
             $('#ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_ID').val(_this.afflShopId);
 537 
             $('#ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_ID').val(_this.afflShopId);
532 
             $('#ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_NM').val(_this.afflShopNm);
 538 
             $('#ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_NM').val(_this.afflShopNm);
533 
             $('#ITP_BTN_OPER06010_SEARCH_AFFL_SHOP').attr('disabled', true);
 539 
             $('#ITP_BTN_OPER06010_SEARCH_AFFL_SHOP').attr('disabled', true);

+ 1 - 0
src/main/webapp/js/app/popup/biz/ITP_BIZPOP_AFFL_SHOP.js
View File 

@@ -39,6 +39,7 @@ function itp_fn_BIZPOP_AFFL_SHOP(parentPopFn, args, returnType) {
39 
 	    	return;
 39 
 	    	return;
40 
 	    }
 40 
 	    }
41 
 	    const selRow = $(THIS_GIRD_ID).getRowData(rowKey);
 41 
 	    const selRow = $(THIS_GIRD_ID).getRowData(rowKey);
42 
+	    console.log(selRow);
42
43
43 
 		var afflData = {};
 44 
 		var afflData = {};
44 
 		var callbackFn = function(result) {
 45 
 		var callbackFn = function(result) {

+ 2 - 2
src/main/webapp/main.html
View File 

@@ -38,8 +38,8 @@
38 
 		var USER_NM; //사용자명
38 
 		var USER_NM; //사용자명
39 
 	</script>
 39 
 	</script>
40
40
41 
-	<script src="./js/app/properties.js"></script>
42 
-	<script src="./js/require.min.js" data-main="./js/app/config.js"></script>
41 
+	<script src="./js/app/properties.js"></script>
42 
+	<script src="./js/require.min.js" data-main="./js/app/config.js"></script>
43 
 </head>
 43 
 </head>
44 
 <body>
 44 
 <body>
45 
 	<div id="ITP_WRAPPER">
 45 
 	<div id="ITP_WRAPPER">

+ 17 - 4
src/main/webapp/mobile/app/main.html
View File 

@@ -33,17 +33,30 @@
33 
 		#ITP_SIDEBAR .itp_nav .itp_svgs li a .itp_tt {float:left;}
 33 
 		#ITP_SIDEBAR .itp_nav .itp_svgs li a .itp_tt {float:left;}
34
34
35 
 	</style>
 35 
 	</style>
36 
+
37 
+	<script>
38 
+		const ITP_SYSTEM_ADMIN_YN = 'Y';
39 
+		const VIEW_PAGE = 'MAIN'; //config.js 에서 로그인 페이지 인지 아닌지 확인하기 위한 변수
40 
+
41 
+		var CONN_KEY; //Jwt 토큰을 담기위한 변수
42 
+		var CODE_LIST; //코드리스트를 담기위한 변수
43 
+		var AUTH_MENU_LIST; //메뉴리스트를 담기위한 변수
44 
+		var ACT_LIST; //액션리스트를 담기위한 변수
45 
+	</script>
46 
+
47 
+	<script src="../js/properties.js"></script>
48 
+	<script src="../../js/require.min.js" data-main="../js/config.js"></script>
36 
 </head>
 49 
 </head>
37 
 	<body>
 50 
 	<body>
38 
 		<div id="ITP_WRAPPER">
 51 
 		<div id="ITP_WRAPPER">
39 
 			<header>
 52 
 			<header>
40 
 				<div class="header_wrap">
 53 
 				<div class="header_wrap">
41 
 					<div class="menu_logo">
 54 
 					<div class="menu_logo">
42 
-						<button id="ITP_BTN_MENU"><img src="../img/menu.png" alt=""></button>
43 
-						<button id="ITP_BTN_HOME"><img src="../img/home.png" alt=""></button>
55 
+						<button id="ITP_MOBILE_BTN_MENU"><img src="../img/menu.png" alt=""></button>
56 
+						<button id="ITP_MOBILE_BTN_HOME"><img src="../img/home.png" alt=""></button>
44 
 					</div>
 57 
 					</div>
45 
 					<div class="logout">
 58 
 					<div class="logout">
46 
-						<button id="ITP_BTN_LOGOUT">로그<br>아웃</button>
59 
+						<button id="ITP_MOBILE_BTN_LOGOUT">로그<br>아웃</button>
47 
 					</div>
 60 
 					</div>
48 
 					<div class="name_info">
 61 
 					<div class="name_info">
49 
 						<label>
 62 
 						<label>
 
@@ -127,7 +140,7 @@
127 
 							<div class="id">asdf1234</div>
 140 
 							<div class="id">asdf1234</div>
128 
 						</div>
 141 
 						</div>
129 
 						<div class="setting">
 142 
 						<div class="setting">
130 
-							<button><img src="../img/gear.png"></button>
143 
+							<button id="ITP_MOBILE_BTN_SETTING"><img src="../img/gear.png"></button>
131 
 						</div>
 144 
 						</div>
132 
 					</div>
 145 
 					</div>
133 
 					<div class="menu_select">
 146 
 					<div class="menu_select">

+ 1 - 19
src/main/webapp/mobile/js/app/login.js
View File 

@@ -23,14 +23,6 @@ require(['config'], function() {
23 
 				itp_fn_login_proc();
 23 
 				itp_fn_login_proc();
24 
 			}
 24 
 			}
25 
 		});
 25 
 		});
26 
-
27 
-		// var callbackFn = function(result) {
28 
-		// 	POP_LIST = result.popList;
29 
-		// 	fn_proc_popup_view('L');
30 
-		// };
31 
-		// const key = {sViewTargetCd: 'L'};
32 
-		// var param = $.param(key);
33 
-		// fn_ajax_call('/api/pop/open-pop', param, callbackFn, 'GET');
34 
 	});
 26 
 	});
35 
 });
 27 
 });
36
28 
 
@@ -89,10 +81,7 @@ function itp_fn_login_proc() {
89 
 		var hashed = fnHashed(result.hashed);
 81 
 		var hashed = fnHashed(result.hashed);
90 
 		$('#userId').val(CryptoJS.AES.encrypt($('#ITP_FORM_LOGIN_USER_ID').val(), hashed));
 82 
 		$('#userId').val(CryptoJS.AES.encrypt($('#ITP_FORM_LOGIN_USER_ID').val(), hashed));
91 
 		$('#password').val(CryptoJS.AES.encrypt($('#ITP_FORM_LOGIN_USER_PW').val(), hashed));
 83 
 		$('#password').val(CryptoJS.AES.encrypt($('#ITP_FORM_LOGIN_USER_PW').val(), hashed));
92 
-		// $('#brandId').val(CryptoJS.AES.encrypt($('#ITP_FORM_LOGIN_BRAND_ID').val(), hashed));
93 
-		console.log('USER_ID ===> ' + CryptoJS.AES.encrypt($('#ITP_FORM_LOGIN_USER_ID').val(), hashed));
94 
 	    var loginFn = function(result) {
 84 
 	    var loginFn = function(result) {
95 
-			alert('SIGN-IN RESULT : ' + JSON.stringify(result));
96 
 			sessionStorage.setItem('itp_login_info', JSON.stringify({
 85 
 			sessionStorage.setItem('itp_login_info', JSON.stringify({
97 
 				timestamp: new Date(),
 86 
 				timestamp: new Date(),
98 
 		        connKey: result.connKey		// Jwt키를 가져와서 세션 스토리지에 저장
 87 
 		        connKey: result.connKey		// Jwt키를 가져와서 세션 스토리지에 저장
 
@@ -100,15 +89,8 @@ function itp_fn_login_proc() {
100 
 	    	$(location).attr('href', MOBILE_CONTEXTPATH + '/app/main.html');
 89 
 	    	$(location).attr('href', MOBILE_CONTEXTPATH + '/app/main.html');
101 
 		};
 90 
 		};
102 
 		var params = $('#ITP_FORM_MOBILE_LOGIN').serializeObject();
 91 
 		var params = $('#ITP_FORM_MOBILE_LOGIN').serializeObject();
103 
-		console.log(JSON.stringify(params));
92 
+		// console.log(JSON.stringify(params));
104 
 		fn_ajax_call('/api/member/sign-in-app', JSON.stringify(params), loginFn, 'POST'); //암호화 해서 보내는 경우 먼저 해시키를 가져와서 암호화해서 보낸다
 93 
 		fn_ajax_call('/api/member/sign-in-app', JSON.stringify(params), loginFn, 'POST'); //암호화 해서 보내는 경우 먼저 해시키를 가져와서 암호화해서 보낸다
105 
 	};
 94 
 	};
106 
 	fn_ajax_call('/api/session/hashed', null, callbackFn, 'GET'); //Crypto 암호화를 위한 해쉬키.. 로그인 후에는 Jwt 포함인 /api/session/hashedKey 이걸로 호출해서 사용한다.
 95 
 	fn_ajax_call('/api/session/hashed', null, callbackFn, 'GET'); //Crypto 암호화를 위한 해쉬키.. 로그인 후에는 Jwt 포함인 /api/session/hashedKey 이걸로 호출해서 사용한다.
107 
-
108 
-	// 공통코드 저장 테스트
109 
-	// let map = new Map();
110 
-	// map.set('useYn', JSON.stringify([{'codeDtlCd':'Y','codeDtlNm':'사용'},{'codeDtlCd':'N','codeDtlNm':'미사용'}]));
111 
-	// sessionStorage.itp_common_code = JSON.stringify(Array.from(map.entries()));
112 
-
113 
-	// $(location).attr('href', ITP_CONTEXTPATH + '/main.html');
114 
 }
 96 
 }

+ 16 - 11
src/main/webapp/mobile/js/app/main.js
View File 

@@ -8,6 +8,7 @@ let NTICE_DETAIL_GRID_LIST = '/api/ntice/detail-grid-list';
8
8
9 
 require(['config'], function() {
 9 
 require(['config'], function() {
10 
 	require([
 10 
 	require([
11 
+		'jquery'
11 
 	], function($) {
 12 
 	], function($) {
12
13
13 
 		setTimeout(function() {
 14 
 		setTimeout(function() {
 
@@ -15,24 +16,28 @@ require(['config'], function() {
15 
 			// $('#ITP_FORM_MAIN_NOTICE_SEARCH_SCH_DT').val(itp_fn_date_format(new Date(), 2));
 16 
 			// $('#ITP_FORM_MAIN_NOTICE_SEARCH_SCH_DT').val(itp_fn_date_format(new Date(), 2));
16 
 			// $('#ITP_FORM_MAIN_NOTICE_SEARCH_USER_ID').val(USER_ID);
 17 
 			// $('#ITP_FORM_MAIN_NOTICE_SEARCH_USER_ID').val(USER_ID);
17 
 			//
 18 
 			//
18 
-			// // 그리드
19 
-			// itp_fn_jqgrid_resize(MAIN_NOTICE_GRID_ID, MAIN_NOTICE_GRID_LIST, 'lg');
20 
-			// itp_fn_MAIN_NOTICE_grid.init();
21 
-	    	// itp_fn_fire_window_resize();
22 
-			//
23 
-			// // 조회
24 
-	    	// itp_fn_MAIN_NOTICE_search();
25 
-			//
26 
 	    	// // Barcode
 19 
 	    	// // Barcode
27 
 			// itp_fn_barcode.init();
 20 
 			// itp_fn_barcode.init();
28
21
29 
-			$('#ITP_BTN_MENU').on('click', function() {
22 
+			$('#ITP_MOBILE_BTN_MENU').on('click', function() {
30 
 				console.log('aaaaaaaaaaaaaa');
 23 
 				console.log('aaaaaaaaaaaaaa');
31 
-				// $('#ITP_MENU').toggle();
24 
+				$('#ITP_MENU').toggle();
32 
 				$('#ITP_MENU').toggleClass('itp_open_nav');
 25 
 				$('#ITP_MENU').toggleClass('itp_open_nav');
33 
-				// $('#ITP_CONTAINER').toggleClass('itp_open_conts');
34 
 				itp_fn_fire_window_resize();
 26 
 				itp_fn_fire_window_resize();
35 
 			});
 27 
 			});
28 
+
29 
+			$('#ITP_MOBILE_BTN_HOME').on('click', function() {
30 
+				console.log('bbbbbbbbbbbb');
31 
+			});
32 
+
33 
+			$('#ITP_MOBILE_BTN_LOGOUT').on('click', function() {
34 
+				console.log('cccccccccccc');
35 
+			});
36 
+
37 
+			$('#ITP_MOBILE_BTN_SETTING').on('click', function() {
38 
+				console.log('ddddddddddddd');
39 
+				$('#ITP_MENU').toggle();
40 
+			});
36 
 		}, 100);
 41 
 		}, 100);
37
42
38 
 	});
 43 
 	});

+ 8 - 1
src/main/webapp/mobile/js/config.js
View File 

@@ -107,11 +107,18 @@ require([
107 
 	});
 107 
 	});
108
108
109 
 	// 로그아웃 버튼
 109 
 	// 로그아웃 버튼
110 
-	$('#ITP_BTN_LOGOUT').click(function() {
110 
+	$('#ITP_MOBILE_BTN_LOGOUT').click(function() {
111 
 		console.log('ITP_BTN_LOGOUT');
 111 
 		console.log('ITP_BTN_LOGOUT');
112 
 		fnLogout();
 112 
 		fnLogout();
113 
 	});
 113 
 	});
114
114
115 
+	var pathname = $(location).attr('pathname');
116 
+	console.log('VIEW_PAGE ===> ', VIEW_PAGE);
117 
+	console.log('pathname ===> ', pathname);
118 
+	if(VIEW_PAGE !== 'LOGIN') {
119 
+
120 
+	}
121 
+
115 
 });
 122 
 });
116
123
117 
 function fn_make_select(options, code, select_id, all_show_yn, all_name) { //셀렉트 박스 만들기
 124 
 function fn_make_select(options, code, select_id, all_show_yn, all_name) { //셀렉트 박스 만들기