上报数据调整（送审价和审定价需和质量复核填报的数据进行同步）

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

@@ -1854,6 +1854,21 @@ public class RuralCostProjectMessageNewController extends BaseController {
             consultantList = ruralProjectMessageS.disposereportedConsultant(reportedConsultants);
         }
         RuralProjectRecords records = projectRecordsService.getById(reported.getProjectId());
+
+        //查询报告信息
+        ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(records.getId());
+
+        //送审价
+        if(StringUtils.isNotBlank(projectReportData.getReviewFee())){
+            Double songShenJia = Double.valueOf(projectReportData.getReviewFee())/10000;
+            model.addAttribute("projectReportDataReviewFee", String.format("%.2f", songShenJia));
+        }
+        //审定价
+        if(StringUtils.isNotBlank(projectReportData.getApprovalFee())){
+            Double shenDingJia = Double.valueOf(projectReportData.getApprovalFee())/10000;
+            model.addAttribute("projectReportDataApprovalFee", String.format("%.2f", shenDingJia));
+        }
+
         /*if(StringUtils.isBlank(reported.getProjectRecordId())){
             reported.setProjectRecordId(records.getProjectId());
         }*/
@@ -1891,6 +1906,23 @@ public class RuralCostProjectMessageNewController extends BaseController {
             reported.setAct(act);
         }
         RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(reported.getProjectId());
+
+
+        //查询报告信息
+        ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(records.getId());
+
+        //送审价
+        if(StringUtils.isNotBlank(projectReportData.getReviewFee())){
+            Double songShenJia = Double.valueOf(projectReportData.getReviewFee())/10000;
+            model.addAttribute("projectReportDataReviewFee", String.format("%.2f", songShenJia));
+        }
+        //审定价
+        if(StringUtils.isNotBlank(projectReportData.getApprovalFee())){
+            Double shenDingJia = Double.valueOf(projectReportData.getApprovalFee())/10000;
+            model.addAttribute("projectReportDataApprovalFee", String.format("%.2f", shenDingJia));
+        }
+
+
         //根据上报id查询上报咨询员的信息
         List<RuralReportConsultant> reportedConsultants=ruralProjectMessageS.getReportedConsultantsList(reported.getId());
         //对上报的咨询员进行处理

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -3505,6 +3505,23 @@ public class WorkProjectNotifyController extends BaseController {
 					//查询项目信息
 					model.addAttribute("ruralProjectRecords", records);
 					model.addAttribute("ruralProjectRecordsReported", reported);
+					//对质量复核中的送审价和审定价进行换算（元→万元）
+
+					model.addAttribute("projectReportDataReviewFee", 0D);
+					model.addAttribute("projectReportDataApprovalFee", 0D);
+
+					//送审价
+					if(StringUtils.isNotBlank(projectReportData.getReviewFee())){
+						Double songShenJia = Double.valueOf(projectReportData.getReviewFee())/10000;
+						model.addAttribute("projectReportDataReviewFee", String.format("%.2f", songShenJia));
+					}
+					//审定价
+					if(StringUtils.isNotBlank(projectReportData.getApprovalFee())){
+						Double shenDingJia = Double.valueOf(projectReportData.getApprovalFee())/10000;
+						model.addAttribute("projectReportDataApprovalFee", String.format("%.2f", shenDingJia));
+					}
+
+
 					model.addAttribute("consultantInfo", consultantList);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						ruralProjectMessageService.getInfoByView(reported);

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/bzshbReportedAudit.jsp

@@ -148,6 +148,30 @@
                             return false;
                         }
                     }
+
+
+                    //质量复核中的送审价
+                    var projectReportDataReviewFee = parseFloat(`${projectReportDataReviewFee}`)
+                    //质量复核中的审定价
+                    var projectReportDataApprovalFee = parseFloat(`${projectReportDataApprovalFee}`)
+                    //送审价
+                    var SongShenJia = parseFloat($("#SongShenJia").val());
+                    //审定价
+                    var ShenDingJia = parseFloat($("#ShenDingJia").val());
+
+
+                    //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
+                    if (projectReportDataReviewFee.toFixed(2) !== SongShenJia.toFixed(2)) {
+                        parent.layer.msg("当前送审价和质量复核中的送审价不同,请先进行同步!", {icon: 5});
+                        return false;
+                    }
+
+                    //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
+                    if(projectReportDataApprovalFee.toFixed(2) !== ShenDingJia.toFixed(2)){
+                        parent.layer.msg("当前审定价和质量复核中的审定价不同,请先进行同步!", {icon: 5});
+                        return false;
+                    }
+
                     var projectType = $("#ProjectType").val();
                     if(projectType == 19){
                         var advisoryIncome = $("#advisoryIncome").val();
@@ -275,6 +299,30 @@
             return false;
         }
         $(document).ready(function() {
+
+            //质量复核中的送审价
+            var projectReportDataReviewFee = `${projectReportDataReviewFee}`
+            //质量复核中的审定价
+            var projectReportDataApprovalFee = `${projectReportDataApprovalFee}`
+            //送审价
+            var SongShenJia = $("#SongShenJia").val();
+            //审定价
+            var ShenDingJia = $("#ShenDingJia").val();
+
+            //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
+            if(projectReportDataReviewFee == SongShenJia){
+                $('.songShenJiaSpanDiv').hide();
+            }else{
+                $('.songShenJiaSpanDiv').show();
+            }
+
+            //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
+            if(projectReportDataApprovalFee == ShenDingJia){
+                $('.shenDingJiaSpanDiv').hide();
+            }else{
+                $('.shenDingJiaSpanDiv').show();
+            }
+
             var radioVal ;
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -653,6 +701,18 @@
             })
         });
 
+        function synchronizationSSJ() {
+            $("#SongShenJia").val(`${projectReportDataReviewFee}`)
+            JingHeJianValue()
+            $('.songShenJiaSpanDiv').hide();
+        }
+
+        function synchronizationSDJ() {
+            $("#ShenDingJia").val(`${projectReportDataApprovalFee}`)
+            JingHeJianValue()
+            $('.shenDingJiaSpanDiv').hide();
+        }
+
         function ZiXunBDEChange(){
             //咨询标的额
             var ZiXunBDE = $("#ZiXunBDE").val();
@@ -843,20 +903,43 @@
 
 
         function JingHeJianValue() {
+            //质量复核中的送审价
+            var projectReportDataReviewFee = parseFloat(`${projectReportDataReviewFee}`)
+            //质量复核中的审定价
+            var projectReportDataApprovalFee = parseFloat(`${projectReportDataApprovalFee}`)
             //送审价
-            var SongShenJia = $("#SongShenJia").val();
+            var SongShenJia = parseFloat($("#SongShenJia").val());
             //审定价
-            var ShenDingJia = $("#ShenDingJia").val();
+            var ShenDingJia = parseFloat($("#ShenDingJia").val());
+
+            //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
+            if(projectReportDataReviewFee.toFixed(2) === SongShenJia.toFixed(2)){
+                $('.songShenJiaSpanDiv').hide();
+            }else{
+                $('.songShenJiaSpanDiv').show();
+            }
+
+            //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
+            if(projectReportDataApprovalFee.toFixed(2) === ShenDingJia.toFixed(2)){
+                $('.shenDingJiaSpanDiv').hide();
+            }else{
+                $('.shenDingJiaSpanDiv').show();
+            }
+
             if(SongShenJia !='' && ShenDingJia != ''){
                 //审核增减额
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
-                $("#JingHeJianE").val(JingHeJianE);
+                // 使用 toFixed(2) 保留两位小数并四舍五入
+                var JingHeJianEFormatted = JingHeJianE.toFixed(2);
+                $("#JingHeJianE").val(JingHeJianEFormatted);
                 //审核增减率
                 if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
                     $("#JingHeJianLv").val("0");
                 }else{
                     var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                    $("#JingHeJianLv").val(JingHeJianLv);
+                    // 格式化结果，保留两位小数
+                    var JingHeJianLvFormatted = JingHeJianLv.toFixed(2);
+                    $("#JingHeJianLv").val(JingHeJianLvFormatted);
                 }
             }else{
                 $("#JingHeJianE").val('');
@@ -2441,14 +2524,26 @@
                     </div>
                     <div class="layui-item layui-col-sm6 lw6" id="songShenJiaDiv">
                         <label class="layui-form-label double-line">送审价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="SongShenJia" placeholder="请输入送审价" htmlEscape="false"  onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                        <div class="layui-input-block">
+                            <div class="input-group">
+                                <form:input path="SongShenJia" placeholder="请输入送审价" htmlEscape="false" onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                                <span class="input-group-btn songShenJiaSpanDiv">
+                                <a href="javascript:void(0)" style="height: 40px;line-height: 40px;" class="form-status" type="button" onclick="synchronizationSSJ()">同步</a>
+                             </span>
+                            </div>
+                            <label id="SongShenJiaError" style="font-size: 13px;line-height: 20px; color: red;" class="songShenJiaSpanDiv">质量复核送审价为：${projectReportDataReviewFee}万元。与上报送审价不同，如需上报，请进行同步保证金额相同</label>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6" id="shenDingJiaDiv">
                         <label class="layui-form-label double-line">审定价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="ShenDingJia" placeholder="请输入审定价" htmlEscape="false"  onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                        <div class="layui-input-block">
+                            <div class="input-group">
+                                <form:input path="ShenDingJia" placeholder="请输入审定价" htmlEscape="false" onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                                <span class="input-group-btn shenDingJiaSpanDiv">
+                                <a href="javascript:void(0)" style="height: 40px;line-height: 40px;" class="form-status" type="button" onclick="synchronizationSDJ()">同步</a>
+                             </span>
+                            </div>
+                            <label id="ShenDingJiaError" style="font-size: 13px;line-height: 20px; color: red;" class=" shenDingJiaSpanDiv">质量复核审定价为：${projectReportDataApprovalFee}万元。与上报审定价不同，如需上报，请进行同步保证金额相同</label>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">

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

@@ -152,6 +152,29 @@
                             return false;
                         }
                     }
+
+
+                    //质量复核中的送审价
+                    var projectReportDataReviewFee = parseFloat(`${projectReportDataReviewFee}`)
+                    //质量复核中的审定价
+                    var projectReportDataApprovalFee = parseFloat(`${projectReportDataApprovalFee}`)
+                    //送审价
+                    var SongShenJia = parseFloat($("#SongShenJia").val());
+                    //审定价
+                    var ShenDingJia = parseFloat($("#ShenDingJia").val());
+
+                    //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
+                    if (projectReportDataReviewFee.toFixed(2) !== SongShenJia.toFixed(2)) {
+                        parent.layer.msg("当前送审价和质量复核中的送审价不同,请先进行同步!", {icon: 5});
+                        return false;
+                    }
+
+                    //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
+                    if(projectReportDataApprovalFee.toFixed(2) !== ShenDingJia.toFixed(2)){
+                        parent.layer.msg("当前审定价和质量复核中的审定价不同,请先进行同步!", {icon: 5});
+                        return false;
+                    }
+
                     var projectType = $("#ProjectType").val();
                     if(projectType == 19){
                         var advisoryIncome = $("#advisoryIncome").val();
@@ -201,9 +224,9 @@
                         }
                     }
 
-                    var ziXunBDE = $("#ZiXunBDE").val();
-                    var ShenDingJia = $("#ShenDingJia").val();
-                    if(ziXunBDE != ShenDingJia){
+                    var ziXunBDE = parseFloat($("#ZiXunBDE").val());
+                    var ShenDingJia = parseFloat($("#ShenDingJia").val());
+                    if(ziXunBDE.toFixed(2) !== ShenDingJia.toFixed(2)){
                         parent.layer.msg("咨询标的额和审定价不同，请调整!", {icon: 5});
                         return ;
                     }
@@ -314,6 +337,30 @@
             return false;
         }
         $(document).ready(function() {
+            //质量复核中的送审价
+            var projectReportDataReviewFee = `${projectReportDataReviewFee}`
+            //质量复核中的审定价
+            var projectReportDataApprovalFee = `${projectReportDataApprovalFee}`
+            //送审价
+            var SongShenJia = $("#SongShenJia").val();
+            //审定价
+            var ShenDingJia = $("#ShenDingJia").val();
+
+            //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
+            if(projectReportDataReviewFee == SongShenJia){
+                $('.songShenJiaSpanDiv').hide();
+            }else{
+                $('.songShenJiaSpanDiv').show();
+            }
+
+            //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
+            if(projectReportDataApprovalFee == ShenDingJia){
+                $('.shenDingJiaSpanDiv').hide();
+            }else{
+                $('.shenDingJiaSpanDiv').show();
+            }
+
+
             var radioVal ;
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -719,6 +766,18 @@
             }
         });
 
+        function synchronizationSSJ() {
+            $("#SongShenJia").val(`${projectReportDataReviewFee}`)
+            JingHeJianValue()
+            $('.songShenJiaSpanDiv').hide();
+        }
+
+        function synchronizationSDJ() {
+            $("#ShenDingJia").val(`${projectReportDataApprovalFee}`)
+            JingHeJianValue()
+            $('.shenDingJiaSpanDiv').hide();
+        }
+
         function ZiXunBDEChange(){
             //咨询标的额
             var ZiXunBDE = $("#ZiXunBDE").val();
@@ -909,22 +968,44 @@
 
 
         function JingHeJianValue() {
+            //质量复核中的送审价
+            var projectReportDataReviewFee = parseFloat(`${projectReportDataReviewFee}`)
+            //质量复核中的审定价
+            var projectReportDataApprovalFee = parseFloat(`${projectReportDataApprovalFee}`)
             //送审价
-            var SongShenJia = $("#SongShenJia").val();
+            var SongShenJia = parseFloat($("#SongShenJia").val());
             //审定价
-            var ShenDingJia = $("#ShenDingJia").val();
+            var ShenDingJia = parseFloat($("#ShenDingJia").val());
+
+            //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
+            if(projectReportDataReviewFee.toFixed(2) === SongShenJia.toFixed(2)){
+                $('.songShenJiaSpanDiv').hide();
+            }else{
+                $('.songShenJiaSpanDiv').show();
+            }
+
+            //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
+            if(projectReportDataApprovalFee.toFixed(2) === ShenDingJia.toFixed(2)){
+                $('.shenDingJiaSpanDiv').hide();
+            }else{
+                $('.shenDingJiaSpanDiv').show();
+            }
+
             if(SongShenJia !='' && ShenDingJia != ''){
                 //审核增减额
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
-                $("#JingHeJianE").val(JingHeJianE);
+                // 使用 toFixed(2) 保留两位小数并四舍五入
+                var JingHeJianEFormatted = JingHeJianE.toFixed(2);
+                $("#JingHeJianE").val(JingHeJianEFormatted);
                 //审核增减率
                 if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
                     $("#JingHeJianLv").val("0");
                 }else{
                     var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                    $("#JingHeJianLv").val(JingHeJianLv);
+                    // 格式化结果，保留两位小数
+                    var JingHeJianLvFormatted = JingHeJianLv.toFixed(2);
+                    $("#JingHeJianLv").val(JingHeJianLvFormatted);
                 }
-
             }else{
                 $("#JingHeJianE").val('');
                 $("#JingHeJianLv").val('');
@@ -1462,14 +1543,26 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6" id="songShenJiaDiv">
                     <label class="layui-form-label double-line">送审价(万元)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input path="SongShenJia" placeholder="请输入送审价" htmlEscape="false" readonly="true" onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                    <div class="layui-input-block">
+                        <div class="input-group">
+                            <form:input path="SongShenJia" placeholder="请输入送审价" htmlEscape="false" onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                            <span class="input-group-btn songShenJiaSpanDiv">
+                                <a href="javascript:void(0)" style="height: 40px;line-height: 40px;" class="form-status" type="button" onclick="synchronizationSSJ()">同步</a>
+                             </span>
+                        </div>
+                        <label id="SongShenJiaError" style="font-size: 13px;line-height: 20px; color: red;" class="songShenJiaSpanDiv">质量复核送审价为：${projectReportDataReviewFee}万元。与上报送审价不同，如需上报，请进行同步保证金额相同</label>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6" id="shenDingJiaDiv">
                     <label class="layui-form-label double-line">审定价(万元)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input path="ShenDingJia" placeholder="请输入审定价" htmlEscape="false" readonly="true" onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                    <div class="layui-input-block">
+                        <div class="input-group">
+                            <form:input path="ShenDingJia" placeholder="请输入审定价" htmlEscape="false" onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                            <span class="input-group-btn shenDingJiaSpanDiv">
+                                <a href="javascript:void(0)" style="height: 40px;line-height: 40px;" class="form-status" type="button" onclick="synchronizationSDJ()">同步</a>
+                             </span>
+                        </div>
+                        <label id="ShenDingJiaError" style="font-size: 13px;line-height: 20px; color: red;" class=" shenDingJiaSpanDiv">质量复核审定价为：${projectReportDataApprovalFee}万元。与上报审定价不同，如需上报，请进行同步保证金额相同</label>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedAudit.jsp

@@ -149,12 +149,34 @@
                         }
                     }
 
-                    var ziXunBDE = $("#ZiXunBDE").val();
-                    var ShenDingJia = $("#ShenDingJia").val();
+                    //质量复核中的送审价
+                    var projectReportDataReviewFee = parseFloat(`${projectReportDataReviewFee}`)
+                    //质量复核中的审定价
+                    var projectReportDataApprovalFee = parseFloat(`${projectReportDataApprovalFee}`)
+                    //送审价
+                    var SongShenJia = parseFloat($("#SongShenJia").val());
+                    //审定价
+                    var ShenDingJia = parseFloat($("#ShenDingJia").val());
+
+                    //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
+                    if (projectReportDataReviewFee.toFixed(2) !== SongShenJia.toFixed(2)) {
+                        parent.layer.msg("当前送审价和质量复核中的送审价不同,请先进行同步!", {icon: 5});
+                        return false;
+                    }
+
+                    //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
+                    if(projectReportDataApprovalFee.toFixed(2) !== ShenDingJia.toFixed(2)){
+                        parent.layer.msg("当前审定价和质量复核中的审定价不同,请先进行同步!", {icon: 5});
+                        return false;
+                    }
+
+
+                    var ziXunBDE = parseFloat($("#ZiXunBDE").val());
+                    var ShenDingJia = parseFloat($("#ShenDingJia").val());
                     var identification = '${identification}'
                     console.log(identification)
                     if(identification && "projectReported" === identification){
-                        if(ziXunBDE != ShenDingJia){
+                        if(ziXunBDE.toFixed(2) !== ShenDingJia.toFixed(2)){
                             parent.layer.msg("咨询标的额和审定价不同，请调整!", {icon: 5});
                             return ;
                         }
@@ -288,6 +310,30 @@
             return false;
         }
         $(document).ready(function() {
+
+            //质量复核中的送审价
+            var projectReportDataReviewFee = `${projectReportDataReviewFee}`
+            //质量复核中的审定价
+            var projectReportDataApprovalFee = `${projectReportDataApprovalFee}`
+            //送审价
+            var SongShenJia = $("#SongShenJia").val();
+            //审定价
+            var ShenDingJia = $("#ShenDingJia").val();
+
+            //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
+            if(projectReportDataReviewFee == SongShenJia){
+                $('.songShenJiaSpanDiv').hide();
+            }else{
+                $('.songShenJiaSpanDiv').show();
+            }
+
+            //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
+            if(projectReportDataApprovalFee == ShenDingJia){
+                $('.shenDingJiaSpanDiv').hide();
+            }else{
+                $('.shenDingJiaSpanDiv').show();
+            }
+
             var radioVal ;
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -696,6 +742,18 @@
             }
         });
 
+        function synchronizationSSJ() {
+            $("#SongShenJia").val(`${projectReportDataReviewFee}`)
+            JingHeJianValue()
+            $('.songShenJiaSpanDiv').hide();
+        }
+
+        function synchronizationSDJ() {
+            $("#ShenDingJia").val(`${projectReportDataApprovalFee}`)
+            JingHeJianValue()
+            $('.shenDingJiaSpanDiv').hide();
+        }
+
         function ZiXunBDEChange(){
             //咨询标的额
             var ZiXunBDE = $("#ZiXunBDE").val();
@@ -886,20 +944,43 @@
 
 
         function JingHeJianValue() {
+            //质量复核中的送审价
+            var projectReportDataReviewFee = parseFloat(`${projectReportDataReviewFee}`)
+            //质量复核中的审定价
+            var projectReportDataApprovalFee = parseFloat(`${projectReportDataApprovalFee}`)
             //送审价
-            var SongShenJia = $("#SongShenJia").val();
+            var SongShenJia = parseFloat($("#SongShenJia").val());
             //审定价
-            var ShenDingJia = $("#ShenDingJia").val();
+            var ShenDingJia = parseFloat($("#ShenDingJia").val());
+
+            //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
+            if(projectReportDataReviewFee.toFixed(2) === SongShenJia.toFixed(2)){
+                $('.songShenJiaSpanDiv').hide();
+            }else{
+                $('.songShenJiaSpanDiv').show();
+            }
+
+            //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
+            if(projectReportDataApprovalFee.toFixed(2) === ShenDingJia.toFixed(2)){
+                $('.shenDingJiaSpanDiv').hide();
+            }else{
+                $('.shenDingJiaSpanDiv').show();
+            }
+
             if(SongShenJia !='' && ShenDingJia != ''){
                 //审核增减额
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
-                $("#JingHeJianE").val(JingHeJianE);
+                // 使用 toFixed(2) 保留两位小数并四舍五入
+                var JingHeJianEFormatted = JingHeJianE.toFixed(2);
+                $("#JingHeJianE").val(JingHeJianEFormatted);
                 //审核增减率
                 if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
                     $("#JingHeJianLv").val("0");
                 }else{
                     var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                    $("#JingHeJianLv").val(JingHeJianLv);
+                    // 格式化结果，保留两位小数
+                    var JingHeJianLvFormatted = JingHeJianLv.toFixed(2);
+                    $("#JingHeJianLv").val(JingHeJianLvFormatted);
                 }
             }else{
                 $("#JingHeJianE").val('');
@@ -1440,14 +1521,26 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6" id="songShenJiaDiv">
                     <label class="layui-form-label double-line">送审价(万元)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input path="SongShenJia" placeholder="请输入送审价" htmlEscape="false"  onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                    <div class="layui-input-block">
+                        <div class="input-group">
+                            <form:input path="SongShenJia" placeholder="请输入送审价" htmlEscape="false" onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                            <span class="input-group-btn songShenJiaSpanDiv">
+                                <a href="javascript:void(0)" style="height: 40px;line-height: 40px;" class="form-status" type="button" onclick="synchronizationSSJ()">同步</a>
+                             </span>
+                        </div>
+                        <label id="SongShenJiaError" style="font-size: 13px;line-height: 20px; color: red;" class="songShenJiaSpanDiv">质量复核送审价为：${projectReportDataReviewFee}万元。与上报送审价不同，如需上报，请进行同步保证金额相同</label>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6" id="shenDingJiaDiv">
                     <label class="layui-form-label double-line">审定价(万元)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input path="ShenDingJia" placeholder="请输入审定价" htmlEscape="false"  onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                    <div class="layui-input-block">
+                        <div class="input-group">
+                            <form:input path="ShenDingJia" placeholder="请输入审定价" htmlEscape="false" onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                            <span class="input-group-btn shenDingJiaSpanDiv">
+                                <a href="javascript:void(0)" style="height: 40px;line-height: 40px;" class="form-status" type="button" onclick="synchronizationSDJ()">同步</a>
+                             </span>
+                        </div>
+                        <label id="ShenDingJiaError" style="font-size: 13px;line-height: 20px; color: red;" class=" shenDingJiaSpanDiv">质量复核审定价为：${projectReportDataApprovalFee}万元。与上报审定价不同，如需上报，请进行同步保证金额相同</label>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">

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

@@ -149,9 +149,32 @@
                         return false;
                     }
                 }
-                var ziXunBDE = $("#ZiXunBDE").val();
-                var ShenDingJia = $("#ShenDingJia").val();
-                if(ziXunBDE != ShenDingJia){
+
+
+                //质量复核中的送审价
+                var projectReportDataReviewFee = parseFloat(`${projectReportDataReviewFee}`)
+                //质量复核中的审定价
+                var projectReportDataApprovalFee = parseFloat(`${projectReportDataApprovalFee}`)
+                //送审价
+                var SongShenJia = parseFloat($("#SongShenJia").val());
+                //审定价
+                var ShenDingJia = parseFloat($("#ShenDingJia").val());
+
+                //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
+                if (projectReportDataReviewFee.toFixed(2) !== SongShenJia.toFixed(2)) {
+                    parent.layer.msg("当前送审价和质量复核中的送审价不同,请先进行同步!", {icon: 5});
+                    return false;
+                }
+
+                //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
+                if(projectReportDataApprovalFee.toFixed(2) !== ShenDingJia.toFixed(2)){
+                    parent.layer.msg("当前审定价和质量复核中的审定价不同,请先进行同步!", {icon: 5});
+                    return false;
+                }
+
+                var ziXunBDE = parseFloat($("#ZiXunBDE").val());
+                var ShenDingJia = parseFloat($("#ShenDingJia").val());
+                if(ziXunBDE.toFixed(2) !== ShenDingJia.toFixed(2)){
                     parent.layer.msg("咨询标的额和审定价不同，请调整!", {icon: 5});
                     return ;
                 }
@@ -273,6 +296,30 @@
             return false;
         }
         $(document).ready(function() {
+
+            //质量复核中的送审价
+            var projectReportDataReviewFee = `${projectReportDataReviewFee}`
+            //质量复核中的审定价
+            var projectReportDataApprovalFee = `${projectReportDataApprovalFee}`
+            //送审价
+            var SongShenJia = $("#SongShenJia").val();
+            //审定价
+            var ShenDingJia = $("#ShenDingJia").val();
+
+            //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
+            if(projectReportDataReviewFee == SongShenJia){
+                $('.songShenJiaSpanDiv').hide();
+            }else{
+                $('.songShenJiaSpanDiv').show();
+            }
+
+            //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
+            if(projectReportDataApprovalFee == ShenDingJia){
+                $('.shenDingJiaSpanDiv').hide();
+            }else{
+                $('.shenDingJiaSpanDiv').show();
+            }
+
             var radioVal ;
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -670,6 +717,18 @@
             }
         });
 
+        function synchronizationSSJ() {
+            $("#SongShenJia").val(`${projectReportDataReviewFee}`)
+            JingHeJianValue()
+            $('.songShenJiaSpanDiv').hide();
+        }
+
+        function synchronizationSDJ() {
+            $("#ShenDingJia").val(`${projectReportDataApprovalFee}`)
+            JingHeJianValue()
+            $('.shenDingJiaSpanDiv').hide();
+        }
+
         function ZiXunBDEChange(){
             //咨询标的额
             var ZiXunBDE = $("#ZiXunBDE").val();
@@ -860,20 +919,43 @@
 
 
         function JingHeJianValue() {
+            //质量复核中的送审价
+            var projectReportDataReviewFee = parseFloat(`${projectReportDataReviewFee}`)
+            //质量复核中的审定价
+            var projectReportDataApprovalFee = parseFloat(`${projectReportDataApprovalFee}`)
             //送审价
-            var SongShenJia = $("#SongShenJia").val();
+            var SongShenJia = parseFloat($("#SongShenJia").val());
             //审定价
-            var ShenDingJia = $("#ShenDingJia").val();
+            var ShenDingJia = parseFloat($("#ShenDingJia").val());
+
+            //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
+            if(projectReportDataReviewFee.toFixed(2) === SongShenJia.toFixed(2)){
+                $('.songShenJiaSpanDiv').hide();
+            }else{
+                $('.songShenJiaSpanDiv').show();
+            }
+
+            //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
+            if(projectReportDataApprovalFee.toFixed(2) === ShenDingJia.toFixed(2)){
+                $('.shenDingJiaSpanDiv').hide();
+            }else{
+                $('.shenDingJiaSpanDiv').show();
+            }
+
             if(SongShenJia !='' && ShenDingJia != ''){
                 //审核增减额
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
-                $("#JingHeJianE").val(JingHeJianE);
+                // 使用 toFixed(2) 保留两位小数并四舍五入
+                var JingHeJianEFormatted = JingHeJianE.toFixed(2);
+                $("#JingHeJianE").val(JingHeJianEFormatted);
                 //审核增减率
                 if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
                     $("#JingHeJianLv").val("0");
                 }else{
                     var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                    $("#JingHeJianLv").val(JingHeJianLv);
+                    // 格式化结果，保留两位小数
+                    var JingHeJianLvFormatted = JingHeJianLv.toFixed(2);
+                    $("#JingHeJianLv").val(JingHeJianLvFormatted);
                 }
             }else{
                 $("#JingHeJianE").val('');
@@ -1402,14 +1484,26 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6" id="songShenJiaDiv">
                     <label class="layui-form-label double-line">送审价(万元)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input path="SongShenJia" placeholder="请输入送审价" htmlEscape="false" readonly="true" onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                    <div class="layui-input-block">
+                        <div class="input-group">
+                            <form:input path="SongShenJia" placeholder="请输入送审价" htmlEscape="false" onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                            <span class="input-group-btn songShenJiaSpanDiv">
+                                <a href="javascript:void(0)" style="height: 40px;line-height: 40px;" class="form-status" type="button" onclick="synchronizationSSJ()">同步</a>
+                             </span>
+                        </div>
+                        <label id="SongShenJiaError" style="font-size: 13px;line-height: 20px; color: red;" class="songShenJiaSpanDiv">质量复核送审价为：${projectReportDataReviewFee}万元。与上报送审价不同，如需上报，请进行同步保证金额相同</label>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6" id="shenDingJiaDiv">
                     <label class="layui-form-label double-line">审定价(万元)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input path="ShenDingJia" placeholder="请输入审定价" htmlEscape="false" readonly="true" onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                    <div class="layui-input-block">
+                        <div class="input-group">
+                            <form:input path="ShenDingJia" placeholder="请输入审定价" htmlEscape="false" onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                            <span class="input-group-btn shenDingJiaSpanDiv">
+                                <a href="javascript:void(0)" style="height: 40px;line-height: 40px;" class="form-status" type="button" onclick="synchronizationSDJ()">同步</a>
+                             </span>
+                        </div>
+                        <label id="ShenDingJiaError" style="font-size: 13px;line-height: 20px; color: red;" class=" shenDingJiaSpanDiv">质量复核审定价为：${projectReportDataApprovalFee}万元。与上报审定价不同，如需上报，请进行同步保证金额相同</label>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">

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

@@ -151,9 +151,30 @@
                     }
                 }
 
-                var ziXunBDE = $("#ZiXunBDE").val();
-                var ShenDingJia = $("#ShenDingJia").val();
-                if(ziXunBDE != ShenDingJia){
+                //质量复核中的送审价
+                var projectReportDataReviewFee = parseFloat(`${projectReportDataReviewFee}`)
+                //质量复核中的审定价
+                var projectReportDataApprovalFee = parseFloat(`${projectReportDataApprovalFee}`)
+                //送审价
+                var SongShenJia = parseFloat($("#SongShenJia").val());
+                //审定价
+                var ShenDingJia = parseFloat($("#ShenDingJia").val());
+
+                //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
+                if (projectReportDataReviewFee.toFixed(2) !== SongShenJia.toFixed(2)) {
+                    parent.layer.msg("当前送审价和质量复核中的送审价不同,请先进行同步!", {icon: 5});
+                    return false;
+                }
+
+                //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
+                if(projectReportDataApprovalFee.toFixed(2) !== ShenDingJia.toFixed(2)){
+                    parent.layer.msg("当前审定价和质量复核中的审定价不同,请先进行同步!", {icon: 5});
+                    return false;
+                }
+
+                var ziXunBDE = parseFloat($("#ZiXunBDE").val());
+                var ShenDingJia = parseFloat($("#ShenDingJia").val());
+                if(ziXunBDE.toFixed(2) !== ShenDingJia.toFixed(2)){
                     parent.layer.msg("咨询标的额和审定价不同，请调整!", {icon: 5});
                     return ;
                 }
@@ -310,6 +331,30 @@
             return false;
         }
         $(document).ready(function() {
+            //质量复核中的送审价
+            var projectReportDataReviewFee = `${projectReportDataReviewFee}`
+            //质量复核中的审定价
+            var projectReportDataApprovalFee = `${projectReportDataApprovalFee}`
+            //送审价
+            var SongShenJia = $("#SongShenJia").val();
+            //审定价
+            var ShenDingJia = $("#ShenDingJia").val();
+
+            //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
+            if(projectReportDataReviewFee == SongShenJia){
+                $('.songShenJiaSpanDiv').hide();
+            }else{
+                $('.songShenJiaSpanDiv').show();
+            }
+
+            //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
+            if(projectReportDataApprovalFee == ShenDingJia){
+                $('.shenDingJiaSpanDiv').hide();
+            }else{
+                $('.shenDingJiaSpanDiv').show();
+            }
+
+
             var radioVal ;
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -707,6 +752,18 @@
             }
         });
 
+        function synchronizationSSJ() {
+            $("#SongShenJia").val(`${projectReportDataReviewFee}`)
+            JingHeJianValue()
+            $('.songShenJiaSpanDiv').hide();
+        }
+
+        function synchronizationSDJ() {
+            $("#ShenDingJia").val(`${projectReportDataApprovalFee}`)
+            JingHeJianValue()
+            $('.shenDingJiaSpanDiv').hide();
+        }
+
         function ZiXunBDEChange(){
             //咨询标的额
             var ZiXunBDE = $("#ZiXunBDE").val();
@@ -897,20 +954,43 @@
 
 
         function JingHeJianValue() {
+            //质量复核中的送审价
+            var projectReportDataReviewFee = parseFloat(`${projectReportDataReviewFee}`)
+            //质量复核中的审定价
+            var projectReportDataApprovalFee = parseFloat(`${projectReportDataApprovalFee}`)
             //送审价
-            var SongShenJia = $("#SongShenJia").val();
+            var SongShenJia = parseFloat($("#SongShenJia").val());
             //审定价
-            var ShenDingJia = $("#ShenDingJia").val();
+            var ShenDingJia = parseFloat($("#ShenDingJia").val());
+
+            //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
+            if(projectReportDataReviewFee.toFixed(2) === SongShenJia.toFixed(2)){
+                $('.songShenJiaSpanDiv').hide();
+            }else{
+                $('.songShenJiaSpanDiv').show();
+            }
+
+            //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
+            if(projectReportDataApprovalFee.toFixed(2) === ShenDingJia.toFixed(2)){
+                $('.shenDingJiaSpanDiv').hide();
+            }else{
+                $('.shenDingJiaSpanDiv').show();
+            }
+
             if(SongShenJia !='' && ShenDingJia != ''){
                 //审核增减额
                 var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
-                $("#JingHeJianE").val(JingHeJianE);
+                // 使用 toFixed(2) 保留两位小数并四舍五入
+                var JingHeJianEFormatted = JingHeJianE.toFixed(2);
+                $("#JingHeJianE").val(JingHeJianEFormatted);
                 //审核增减率
                 if(parseFloat(ShenDingJia) == 0.00 || parseFloat(SongShenJia) == 0.00 ){
                     $("#JingHeJianLv").val("0");
                 }else{
                     var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
-                    $("#JingHeJianLv").val(JingHeJianLv);
+                    // 格式化结果，保留两位小数
+                    var JingHeJianLvFormatted = JingHeJianLv.toFixed(2);
+                    $("#JingHeJianLv").val(JingHeJianLvFormatted);
                 }
             }else{
                 $("#JingHeJianE").val('');
@@ -1426,16 +1506,29 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw6" id="songShenJiaDiv">
                     <label class="layui-form-label double-line">送审价(万元)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input path="SongShenJia" placeholder="请输入送审价" htmlEscape="false" readonly="true" onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                    <div class="layui-input-block">
+                        <div class="input-group">
+                            <form:input path="SongShenJia" placeholder="请输入送审价" htmlEscape="false" onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                            <span class="input-group-btn songShenJiaSpanDiv">
+                                <a href="javascript:void(0)" style="height: 40px;line-height: 40px;" class="form-status" type="button" onclick="synchronizationSSJ()">同步</a>
+                             </span>
+                        </div>
+                        <label id="SongShenJiaError" style="font-size: 13px;line-height: 20px; color: red;" class="songShenJiaSpanDiv">质量复核送审价为：${projectReportDataReviewFee}万元。与上报送审价不同，如需上报，请进行同步保证金额相同</label>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6" id="shenDingJiaDiv">
                     <label class="layui-form-label double-line">审定价(万元)：</label>
-                    <div class="layui-input-block with-icon">
-                        <form:input path="ShenDingJia" placeholder="请输入审定价" htmlEscape="false" readonly="true" onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                    <div class="layui-input-block">
+                        <div class="input-group">
+                            <form:input path="ShenDingJia" placeholder="请输入审定价" htmlEscape="false" onkeyup="num(this)" class="form-control layui-input number" onchange="JingHeJianValue()"/>
+                            <span class="input-group-btn shenDingJiaSpanDiv">
+                                <a href="javascript:void(0)" style="height: 40px;line-height: 40px;" class="form-status" type="button" onclick="synchronizationSDJ()">同步</a>
+                             </span>
+                        </div>
+                        <label id="ShenDingJiaError" style="font-size: 13px;line-height: 20px; color: red;" class=" shenDingJiaSpanDiv">质量复核审定价为：${projectReportDataApprovalFee}万元。与上报审定价不同，如需上报，请进行同步保证金额相同</label>
                     </div>
                 </div>
+
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">审核增减额(万元)：</label>
                     <div class="layui-input-block with-icon">