Merge branch 'sowon' into develop

src/main/webapp/WEB-INF/views/marketing/PlanDetailPopupForm.html

@@ -139,6 +139,9 @@
 							<label class="chkBox" th:if="${usableCustGradeList}" th:each="oneData, status : ${usableCustGradeList}">
 								<input type="checkbox" name="usableCustGradeArr" th:value="${oneData.cd}" th:text="${oneData.cdNm}"/>
 							</label>
+							<label class="chkBox">
+								<input type="checkbox" name="usableCustGradeArr" value="G110_60" th:text="비회원"/>
+							</label>
 						</td>
 						<th>사용가능고객구분<em class="required" title="필수"></em></th>
 						<td>
@@ -207,13 +210,15 @@
 							</div>
 						</td>
 					</tr> -->
-					<tr>
+					<tr id="pollTr" style="display: none;">
 						<th>투표일련번호</th>
-						<td>
+						<td colspan="3">
 							<input type="text" class="w100 aR" name="pollSq" th:field="*{pollSq}"/>
 						</td>
+					</tr>
+					<tr>
 						<th class="custJoinTr" colspan="1">신규회원여부<em class="required" title="필수"></em></th>
-						<td colspan="2">
+						<td colspan="3">
 							<select name="newCustYn" id="newCustYn" onchange="newCustYnChange(this)" required="required" data-valid-name="신규회원여부" th:field="*{newCustYn}">
 								<option value="Y" selected="selected">Y</option>
 								<option value="N" >N</option>
@@ -532,7 +537,10 @@
 						<th>사용고객등급구분</th>
 						<td>
 							<label class="chkBox" th:if="${usableCustGradeList}" th:each="oneData, status : ${usableCustGradeList}">
-								<input type="checkbox" name="usableCustGradeArr" th:value="${oneData.cd}" th:text="${oneData.cdNm}"/>
+								<input type="checkbox" name="usableCustGradeArr" th:value="${oneData.cd}" th:text="${oneData.cdNm}" checked="checked"/>
+							</label>
+							<label class="chkBox">
+								<input type="checkbox" name="usableCustGradeArr" value="G110_60" th:text="비회원" checked="checked"/>
 							</label>
 						</td>
 						<th>사용가능고객구분<em class="required" title="필수"></em></th>
@@ -590,12 +598,13 @@
 							</div>
 						</td>
 					</tr> -->
-					<tr>
-									
+					<tr id="pollTr" style="display: none;">
 						<th>투표일련번호</th>
 						<td>
 							<input type="text" class="w100 aR" name="pollSq"/>
 						</td>
+					</tr>
+					<tr>
 						<th class="custJoinTr" colspan="1">신규회원여부<em class="required" title="필수"></em></th>
 						<td colspan="2">
 							<select name="newCustYn" id="newCustYn" onchange="newCustYnChange(this)" required="required" data-valid-name="신규회원여부">
@@ -1143,6 +1152,10 @@
 					if(!validationPlanDetail()){
 						return false;
 					}
+					if ($('#planRegisterForm input[name=mainPimg]').val()=='') {
+						mcxDialog.alert("메인이미지를 등록하세요.");
+						return false;
+					}
 					var chkFrontGb = $('#planRegisterForm input:checkbox[name=frontGb]:checked');
 					
 					if(chkFrontGb.length < 1){
@@ -1379,6 +1392,7 @@
 		}
 		
 		if($(obj).val()=='E'){
+			$("#pollTr").show();
 			$("#questionEventInsert").show();
 			$("#questionEventUpdate").show();
 			if (mode =='U') {
@@ -1393,6 +1407,7 @@
 		}else{
 			$("#questionEventInsert").hide();
 			$("#questionEventUpdate").hide();
+			$("#pollTr").hide();
 		}
 	}