gagamel 5 лет назад
Родитель
Сommit
17582c9173
1 измененных файлов с 16 добавлено и 10 удалено
  1. 16 10
      style24.admin/src/main/webapp/WEB-INF/views/board/NoticeForm.html

+ 16 - 10
style24.admin/src/main/webapp/WEB-INF/views/board/NoticeForm.html

@@ -114,7 +114,7 @@
 						<th>사용여부</th>
 						<td>
 							<input type="hidden" name="useYn"/>
-							<label class="chkBox"><input type="checkbox" name="chkUseYn" checked="checked" value="Y"/>사용</label>
+							<label class="chkBox checked"><input type="checkbox" name="chkUseYn" value="Y" checked="checked"/>사용</label>
 						</td>
 					</tr>
 					<tr id="trNew">
@@ -155,7 +155,7 @@
 						<th>팝업여부</th>
 						<td>
 							<input type="hidden" name="popupYn"/>
-							<label class="chkBox"><input type="checkbox" name="chkPopupYn" checked="checked" value="Y"/>팝업</label>
+							<label class="chkBox"><input type="checkbox" name="chkPopupYn" value="Y"/>팝업</label>
 						</td>
 						<th>팝업노출기간</th>
 						<td colspan="5">
@@ -283,11 +283,15 @@
 		{headerName: "팝업여부", field: "popupYn", width: 90, cellClass: 'text-center'},
 		{
 			headerName: "팝업노출시작일", field: "popupDispStdt", width: 120, cellClass: 'text-center',
-			cellRenderer: function(params) { return gagaAgGrid.toDateFormat(params.value); }
+			cellRenderer: function(params) {
+				return params.value == '00000000' ? '' : gagaAgGrid.toDateFormat(params.value);
+			}
 		},
 		{
 			headerName: "팝업노출종료일", field: "popupDispEddt", width: 120, cellClass: 'text-center',
-			cellRenderer: function(params) { return gagaAgGrid.toDateFormat(params.value); }
+			cellRenderer: function(params) {
+				return params.value == '00000000' ? '' : gagaAgGrid.toDateFormat(params.value);
+			}
 		},
 		{headerName: "사용여부", field: "useYn", width: 90, cellClass: 'text-center'},
 		{headerName: "등록자", field: "regNm", width: 90, cellClass: 'text-center'},
@@ -344,8 +348,8 @@
 				$('#detailForm input:checkbox[name=chkPopupYn]').prop('checked', false);
 				$("#detailForm input:checkbox[name=chkPopupYn]").parent().removeClass('checked');
 			}
-			$('#detailForm input[name=popupDispStdt]').val(event.data.popupDispStdt.toDate("YYYYMMDD").format("YYYY-MM-DD"));
-			$('#detailForm input[name=popupDispEddt]').val(event.data.popupDispEddt.toDate("YYYYMMDD").format("YYYY-MM-DD"));
+			$('#detailForm input[name=popupDispStdt]').val(event.data.popupDispStdt == '00000000' ? '' : event.data.popupDispStdt.toDate("YYYYMMDD").format("YYYY-MM-DD"));
+			$('#detailForm input[name=popupDispEddt]').val(event.data.popupDispEddt == '00000000' ? '' : event.data.popupDispEddt.toDate("YYYYMMDD").format("YYYY-MM-DD"));
 		}
 
 		// 공지내용. Summernote에 값 세팅
@@ -366,9 +370,6 @@
 	// 수신자 목록 조회
 	var fnGetNoticeReceiverList = function(noticeSq) {
 		let actionUrl = '/board/notice/receiver/list/' + noticeSq;
-		if (noticeType == 'G047_20') {
-			actionUrl = '/renderer/avail/commonCode/list/G048'; // 부서
-		}
 		
 		$.getJSON(actionUrl
 			, function(result) {
@@ -387,7 +388,7 @@
 							var data = result[j].receiverId;
 							if ($('#detailForm input:checkbox[name=receiverIds]').eq(i).val() == data) {
 								$('#detailForm input:checkbox[name=receiverIds]').eq(i).prop('checked', true);
-								$("#detailForm input:checkbox[name=receiverIds]").parent().addClass('checked');
+								$("#detailForm input:checkbox[name=receiverIds]").eq(i).parent().addClass('checked');
 							}
 						}
 					}
@@ -598,6 +599,11 @@
 		if (!gagajf.validation('#detailForm'))
 			return false;
 
+		if (gagajf.isNull($('#detailForm textarea[name=noticeContent]').val())) {
+			mcxDialog.alert('공지내용을 입력해 주세요.');
+			return;
+		}
+		
 		$('#detailForm input[name=useYn]').val($('#detailForm input:checkbox[name=chkUseYn]').is(":checked") ? 'Y' : 'N');
 		$('#detailForm input[name=popupYn]').val($('#detailForm input:checkbox[name=chkPopupYn]').is(":checked") ? 'Y' : 'N');