2 Revīzijas 32b1a19ffd ... 59a86e4c18

Autors SHA1 Ziņojums Datums
  dwkim 59a86e4c18 Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view 2 gadi atpakaļ
  dwkim aee3b5c7c7 미납금관리 수정 및 매장팝업 검색항목 추가 2 gadi atpakaļ

+ 1 - 0
src/main/webapp/app/popup/biz/BIZPOP_BRAND_STORE.html

@@ -13,6 +13,7 @@
13
 							<div class="form-horizontal fix">
13
 							<div class="form-horizontal fix">
14
 								<div class="col-xs-9 itp_ip itp_pr">
14
 								<div class="col-xs-9 itp_ip itp_pr">
15
 									<input type="text" name="afflShopNm" id="ITP_FORM_BIZPOP_BRAND_STORE_NM" class="form-control itp_input" placeholder="매장명">
15
 									<input type="text" name="afflShopNm" id="ITP_FORM_BIZPOP_BRAND_STORE_NM" class="form-control itp_input" placeholder="매장명">
16
+									<input type="hidden" name="sloanDvsn" id="ITP_FORM_BIZPOP_LOAN_DVSN" class="form-control itp_input" >
16
 								</div>
17
 								</div>
17
 								<div class="pull-right itp_cicon">
18
 								<div class="pull-right itp_cicon">
18
 									<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_BRAND_STORE_BTN_SEARCH" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i> 조회</button>
19
 									<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_BRAND_STORE_BTN_SEARCH" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i> 조회</button>

+ 5 - 3
src/main/webapp/js/app/loanmng/ITP_LOANMNG03010.js

@@ -374,12 +374,14 @@ let listObj = {
374
 			createObj.init();
374
 			createObj.init();
375
 		}, 
375
 		}, 
376
 		storePop: function() {
376
 		storePop: function() {
377
-			fn_call_popup('biz', 'BIZPOP_BRAND_STORE', '#ITP_ASIDE', function(result) {
377
+			
378
+			const key = {loanDvsn:"LD02"};
379
+			fn_call_popup('biz', 'BIZPOP_BRAND_STORE', '#ITP_ASIDE',function(result) {
378
 				// alert(JSON.stringify(result));
380
 				// alert(JSON.stringify(result));
379
 				$('#ITP_FORM_LOANMNG03010_SEARCH_STORE_ID').val(result[0].storeId);
381
 				$('#ITP_FORM_LOANMNG03010_SEARCH_STORE_ID').val(result[0].storeId);
380
-				$('#ITP_FORM_LOANMNG03010_SEARCH_STORE_NM').val(result[0].storeNm);				
382
+				$('#ITP_FORM_LOANMNG03010_SEARCH_STORE_NM').val(result[0].storeNm);
381
 				listObj.button.search();
383
 				listObj.button.search();
382
-			}, null, 'S');
384
+			}, key, 'S');
383
 		}, 
385
 		}, 
384
 		storeErase: function() {
386
 		storeErase: function() {
385
 			$('#ITP_FORM_LOANMNG03010_SEARCH_STORE_ID').val('');
387
 			$('#ITP_FORM_LOANMNG03010_SEARCH_STORE_ID').val('');

+ 9 - 0
src/main/webapp/js/app/popup/biz/ITP_BIZPOP_BRAND_STORE.js

@@ -10,6 +10,7 @@ let API_POP_GRID_LIST = '/api/store/pop-grid-list';
10
 
10
 
11
 function itp_fn_BIZPOP_BRAND_STORE(parentPopFn, args, returnType) {
11
 function itp_fn_BIZPOP_BRAND_STORE(parentPopFn, args, returnType) {
12
 	
12
 	
13
+	console.log(args);
13
 	let itp_BIZPOP_BRAND_STORE_param = {};
14
 	let itp_BIZPOP_BRAND_STORE_param = {};
14
 	let itp_BIZPOP_BRAND_STORE_search = false;
15
 	let itp_BIZPOP_BRAND_STORE_search = false;
15
 
16
 
@@ -20,8 +21,14 @@ function itp_fn_BIZPOP_BRAND_STORE(parentPopFn, args, returnType) {
20
 	$('#ITP_FORM_BIZPOP_BRAND_ID').val(fn_make_user_info.get('brandId'));
21
 	$('#ITP_FORM_BIZPOP_BRAND_ID').val(fn_make_user_info.get('brandId'));
21
 	if(args) {
22
 	if(args) {
22
 		$('#ITP_FORM_BIZPOP_BRAND_STORE_NM').val(args.storeNm);
23
 		$('#ITP_FORM_BIZPOP_BRAND_STORE_NM').val(args.storeNm);
24
+		
25
+		if (args.loanDvsn) {
26
+			$('#ITP_FORM_BIZPOP_LOAN_DVSN').val(args.loanDvsn);
27
+		}
23
 	}
28
 	}
24
 	
29
 	
30
+	
31
+	
25
 	$('#ITP_BIZPOP_BRAND_STORE').one('shown.bs.modal', function(e) {
32
 	$('#ITP_BIZPOP_BRAND_STORE').one('shown.bs.modal', function(e) {
26
 		itp_fn_jqgrid_resize(THIS_GIRD_ID, '#ITP_BIZPOP_BRAND_STORE_jqGrid_list', '');
33
 		itp_fn_jqgrid_resize(THIS_GIRD_ID, '#ITP_BIZPOP_BRAND_STORE_jqGrid_list', '');
27
 		itp_fn_fire_window_resize();
34
 		itp_fn_fire_window_resize();
@@ -75,6 +82,8 @@ function itp_fn_BIZPOP_BRAND_STORE(parentPopFn, args, returnType) {
75
 
82
 
76
 	itp_fn_BIZPOP_BRAND_STORE_empty.push();
83
 	itp_fn_BIZPOP_BRAND_STORE_empty.push();
77
 	let param = $('#ITP_FORM_BIZPOP_BRAND_STORE').serializeObject();
84
 	let param = $('#ITP_FORM_BIZPOP_BRAND_STORE').serializeObject();
85
+	console.log("=============");
86
+	console.log(param);
78
 	param.gridSize = 10;
87
 	param.gridSize = 10;
79
 
88
 
80
 	$(THIS_GIRD_ID).jqGrid({
89
 	$(THIS_GIRD_ID).jqGrid({