浏览代码

质量复核审核增减额和审核增减率计算方式修改

user5 3 年之前
父节点
当前提交
72fe567bb6

+ 9 - 4
src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp

@@ -478,10 +478,12 @@
 			top.layer.msg("已确认!", {icon: 1});
 		}
 		function getFee() {
+			//送审价
 			var rf = $("#reviewFee").val();
+			//审定价
 			var af = $("#approvalFee").val();
-			if(rf != ''&& af !=''){
-				var hf = (rf*100-af*100)/100;
+			if(rf != '' && rf != '0.00' && af !='' && af !='0.00'){
+				var hf = (af*100-rf*100)/100;
 				var rate = parseFloat(hf) / parseFloat(rf) * 100
 				$("#verifyFee").val(hf.toFixed(2));
 				$("#verifyRate").val(rate.toFixed(2));
@@ -503,14 +505,17 @@
 		}
 
 		function getApprovalFee() {
+        	//送审价
 			var rf = $("#reviewFee").val();
+			//审定价
 			var af = $("#approvalFee").val();
 			//土建
 			var bf = $("#buildingFee").val();
 			//安装
 			var inf = $("#installFee").val();
-			if(rf != ''&& af !=''){
-				var hf = (rf*100-af*100)/100;
+			if(rf != '' && rf != '0.00' && af !='' && af !='0.00'){
+				//计算审核增减额
+				var hf = (af*100-rf*100)/100;
 				var rate = parseFloat(hf) / parseFloat(rf) * 100
 				$("#verifyFee").val(hf.toFixed(2));
 				$("#verifyRate").val(rate.toFixed(2));

+ 9 - 4
src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportModify.jsp

@@ -464,10 +464,12 @@
 			top.layer.msg("已确认!", {icon: 1});
 		}
 		function getFee() {
+			//送审价
 			var rf = $("#reviewFee").val();
+			//审定价
 			var af = $("#approvalFee").val();
-			if(rf != ''&& af !=''){
-				var hf = (rf*100-af*100)/100;
+			if(rf != '' && rf != '0.00' && af !='' && af !='0.00'){
+				var hf = (af*100-rf*100)/100;
 				var rate = parseFloat(hf) / parseFloat(rf) * 100
 				$("#verifyFee").val(hf.toFixed(2));
 				$("#verifyRate").val(rate.toFixed(2));
@@ -478,14 +480,17 @@
 		}
 
 		function getApprovalFee() {
+			//送审价
 			var rf = $("#reviewFee").val();
+			//审定价
 			var af = $("#approvalFee").val();
 			//土建
 			var bf = $("#buildingFee").val();
 			//安装
 			var inf = $("#installFee").val();
-			if(rf != ''&& af !=''){
-				var hf = (rf*100-af*100)/100;
+			if(rf != '' && rf != '0.00' && af !='' && af !='0.00'){
+				//计算审核增减额
+				var hf = (af*100-rf*100)/100;
 				var rate = parseFloat(hf) / parseFloat(rf) * 100
 				$("#verifyFee").val(hf.toFixed(2));
 				$("#verifyRate").val(rate.toFixed(2));

+ 9 - 4
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModify.jsp

@@ -208,10 +208,12 @@
             })
         });
         function getFee() {
+            //送审价
             var rf = $("#reviewFee").val();
+            //审定价
             var af = $("#approvalFee").val();
-            if(rf != ''&& af !=''){
-                var hf = (rf*100-af*100)/100;
+            if(rf != '' && rf != '0.00' && af !='' && af !='0.00'){
+                var hf = (af*100-rf*100)/100;
                 var rate = parseFloat(hf) / parseFloat(rf) * 100
                 $("#verifyFee").val(hf.toFixed(2));
                 $("#verifyRate").val(rate.toFixed(2));
@@ -245,14 +247,17 @@
             top.layer.msg("已确认!", {icon: 1});
         }
         function getApprovalFee() {
+            //送审价
             var rf = $("#reviewFee").val();
+            //审定价
             var af = $("#approvalFee").val();
             //土建
             var bf = $("#buildingFee").val();
             //安装
             var inf = $("#installFee").val();
-            if(rf != ''&& af !=''){
-                var hf = (rf*100-af*100)/100;
+            if(rf != '' && rf != '0.00' && af !='' && af !='0.00'){
+                //计算审核增减额
+                var hf = (af*100-rf*100)/100;
                 var rate = parseFloat(hf) / parseFloat(rf) * 100
                 $("#verifyFee").val(hf.toFixed(2));
                 $("#verifyRate").val(rate.toFixed(2));

+ 9 - 4
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm.jsp

@@ -418,10 +418,12 @@
 		}
 
 		function getFee() {
+			//送审价
 			var rf = $("#reviewFee").val();
+			//审定价
 			var af = $("#approvalFee").val();
-			if(rf != ''&& af !=''){
-				var hf = (rf*100-af*100)/100;
+			if(rf != '' && rf != '0.00' && af !='' && af !='0.00'){
+				var hf = (af*100-rf*100)/100;
 				var rate = parseFloat(hf) / parseFloat(rf) * 100
 				$("#verifyFee").val(hf.toFixed(2));
 				$("#verifyRate").val(rate.toFixed(2));
@@ -443,14 +445,17 @@
 		}
 
 		function getApprovalFee() {
+			//送审价
 			var rf = $("#reviewFee").val();
+			//审定价
 			var af = $("#approvalFee").val();
 			//土建
 			var bf = $("#buildingFee").val();
 			//安装
 			var inf = $("#installFee").val();
-			if(rf != ''&& af !=''){
-				var hf = (rf*100-af*100)/100;
+			if(rf != '' && rf != '0.00' && af !='' && af !='0.00'){
+				//计算审核增减额
+				var hf = (af*100-rf*100)/100;
 				var rate = parseFloat(hf) / parseFloat(rf) * 100
 				$("#verifyFee").val(hf.toFixed(2));
 				$("#verifyRate").val(rate.toFixed(2));