Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/bzshbReportedAudit.jsp

@@ -625,13 +625,13 @@
 
             })
 
-            var GCGMValueVal = $("#GCGMValue").val();
-            if(GCGMValueVal == "50"){
-                $("#GCGMValueParameter").removeClass("number");
-            }else{
-                $("#GCGMValueParameter").removeClass("number");
-                $("#GCGMValueParameter").addClass("number");
-            }
+            // var GCGMValueVal = $("#GCGMValue").val();
+            // if(GCGMValueVal == "50"){
+            //     $("#GCGMValueParameter").removeClass("number");
+            // }else{
+            //     $("#GCGMValueParameter").removeClass("number");
+            //     $("#GCGMValueParameter").addClass("number");
+            // }
             var contents=${ruralProjectRecordsReported.contentsIncludeList}
             for(var i=0;i<contents.length;i++){
                 var con=contents[i];
@@ -1310,7 +1310,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>工程用途：</label>
                     <div class="layui-input-block">
-                        <input type="text" value="${engineeringInfo.engineeringName}" readonly class="form-control layui-input">
+                        <input type="text" id="PorjectUse" value="${engineeringInfo.engineeringName}" readonly class="form-control layui-input">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -1322,7 +1322,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <form:input path="GCGMValueParameter" placeholder="请输入建筑规模值" onkeyup="numGCGN(this)" readonly="true" htmlEscape="false" class="form-control judgment layui-input number"/>
+                    <form:input path="GCGMValueParameter" placeholder="请输入建筑规模值" readonly="true" htmlEscape="false" class="form-control judgment layui-input"/>
                 </div>
 
 

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

@@ -123,10 +123,9 @@
 						}
 					}
 				}
-				var reportedFalg = ${reportedFalg}
+				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()){

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

@@ -123,7 +123,7 @@
 						}
 					}
 				}
-				var reportedFalg = ${reportedFalg}
+				var reportedFalg = "${reportedFalg}"
 				if(boolFlag){
 					if(false == reportedFalg){
 

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

@@ -123,7 +123,7 @@
 						}
 					}
 				}
-				var reportedFalg = ${reportedFalg}
+				var reportedFalg ="${reportedFalg}"
 				if(boolFlag){
 					if(false == reportedFalg){
 

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedModify.jsp

@@ -1003,7 +1003,7 @@
 <div class="single-form">
     <div class="container">
         <sys:message content="${message}"/>
-        <form:form id="inputForm" modelAttribute="ruralProjectRecordsReported" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectMessage/auditSaveReported" method="post" class="form-horizontal layui-form">
+        <form:form id="inputForm" modelAttribute="ruralProjectRecordsReported" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectMessageNew/auditSaveReported" method="post" class="form-horizontal layui-form">
             <form:hidden path="id"/>
             <form:hidden path="projectId"/>
             <form:hidden path="province"/>