造价审核报告修改

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

@@ -181,6 +181,18 @@
 						<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">土建比例(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">安装比例(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
 			</div>
 
 			<div class="form-group layui-row">

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

@@ -95,6 +95,76 @@
                     }
                 }
             });
+        }function getFee() {
+            var rf = $("#reviewFee").val();
+            var af = $("#approvalFee").val();
+            if(rf != ''&& af !=''){
+                var hf = parseInt(rf)-parseInt(af);
+                var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
+                $("#verifyFee").val(hf);
+                $("#verifyRate").val(rate);
+            }
+            if(af !=''){
+                $("#consultFee").val(af)
+            }
+        }
+
+        function getApprovalFee() {
+            var rf = $("#reviewFee").val();
+            var af = $("#approvalFee").val();
+            //土建
+            var bf = $("#buildingFee").val();
+            //安装
+            var inf = $("#installFee").val();
+            if(rf != ''&& af !=''){
+                var hf = parseInt(rf)-parseInt(af);
+                var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
+                $("#verifyFee").val(hf);
+                $("#verifyRate").val(rate);
+            }
+            if(af !=''){
+                $("#consultFee").val(af)
+            }
+            $("#buildingFee").val("");
+            $("#installFee").val("");
+            $("#buildingRate").val("");
+            $("#installRate").val("");
+        }
+
+        function getInstallFee() {
+            var af = $("#approvalFee").val();
+            //安装
+            var inf = $("#installFee").val();
+            if(inf != ''&& af !=''){
+                var hf = parseInt(af)-parseInt(inf);
+                var rate = Math.round(parseInt(inf) / parseInt(af) * 100) / 100 * 100
+                $("#installRate").val(rate);
+                $("#buildingFee").val(hf);
+                bf = hf;
+                var bRate = Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100
+                $("#buildingRate").val(bRate);
+            }
+            if(inf == ''|| af ==''){
+                $("#installRate").val("");
+            }
+        }
+
+        function getBuildingFee() {
+            var af = $("#approvalFee").val();
+            //土建
+            var bf = $("#buildingFee").val();
+            if(bf != ''&& af !=''){
+                var hf = parseInt(af)-parseInt(bf);
+                var rate = Math.round(parseInt(bf) / parseInt(af) * 100) / 100 * 100
+                $("#buildingRate").val(rate);
+                $("#installFee").val(hf);
+                inf = hf;
+                var inRate = Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100
+                $("#installRate").val(inRate);
+            }
+            if(bf == ''|| af ==''){
+                $("#buildingRate").val("");
+            }
         }
     </script>
 </head>
@@ -136,13 +206,13 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input" readonly="true"/>
+                        <form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input" readonly="true" onchange="getFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input" readonly="true"/>
+                        <form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input" readonly="true" onchange="getApprovalFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -172,13 +242,25 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">土建造价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                        <form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true" onchange="getBuildingFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">安装造价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                        <form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true" onchange="getInstallFee()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">土建比例(%)：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">安装比例(%)：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                     </div>
                 </div>
             </div>

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

@@ -249,13 +249,13 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line">其中土建百分比(%)：</label>
+					<label class="layui-form-label double-line">土建比例(%)：</label>
 					<div class="layui-input-block">
 						<form:input path="buildingPercent" htmlEscape="false" id="buildingPercent" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line">其中安装百分比(%)：</label>
+					<label class="layui-form-label double-line">安装比例(%)：</label>
 					<div class="layui-input-block">
 						<form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
 					</div>
@@ -266,18 +266,6 @@
 						<input value="<fmt:formatNumber value="${projectRecords.unitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line">土建单位造价(元)：</label>
-					<div class="layui-input-block">
-						<input  value="<fmt:formatNumber value="${projectRecords.buildingUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line">安装单位造价(元)：</label>
-					<div class="layui-input-block">
-						<input  value="<fmt:formatNumber value="${projectRecords.installUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="readonly"/>
-					</div>
-				</div>
 				<div class="layui-item layui-col-sm6 lw6 with-textarea">
 					<label class="layui-form-label">工程概况：</label>
 					<div class="layui-input-block">

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

@@ -257,6 +257,64 @@
 			}
 		}
 
+		function getApprovalFee() {
+			var rf = $("#reviewFee").val();
+			var af = $("#approvalFee").val();
+			//土建
+			var bf = $("#buildingFee").val();
+			//安装
+			var inf = $("#installFee").val();
+			if(rf != ''&& af !=''){
+				var hf = parseInt(rf)-parseInt(af);
+				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
+				$("#verifyFee").val(hf);
+				$("#verifyRate").val(rate);
+			}
+			if(af !=''){
+				$("#consultFee").val(af)
+			}
+			$("#buildingFee").val("");
+			$("#installFee").val("");
+			$("#buildingRate").val("");
+			$("#installRate").val("");
+		}
+
+		function getInstallFee() {
+			var af = $("#approvalFee").val();
+			//安装
+			var inf = $("#installFee").val();
+			if(inf != ''&& af !=''){
+				var hf = parseInt(af)-parseInt(inf);
+				var rate = Math.round(parseInt(inf) / parseInt(af) * 100) / 100 * 100
+				$("#installRate").val(rate);
+				$("#buildingFee").val(hf);
+				bf = hf;
+				var bRate = Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100
+				$("#buildingRate").val(bRate);
+			}
+			if(inf == ''|| af ==''){
+				$("#installRate").val("");
+			}
+		}
+
+		function getBuildingFee() {
+			var af = $("#approvalFee").val();
+			//土建
+			var bf = $("#buildingFee").val();
+			if(bf != ''&& af !=''){
+				var hf = parseInt(af)-parseInt(bf);
+				var rate = Math.round(parseInt(bf) / parseInt(af) * 100) / 100 * 100
+				$("#buildingRate").val(rate);
+				$("#installFee").val(hf);
+				inf = hf;
+				var inRate = Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100
+				$("#installRate").val(inRate);
+			}
+			if(bf == ''|| af ==''){
+				$("#buildingRate").val("");
+			}
+		}
+
         function addReview(obj) {
             var infoId = $("#id").val();
             var name = $("#name").val();
@@ -347,7 +405,7 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()"/>
+							<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getApprovalFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
@@ -377,15 +435,27 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">土建造价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number"/>
+							<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number" onchange="getBuildingFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">安装造价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number"/>
+							<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number" onchange="getInstallFee()"/>
 						</div>
 					</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">土建比例(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">安装比例(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
 				</div>
 
 			<div class="form-group layui-row">

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

@@ -78,6 +78,18 @@
 					<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 				</div>
 			</div>
+			<div class="layui-item layui-col-sm6">
+				<label class="layui-form-label">土建比例(%)：</label>
+				<div class="layui-input-block with-icon">
+					<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+				</div>
+			</div>
+			<div class="layui-item layui-col-sm6">
+				<label class="layui-form-label">安装比例(%)：</label>
+				<div class="layui-input-block with-icon">
+					<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+				</div>
+			</div>
 		</div>
 		<div class="form-group layui-row">
 			<div class="form-group-label"><h2>报告文件</h2></div>