Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordAudit.jsp

@@ -348,7 +348,7 @@
 						<div class="layui-item layui-col-sm6" style="display: none;">
 							<label class="layui-form-label">费率(%)：</label>
 							<div class="layui-input-block with-icon">
-								<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  readonly="true" class="form-control layui-input number"/>
+								<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">

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

@@ -1574,7 +1574,7 @@
 					<div class="layui-item layui-col-sm6" style="display: none;">
 						<label class="layui-form-label">费率(%)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  onkeyup="wirteNum(this)" class="form-control layui-input number"/>
+							<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  class="form-control layui-input"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp

@@ -916,7 +916,7 @@
 				<div class="layui-item layui-col-sm6" style="display: none;">
 					<label class="layui-form-label">费率(%)：</label>
 					<div class="layui-input-block with-icon">
-						<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  onkeyup="wirteNum(this)" class="form-control layui-input number"/>
+						<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false" class="form-control layui-input"/>
 					</div>
 				</div>
 					<%--<c:choose>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportModify.jsp

@@ -822,7 +822,7 @@
 				<div class="layui-item layui-col-sm6" style="display: none;">
 					<label class="layui-form-label">费率(%)：</label>
 					<div class="layui-input-block with-icon">
-						<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  onkeyup="wirteNum(this)" class="form-control layui-input number"/>
+						<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false" class="form-control layui-input"/>
 					</div>
 				</div>
 					<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordAudit.jsp

@@ -355,7 +355,7 @@
 						<div class="layui-item layui-col-sm6" style="display: none;">
 							<label class="layui-form-label">费率(%)：</label>
 							<div class="layui-input-block with-icon">
-								<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  readonly="true" class="form-control layui-input number"/>
+								<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">

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

@@ -1574,7 +1574,7 @@
 					<div class="layui-item layui-col-sm6" style="display: none;">
 						<label class="layui-form-label">费率(%)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  onkeyup="wirteNum(this)" class="form-control layui-input number"/>
+							<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false" class="form-control layui-input"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">

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

@@ -1574,7 +1574,7 @@
 					<div class="layui-item layui-col-sm6" style="display: none;">
 						<label class="layui-form-label">费率(%)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  onkeyup="wirteNum(this)" class="form-control layui-input number"/>
+							<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false" class="form-control layui-input"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit.jsp

@@ -464,7 +464,7 @@
 						<div class="layui-item layui-col-sm6" style="display: none;">
 							<label class="layui-form-label">费率(%)：</label>
 							<div class="layui-input-block with-icon">
-								<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  readonly="true" class="form-control layui-input number"/>
+								<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModify.jsp

@@ -549,7 +549,7 @@
                 <div class="layui-item layui-col-sm6" style="display: none;">
                     <label class="layui-form-label">费率(%)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  onkeyup="wirteNum(this)" class="form-control layui-input number"/>
+                        <form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModifyTwo.jsp

@@ -450,7 +450,7 @@
                 <div class="layui-item layui-col-sm6" style="display: none;">
                     <label class="layui-form-label">费率(%)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input placeholder="请输入合同费率" readonly="true" id="contractRate" path="projectReportData.contractRate" htmlEscape="false" onkeyup="wirteNum(this)" class="form-control layui-input number"/>
+                        <form:input placeholder="请输入合同费率" readonly="true" id="contractRate" path="projectReportData.contractRate" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm.jsp

@@ -844,7 +844,7 @@
 					<div class="layui-item layui-col-sm6" style="display: none;">
 						<label class="layui-form-label">费率(%)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  onkeyup="wirteNum(this)" class="form-control layui-input number"/>
+							<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false" class="form-control layui-input"/>
 						</div>
 					</div>
 					<%--<c:choose>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportFormTwo.jsp

@@ -692,7 +692,7 @@
 					<div class="layui-item layui-col-sm6" style="display: none;">
 						<label class="layui-form-label">费率(%)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input placeholder="请输入合同费率" id="contractRate"  readonly="true"  path="projectReportData.contractRate" htmlEscape="false" onkeyup="wirteNum(this)" class="form-control layui-input number"/>
+							<form:input placeholder="请输入合同费率" id="contractRate"  readonly="true"  path="projectReportData.contractRate" htmlEscape="false" class="form-control layui-input"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6 lw7">

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

@@ -338,7 +338,7 @@
 				<div class="layui-item layui-col-sm6" style="display: none;">
 					<label class="layui-form-label">费率(%)：</label>
 					<div class="layui-input-block with-icon">
-						<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false" readonly="true" class="form-control layui-input number"/>
+						<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false" readonly="true" class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">

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

@@ -338,7 +338,7 @@
 				<div class="layui-item layui-col-sm6" style="display: none;">
 					<label class="layui-form-label">费率(%)：</label>
 					<div class="layui-input-block with-icon">
-						<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false" readonly="true" class="form-control layui-input number"/>
+						<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false" readonly="true" class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportIssueView.jsp

@@ -217,7 +217,7 @@
 				<div class="layui-item layui-col-sm6" style="display: none;">
 					<label class="layui-form-label">费率(%)：</label>
 					<div class="layui-input-block with-icon">
-						<form:input placeholder="请输入合同费率" id="contractRate" cssStyle="background-color: #f1f1f1" path="projectReportData.contractRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+						<form:input placeholder="请输入合同费率" id="contractRate" cssStyle="background-color: #f1f1f1" path="projectReportData.contractRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp

@@ -231,7 +231,7 @@
 				<div class="layui-item layui-col-sm6" style="display: none;">
 					<label class="layui-form-label">费率(%)：</label>
 					<div class="layui-input-block with-icon">
-						<form:input placeholder="请输入合同费率" id="contractRate" cssStyle="background-color: #f1f1f1" path="projectReportData.contractRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+						<form:input placeholder="请输入合同费率" id="contractRate" cssStyle="background-color: #f1f1f1" path="projectReportData.contractRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">