메인 공지사항 화면수정

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

@@ -17,14 +17,10 @@
 									<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 id="ITP_FORM_NOTICE_INFO_POPUP_AFFL_SHOP_NM" class="col-xs-4 itp_ip">
 											</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 id="ITP_FORM_NOTICE_INFO_POPUP_BRAND_NM" class="col-xs-4 itp_ip"> 
 											</div>
 										</div>
 									</div>
@@ -33,19 +29,13 @@
 											<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 class="col-xs-10 itp_ip" id="ITP_FORM_NOTICE_INFO_POPUP_FROM_TO"> 
 											</div>
 										</div>
 									</div>
@@ -67,8 +57,7 @@
 											</div>
 										</div> 
 									</div>
-								</section>
-								
+								</section>								
 							</form>		
 
 

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

@@ -354,7 +354,15 @@ var itp_fn_MAIN_NOTICE_search = function() {
 		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><a href="javascript:clickNotify('${c.nticeNo}')">${c.nticeTitl}</a></td><td>${c.nticeStatNm}</td><td>${c.addDt}</td></tr>`;
+				let title=c.nticeTitl;
+				if(title.length>62) {
+					title=title.substr(0,62)+'...';
+				} 
+				s+=`<tr>
+					<td>${idx}</td><td>${c.brandNm}</td>
+					<td><a href="javascript:clickNotify('${c.nticeNo}')">${title}</a></td>
+					<td>${c.nticeStatNm}</td><td>${c.addDt}</td>
+				</tr>`;
 				idx++;
 			}
 			tb.html(s);

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

@@ -15,20 +15,19 @@ 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_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_FORM_NOTICE_INFO_POPUP_AFFL_SHOP_NM').val(result.afflShopNm);
-		$('#ITP_FORM_NOTICE_INFO_POPUP_BRAND_NM').val(result.brandNm);
+		$('#ITP_FORM_NOTICE_INFO_POPUP_NTICE_TITL').val(result.nticeTitl);
+		$('#ITP_FORM_NOTICE_INFO_POPUP_NTICE_DESC').val(result.nticeDesc);
+		$('#ITP_FORM_NOTICE_INFO_POPUP_FROM_TO').html(result.notiStDay+' ~ '+result.notiEdDay); 
+		$('#ITP_FORM_NOTICE_INFO_POPUP_AFFL_SHOP_NM').html(result.afflShopNm);
+		$('#ITP_FORM_NOTICE_INFO_POPUP_BRAND_NM').html(result.brandNm);
 
 		setFileUploadInfoPopup();
 		
-		formReadonly("#ITP_FORM_NOTICE_INFO_POPUP .form-control");
+		formReadonly('#ITP_FORM_NOTICE_INFO_POPUP .form-control');
 		 	
 	}, 'GET');
 	
@@ -39,7 +38,7 @@ function itp_fn_NOTICE_INFO_POPUP(parentPopFn, args, returnType) {
 	}).modal('show');
 	
 };
-
+ 
 
 function setFileUploadInfoPopup() {
 	//파일업로드(등록/수정화면) 

src/main/webapp/main.html

@@ -178,6 +178,11 @@
 		  .rtable--flip td:not(:last-child) {
 			border-bottom: 0;
 		  }
+		  #ITP_SAFE_STCK_GRAPH {
+			  width: 100%;
+			  border: 1px solid #ccc;
+			  padding: 16px;
+		  }
 		  
 	</style>
 </head>
@@ -498,7 +503,7 @@
 									<div class="itp_graph_title">
 										<div class="itp_graph_info">안전재고</div>
 									</div>
-									<div id="ITP_SAFE_STCK_GRAPH" class="itp_graph_area" style="width:87%;"></div>
+									<div id="ITP_SAFE_STCK_GRAPH" class="itp_graph_area"></div>
 								</div>
 							</div>
 						</article>