Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/adminReportEditForm.jsp

@@ -125,7 +125,7 @@
 				}
 				var reportedFalg = "${reportedFalg}"
 				if(boolFlag){
-					if(false == reportedFalg){
+
 						var startDate = new Date($("#startDate").val());
 						var endingDate = new Date($("#endingDate").val());
 						if(startDate.getTime() > endingDate.getTime()){
@@ -153,7 +153,7 @@
 								}
 							}
 						}
-					}else{
+					if("false" != reportedFalg){{
 						//咨询标的额
 						var ZiXunBDE = $("#ZiXunBDE").val();
 						var GCGMValue = $("#GCGMValue").val();

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsAdminModify.jsp

@@ -119,6 +119,8 @@
                         layui.form.render();
                     }else if(span==1){
                         $("#emergencyProject").parent().parent().parent().show();
+                        //B级默认非紧急项目
+                        $("#emergencyProjectFlag").val("0");
                     }
                 });
                 form.on('switch(emergencyProject)',function(data){

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -195,6 +195,8 @@
                         layui.form.render();
                     }else if(span==1){
                         $("#emergencyProject").parent().parent().parent().show();
+                        //B级默认非紧急项目
+                        $("#emergencyProjectFlag").val("0");
                     }
                 });
                 form.on('switch(emergencyProject)',function(data){

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -209,6 +209,8 @@
                         layui.form.render();
                     }else if(span==1){
                         $("#emergencyProject").parent().parent().parent().show();
+                        //B级默认非紧急项目
+                        $("#emergencyProjectFlag").val("0");
                     }
                 });
                 form.on('switch(emergencyProject)',function(data){

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/adminReportEditFormAlls.jsp

@@ -125,8 +125,6 @@
 				}
 				var reportedFalg = "${reportedFalg}"
 				if(boolFlag){
-					if(false == reportedFalg){
-
 						var startDate = new Date($("#startDate").val());
 						var endingDate = new Date($("#endingDate").val());
 						if(startDate.getTime() > endingDate.getTime()){
@@ -154,7 +152,7 @@
 								}
 							}
 						}
-					}else{
+					if("false" != reportedFalg){
 						//咨询标的额
 						var ZiXunBDE = $("#ZiXunBDE").val();
 						var GCGMValue = $("#GCGMValue").val();
@@ -2543,7 +2541,7 @@
 								<div class="layui-input-block with-icon">
 									<form:input path="recordsReported.projectTotalInvestment" placeholder="请输入工程项目总投资" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number"/>
 								</div>
-							</div>
+								</div>
 							<div class="layui-item layui-col-sm6 lw6">
 								<label class="layui-form-label"><span class="require-item">*</span>总咨询师：</label>
 								<div class="layui-input-block  with-icon">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/adminReportEditForms.jsp

@@ -125,8 +125,6 @@
 				}
 				var reportedFalg ="${reportedFalg}"
 				if(boolFlag){
-					if(false == reportedFalg){
-
 						var startDate = new Date($("#startDate").val());
 						var endingDate = new Date($("#endingDate").val());
 						if(startDate.getTime() > endingDate.getTime()){
@@ -154,7 +152,7 @@
 								}
 							}
 						}
-					}else{
+					if("false"!= reportedFalg){
 						//咨询标的额
 						var ZiXunBDE = $("#ZiXunBDE").val();
 						var GCGMValue = $("#GCGMValue").val();