上报页面金额保留两位小数修改

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectViewController.java

@@ -542,11 +542,13 @@ public class RuralProjectViewController extends BaseController {
             projectRecords = projectRecordsService.get(reported.getProjectId());
             model.addAttribute("projectRecords", projectRecords);
         }
-        reported = ruralProjectMessageService.getRuralProjectRecordsReported(reported.getProjectId());
-        model.addAttribute("projectTypeId",reported.getProjectType());
-        User user = UserUtils.get(reported.getXmFZR());
-        if(null != user){
-            model.addAttribute("xmFZRName",user.getName());
+        RuralProjectRecordsReported newReported = ruralProjectMessageService.getRuralProjectRecordsReported(reported.getProjectId());
+        if(null!= newReported){
+            model.addAttribute("projectTypeId",newReported.getProjectType());
+            User user = UserUtils.get(newReported.getXmFZR());
+            if(null != user){
+                model.addAttribute("xmFZRName",user.getName());
+            }
         }
         if (null!=reported){
             ruralProjectMessageService.getInfoByView(reported);

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReportedForm.jsp

@@ -902,7 +902,7 @@
                     var t = a.replace('wcyysr','wcyysrbl');
                     if(!/^\d+(\.\d{1,10})?$/.test( t2 )){
                         $("#" +  t ).val("");
-                        parent.layer.msg("请填写正确完成营业收入（元）",{icon:5});
+                        parent.layer.msg("请填写正确完成营业收入（万元）",{icon:5});
                         return;
                     }else {
                         var wcyysrbl = t2 / m *100;
@@ -925,12 +925,12 @@
                 var m = parseFloat(mv);
                 var size = $("#reportedConsultantList tr").length;
                 if(size>0){
-                    for (var i = 1;i<=50;i++){
+                    for (var i = 1;i<=99;i++){
                         var wcyysrbl = $("#reportedConsultantList"+i+"_wcyysrbl").val();
 
                         if(wcyysrbl != undefined && wcyysrbl!=''){
                             var wcyysr = m * wcyysrbl /100;
-                            $("#reportedConsultantList"+i+"_wcyysr").val(wcyysr);
+                            $("#reportedConsultantList"+i+"_wcyysr").val(parseFloat(wcyysr.toFixed(2)));
                         }
                     }
                 }

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

@@ -1380,7 +1380,7 @@
 					var t = a.replace('wcyysr','wcyysrbl');
 					if(!/^\d+(\.\d{1,10})?$/.test( t2 )){
 						$("#" +  t ).val("");
-						parent.layer.msg("请填写正确完成营业收入（元）",{icon:5});
+						parent.layer.msg("请填写正确完成营业收入（万元）",{icon:5});
 						return;
 					}else {
 						var wcyysrbl = t2 / m *100;
@@ -1403,12 +1403,12 @@
 				var m = parseFloat(mv);
 				var size = $("#reportedConsultantList tr").length;
 				if(size>0){
-					for (var i = 1;i<=50;i++){
+					for (var i = 1;i<=99;i++){
 						var wcyysrbl = $("#reportedConsultantList"+i+"_wcyysrbl").val();
 
 						if(wcyysrbl != undefined && wcyysrbl!=''){
 							var wcyysr = m * wcyysrbl /100;
-							$("#reportedConsultantList"+i+"_wcyysr").val(wcyysr);
+							$("#reportedConsultantList"+i+"_wcyysr").val(parseFloat(wcyysr.toFixed(2)));
 						}
 					}
 				}
@@ -2966,4 +2966,4 @@
 	}
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedForm.jsp

@@ -499,7 +499,7 @@
                     var t = a.replace('wcyysr','wcyysrbl');
                     if(!/^\d+(\.\d{1,10})?$/.test( t2 )){
                         $("#" +  t ).val("");
-                        parent.layer.msg("请填写正确完成营业收入（元）",{icon:5});
+                        parent.layer.msg("请填写正确完成营业收入（万元）",{icon:5});
                         return;
                     }else {
                         var wcyysrbl = t2 / m *100;
@@ -519,15 +519,15 @@
                     parent.layer.msg("请填写正确的咨询营业收入",{icon:5});
                     return;
                 }
-                var m = parseFloat(mv)* 10000;
+                var m = parseFloat(mv);
                 var size = $("#reportedConsultantList tr").length;
                 if(size>0){
-                    for (var i = 1;i<=50;i++){
+                    for (var i = 1;i<=99;i++){
                         var wcyysrbl = $("#reportedConsultantList"+i+"_wcyysrbl").val();
 
                         if(wcyysrbl != undefined && wcyysrbl!=''){
                             var wcyysr = m * wcyysrbl /100;
-                            $("#reportedConsultantList"+i+"_wcyysr").val(wcyysr);
+                            $("#reportedConsultantList"+i+"_wcyysr").val(parseFloat(wcyysr.toFixed(2)));
                         }
                     }
                 }

src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedFormPerson.jsp

@@ -499,7 +499,7 @@
                     var t = a.replace('wcyysr','wcyysrbl');
                     if(!/^\d+(\.\d{1,10})?$/.test( t2 )){
                         $("#" +  t ).val("");
-                        parent.layer.msg("请填写正确完成营业收入（元）",{icon:5});
+                        parent.layer.msg("请填写正确完成营业收入（万元）",{icon:5});
                         return;
                     }else {
                         var wcyysrbl = t2 / m *100;
@@ -519,15 +519,15 @@
                     parent.layer.msg("请填写正确的咨询营业收入",{icon:5});
                     return;
                 }
-                var m = parseFloat(mv)* 10000;
+                var m = parseFloat(mv);
                 var size = $("#reportedConsultantList tr").length;
                 if(size>0){
-                    for (var i = 1;i<=50;i++){
+                    for (var i = 1;i<=99;i++){
                         var wcyysrbl = $("#reportedConsultantList"+i+"_wcyysrbl").val();
 
                         if(wcyysrbl != undefined && wcyysrbl!=''){
                             var wcyysr = m * wcyysrbl /100;
-                            $("#reportedConsultantList"+i+"_wcyysr").val(wcyysr);
+                            $("#reportedConsultantList"+i+"_wcyysr").val(parseFloat(wcyysr.toFixed(2)));
                         }
                     }
                 }

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

@@ -901,7 +901,7 @@
                     var t = a.replace('wcyysr','wcyysrbl');
                     if(!/^\d+(\.\d{1,10})?$/.test( t2 )){
                         $("#" +  t ).val("");
-                        parent.layer.msg("请填写正确完成营业收入（元）",{icon:5});
+                        parent.layer.msg("请填写正确完成营业收入（万元）",{icon:5});
                         return;
                     }else {
                         var wcyysrbl = t2 / m *100;
@@ -924,12 +924,12 @@
                 var m = parseFloat(mv);
                 var size = $("#reportedConsultantList tr").length;
                 if(size>0){
-                    for (var i = 1;i<=50;i++){
+                    for (var i = 1;i<=99;i++){
                         var wcyysrbl = $("#reportedConsultantList"+i+"_wcyysrbl").val();
 
                         if(wcyysrbl != undefined && wcyysrbl!=''){
                             var wcyysr = m * wcyysrbl /100;
-                            $("#reportedConsultantList"+i+"_wcyysr").val(wcyysr);
+                            $("#reportedConsultantList"+i+"_wcyysr").val(parseFloat(wcyysr.toFixed(2)));
                         }
                     }
                 }

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

@@ -1380,7 +1380,7 @@
 					var t = a.replace('wcyysr','wcyysrbl');
 					if(!/^\d+(\.\d{1,10})?$/.test( t2 )){
 						$("#" +  t ).val("");
-						parent.layer.msg("请填写正确完成营业收入（元）",{icon:5});
+						parent.layer.msg("请填写正确完成营业收入（万元）",{icon:5});
 						return;
 					}else {
 						var wcyysrbl = t2 / m *100;
@@ -1403,12 +1403,12 @@
 				var m = parseFloat(mv);
 				var size = $("#reportedConsultantList tr").length;
 				if(size>0){
-					for (var i = 1;i<=50;i++){
+					for (var i = 1;i<=99;i++){
 						var wcyysrbl = $("#reportedConsultantList"+i+"_wcyysrbl").val();
 
 						if(wcyysrbl != undefined && wcyysrbl!=''){
 							var wcyysr = m * wcyysrbl /100;
-							$("#reportedConsultantList"+i+"_wcyysr").val(wcyysr);
+							$("#reportedConsultantList"+i+"_wcyysr").val(parseFloat(wcyysr.toFixed(2)));
 						}
 					}
 				}

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

@@ -914,7 +914,7 @@
                     var t = a.replace('wcyysr','wcyysrbl');
                     if(!/^\d+(\.\d{1,10})?$/.test( t2 )){
                         $("#" +  t ).val("");
-                        parent.layer.msg("请填写正确完成营业收入（元）",{icon:5});
+                        parent.layer.msg("请填写正确完成营业收入（万元）",{icon:5});
                         return;
                     }else {
                         var wcyysrbl = t2 / m *100;
@@ -937,12 +937,12 @@
                 var m = parseFloat(mv);
                 var size = $("#reportedConsultantList tr").length;
                 if(size>0){
-                    for (var i = 1;i<=50;i++){
+                    for (var i = 1;i<=99;i++){
                         var wcyysrbl = $("#reportedConsultantList"+i+"_wcyysrbl").val();
 
                         if(wcyysrbl != undefined && wcyysrbl!=''){
                             var wcyysr = m * wcyysrbl /100;
-                            $("#reportedConsultantList"+i+"_wcyysr").val(wcyysr);
+                            $("#reportedConsultantList"+i+"_wcyysr").val(parseFloat(wcyysr.toFixed(2)));
                         }
                     }
                 }

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

@@ -903,7 +903,7 @@
                     var t = a.replace('wcyysr','wcyysrbl');
                     if(!/^\d+(\.\d{1,10})?$/.test( t2 )){
                         $("#" +  t ).val("");
-                        parent.layer.msg("请填写正确完成营业收入（元）",{icon:5});
+                        parent.layer.msg("请填写正确完成营业收入（万元）",{icon:5});
                         return;
                     }else {
                         var wcyysrbl = t2 / m *100;
@@ -926,12 +926,12 @@
                 var m = parseFloat(mv);
                 var size = $("#reportedConsultantList tr").length;
                 if(size>0){
-                    for (var i = 1;i<=50;i++){
+                    for (var i = 1;i<=99;i++){
                         var wcyysrbl = $("#reportedConsultantList"+i+"_wcyysrbl").val();
 
                         if(wcyysrbl != undefined && wcyysrbl!=''){
                             var wcyysr = m * wcyysrbl /100;
-                            $("#reportedConsultantList"+i+"_wcyysr").val(wcyysr);
+                            $("#reportedConsultantList"+i+"_wcyysr").val(parseFloat(wcyysr.toFixed(2)));
                         }
                     }
                 }

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

@@ -515,7 +515,7 @@
                     var t = a.replace('wcyysr','wcyysrbl');
                     if(!/^\d+(\.\d{1,10})?$/.test( t2 )){
                         $("#" +  t ).val("");
-                        parent.layer.msg("请填写正确完成营业收入（元）",{icon:5});
+                        parent.layer.msg("请填写正确完成营业收入（万元）",{icon:5});
                         return;
                     }else {
                         var wcyysrbl = t2 / m *100;
@@ -535,15 +535,15 @@
                     parent.layer.msg("请填写正确的咨询营业收入",{icon:5});
                     return;
                 }
-                var m = parseFloat(mv)* 10000;
+                var m = parseFloat(mv);
                 var size = $("#reportedConsultantList tr").length;
                 if(size>0){
-                    for (var i = 1;i<=50;i++){
+                    for (var i = 1;i<=99;i++){
                         var wcyysrbl = $("#reportedConsultantList"+i+"_wcyysrbl").val();
 
                         if(wcyysrbl != undefined && wcyysrbl!=''){
                             var wcyysr = m * wcyysrbl /100;
-                            $("#reportedConsultantList"+i+"_wcyysr").val(wcyysr);
+                            $("#reportedConsultantList"+i+"_wcyysr").val(parseFloat(wcyysr.toFixed(2)));
                         }
                     }
                 }

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

@@ -900,7 +900,7 @@
                     var t = a.replace('wcyysr','wcyysrbl');
                     if(!/^\d+(\.\d{1,10})?$/.test( t2 )){
                         $("#" +  t ).val("");
-                        parent.layer.msg("请填写正确完成营业收入（元）",{icon:5});
+                        parent.layer.msg("请填写正确完成营业收入（万元）",{icon:5});
                         return;
                     }else {
                         var wcyysrbl = t2 / m *100;
@@ -923,12 +923,12 @@
                 var m = parseFloat(mv);
                 var size = $("#reportedConsultantList tr").length;
                 if(size>0){
-                    for (var i = 1;i<=50;i++){
+                    for (var i = 1;i<=99;i++){
                         var wcyysrbl = $("#reportedConsultantList"+i+"_wcyysrbl").val();
 
                         if(wcyysrbl != undefined && wcyysrbl!=''){
                             var wcyysr = m * wcyysrbl /100;
-                            $("#reportedConsultantList"+i+"_wcyysr").val(wcyysr);
+                            $("#reportedConsultantList"+i+"_wcyysr").val(parseFloat(wcyysr.toFixed(2)));
                         }
                     }
                 }