소스 검색

운영관리, 기준정보관리 오류 수정

juney 2 년 전
부모
커밋
86eb7d0292

+ 6 - 5
src/main/webapp/app/stinfo/STINFO03010.html

@@ -52,6 +52,7 @@
52 52
 								<input type="hidden" id="ITP_FORM_STINFO03010_DETAIL_POP_NO" name="popNo" value="">
53 53
 								<input type="hidden" id="ITP_FORM_STINFO03010_DETAIL_AFFL_SHOP_ID" name="afflShopId" value="">
54 54
 								<input type="hidden" id="ITP_FORM_STINFO03010_DETAIL_BRAND_ID" name="brandId" value="">
55
+								<input type="hidden" id="ITP_FORM_STINFO03010_DETAIL_SPPLY_ID" name="spplyId" value="">
55 56
 								<input type="hidden" id="ITP_FORM_STINFO03010_DETAIL_ACCT_FILE_NO" name="bsnsRegFileNo" value="">
56 57
 								<input type="hidden" id="ITP_FORM_STINFO03010_DETAIL_CORP_FILE_NO" name="bbookCopyFileNo" value="">
57 58
 					
@@ -78,9 +79,9 @@
78 79
 											<label class="col-xs-2 itp_lb">공급업체번호</label>
79 80
 											<div class="col-xs-4 itp_ip">
80 81
 												<div class="col-xs-7 itp_in fnSpplyId" style="top:4px;"></div>
81
-												<div class="col-xs-4 itp_in" style="margin-left:5px;">
82
+												<!--<div class="col-xs-4 itp_in" style="margin-left:5px;">
82 83
 													<button type="button" id="ITP_BTN_STINFO03010_RESET_PW" class="btn btn-danger btn-sm PWC" style="margin: -1px 0px 0px 3px; display:block;">비밀번호 초기화</button>
83
-												</div>
84
+												</div>-->
84 85
 											</div>
85 86
 											<label class="col-xs-2 itp_lb">기업형태 *</label>
86 87
 											<div class="col-xs-4 itp_ip">
@@ -327,7 +328,7 @@
327 328
 							<form id="ITP_FORM_STINFO03010_VIEW" class="form-horizontal">
328 329
 								<input type="hidden" id="ITP_FORM_STINFO03010_VIEW_VIEW_CD" name="viewCd" value="C">
329 330
 								<input type="hidden" id="ITP_FORM_STINFO03010_VIEW_POP_NO" name="popNo" value="">
330
-								<input type="hidden" id="ITP_FORM_STINFO03010_DETAIL_SPPLY_ID" name="spplyId" value="">
331
+								<input type="hidden" id="ITP_FORM_STINFO03010_VIEW_SPPLY_ID" name="spplyId" value="">
331 332
 								<input type="hidden" id="ITP_FORM_STINFO03010_VIEW_MENU_NO" name="menuNo" value="">
332 333
 								<input type="hidden" id="ITP_FORM_STINFO03010_VIEW_FILE_NO" name="popFileNo" value="">
333 334
 					
@@ -458,12 +459,12 @@
458 459
 										<div class="form-group">
459 460
 											<label class="col-xs-2 itp_lb">통장사본</label>
460 461
 											<div class="col-xs-4 itp_ip">
461
-												<div class="col-xs-6 itp_in fnFilePath">
462
+												<div id="ITP_STINFO03010_VIEW_ACCT_FILE" class="col-xs-6 itp_in fnFilePath">
462 463
 												</div>
463 464
 											</div>
464 465
 											<label class="col-xs-2 itp_lb">사업자등록파일</label>
465 466
 											<div class="col-xs-4 itp_ip">
466
-												<div class="col-xs-8 itp_in fnFilePath">
467
+												<div id="ITP_STINFO03010_VIEW_REG_NO_FILE" class="col-xs-8 itp_in fnFilePath">
467 468
 												</div>
468 469
 											</div>
469 470
 										</div>

+ 3 - 3
src/main/webapp/app/stinfo/STINFO04010.html

@@ -101,7 +101,7 @@
101 101
 											<label class="col-xs-2 itp_lb">상태 *</label>
102 102
 											<div class="col-xs-3 itp_ip">
103 103
 												<div class="col-xs-9 itp_in">
104
-								               		<select id="ITP_FORM_STINFO04010_DETAIL_ST_CD" data-select-code="ITEM_ST_CD" data-check-required="empty" class="form-control itp_input default_st_cd" name="itemStCd"></select>
104
+								               		<select id="ITP_FORM_STINFO04010_DETAIL_ITEM_ST_CD" data-select-code="ITEM_ST_CD" data-check-required="empty" class="form-control itp_input default_st_cd" name="itemStCd"></select>
105 105
 												</div>
106 106
 											</div>
107 107
 										</div>
@@ -352,7 +352,7 @@
352 352
 										</div>
353 353
 									</div>
354 354
 									<div class="itp_form_in">
355
-										<div class="form-group colspan">
355
+										<div class="form-group border">
356 356
 											<label class="col-xs-2 itp_lb">품목이미지</label>
357 357
 											<div class="col-xs-10 itp_ip colspan">
358 358
 												<div class="fileupload-wrapper">
@@ -587,7 +587,7 @@
587 587
 										<div class="form-group border">
588 588
 											<label class="col-xs-2 itp_lb">품목이미지</label>
589 589
 											<div class="col-xs-12 itp_ip colspan">
590
-												<div class="col-xs-1 itp_in fnItemImageFile" style="width:auto;">
590
+												<div id="ITP_FORM_STINFO04010_VIEW_FILE" class="col-xs-1 itp_in fnItemImageFile" style="width:auto;">
591 591
 												</div>
592 592
 											</div>
593 593
 										</div>

+ 10 - 5
src/main/webapp/app/stinfo/STINFO05010.html

@@ -85,6 +85,11 @@
85 85
 								<input type="hidden" id="ITP_FORM_STINFO05010_DETAIL_AFFL_SHOP_ID" name="afflShopId" value="">
86 86
 								<input type="hidden" id="ITP_FORM_STINFO05010_DETAIL_BRAND_ID" name="brandId" value="">
87 87
 								<input type="hidden" id="ITP_FORM_STINFO05010_DETAIL_BRAND_UNIT_UNQ_NO" name="brandUnitUnqNo" value="">
88
+								<input type="hidden" id="ITP_FORM_STINFO05010_DETAIL_ITEM_ID" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="empty" name="itemId" value="">
89
+								<input type="hidden" id="ITP_FORM_STINFO05010_DETAIL_ITEM_NM" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="empty" name="itemNm" value="">
90
+								<input type="hidden" id="ITP_FORM_STINFO05010_DETAIL_SPPLY_ID" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="empty" name="spplyId" value="">
91
+								<input type="hidden" id="ITP_FORM_STINFO05010_DETAIL_SPPLY_NM" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="empty" name="spplyNm" value="">
92
+								<input type="hidden" id="ITP_FORM_STINFO05010_DETAIL_FILE_NO" name="shortContFileNo" value="">
88 93
 					
89 94
 								<section class="itp_form_sec">
90 95
 									<h4 class="itp_form_tit">단가정보-신규</h4>
@@ -107,10 +112,10 @@
107 112
 												<label class="col-xs-2 itp_lb">품목번호 *</label>
108 113
 												<div class="col-xs-10 itp_ip">
109 114
 													<div class="col-xs-3 itp_in">
110
-														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_ITEM_ID" data-check-required="empty" class="form-control itp_input" name="itemId" value="" maxlength="100" readonly>
115
+														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_SCH_ITEM_ID" class="form-control itp_input" value="" maxlength="100" readonly>
111 116
 									                </div>
112 117
 													<div class="col-xs-3 itp_in" style="padding-left: 5px;">
113
-														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_ITEM_NM" data-check-required="empty" class="form-control itp_input" name="itemNm" value="" maxlength="100" readonly>
118
+														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_SCH_ITEM_NM" class="form-control itp_input" value="" maxlength="100" readonly>
114 119
 									                </div>
115 120
 													<div class="col-xs-2 itp_in" style="padding-left: 5px;">
116 121
 														<button type="button" id="ITP_BTN_STINFO05010_DETAIL_ITEM_SRH_" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
@@ -122,10 +127,10 @@
122 127
 												<label class="col-xs-2 itp_lb">공급업체 *</label>
123 128
 												<div class="col-xs-10 itp_ip">
124 129
 													<div class="col-xs-3 itp_in">
125
-														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_SPPLY_ID" data-check-required="empty" class="form-control itp_input" name="spplyId" value="공급업체번호" maxlength="100" readonly>
130
+														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_SCH_SPPLY_ID" class="form-control itp_input"  value="공급업체번호" maxlength="100" readonly>
126 131
 									                </div>
127 132
 													<div class="col-xs-3 itp_in" style="padding-left: 5px;">
128
-														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_SPPLY_NM" data-check-required="empty" class="form-control itp_input" name="spplyNm" value="공급업체명" maxlength="100" readonly>
133
+														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_SCH_SPPLY_NM" class="form-control itp_input" value="공급업체명" maxlength="100" readonly>
129 134
 									                </div>
130 135
 													<div class="col-xs-2 itp_in" style="padding-left: 5px;">
131 136
 														<button type="button" id="ITP_BTN_STINFO05010_DETAIL_SPPLY_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
@@ -338,7 +343,7 @@
338 343
 									<div class="itp_form_in">
339 344
 										<div class="form-group border">
340 345
 											<label class="col-xs-2 itp_lb">계약문서</label>
341
-											<div class="col-xs-10 itp_ip fnFilePath"></div>
346
+											<div id="ITP_FORM_STINFO05010_VIEW_FILE" class="col-xs-10 itp_ip fnFilePath"></div>
342 347
 										</div>	
343 348
 									</div>			
344 349
 								</section>								

+ 1 - 0
src/main/webapp/app/stinfo/STINFO07010.html

@@ -7,6 +7,7 @@
7 7
 					<button type="button" id="ITP_BTN_STINFO07010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
8 8
 					<button type="button" id="ITP_BTN_STINFO07010_NEWREG" class="btn btn-primary btn-sm ADB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;추가&nbsp;&nbsp;</button>
9 9
 					<button type="button" id="ITP_BTN_STINFO07010_DELETE" class="btn btn-danger btn-sm DEB"><i class="glyphicon "></i>&nbsp;&nbsp;삭제&nbsp;&nbsp;</button>
10
+					<button type="button" id="ITP_BTN_STINFO07010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon"></i>&nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
10 11
 				</div>
11 12
 			</div>
12 13
 			<div class="itp_det_in">

+ 2 - 2
src/main/webapp/js/app/config.js

@@ -3029,13 +3029,13 @@ let itp_fn_form_event = {
3029 3029
 let itp_fn_attach_file = {
3030 3030
 	view: (id, fileList, clazz, style) => {
3031 3031
 		$.each(fileList, function(i, item) {
3032
-			var text = 	'<img ' +
3032
+			var img = 	'<img ' +
3033 3033
 						'src="' + item.filePath + '" ' +
3034 3034
 						'alt="' + item.fileNm + '" ' +
3035 3035
 						'id="' + (item.fileNo + '_' + i) + '" ' +
3036 3036
 						'class="' + clazz + '" ' +
3037 3037
 						'style="' + style + '" />';
3038
-			$('#' + id).append(text);
3038
+			$('#' + id).append(img);
3039 3039
 		});
3040 3040
 	}
3041 3041
 };

+ 9 - 17
src/main/webapp/js/app/oper/ITP_OPER02010.js

@@ -146,7 +146,6 @@ let pageObj = {
146 146
 	init: function () {
147 147
 		this.ui.init();
148 148
 		this.event.init();
149
-		this.fileUpload();
150 149
 	},
151 150
 	pageMode: '',
152 151
 	ui: {
@@ -251,13 +250,17 @@ let pageObj = {
251 250
 		//파일업로드(등록/수정화면)
252 251
 		var id = 'OPER02010';
253 252
 		$('#ITP_' + id + '_DETAIL_UPLOAD').empty();
253
+		$('#ITP_' + id + '_DETAIL_LOGO_FILE').empty();
254
+		var removeFn = (param) => {
255
+			$('#ITP_' + id + '_DETAIL_LOGO_FILE').empty();
256
+		};
254 257
 		const fileArgs = {
255 258
 			'fileNo': $('#ITP_FORM_' + id + '_DETAIL_FILE_NO').val(),
256 259
 			'viewCd': $('#ITP_FORM_' + id + '_DETAIL_VIEW_CD').val(),
257 260
 			'showYn': $('#ITP_' + id + '_DETAIL_UPLOAD').attr('data-show-yn'),
258 261
 			'fileId': '#ITP_FORM_' + id + '_DETAIL_FILE_NO' //파일번호를 서버에서 받아서 넣을 파일번호 인풋박스 아이디
259 262
 		};
260
-		itp_fn_set_file_upload('ITP_' + id + '_DETAIL_UPLOAD', 'notice', true, false, id, fileArgs);
263
+		itp_fn_set_file_upload('ITP_' + id + '_DETAIL_UPLOAD', 'notice', true, false, id, fileArgs, removeFn);
261 264
 	},
262 265
 	switchScreen: function(mode) {
263 266
 		pageObj.pageMode = mode;
@@ -506,13 +509,8 @@ let viewObj = {
506 509
 		$('#ITP_FORM_OPER02010_VIEW .fnTargetNm').text(result.targetNm);
507 510
 		$('#ITP_FORM_OPER02010_VIEW_FILE_NO').val(result.fileNo); //파일번호 셋팅
508 511
 
509
-		//파일업로드(뷰화면)
510
-		$('#ITP_OPER02010_VIEW_UPLOAD').empty();
511
-		const fileArgs = {
512
-			'fileNo': $('#ITP_FORM_OPER02010_VIEW_FILE_NO').val(),
513
-			'viewCd': $('#ITP_FORM_OPER02010_VIEW_VIEW_CD').val()
514
-		};
515
-		itp_fn_set_file_upload('ITP_OPER02010_VIEW_UPLOAD', 'notice', true, false, 'OPER02010', fileArgs);
512
+		itp_fn_attach_file.view('ITP_OPER02010_VIEW_UPLOAD', result.fileNoList
513
+			, 'form-control itp_input', 'border:none; top:0px; left:12px; height:100px; width:125px; position:absolute;');
516 514
 
517 515
 		// 권한정보 리스트 조회
518 516
 		// pageObj.grid.init('VIEW');
@@ -572,14 +570,7 @@ let modifyObj = {
572 570
 		}
573 571
 
574 572
 		//파일업로드(수정화면)
575
-		$('#ITP_OPER02010_DETAIL_UPLOAD').empty();
576
-		const fileArgs = {
577
-			'fileNo': $('#ITP_FORM_OPER02010_DETAIL_FILE_NO').val(),
578
-			'viewCd': $('#ITP_FORM_OPER02010_DETAIL_VIEW_CD').val(),
579
-			'showYn': $('#ITP_OPER02010_DETAIL_UPLOAD').attr('data-show-yn'),
580
-			'fileId': '#ITP_FORM_OPER02010_DETAIL_FILE_NO' //파일번호를 서버에서 받아서 넣을 파일번호 인풋박스 아이디
581
-		};
582
-		itp_fn_set_file_upload('ITP_OPER02010_DETAIL_UPLOAD', 'notice', true, false, 'OPERATION02010', fileArgs);
573
+		pageObj.fileUpload();
583 574
 
584 575
 		// 리스트 조회
585 576
 		// createObj.form.init();
@@ -590,6 +581,7 @@ let modifyObj = {
590 581
 /*신규화면 Object*/
591 582
 let createObj = {
592 583
 	init: function () {
584
+		pageObj.fileUpload();
593 585
 		// this.form.init();
594 586
 	},
595 587
 	/*form: {

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

@@ -488,7 +488,6 @@ let viewObj = {
488 488
 		$('#ITP_FORM_OPER03010_VIEW .fnLoadAddr').text(result.addr1);
489 489
 		$('#ITP_FORM_OPER03010_VIEW .fnDtlAddr').text(result.addr2);
490 490
 
491
-		pageObj.fileUpload();
492 491
 		itp_fn_attach_file.view('ITP_OPER03010_VIEW_LOGO_FILE', result.fileLogNoList
493 492
 			, 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
494 493
 
@@ -598,7 +597,6 @@ let createObj = {
598 597
 		},
599 598
 		save: function() {
600 599
 			const formId = '#ITP_FORM_OPER03010_DETAIL';
601
-			itp_fn_form_event.removeChar('#ITP_FORM_OPER03010_DETAIL');
602 600
 			itp_fn_form_clear_validate(null, formId);
603 601
 
604 602
 			if (itp_fn_form_event.isValid(formId)) {
@@ -624,6 +622,7 @@ let createObj = {
624 622
 						}
625 623
 					});
626 624
 
625
+					itp_fn_form_event.removeChar(formId);
627 626
 					let param = $(formId).serializeObject();
628 627
 					param.gridInsertData = gridInsertData;
629 628
 					param.gridUpdateData = gridUpdateData;

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

@@ -437,8 +437,9 @@ let modifyObj = {
437 437
         $('#ITP_FORM_OPER06010_DETAIL .fnAddDt').text(result.sysRegDttm);
438 438
         $('#ITP_FORM_OPER06010_DETAIL .fnChgDt').text(result.sysChgDttm);
439 439
 
440
+        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_FILE_NO').val(result.brandLogoFileNo);
440 441
         pageObj.fileUpload();
441
-        itp_fn_attach_file.view('ITP_OPER03010_DETAI_LOGO_FILE', result.fileLogNoList
442
+        itp_fn_attach_file.view('ITP_OPER06010_DETAIL_LOGO_FILE', result.fileLogNoList
442 443
             , 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
443 444
 
444 445
         let locate = result.addr1 + ' ' + result.addr2;

+ 14 - 249
src/main/webapp/js/app/stinfo/ITP_STINFO02011.js

@@ -10,30 +10,11 @@ require(['config'], function() {
10 10
  --------------------------------------------------------
11 11
  - Object 목록								            -
12 12
  --------------------------------------------------------
13
- * const gridColModel = {}	: 화면 Grid Object			*
14 13
  * let pageObj = {}			: 화면공통 Object			*
15
- * let listObj = {}			: 목록화면 Object			*
16 14
  * let viewObj = {}			: 상세화면 Object			*
17 15
  * let modifyObj = {}		: 수정화면 Object			*
18
- * let createObj = {}		: 신규화면 Object			*
19 16
  *******************************************************/
20 17
 
21
-/*화면 변수*/
22
-const STINFO02011_GRID_ID = '#ITP_STINFO02011_jqGrid';
23
-const STINFO02011_GRID_LIST = '#ITP_STINFO02011_jqGrid_list';
24
-const STINFO02011_GRID_PAGER = '#ITP_STINFO02011_jqGridPager';
25
-const STINFO02011_GRID_EMPTY = '#ITP_STINFO02011_jqGridEmpty';
26
-
27
-const STINFO02011_VIEW_GRID_ID = '#ITP_STINFO02011_VIEW_jqGrid';
28
-const STINFO02011_VIEW_GRID_LIST = '#ITP_STINFO02011_VIEW_jqGrid_list';
29
-const STINFO02011_VIEW_GRID_PAGER = '#ITP_STINFO02011_VIEW_jqGridPager';
30
-const STINFO02011_VIEW_GRID_EMPTY = '#ITP_STINFO02011_VIEW_jqGridEmpty';
31
-
32
-const STINFO02011_DETAIL_GRID_ID = '#ITP_STINFO02011_DETAIL_jqGrid';
33
-const STINFO02011_DETAIL_GRID_LIST = '#ITP_STINFO02011_DETAIL_jqGrid_list';
34
-const STINFO02011_DETAIL_GRID_PAGER = '#ITP_STINFO02011_DETAIL_jqGridPager';
35
-const STINFO02011_DETAIL_GRID_EMPTY = '#ITP_STINFO02011_DETAIL_jqGridEmpty';
36
-
37 18
 let ITP_FORM_STINFO02011_DETAIL_IS_WRITING = false;
38 19
 
39 20
 /*API URL*/
@@ -42,100 +23,6 @@ let API_DETAIL_INFO 		= '/api/store/info-store';			// 상세
42 23
 let API_DETAIL_SAVE 		= '/api/store/save-store';			// 저장
43 24
 let API_INTI_PW				= '/api/store/inti-storePw';		// 패스워드 초기화
44 25
 
45
-/*화면 Grid ColModel*/
46
-const gridColModel = {
47
-	list: [
48
-		{
49
-			index: 'STORE_ID', name: 'storeId',
50
-			label: ITP_MSG_LOCALE.label.storeId, //매장번호
51
-			width: '10', fixed: false, align: 'center',
52
-			sortable: false, hidden: false
53
-		},
54
-		{
55
-			index: 'STORE_NM', name: 'storeNm',
56
-			label: ITP_MSG_LOCALE.label.storeNm, //매장명
57
-			width: '13', fixed: false, align: 'center',
58
-			sortable: false, hidden: false
59
-		},
60
-		{
61
-			index: 'BRAND_ID', name: 'brandId',
62
-			label: ITP_MSG_LOCALE.label.brandId, //브랜드ID
63
-			width: '10', fixed: false, align: 'center',
64
-			sortable: false, hidden: true
65
-		},
66
-		{
67
-			index: 'BRAND_NM', name: 'brandNm',
68
-			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
69
-			width: '10', fixed: false, align: 'center',
70
-			sortable: false, hidden: false
71
-		},
72
-		{
73
-			index: 'BSNS_REG_NO', name: 'bsnsRegNo',
74
-			label: ITP_MSG_LOCALE.label.bsnsRegNo, //사업자등록번호
75
-			width: '13', fixed: false, align: 'center',
76
-			sortable: false, hidden: false
77
-		},
78
-		{
79
-			index: 'STORE_DVSN', name: 'storeDvsn',
80
-			label: ITP_MSG_LOCALE.label.storeDvsn, //매장구분
81
-			width: '15', fixed: false, align: 'center',
82
-			sortable: false, hidden: true
83
-		},
84
-		{
85
-			index: 'STORE_DVSN_NM', name: 'storeDvsnNm',
86
-			label: ITP_MSG_LOCALE.label.storeDvsn, //매장구분명
87
-			width: '15', fixed: false, align: 'center',
88
-			sortable: false, hidden: false
89
-		},
90
-		{
91
-			index: 'STORE_ST_NM', name: 'storeStNm',
92
-			label: ITP_MSG_LOCALE.label.stNm, //상태
93
-			width: '6', fixed: false, align: 'center',
94
-			sortable: false, hidden: false
95
-		},
96
-		{
97
-			index: 'SYS_REG_DTTM', name: 'sysRegDttm',
98
-			label: ITP_MSG_LOCALE.label.sysRegDttm, //최초등록일
99
-			width: '10', fixed: false, align: 'center',
100
-			sortable: false, hidden: false
101
-		},
102
-	],
103
-	detail: [
104
-		{
105
-			index: 'VIEW_CD', name: 'viewCd',
106
-			label: ITP_MSG_LOCALE.label.viewCd,
107
-			width: '10', fixed: false, align: 'center',
108
-			sortable: false, hidden: true
109
-		},
110
-		{
111
-			index: 'AUTH_NO', name: 'authNo',
112
-			label: ITP_MSG_LOCALE.label.permitCd,
113
-			width: '20', fixed: false, align: 'center',
114
-			sortable: false, editable: false, edittype: 'text',
115
-			editrules: {required: true}
116
-		},
117
-		{
118
-			index: 'AUTH_NM', name: 'authNm',
119
-			label: ITP_MSG_LOCALE.label.permitName,
120
-			width: '30', fixed: false, align: 'center',
121
-			sortable: true, editable: false, edittype: 'text',
122
-			editrules: {required: true}
123
-		},
124
-		{
125
-			index: 'USE_YN_NM', name: 'useYnNm',
126
-			label: ITP_MSG_LOCALE.label.status,
127
-			width: '10', fixed: false, align: 'center',
128
-			sortable: false, editable: false, edittype: 'text'
129
-		},
130
-		{
131
-			index: 'ADD_DT', name: 'addDt',
132
-			label: ITP_MSG_LOCALE.label.regDt,
133
-			width: '10', fixed: false, align: 'center',
134
-			sortable: false, editable: false, edittype: 'text'
135
-		}
136
-	]
137
-};
138
-
139 26
 /*화면공통 Object*/
140 27
 let pageObj = {
141 28
 	init: function () {
@@ -146,7 +33,6 @@ let pageObj = {
146 33
 		init: function () {
147 34
 			this.view();
148 35
 			this.form();
149
-			this.grid();
150 36
 			this.ready();
151 37
 		},
152 38
 		view: function() {
@@ -168,7 +54,7 @@ let pageObj = {
168 54
 
169 55
 			// form alert message 주입
170 56
 			$('input[data-alert-required="ONLYCHK"]').each(function() {
171
-				if($(this).data('alert-msg') === 'address') {
57
+				if($(this).data('alert-msg') === 'addrses') {
172 58
 					$(this).data('alert-msg', ITP_MSG_LOCALE.message.form.emptyAddr);
173 59
 				}
174 60
 			});
@@ -176,11 +62,6 @@ let pageObj = {
176 62
 		form: function() {
177 63
 			itp_fn_form_event.onKeyup('#ITP_FORM_STINFO02011_DETAIL');
178 64
 		},
179
-		grid: function() {
180
-			// itp_fn_jqgrid_resize(STINFO02011_GRID_ID, STINFO02011_GRID_LIST, 'lg');
181
-			// listObj.empty.init();
182
-			// itp_fn_fire_window_resize();
183
-		},
184 65
 		ready: function() {
185 66
 			viewObj.init();
186 67
 		}
@@ -206,18 +87,16 @@ let pageObj = {
206 87
 		}
207 88
 	},
208 89
 	switchScreen: function(mode) {
209
-		$('.itp_det_head').find('button[id^="ITP_BTN_STINFO02011_"]').each(function(i) {
210
-			$(this).hide();
211
-		});
212
-		$('#ITP_TAB_STINFO02011').find('div[id$="_CONTAINER"]').each(function(i) {
213
-			$(this).hide();
214
-		});
90
+		$('.itp_det_head').find('button[id^="ITP_BTN_STINFO02011_"]').hide();
91
+		$('#ITP_TAB_STINFO02011').find('div[id$="_CONTAINER"]').hide();
92
+
215 93
 		if(mode == 'LIST') { // 목록
216 94
 			$('#ITP_AJAX_STINFO02011_LIST_CONTAINER').show();
217 95
 			fn_show_btn_auth_array(['#ITP_BTN_STINFO02011_SRH', '#ITP_BTN_STINFO02011_NEWREG']);
96
+			$('#ITP_FORM_STINFO02011_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
218 97
 		} else if(mode == 'ADD') { // 등록
219 98
 			$('#ITP_AJAX_STINFO02011_DETAIL_CONTAINER').show();
220
-			fn_show_btn_auth_array(['#ITP_BTN_STINFO02011_CANCELLIST', '#ITP_BTN_STINFO02011_SAVE']);
99
+			fn_show_btn_auth_array(['#ITP_BTN_STINFO02011_SAVE']);
221 100
 
222 101
 			$('#ITP_FORM_STINFO02011_DETAIL').find('input, textarea, select, checkbox').each(function(i, elem) {
223 102
 				$(this).attr('id') === 'ITP_FORM_STINFO02011_DETAIL_VIEW_CD' ? $(this).val('C') : $(this).val('');
@@ -226,7 +105,6 @@ let pageObj = {
226 105
 				}
227 106
 			});
228 107
 
229
-
230 108
 			// 가맹점 정보 설정
231 109
 			$('#ITP_FORM_STINFO02011_DETAIL_AFFL_SHOP_ID').val(fn_make_user_info.get('afflShopId'));
232 110
 			$('#ITP_FORM_STINFO02011_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
@@ -244,15 +122,17 @@ let pageObj = {
244 122
 				if($(this).data('check-required')) $(this).data('check-required', 'empty');
245 123
 				$(this).attr('disabled', false);
246 124
 			});
125
+
247 126
 		} else if(mode == 'MODIFY') { // 수정
248 127
 			$('#ITP_AJAX_STINFO02011_DETAIL_CONTAINER').show();
249
-			fn_show_btn_auth_array(['#ITP_BTN_STINFO02011_CANCELLIST', '#ITP_BTN_STINFO02011_SAVE', '#ITP_BTN_STINFO02011_RESET_PW']);
128
+			fn_show_btn_auth_array(['#ITP_BTN_STINFO02011_CANCELLIST', '#ITP_BTN_STINFO02011_SAVE']);
250 129
 
251 130
 			$('#ITP_FORM_STINFO02011_DETAIL_AFFL_SHOP_ID').val(fn_make_user_info.get('afflShopId'));
252 131
 			$('#ITP_FORM_STINFO02011_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
253 132
 			$('#ITP_FORM_STINFO02011_DETAIL .fnBrandNm').text(fn_make_user_info.get('brandNm'));
254 133
 
255 134
 			$('#ITP_FORM_STINFO02011_DETAIL_STORE_ID').attr('readonly', true);
135
+			// $('#ITP_BTN_STINFO02011_RESET_PW').show();
256 136
 			$('#ITP_FORM_STINFO02011_DETAIL .itp_form_info').show();
257 137
 			$('#ITP_FORM_STINFO02011_DETAIL .itp_form_info').find('input, select').each(function(i, elem) {
258 138
 				if($(this).data('check-required')) $(this).data('check-required', 'empty');
@@ -263,114 +143,10 @@ let pageObj = {
263 143
 				if($(this).data('check-required')) $(this).data('check-required', '');
264 144
 				$(this).attr('disabled', true);
265 145
 			});
146
+
266 147
 		} else if(mode == 'VIEW') { // 보기
267 148
 			$('#ITP_AJAX_STINFO02011_VIEW_CONTAINER').show();
268
-			fn_show_btn_auth_array(['#ITP_BTN_STINFO02011_MODIFY', '#ITP_BTN_STINFO02011_CANCELLIST']);
269
-		}
270
-	}
271
-};
272
-
273
-/*목록화면 Object*/
274
-let listObj = {
275
-	init: function () {
276
-		this.grid.init();
277
-	},
278
-	itp_STINFO02011_search: false,
279
-	button: {
280
-		search: function() {
281
-			listObj.itp_STINFO02011_search = true;
282
-			let param = $('#ITP_FORM_STINFO02011_SEARCH').serializeObject();
283
-			param.gridSize = $.jgrid.defaults.rowNum;
284
-			param.gridPage = $.jgrid.defaults.page;
285
-			$(STINFO02011_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
286
-		},
287
-		create: function() {
288
-			pageObj.switchScreen('ADD');
289
-			itp_fn_form_clear_validate(null, '#ITP_FORM_STINFO02011_DETAIL');
290
-			createObj.init();
291
-		}
292
-	},
293
-	empty: {
294
-		init: function() {
295
-			var _this = this;
296
-			this.push();
297
-			$(STINFO02011_GRID_EMPTY).on('click', function() {
298
-				_this.back();
299
-				_this.itp_STINFO02011_param.gridSize = $.jgrid.defaults.rowNum;
300
-				$(STINFO02011_GRID_ID).setGridParam({'postData': JSON.stringify(_this.itp_STINFO02011_param)}).trigger('reloadGrid');
301
-			});
302
-		},
303
-		itp_STINFO02011_param: {},
304
-		push: function() {
305
-			let param = $('#ITP_FORM_STINFO02011_SEARCH').serializeObject();
306
-			listObj.itp_STINFO02011_param = param;
307
-		},
308
-		back: function() {
309
-			$('#ITP_FORM_STINFO02011_SERVICE_ST_DT').val(this.itp_STINFO02011_param.searchDateType);
310
-			$('#ITP_FORM_STINFO02011_SEARCH_FROM_DT').val(this.itp_STINFO02011_param.fromDt);
311
-			$('#ITP_FORM_STINFO02011_SEARCH_TO_DT').val(this.itp_STINFO02011_param.toDt);
312
-			$('#ITP_FORM_STINFO02011_SEARCH_STORE_DVSN').val(this.itp_STINFO02011_param.sstoreDvsn);
313
-			$('#ITP_FORM_STINFO02011_SEARCH_STORE_ST_CD').val(this.itp_STINFO02011_param.sstoreStCd);
314
-			$('#ITP_FORM_STINFO02011_SEARCH_LOAN_DVSN').val(this.itp_STINFO02011_param.sloanDvsn);
315
-			$('#ITP_FORM_STINFO02011_SEARCH_STORE_NM').val(this.itp_STINFO02011_param.sstoreMm);
316
-		}
317
-	},
318
-	grid: {
319
-		init: function () {
320
-			// 데이터 없을때
321
-			listObj.empty.push();
322
-			this.search();
323
-		},
324
-		colModel: gridColModel.list,
325
-		search: function() {
326
-			pageObj.switchScreen('LIST');
327
-			this.unload();
328
-			this.load();
329
-		},
330
-		load: function() {
331
-			let param = $('#ITP_FORM_STINFO02011_SEARCH').serializeObject();
332
-			param.gridSize = $.jgrid.defaults.rowNum;
333
-			param.sbrandId = fn_make_user_info.get('brandId');
334
-			// param.sbrandId = sessionStorage.getItem('itp_brand_id') !== null ? sessionStorage.getItem('itp_brand_id') : 'BRD221000001';
335
-
336
-			var option = {
337
-				gridId: STINFO02011_GRID_ID,
338
-				colModel: gridColModel.list,
339
-				param: param,
340
-				url: DOMAIN + API_DETAIL_GRID_LIST,
341
-				pager: STINFO02011_GRID_PAGER,
342
-				onCellSelect: function(rowId, cellIdx, cellValue) {
343
-					var cm = $(this).jqGrid('getGridParam', 'colModel');
344
-					var colNm = cm[cellIdx].name;
345
-					if (colNm == 'storeNm') {
346
-						const selectVal = $(this).jqGrid('getCell', rowId, 'storeId');
347
-						const key = {brandId:fn_make_user_info.get('brandId'), storeId: selectVal, viewCd: 'R'};
348
-						var param = $.param(key);
349
-						viewObj.init(param);
350
-					}
351
-				},
352
-				loadComplete: function(data) {
353
-					console.log(data);
354
-					itp_fn_grid_load_complete(data, STINFO02011_GRID_ID, true, 'number', 'STINFO02011', listObj.itp_STINFO02011_search, listObj.empty, true, data.gridRecords, true);
355
-					var ids = $(STINFO02011_GRID_ID).getDataIDs();
356
-					$.each(ids, function(idx, rowId) {
357
-						$(STINFO02011_GRID_ID).jqGrid('setCell', rowId, 'storeNm', '', ITP_GRID_COL_STYLE.link);
358
-					});
359
-				},
360
-				onPaging: function(action) {
361
-					itp_fn_grid_paging(STINFO02011_GRID_ID, action, param);
362
-				}
363
-			};
364
-			itp_fn_grid_make_remote(option);
365
-		},
366
-		clearData : function() {
367
-			$(STINFO02011_GRID_ID).jqGrid('clearGridData', true);
368
-			$(STINFO02011_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
369
-			$(STINFO02011_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
370
-			$(STINFO02011_GRID_EMPTY).show();
371
-		},
372
-		unload : function() {
373
-			$.jgrid.gridUnload(STINFO02011_GRID_ID);
149
+			fn_show_btn_auth_array(['#ITP_BTN_STINFO02011_MODIFY']);
374 150
 		}
375 151
 	}
376 152
 };
@@ -428,10 +204,9 @@ let modifyObj = {
428 204
 	init: function () {
429 205
 	},
430 206
 	button: {
431
-		modify: function (param) {
207
+		modify: function () {
432 208
 			itp_fn_form_clear_validate(null, '#ITP_FORM_STINFO02011_DETAIL');
433
-			const selectVal = $('#ITP_FORM_STINFO02011_VIEW_STORE_ID').val();
434
-			const key = {brandId:fn_make_user_info.get('brandId'), storeId: selectVal, viewCd: 'R'};
209
+			const key = {brandId:fn_make_user_info.get('brandId'), storeId: fn_make_user_info.get('storeId'), viewCd: 'R'};
435 210
 			var param = $.param(key);
436 211
 			modifyObj.load(param);
437 212
 		},
@@ -490,7 +265,7 @@ let modifyObj = {
490 265
 		var cmpyAdres = result.addr1/* + ' ' + result.addr*/;
491 266
 		kakaoMap.init('ITP_FORM_STINFO02011_DETAIL', cmpyAdres);
492 267
 
493
-		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_DPST_BNK_CD').val(result.storeBnkCd);
268
+		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_BNK_CD').val(result.storeBnkCd);
494 269
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_ACCT_NO').val(result.storeAcctNo);
495 270
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_OWAC_NM').val(result.storeOwacNm);
496 271
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_LOAN_DVSN').val(result.loanDvsn);
@@ -502,13 +277,3 @@ let modifyObj = {
502 277
 		$('#ITP_FORM_STINFO02011_DETAIL .fnSysChgDttm').text(result.sysChgDttm);
503 278
 	}
504 279
 };
505
-
506
-/*신규화면 Object*/
507
-let createObj = {
508
-	init: function () {
509
-		$('#ITP_FORM_STINFO02011_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
510
-		kakaoMap.init('ITP_FORM_STINFO02011_DETAIL', '');
511
-	},
512
-	button: {
513
-	}
514
-};

+ 26 - 9
src/main/webapp/js/app/stinfo/ITP_STINFO03010.js

@@ -39,6 +39,8 @@ const STINFO03010_DETAIL_GRID_EMPTY = '#ITP_STINFO03010_DETAIL_jqGridEmpty';
39 39
 let ITP_FORM_STINFO03010_DETAIL_IS_DUPLICATE = false;
40 40
 let ITP_FORM_STINFO03010_DETAIL_IS_WRITING = false;
41 41
 
42
+let ITP_COMMON_ASSGN_TASK = fn_make_common_cd_list(CODE_LIST, 'ASSGN_TASK', true, '담당업무');
43
+
42 44
 /*API URL*/
43 45
 let API_DETAIL_GRID_LIST 	= '/api/spply/detail-grid-list';	// 목록
44 46
 let API_DETAIL_INFO 		= '/api/spply/info-spply';			// 상세
@@ -144,12 +146,20 @@ const gridColModel = {
144 146
 			width: '10', fixed: false, align: 'center',
145 147
 			sortable: false, editable: true, edittype: 'text'
146 148
 		},
149
+		{
150
+			index: 'ASSGN_TASK', name: 'assgnTask',
151
+			label: ITP_MSG_LOCALE.label.assgnTaskNm, //담당업무
152
+			width: '10', fixed: false, align: 'center',
153
+			sortable: false, editable: true, formatter: 'select', edittype: 'select',
154
+			editoptions: {value: ITP_COMMON_ASSGN_TASK},
155
+			editrules: {required: false}
156
+		}/*,
147 157
 		{
148 158
 			index: 'ASSGN_TASK_NM', name: 'assgnTaskNm',
149 159
 			label: ITP_MSG_LOCALE.label.assgnTaskNm, //담당업무
150 160
 			width: '10', fixed: false, align: 'center',
151 161
 			sortable: false, editable: true, edittype: 'text'
152
-		}
162
+		}*/
153 163
 	]
154 164
 };
155 165
 
@@ -433,7 +443,7 @@ let viewObj = {
433 443
 	callback: function (result) {
434 444
 		console.log(result);
435 445
 		pageObj.switchScreen('VIEW');
436
-		$('#ITP_FORM_STINFO03010_VIEW #ITP_FORM_STINFO03010_DETAIL_SPPLY_ID').val(result.spplyId);
446
+		$('#ITP_FORM_STINFO03010_VIEW #ITP_FORM_STINFO03010_VIEW_SPPLY_ID').val(result.spplyId);
437 447
 		$('#ITP_FORM_STINFO03010_VIEW .fnBrandNm').text(result.brandNm);
438 448
 		$('#ITP_FORM_STINFO03010_VIEW .fnStCd').text(result.stNm);
439 449
 		$('#ITP_FORM_STINFO03010_VIEW .fnSpplyId').text(result.spplyId);
@@ -462,6 +472,12 @@ let viewObj = {
462 472
 		// $('#ITP_FORM_STINFO03010_VIEW .fnRegDt').text(result.openDt);
463 473
 		// $('#ITP_FORM_STINFO03010_VIEW .fnCloseDt').text(result.openDt);
464 474
 
475
+		itp_fn_attach_file.view('ITP_STINFO03010_VIEW_ACCT_FILE', result.fileBookCopyNoList
476
+			, 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
477
+
478
+		itp_fn_attach_file.view('ITP_STINFO03010_VIEW_REG_NO_FILE', result.fileBsnsRegNoList
479
+			, 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
480
+
465 481
 		// 담당자정보  리스트 조회
466 482
 		pageObj.grid.init('VIEW', result.spplyMgrList);
467 483
 		// viewObj.grid.load(result.spplyMgrList);
@@ -475,7 +491,7 @@ let modifyObj = {
475 491
 	button: {
476 492
 		modify: function (param) {
477 493
 			itp_fn_form_clear_validate(null, '#ITP_FORM_STINFO03010_DETAIL');
478
-			const selectVal = $('#ITP_FORM_STINFO03010_DETAIL_SPPLY_ID').val();
494
+			const selectVal = $('#ITP_FORM_STINFO03010_VIEW_SPPLY_ID').val();
479 495
 			const key = {brandId:fn_make_user_info.get('brandId'), spplyId: selectVal, viewCd: 'R'};
480 496
 			var param = $.param(key);
481 497
 			modifyObj.load(param);
@@ -493,6 +509,7 @@ let modifyObj = {
493 509
 		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
494 510
 		$('#ITP_FORM_STINFO03010_DETAIL .fnBrandNm').text(result.brandNm);
495 511
 		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_ST_CD').val(result.stCd);
512
+		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_SPPLY_ID').val(result.spplyId);
496 513
 		$('#ITP_FORM_STINFO03010_DETAIL .fnSpplyId').text(result.spplyId);
497 514
 		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_CORP_TYPE').val(result.corpType);
498 515
 		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_SPPLY_NM').val(result.spplyNm);
@@ -560,19 +577,19 @@ let createObj = {
560 577
 					$(STINFO03010_DETAIL_GRID_ID).jqGrid('saveCell', i+1, 2)
561 578
 				}
562 579
 				const rowData = $(STINFO03010_DETAIL_GRID_ID).getRowData();
563
-				const keyValue = $(formId + '_BRAND_ID').val();
564 580
 				$.each(rowData, function(key, value) {
565
-					if (value.viewCd != 'R') {
566
-						value.userId = keyValue;
567
-						if (value.viewCd == 'C') {
581
+					if (value.viewCd !== 'R') {
582
+						value.spplyId = $(formId + '_SPPLY_ID').val();
583
+						if (value.viewCd === 'C') {
568 584
 							gridInsertData.push(value);
569
-						} else if (value.viewCd == 'U') {
585
+						} else if (value.viewCd === 'U') {
570 586
 							gridUpdateData.push(value);
571
-						} else if (value.viewCd == 'D') {
587
+						} else if (value.viewCd === 'D') {
572 588
 							gridDeleteData.push(value);
573 589
 						}
574 590
 					}
575 591
 				});
592
+				itp_fn_form_event.removeChar(formId);
576 593
 				let param = $(formId).serializeObject();
577 594
 				param.gridInsertData = gridInsertData;
578 595
 				param.gridUpdateData = gridUpdateData;

+ 13 - 9
src/main/webapp/js/app/stinfo/ITP_STINFO04010.js

@@ -154,7 +154,7 @@ let pageObj = {
154 154
     init: function () {
155 155
         this.ui.init();
156 156
         this.event.init();
157
-        this.fileUpload();
157
+        // this.fileUpload();
158 158
     },
159 159
     ui: {
160 160
         init: function () {
@@ -225,7 +225,7 @@ let pageObj = {
225 225
             'showYn': $('#ITP_' + id + '_DETAIL_UPLOAD').attr('data-show-yn'),
226 226
             'fileId': '#ITP_FORM_' + id + '_DETAIL_FILE_NO' //파일번호를 서버에서 받아서 넣을 파일번호 인풋박스 아이디
227 227
         };
228
-        itp_fn_set_file_upload('ITP_' + id + '_DETAIL_UPLOAD', 'notice', true, false, id, fileArgs);
228
+        itp_fn_set_file_upload('ITP_' + id + '_DETAIL_UPLOAD', 'affl', true, false, id, fileArgs);
229 229
     },
230 230
     switchScreen: function(mode) {
231 231
         $('.itp_det_head').find('button[id^="ITP_BTN_STINFO04010_"]').each(function(i) {
@@ -437,9 +437,9 @@ let viewObj = {
437 437
         $('#ITP_FORM_STINFO04010_VIEW .fnRtnPssblYn').text(result.rtnPssblYn);
438 438
         $('#ITP_FORM_STINFO04010_VIEW .fnRtnDvsn').text(result.rtnDvsn);
439 439
 
440
-        $.each(result.imageFileNoList, function(index, item) {
441
-            $('#ITP_FORM_STINFO04010_VIEW .fnItemImageFile').append('<img src="' + item.filePath + '" />');
442
-        });
440
+        itp_fn_attach_file.view('ITP_FORM_STINFO04010_VIEW_FILE', result.imageFileNoList
441
+            , 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
442
+
443 443
     }
444 444
 };
445 445
 
@@ -465,7 +465,7 @@ let modifyObj = {
465 465
 
466 466
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_VIEW_CD').val('U');
467 467
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_ITEM_ID').val(result.itemId);
468
-        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_STORE_ST_CD').val(result.itemStCd);
468
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_ITEM_ST_CD').val(result.itemStCd);
469 469
         $('#ITP_FORM_STINFO04010_DETAIL .fnItemClassMgntNo').text(result.itemId);
470 470
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_ITEM_TYPE').val(result.itemType);
471 471
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_ITEM_NM').val(result.itemClassNm);
@@ -489,9 +489,12 @@ let modifyObj = {
489 489
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_EXPRY_PERIOD').val(result.expryPeriod);
490 490
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_RTN_PSSBL_YN').val(result.rtnPssblYn);
491 491
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_RTN_DVSN').val(result.rtnDvsn);
492
-        $.each(result.imageFileNoList, function(index, item) {
493
-            $('#ITP_FORM_STINFO04010_VIEW .ITEM_IMAGE').append('<img src=" + item.filePath +" />');
494
-        });
492
+        // $.each(result.imageFileNoList, function(index, item) {
493
+        //     $('#ITP_FORM_STINFO04010_VIEW .ITEM_IMAGE').append('<img src=" + item.filePath +" />');
494
+        // });
495
+
496
+        $('#ITP_FORM_OPER04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_FILE_NO').val(result.itemImageFileNo);
497
+        pageObj.fileUpload();
495 498
 
496 499
         itemClassLevel.data.push(result.itemClass1);
497 500
         itemClassLevel.data.push(result.itemClass2);
@@ -505,6 +508,7 @@ let modifyObj = {
505 508
 let createObj = {
506 509
     init: function () {
507 510
         pageObj.switchScreen('ADD');
511
+        pageObj.fileUpload();
508 512
         itp_fn_form_clear_validate(null, '#ITP_FORM_STINFO04010_DETAIL');
509 513
         this.button.init();
510 514
         itemClassLevel.make(1, 'ADD');

+ 29 - 23
src/main/webapp/js/app/stinfo/ITP_STINFO05010.js

@@ -140,7 +140,6 @@ let pageObj = {
140 140
 	init: function () {
141 141
 		this.ui.init();
142 142
 		this.event.init();
143
-		this.fileUpload();
144 143
 	},
145 144
 	ui: {
146 145
 		init: function () {
@@ -166,6 +165,13 @@ let pageObj = {
166 165
 			$('#ITP_TAB_STINFO05010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
167 166
 			$('#ITP_FORM_STINFO05010_SEARCH_CONT_STT_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
168 167
 			$('#ITP_FORM_STINFO05010_SEARCH_CONT_END_DT').datepicker('setDate', new Date());
168
+
169
+			// form alert message 주입
170
+			$('input[data-alert-required="ONLYCHK"]').each(function() {
171
+				if($(this).data('alert-msg') === 'empty') {
172
+					$(this).data('alert-msg', ITP_MSG_LOCALE.message.form.needAll);
173
+				}
174
+			});
169 175
 		},
170 176
 		grid: function() {
171 177
 			itp_fn_jqgrid_resize(STINFO05010_GRID_ID, STINFO05010_GRID_LIST, 'sm');
@@ -426,9 +432,8 @@ let viewObj = {
426 432
 		$('#ITP_FORM_STINFO05010_VIEW .fnChgId').text(result.sysChgId);
427 433
 		$('#ITP_FORM_STINFO05010_VIEW .fnChgDt').text(result.sysChgDttm);
428 434
 
429
-		$.each(result.imageFileNoList, function(index, item) {
430
-			$('#ITP_FORM_STINFO05010_VIEW .fnFilePath').append('<img src=" + item.filePath +" />');
431
-		});
435
+		itp_fn_attach_file.view('ITP_FORM_STINFO05010_VIEW_FILE', result.imageFileNoList
436
+			, 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
432 437
 	}
433 438
 };
434 439
 
@@ -460,10 +465,10 @@ let modifyObj = {
460 465
 		$('#ITP_FORM_STINFO05010_DETAIL .fnItemNm').text(result.itemNm);
461 466
 		$('#ITP_FORM_STINFO05010_DETAIL .fnSpplyId').text(result.spplyId);
462 467
 		$('#ITP_FORM_STINFO05010_DETAIL .fnSpplyNm').text(result.spplyNm);
463
-		// $('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_ITEM_ID').val(result.itemId);
464
-		// $('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_ITEM_NM').val(result.itemNm);
465
-		// $('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_SPPLY_ID').val(result.spplyId);
466
-		// $('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_SPPLY_NM').val(result.spplyNm);
468
+		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_ITEM_ID').val(result.itemId);
469
+		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_ITEM_NM').val(result.itemNm);
470
+		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_SPPLY_ID').val(result.spplyId);
471
+		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_SPPLY_NM').val(result.spplyNm);
467 472
 		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_SPPLY_ITEM_ID').val(result.spplyItemId);
468 473
 		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_CONT_STT_DT').val(result.contSttDt);
469 474
 		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_CONT_END_DT').val(result.contEndDt);
@@ -478,9 +483,9 @@ let modifyObj = {
478 483
 		$('#ITP_FORM_STINFO05010_DETAIL .fnRegDt').text(result.sysRegDttm);
479 484
 		$('#ITP_FORM_STINFO05010_DETAIL .fnChgId').text(result.sysChgId);
480 485
 		$('#ITP_FORM_STINFO05010_DETAIL .fnChgDt').text(result.sysChgDttm);
481
-		$.each(result.imageFileNoList, function(index, item) {
482
-			$('#ITP_FORM_STINFO05010_VIEW .ITEM_IMAGE').append('<img src=" + item.filePath +" />');
483
-		});
486
+
487
+		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_FILE_NO').val(result.shortContFileNo);
488
+		pageObj.fileUpload();
484 489
 	}
485 490
 };
486 491
 
@@ -488,6 +493,7 @@ let modifyObj = {
488 493
 let createObj = {
489 494
 	init: function () {
490 495
 		pageObj.switchScreen('ADD');
496
+		pageObj.fileUpload();
491 497
 		itp_fn_form_clear_validate(null, '#ITP_FORM_STINFO05010_DETAIL');
492 498
 		$('#ITP_FORM_STINFO05010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
493 499
 		$('#ITP_FORM_STINFO05010_DETAIL .fnBrandNm').text(fn_make_user_info.get('brandNm'));
@@ -499,7 +505,10 @@ let createObj = {
499 505
 		save: function() {
500 506
 			const formId = '#ITP_FORM_STINFO05010_DETAIL';
501 507
 			itp_fn_form_clear_validate(null, formId);
502
-			if (createObj.isValid(formId)) {
508
+
509
+			console.log(itp_fn_form_event.isValid(formId));
510
+			if (itp_fn_form_event.isValid(formId)) {
511
+				itp_fn_form_event.removeChar(formId);
503 512
 				let param = $(formId).serializeObject();
504 513
 				console.log(JSON.stringify(param));
505 514
 				var searhFn = function() {
@@ -509,17 +518,6 @@ let createObj = {
509 518
 				fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
510 519
 			}
511 520
 		}
512
-	},
513
-	isValid: function(formId) {
514
-		var isValid = false;
515
-		$(formId).find('input, select, checkbox, textarea').each(function(k) {
516
-			if($(this).data('check-required')) {
517
-				var arry = $(this).data('check-required').split(',');
518
-				isValid = itp_fn_form_validate(formId, '#' + $(this).attr('id'), arry, undefined);
519
-				if(!isValid) return false;
520
-			}
521
-		});
522
-		return isValid;
523 521
 	}
524 522
 };
525 523
 
@@ -574,9 +572,13 @@ var popSearch = {
574 572
 					if(id.lastIndexOf('ITEM') > -1) {
575 573
 						$('#ITP_FORM_STINFO05010_DETAIL_ITEM_ID').val(rowDataPop.itemId);
576 574
 						$('#ITP_FORM_STINFO05010_DETAIL_ITEM_NM').val(rowDataPop.itemNm);
575
+						$('#ITP_FORM_STINFO05010_DETAIL_SCH_ITEM_ID').val(rowDataPop.itemId);
576
+						$('#ITP_FORM_STINFO05010_DETAIL_SCH_ITEM_NM').val(rowDataPop.itemNm);
577 577
 					} else {
578 578
 						$('#ITP_FORM_STINFO05010_DETAIL_SPPLY_ID').val(rowDataPop.spplyId);
579 579
 						$('#ITP_FORM_STINFO05010_DETAIL_SPPLY_NM').val(rowDataPop.spplyNm);
580
+						$('#ITP_FORM_STINFO05010_DETAIL_SCH_SPPLY_ID').val(rowDataPop.spplyId);
581
+						$('#ITP_FORM_STINFO05010_DETAIL_SCH_SPPLY_NM').val(rowDataPop.spplyNm);
580 582
 					}
581 583
 				}
582 584
 			});
@@ -592,9 +594,13 @@ var popSearch = {
592 594
 			if(id.lastIndexOf('ITEM') > -1) {
593 595
 				$('#ITP_FORM_STINFO05010_DETAIL_ITEM_ID').val('');
594 596
 				$('#ITP_FORM_STINFO05010_DETAIL_ITEM_NM').val('');
597
+				$('#ITP_FORM_STINFO05010_DETAIL_SCH_ITEM_ID').val('');
598
+				$('#ITP_FORM_STINFO05010_DETAIL_SCH_ITEM_NM').val('');
595 599
 			} else {
596 600
 				$('#ITP_FORM_STINFO05010_DETAIL_SPPLY_ID').val('');
597 601
 				$('#ITP_FORM_STINFO05010_DETAIL_SPPLY_NM').val('');
602
+				$('#ITP_FORM_STINFO05010_DETAIL_SCH_SPPLY_ID').val('');
603
+				$('#ITP_FORM_STINFO05010_DETAIL_SCH_SPPLY_NM').val('');
598 604
 			}
599 605
 		}
600 606
 	}

+ 38 - 21
src/main/webapp/js/app/stinfo/ITP_STINFO06010.js

@@ -59,25 +59,25 @@ const gridColModel = {
59 59
 		{
60 60
 			index: 'STORE_NM', name: 'storeNm',
61 61
 			label: ITP_MSG_LOCALE.label.storeNm, //매장명
62
-			width: '10', fixed: false, align: 'center',
62
+			width: '15', fixed: false, align: 'center',
63 63
 			sortable: false, hidden: false
64 64
 		},
65 65
 		{
66 66
 			index: 'CONT_STT_DT', name: 'contSttDt',
67 67
 			label: ITP_MSG_LOCALE.label.contSttDt, //계약시작일
68
-			width: '15', fixed: false, align: 'center',
68
+			width: '10', fixed: false, align: 'center',
69 69
 			sortable: false, hidden: false
70 70
 		},
71 71
 		{
72 72
 			index: 'CONT_END_DT', name: 'contEndDt',
73 73
 			label: ITP_MSG_LOCALE.label.contEndDt, //계약종료일
74
-			width: '6', fixed: false, align: 'center',
74
+			width: '10', fixed: false, align: 'center',
75 75
 			sortable: false, hidden: false
76 76
 		},
77 77
 		{
78 78
 			index: 'SYS_REG_DTTM', name: 'sysRegDttm',
79 79
 			label: ITP_MSG_LOCALE.label.sysRegDt, //계약생성일
80
-			width: '6', fixed: false, align: 'center',
80
+			width: '10', fixed: false, align: 'center',
81 81
 			sortable: false, hidden: false
82 82
 		},
83 83
 		{
@@ -210,8 +210,8 @@ let pageObj = {
210 210
 			// 조회일자 지정
211 211
 			var now = new Date();
212 212
 			$('#ITP_TAB_STINFO06010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
213
-			$('#ITP_FORM_STINFO06010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
214
-			$('#ITP_FORM_STINFO06010_SEARCH_TO_DT').datepicker('setDate', new Date());
213
+			$('#ITP_FORM_STINFO06010_DETAIL_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
214
+			$('#ITP_FORM_STINFO06010_DETAIL_TO_DT').datepicker('setDate', new Date());
215 215
 		},
216 216
 		grid: function() {
217 217
 			itp_fn_jqgrid_resize(STINFO06010_GRID_ID, STINFO06010_GRID_LIST, 'lg');
@@ -240,6 +240,20 @@ let pageObj = {
240 240
 				});
241 241
 			});
242 242
 
243
+			var fnDateChange = function(cellname, data) {
244
+				var cnt = $(STINFO06010_DETAIL_GRID_ID).getGridParam("reccount");
245
+				for (var i=1; i<=cnt; i++) {
246
+					$(STINFO06010_DETAIL_GRID_ID).jqGrid('setCell', i, cellname, data);
247
+				}
248
+			};
249
+			$('#ITP_FORM_STINFO06010_DETAIL_FROM_DT').datepicker().on('changeDate', function () {
250
+				fnDateChange('contSttDt', $(this).val());
251
+			});
252
+
253
+			$('#ITP_FORM_STINFO06010_DETAIL_TO_DT').datepicker().on('changeDate', function () {
254
+				fnDateChange('contEndDt', $(this).val());
255
+			});
256
+
243 257
 			$('body').on('click', function(e) {
244 258
 				var gridId = STINFO06010_DETAIL_GRID_ID.replace('#', '');
245 259
 				itp_fn_grid_reset_selection(e, STINFO06010_GRID_LAST_ROW_ID, gridId, 'STINFO06010');
@@ -322,7 +336,8 @@ let listObj = {
322 336
 			$(STINFO06010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
323 337
 		},
324 338
 		create: function() {
325
-			createObj.init();
339
+			var param = {'brandId':fn_make_user_info.get('brandId')};
340
+			createObj.init(param);
326 341
 		}
327 342
 	},
328 343
 	empty: {
@@ -377,8 +392,8 @@ let listObj = {
377 392
 						$('#ITP_FORM_STINFO06010_DETAIL_STORE_ID').val(storeId);
378 393
 						$('#ITP_FORM_STINFO06010_DETAIL_STORE_NM').val(storeNm);
379 394
 						const key = {brandId:fn_make_user_info.get('brandId'), storeId: storeId, contSttDt: contSttDt, contEndDt: contEndDt, viewCd: 'R'};
380
-						var param = $.param(key);
381
-						modifyObj.init(param);
395
+						// var param = $.param(key);
396
+						modifyObj.init(key);
382 397
 					}
383 398
 				},
384 399
 				loadComplete: function(data) {
@@ -488,9 +503,8 @@ let modifyObj = {
488 503
 
489 504
 /*신규화면 Object*/
490 505
 let createObj = {
491
-	init: function () {
506
+	init: function (param) {
492 507
 		pageObj.switchScreen('ADD');
493
-		var param = $.param($('#ITP_FORM_STINFO06010_DETAIL').serializeObject());
494 508
 		this.grid.init(param);
495 509
 		this.button.init();
496 510
 	},
@@ -525,17 +539,20 @@ let createObj = {
525 539
 				var gridUpdateData = [];
526 540
 				var changeRows = createObj.changeRows(rows);
527 541
 				$.each(changeRows, function (index, item) {
528
-					if(pageObj.screenMode === 'ADD') {
529
-						item['contSttDt'] = $('#ITP_FORM_STINFO06010_DETAIL_FROM_DT').val();
530
-						item['contEndDt'] = $('#ITP_FORM_STINFO06010_DETAIL_TO_DT').val();
542
+					if(item.viewCd === 'C') {
531 543
 						gridInsertData.push(item);
532
-					} else {
533
-						if(item.viewCd === 'C') {
534
-							gridInsertData.push(item);
535
-						} else if(item.viewCd === 'U') {
536
-							gridUpdateData.push(item);
537
-						}
544
+					} else if(item.viewCd === 'U') {
545
+						gridUpdateData.push(item);
538 546
 					}
547
+					// if(pageObj.screenMode === 'ADD') {
548
+					// 	gridInsertData.push(item);
549
+					// } else {
550
+					// 	if(item.viewCd === 'C') {
551
+					// 		gridInsertData.push(item);
552
+					// 	} else if(item.viewCd === 'U') {
553
+					// 		gridUpdateData.push(item);
554
+					// 	}
555
+					// }
539 556
 				});
540 557
 				param['viewCd'] = 'U';
541 558
 				param['brandId'] = fn_make_user_info.get('brandId');
@@ -565,7 +582,7 @@ let createObj = {
565 582
 			var option = {
566 583
 				gridId: STINFO06010_DETAIL_GRID_ID,
567 584
 				colModel: gridColModel.detail,
568
-				mtype: 'GET',
585
+				mtype: 'POST',
569 586
 				param: param,
570 587
 				url: DOMAIN + API_DETAIL_NEW,
571 588
 				loadComplete: function(data) {

+ 0 - 1
src/main/webapp/js/app/system/ITP_SYSTEM03010.js

@@ -70,7 +70,6 @@ require(['config'], function() {
70 70
 				param.gridInsertData = gridInsertData;
71 71
 				param.gridUpdateData = gridUpdateData;
72 72
 				param.gridDeleteData = gridDeleteData;
73
-				console.log(param); return;
74 73
 				var searhFn = function() {
75 74
 					var keyword = {keyword: $('#ITP_KEYWORD_SYSTEM03010_INPUT').val()};
76 75
 					var param = $('#ITP_SYSTEM03010_ADV_SRH_FORM').serialize() + '&' + $.param(keyword);

+ 4 - 4
src/main/webapp/mobile/app/main.html

@@ -59,7 +59,7 @@
59 59
 				</div>
60 60
 			</header>
61 61
 
62
-			<nav id="ITP_SIDEBAR" class="itp_open_nav">
62
+			<!--<nav id="ITP_SIDEBAR" class="itp_open_nav">
63 63
 
64 64
 				<ul class="panel-group itp_nav"></ul>
65 65
 
@@ -110,9 +110,9 @@
110 110
 					</div>
111 111
 				</li>
112 112
 				</textarea>
113
-			</nav>
113
+			</nav>-->
114 114
 
115
-			<!--<div id="ITP_MENU" style="display: block;">
115
+			<div id="ITP_MENU" style="display: block;">
116 116
 				<div class="menu_area">
117 117
 					<button class="ITP_BTN_CLOSE"><img src="../img/close2.png"></button>
118 118
 				</div>
@@ -224,7 +224,7 @@
224 224
 						</ul>
225 225
 					</div>
226 226
 				</div>
227
-			</div>-->
227
+			</div>
228 228
 			<div id="ITP_CONTAINER">
229 229
 
230 230
 			</div>