Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/projectrecord/projectRecordsAudit.jsp

@@ -32,7 +32,7 @@
                 $("#inputForm").submit();
                 return true;
             }
-	
+
 		  return false;
 		}
 		$(document).ready(function() {
@@ -310,7 +310,7 @@
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label double-line">建筑面积或规模：</label>
 					<div class="layui-input-block">
-						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
 				<%--<div class="layui-item layui-col-sm6 lw7">
@@ -763,4 +763,4 @@
 	</div>
 </div>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -1235,7 +1235,7 @@
                         </form:select>
                     </div>
                 </div>
-                
+
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">创建人：</label>
                     <div class="layui-input-block">
@@ -1273,7 +1273,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">建筑面积或规模：</label>
                     <div class="layui-input-block"><%--onchange="getFee()"--%>
-                        <form:input placeholder="请输入建筑面积和规模" path="buildingScale" htmlEscape="false"  class="form-control layui-input number" />
+                        <form:input placeholder="请输入建筑面积和规模" path="buildingScale" htmlEscape="false" maxlength="64" class="form-control layui-input" />
                     </div>
                 </div>
                <%-- <div class="layui-item layui-col-sm6 lw7">
@@ -1327,19 +1327,19 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">单位造价(元)：</label>
                     <div class="layui-input-block">
-                        <form:input placeholder="请输入单位造价" path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="false"/>
+                        <form:input placeholder="请输入单位造价" path="unitFees" htmlEscape="false" id="unitFees" onkeyup="wirteNum(this)" maxlength="10" class="form-control layui-input number" readonly="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">土建单位造价(元)：</label>
                     <div class="layui-input-block">
-                        <form:input placeholder="请输入土建单位造价" path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="false"/>
+                        <form:input placeholder="请输入土建单位造价" path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" onkeyup="wirteNum(this)" maxlength="10" class="form-control layui-input number" readonly="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">安装单位造价(元)：</label>
                     <div class="layui-input-block">
-                        <form:input placeholder="请输入安装单位造价" path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="false"/>
+                        <form:input placeholder="请输入安装单位造价" path="installUnitFees" htmlEscape="false" id="installUnitFees" onkeyup="wirteNum(this)" maxlength="10" class="form-control layui-input number" readonly="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
@@ -1886,4 +1886,4 @@
     </div>
 </div>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/projectrecord/projectRecordsModify.jsp

@@ -26,7 +26,7 @@
 			  $("#inputForm").submit();
 			  return true;
 		  }
-	
+
 		  return false;
 		}
 		$(document).ready(function() {
@@ -289,7 +289,7 @@
         function addFile() {
             $("#attachment_file").click();
         }
-        
+
         function addRow(list, idx, tpl, row){
             // var idx1 = $("#workClientLinkmanList tr").length;
                 bornTemplete(list, idx, tpl, row, idx);
@@ -511,7 +511,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">建筑面积或规模：</label>
                     <div class="layui-input-block"><%--onchange="getFee()"--%>
-                        <form:input path="buildingScale" placeholder="请输入建筑面积或规模" htmlEscape="false"  class="form-control layui-input number" />
+                        <form:input path="buildingScale" placeholder="请输入建筑面积或规模" htmlEscape="false" maxlength="64" class="form-control layui-input" />
                     </div>
                 </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">
@@ -565,19 +565,19 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">单位造价(元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="unitFees" placeholder="请输入单位造价" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="false"/>
+                        <form:input path="unitFees" placeholder="请输入单位造价" htmlEscape="false" id="unitFees" onkeyup="wirteNum(this)" maxlength="10" class="form-control layui-input number" readonly="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">土建单位造价(元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="buildingUnitFees" placeholder="请输入土建单位造价" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="false"/>
+                        <form:input path="buildingUnitFees" placeholder="请输入土建单位造价" htmlEscape="false" id="buildingUnitFees" onkeyup="wirteNum(this)" maxlength="10" class="form-control layui-input number" readonly="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">安装单位造价(元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="installUnitFees" placeholder="请输入安装单位造价" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="false"/>
+                        <form:input path="installUnitFees" placeholder="请输入安装单位造价" htmlEscape="false" id="installUnitFees" onkeyup="wirteNum(this)" maxlength="10" class="form-control layui-input number" readonly="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
@@ -826,4 +826,4 @@
 </div>
 
 </body>
-</html>
+</html>