Merge branch 'master' of http://gitlab.house365.com/xuzhou/njzsb

* 'master' of http://gitlab.house365.com/xuzhou/njzsb:
  30日显示

# Conflicts:
#	WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Add.jsp

WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Add.jsp

@@ -8,6 +8,15 @@
         .l-btn-icon.icon-add {
             margin-top: -7px;
         }
+		.showPt{
+			display: none;
+		}
+		.dis-bl{
+			display: block !important;
+			width: 100%;
+			border: none !important;
+			line-height: 32px;
+		}
     </style>
 	<script>
         var index4Sf = 1;
@@ -89,6 +98,7 @@
 
 			/*} else {*/
 			var cnjfhj = $('#sfTable input[name="rfxmsfxx.cnjfhj"]:checked').val();
+
 			if (cnjfhj=="" && $('#cnjfhj').val()!=undefined && $('#cnjfhj').val() !=null){
                 var val = $('#cnjfhj').val();
                 cnjfhj = val;
@@ -111,7 +121,7 @@
 				async: false,
 				url: "${ctx}/jsp/rfxm/rfxmSfxxCheck.action",
 				type: 'post',
-				dataType: 'json',
+				dataType: 'json',缴费承诺环节
 				async: false,
 				data: {rfxmid : "${rfxm.id}","rfxmsfxx.cnjfhj":cnjfhj, "rfxmsfxx.yzsqy":yzsqy, "rfxmsfxx.dsdw":dsdw, "rfxmsfxx.sfxmmc":sfxmmc, "rfxmsfxx.shbm":shbm},
 				error: function (data) {
@@ -327,17 +337,16 @@
 								<tr>
 									<th width="15">缴费承诺环节</th>
 									<td width="35%">
-										<input type="radio" name="rfxmsfxx.cnjfhj" value="施工许可前" checked="checked"/>
+										<input type="radio" class="rd" name="rfxmsfxx.cnjfhj" value="施工许可前" checked="checked"/>
 										施工许可前
-										<input type="radio" name="rfxmsfxx.cnjfhj" value="竣工验收前"/>
+										<input type="radio" class="rd" name="rfxmsfxx.cnjfhj" value="竣工验收前"/>
 										竣工验收前
-										<input type="radio" name="rfxmsfxx.cnjfhj" value="30日内" />30日内
+										<input type="radio" class="rd" name="rfxmsfxx.cnjfhj" value="30日内" />30日内
 									</td>
 									<th width="15">提前缴纳配套费</th>
-									<td width="35%">
+									<td width="35%" class="showPt">
 										<input type="radio" name="zzhxmsfxx.tqjn" value="0" checked="checked" />否
-										<input type="radio" name="zzhxmsfxx.tqjn" value="1" />是
-
+										<input type="radio" name="zzhxmsfxx.tqjn" value="1" checked="checked" />是
 									</td>
 								</tr>
 								<tr>
@@ -401,5 +410,15 @@
 			</div>
 		</div>
 	</div>
+	<script>
+		$(".rd").on('click',function () {
+			if($(this).val()=='30日内'){
+				$('.showPt').addClass('dis-bl')
+			}else{
+				$('.showPt').removeClass('dis-bl')
+			}
+
+		})
+	</script>
 </body>
 </html>

WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Detail.jsp

@@ -212,8 +212,8 @@
 							<tr>
 								<th width="15%" id='lianxidan'>规划许可证编号</th>
 								<td width="35%"  >${rfxm.xkzh}</td>
-								<th width="15%">规划许可证类型</th>
-								<td width="35%">${rfxm.ghxkzlx}</td>
+								<th width="15%">二级统计单位</th>
+								<td width="35%">${rfxm.zsfw}</td>
 							</tr>
 							<tr>
 								<%--<th width="15%">规划许可证类型</th>