메인 공지사항 팝업

src/main/webapp/app/popup/comm/NOTICE_INFO_POPUP.html

@@ -5,39 +5,73 @@
 					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 					<h5 class="modal-title">공지사항</h5>
 				</div>
-				<div class="modal-body">
+				<div class="modal-body"> 
 					<div class="itp_form itp_type1 fix">
-						<div class="col-xs-12">
-							<div class="form-horizontal">
-								<form id="ITP_FORM_NOTICE_INFO_POPUP">
+						<div class="form-horizontal">
+
+							<form id="ITP_FORM_NOTICE_INFO_POPUP" class="form-horizontal"> 
 								<input type="hidden" id="ITP_FORM_NOTICE_INFO_POPUP_VIEW_CD" name="viewCd" value="R">
-								<input type="hidden" id="ITP_FORM_NOTICE_INFO_POPUP_NTICE_NO" name="nticeNo" value="">
 								<input type="hidden" id="ITP_FORM_NOTICE_INFO_POPUP_FILE_NO" name="fileNo" value="">
-							
-								<div class="form-group">
-									<label class="col-xs-4 itp_lb">공지제목</label>
-									<div class="col-xs-7 itp_ip fnNticeTitl"></div>
-								</div>
-								<div class="form-group">
-									<label class="col-xs-4 itp_lb">공지일자</label>
-									<div class="col-xs-7 itp_ip fnNotiDay"></div>
-								</div>						
-								<div class="form-group">
-									<label class="col-xs-4 itp_lb">공지내용</label>
-									<div class="col-xs-7 itp_ip fnNticeDesc"></div>
-								</div>
-								<div class="form-group">
-									<label class="col-xs-4 itp_lb">첨부파일</label>
-									<div class="col-xs-7 itp_ip">
-										<div class="col-xs-12 itp_in">
-											<div class="fileupload-wrapper">
-												<div id="ITP_NOTICE_INFO_POPUP_VIEW_UPLOAD"></div>
+								<input type="hidden" id="ITP_FORM_NOTICE_INFO_POPUP_NTICE_NO" name="nticeNo" value="">
+								<section class="itp_form_sec">
+									<div class="itp_form_in border-top">
+										<div class="form-group">
+											<label class="col-xs-2 itp_lb">브랜드그룹</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="itp_in">
+													<input type="text" name="afflShopNm" id="ITP_FORM_NOTICE_INFO_POPUP_AFFL_SHOP_NM" class="form-control itp_input">
+												</div> 
+											</div>
+											<label class="col-xs-2 itp_lb">브랜드</label>
+											<div class="col-xs-4 itp_ip">
+												<input type="text" name="brandNm" id="ITP_FORM_NOTICE_INFO_POPUP_BRAND_NM" class="form-control itp_input"> 
 											</div>
 										</div>
 									</div>
-								</div>
-								</form>
-							</div>
+									<div class="itp_form_in">
+										<div class="form-group colspan">
+											<label class="col-xs-2 itp_lb">공지제목 *</label>
+											<div class="col-xs-10 itp_ip">
+												<input type="text" id="ITP_FORM_NOTICE_INFO_POPUP_NTICE_TITL" data-check-required="empty" class="form-control itp_input" name="nticeTitl" value="">
+											
+											</div>
+										</div>
+									</div>
+									<div class="itp_form_in">
+										<div class="form-group">
+											<label class="col-xs-2 itp_lb">공지일자 *</label>
+											<div class="col-xs-10 itp_ip">
+												<div class="input-group">
+													<input type="text" id="ITP_FORM_NOTICE_INFO_POPUP_FROM_DT" data-check-required="empty" class="form-control itp_input" name="notiStDay" readonly>
+													<span class="input-group-addon itp_date_to">~</span>
+													<input type="text" id="ITP_FORM_NOTICE_INFO_POPUP_TO_DT" data-check-required="empty" class="form-control itp_input" name="notiEdDay" readonly>
+												</div> 
+											</div>
+										</div>
+									</div>
+									<div class="itp_form_in">	
+										<div class="form-group">
+											<label class="col-xs-2 itp_lb">공지내용</label>
+											<div class="col-xs-10 itp_ip">
+												<textarea id="ITP_FORM_NOTICE_INFO_POPUP_NTICE_DESC" class="form-control" rows="8" name="nticeDesc" maxlength="200"></textarea>
+											</div>
+										</div>
+									</div>
+									<div class="itp_form_in">	
+										<div class="form-group">
+											<label class="col-xs-2 itp_lb">첨부파일</label>
+											<div class="col-xs-10 itp_ip">
+												<div class="fileupload-wrapper">
+													<div id="ITP_FORM_NOTICE_INFO_POPUP_UPLOAD"></div>
+												</div>
+											</div>
+										</div> 
+									</div>
+								</section>
+								
+							</form>		
+
+
 						</div>
 					</div>
 				</div>

src/main/webapp/js/app/main.js

@@ -351,11 +351,10 @@ var itp_fn_MAIN_NOTICE_search = function() {
 	let param = $(formId).serializeObject();
 	var searhFn = function(result) {
 		const tb=$('#ITP_NOTE_PANEL .rtable').find('tbody');
-		console.log("xxxxxxxxx", result, tb)
 		if(Array.isArray(result.gridRows) && result.gridRows.length ) {
 			var s='', idx=1;
 			for(var c of result.gridRows ) {
-				s+=`<tr><td>${idx}</td><td>${c.brandNm}</td><td>${c.nticeTitl}</td><td>${c.nticeStatNm}</td><td>${c.addDt}</td></tr>`;
+				s+=`<tr><td>${idx}</td><td>${c.brandNm}</td><td><a href="javascript:clickNotify('${c.nticeNo}')">${c.nticeTitl}</a></td><td>${c.nticeStatNm}</td><td>${c.addDt}</td></tr>`;
 				idx++;
 			}
 			tb.html(s);
@@ -365,4 +364,8 @@ var itp_fn_MAIN_NOTICE_search = function() {
 	};
 	fn_ajax_call(NTICE_DETAIL_GRID_LIST, JSON.stringify(param), searhFn, 'POST');
 };
-
+function clickNotify(nticeNo) {
+	fn_call_popup('comm', 'NOTICE_INFO_POPUP', '#ITP_ASIDE', function(rowDataPop) { 
+		 console.log("rowDataPop ==> ", rowDataPop)
+	}, {nticeNo}, 'S');
+}

src/main/webapp/js/app/popup/comm/ITP_NOTICE_INFO_POPUP.js

@@ -14,19 +14,21 @@ function itp_fn_NOTICE_INFO_POPUP(parentPopFn, args, returnType) {
 	
 	fn_ajax_call(NTICE_INFO_NTICE, args, function(result) {
 		
-		$('#ITP_FORM_NOTICE_INFO_POPUP_NTICE_NO').val(result.nticeNo);		
-		$('#ITP_FORM_NOTICE_INFO_POPUP .fnNticeTitl').text(result.nticeTitl);	
-		$('#ITP_FORM_NOTICE_INFO_POPUP .fnNotiDay').text(result.notiStDay+' ~ '+result.notiEdDay);	
-		$('#ITP_FORM_NOTICE_INFO_POPUP .fnNticeDesc').html(result.nticeDesc.replace(/(\n|\r\n)/g, '<br>'));
+		$('#ITP_FORM_NOTICE_INFO_POPUP_NTICE_NO').val(result.nticeNo);
+		$('#ITP_FORM_NOTICE_INFO_POPUP_NTICE_TITL').val(result.nticeTitl);
+		$('#ITP_FORM_NOTICE_INFO_POPUP_FROM_DT').val(result.notiStDay);
+		$('#ITP_FORM_NOTICE_INFO_POPUP_TO_DT').val(result.notiEdDay);
+		$('#ITP_FORM_NOTICE_INFO_POPUP_NTICE_DESC').val(result.nticeDesc);
+		$('#ITP_FORM_NOTICE_INFO_POPUP_TARGET_CD').val(result.targetCd);
 		$('#ITP_FORM_NOTICE_INFO_POPUP_FILE_NO').val(result.fileNo); //파일번호 셋팅
 
-		//파일업로드(뷰화면)
-		$('#ITP_NOTICE_INFO_POPUP_VIEW_UPLOAD').empty();
-		const fileArgs = {
-			'fileNo': $('#ITP_FORM_NOTICE_INFO_POPUP_FILE_NO').val(),
-			'viewCd': $('#ITP_FORM_NOTICE_INFO_POPUP_VIEW_CD').val()
-		};
-		itp_fn_set_file_upload('ITP_NOTICE_INFO_POPUP_VIEW_UPLOAD', 'notice', true, false, 'OPERATION02010', fileArgs);
+		// 브랜드그룹 셋팅
+		$('#ITP_FORM_NOTICE_INFO_POPUP_AFFL_SHOP_NM').val(result.afflShopNm);
+		$('#ITP_FORM_NOTICE_INFO_POPUP_BRAND_NM').val(result.brandNm);
+
+		setFileUploadInfoPopup();
+		
+		formReadonly("#ITP_FORM_NOTICE_INFO_POPUP .form-control");
 		 	
 	}, 'GET');
 	
@@ -38,3 +40,35 @@ function itp_fn_NOTICE_INFO_POPUP(parentPopFn, args, returnType) {
 	
 };
 
+
+function setFileUploadInfoPopup() {
+	//파일업로드(등록/수정화면) 
+	const option={
+		url: DOMAIN + '/api/file/upload',
+		inputName: 'uploadFile',
+		folderName: 'notice',
+		fileNumber:  $('#ITP_FORM_NOTICE_INFO_POPUP_FILE_NO').val(),
+		fileInput: '#ITP_FORM_NOTICE_INFO_POPUP_FILE_NO',
+		fileTypes: ITP_UPLOAD_DEFAULTS.fileTypes,
+		viewCode: 'R',
+		formMethod: 'post',
+		multiFile: true,
+		multiUpload: false,
+		maxSize: 100,
+		maxFiles: 5,
+		showThumb: false,
+		thumbWidth: 0,
+  		thumbHeight: 0,
+		debug: true, 
+		screen_id: 'ITP_FORM_NOTICE_INFO_POPUP',
+		showYn: false, 
+	};
+	console.log("option ==> ",option)
+	$('#ITP_FORM_NOTICE_INFO_POPUP_UPLOAD').empty(); 
+	$('#ITP_FORM_NOTICE_INFO_POPUP_UPLOAD').bootstrapFileUpload(option);
+
+	setTimeout(function() {
+		$('#ITP_FORM_NOTICE_INFO_POPUP_UPLOAD_FORM').hide(); 
+	},20);
+
+}

src/main/webapp/main.html

@@ -54,6 +54,34 @@
 			margin: 0 0 10px 0;
 			color: #233c44;
 		}
+		
+		#ITP_FORM_NOTICE_INFO_POPUP .itp_form_in {
+			margin: 0;
+			padding: 0;
+			display: table;
+			width: 100%;
+		}
+		#ITP_FORM_NOTICE_INFO_POPUP .form-group {
+			margin: 0;
+			padding: 0;
+			display: table-row;
+		}
+		#ITP_FORM_NOTICE_INFO_POPUP .itp_detail .itp_form .border-top {
+			border-top: 1px solid #666;
+		}
+		#ITP_FORM_NOTICE_INFO_POPUP .form-group .itp_lb, #ITP_FORM_NOTICE_INFO_POPUP .form-group .itp_ip {
+			display: table-cell;
+			padding: 2px 15px 0 15px;
+			border-top: 1px solid #ededed;
+			float: none;
+			vertical-align: middle;
+			height: 32px;
+		}
+		#ITP_FORM_NOTICE_INFO_POPUP .itp_detail .itp_form .itp_form_in {
+			margin-top: 25px;
+			padding-left: 8px;
+		}
+
 		.itp_graph_panel {
 			border: 1px solid #ccc;
 			padding: 12px;
@@ -801,12 +829,9 @@
 			</div>
 		</footer>
 		
-		<aside id="ITP_ASIDE"></aside>	
-		
-		
+		<aside id="ITP_ASIDE"></aside>	 
 	</div> 
 	<script src="./js/cpexcel.js"></script>
 	<script src="./js/xlsx.js"></script>
-
 </body>
 </html>