上报，总审审批展示信息

质量复核页面跳转调整

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageNewService.java

@@ -2441,12 +2441,18 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         User zsUser = UserUtils.get(projectReportData.getBzshbUserId());
         //判断审核增减率
         //判断审核增减率是否大于30%（大于则为false，否则为true）
-        if(Double.valueOf(reported.getJingHeJianLv())>30 && "10".equals(reported.getProjectType())){
-            bmzrList = Lists.newArrayList();
-            bmzrList.add(zsUser);
-            variables.put("bmzrCount",bmzrList.size());
-            variables.put("bmzrList", bmzrList);
-            variables.put("passLv",false);
+        if("10".equals(reported.getProjectType())){
+            if(Double.valueOf(reported.getJingHeJianLv())>30 ){
+                bmzrList = Lists.newArrayList();
+                bmzrList.add(zsUser);
+                variables.put("bmzrCount",bmzrList.size());
+                variables.put("bmzrList", bmzrList);
+                variables.put("passLv",false);
+            }else{
+                variables.put("bmzrCount",bmzrList.size());
+                variables.put("bmzrList", bmzrList);
+                variables.put("passLv",true);
+            }
         }else{
             variables.put("bmzrCount",bmzrList.size());
             variables.put("bmzrList", bmzrList);

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

@@ -296,7 +296,7 @@ public class RuralCostProjectMessageController extends BaseController {
         } else if (projectReportData == null || StringUtils.isBlank(projectReportData.getId())) {
             return "modules/ruralprojectrecords/cost/projectcontentinfo/reportForm";
         } else {
-            return "modules/ruralprojectrecords/cost/projectcontentinfo/reportView";
+            return "modules/ruralprojectrecords/cost/projectcontentinfo/reportForm";
         }
     }
 

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

@@ -316,7 +316,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
         } else if (projectReportData == null || StringUtils.isBlank(projectReportData.getId())) {
             return "modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm";
         } else {
-            return "modules/ruralprojectrecords/cost/projectcontentinfo/reportView";
+            return "modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm";
         }
     }
 
@@ -1450,15 +1450,19 @@ public class RuralCostProjectMessageNewController extends BaseController {
             }else if ("modifyApply".equals(taskDefKey)){
                 //判断审核增减率
                 //判断审核增减率是否大于30%（大于则为false，否则为true）
-                if(Double.valueOf(reported.getJingHeJianLv())>30 && "10".equals(reported.getProjectType())){
-                    //获取项目信息
-                    ProjectRecords projectRecords = projectRecordsServices.getRuralMasters(reported.getProjectId());
-                    //查询报告信息
-                    ProjectReportData projectReportData = projectReportDataDao.getProjectReportData(projectRecords.getId());
-                    //查询报告审核总审人员
-                    User zsUser = UserUtils.get(projectReportData.getBzshbUserId());
-                    users = Lists.newArrayList();
-                    users.add(zsUser);
+                if("10".equals(reported.getProjectType())){
+                    if(Double.valueOf(reported.getJingHeJianLv())>30) {
+                        //获取项目信息
+                        ProjectRecords projectRecords = projectRecordsServices.getRuralMasters(reported.getProjectId());
+                        //查询报告信息
+                        ProjectReportData projectReportData = projectReportDataDao.getProjectReportData(projectRecords.getId());
+                        //查询报告审核总审人员
+                        User zsUser = UserUtils.get(projectReportData.getBzshbUserId());
+                        users = Lists.newArrayList();
+                        users.add(zsUser);
+                    }else{
+                        users = UserUtils.getByRoleActivityEnname("sbglyyjla",3,t.getOffice().getId(),"4",t.getCreateBy());
+                    }
                 }else{
                     users = UserUtils.getByRoleActivityEnname("sbglyyjla",3,t.getOffice().getId(),"4",t.getCreateBy());
                 }

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

@@ -303,7 +303,7 @@ public class RuralProjectMessageController extends BaseController {
         } else if (projectReportData == null || StringUtils.isBlank(projectReportData.getId())) {
             return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportForm";
         } else {
-            return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportView";
+            return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportForm";
         }
     }
 

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

@@ -318,7 +318,7 @@ public class RuralProjectMessageNewController extends BaseController {
         } else if (projectReportData == null || StringUtils.isBlank(projectReportData.getId())) {
             return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm";
         } else {
-            return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportView";
+            return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm";
         }
     }
 
@@ -1455,15 +1455,19 @@ public class RuralProjectMessageNewController extends BaseController {
             }else if ("modifyApply".equals(taskDefKey)){
                 //判断审核增减率
                 //判断审核增减率是否大于30%（大于则为false，否则为true）
-                if(Double.valueOf(reported.getJingHeJianLv())>30 && "10".equals(reported.getProjectType())){
-                    //获取项目信息
-                    ProjectRecords projectRecords = projectRecordsServices.getRuralMasters(reported.getProjectId());
-                    //查询报告信息
-                    ProjectReportData projectReportData = projectReportDataDao.getProjectReportData(projectRecords.getId());
-                    //查询报告审核总审人员
-                    User zsUser = UserUtils.get(projectReportData.getBzshbUserId());
-                    users = Lists.newArrayList();
-                    users.add(zsUser);
+                if("10".equals(reported.getProjectType())){
+                    if(Double.valueOf(reported.getJingHeJianLv())>30) {
+                        //获取项目信息
+                        ProjectRecords projectRecords = projectRecordsServices.getRuralMasters(reported.getProjectId());
+                        //查询报告信息
+                        ProjectReportData projectReportData = projectReportDataDao.getProjectReportData(projectRecords.getId());
+                        //查询报告审核总审人员
+                        User zsUser = UserUtils.get(projectReportData.getBzshbUserId());
+                        users = Lists.newArrayList();
+                        users.add(zsUser);
+                    }else{
+                        users = UserUtils.getByRoleActivityEnname("sbglyyjla",3,t.getOffice().getId(),"4",t.getCreateBy());
+                    }
                 }else{
                     users = UserUtils.getByRoleActivityEnname("sbglyyjla",3,t.getOffice().getId(),"4",t.getCreateBy());
                 }

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

@@ -1737,8 +1737,10 @@ public class WorkProjectNotifyController extends BaseController {
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						model.addAttribute("identification", "projectReported");
 						model.addAttribute("identificationName","项目上报审核意见");
-						if(Double.valueOf(reported.getJingHeJianLv())>30 && "10".equals(reported.getProjectType())){
-							return "modules/ruralprojectrecords/cost/newReported/bzshbReportedAudit";
+						if("10".equals(reported.getProjectType())){
+							if(Double.valueOf(reported.getJingHeJianLv())>30){
+								return "modules/ruralprojectrecords/cost/newReported/bzshbReportedAudit";
+							}
 						}
 						return "modules/ruralprojectrecords/cost/newReported/reportedAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {

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

@@ -1125,7 +1125,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block  with-icon">
-                        <input type="text" value="${ruralProjectRecordsReported.ziXunHTBH}" class="form-control layui-input">
+                        <input type="text" value="${ruralProjectRecordsReported.ziXunHTBH}" readonly class="form-control layui-input">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -1207,34 +1207,34 @@
                                         <input id="reportedConsultantList{{idx}}_roleFlag" name="reportedConsultantList[{{idx}}].roleFlag" type="hidden" value="0"/>
                                         <input id="reportedConsultantList{{idx}}_remindId" name="reportedConsultantList[{{idx}}].remindId" type="hidden" value="{{row.remindId}}"/>
                                         <input id="reportedConsultantList{{idx}}_zhucezigezhKey" name="reportedConsultantList[{{idx}}].zhucezigezhKey" type="hidden" value="{{row.zhucezigezhKey}}"/>
+                                        <input id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" type="hidden" value="{{row.zixunyuan}}"/>
                                     </td>
 
                                     <td width="60px">
                                         <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
                                     </td>
                                     <td>
-                                        <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                        <input value="{{row.zixunyuanName}}" readonly="true" class="form-control"/>
                                     </td>
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>
 									</td>
 									<td>
-                                        <input id="reportedConsultantList{{idx}}_idCard" placeholder="请输入身份证号" name="reportedConsultantList[{{idx}}].idCard" value="{{row.idCard}}" class="form-control judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_idCard" readonly="true"  placeholder="请输入身份证号" name="reportedConsultantList[{{idx}}].idCard" value="{{row.idCard}}" class="form-control judgment"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control"/>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID"  readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control"/>
                                     </td>
 
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wcyysrbl" placeholder="请输入收入比例" onkeyup="num(this)" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysrbl" value="{{row.wcyysrbl}}" class="form-control number judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysrbl" readonly="true"  placeholder="请输入收入比例" onkeyup="num(this)" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysrbl" value="{{row.wcyysrbl}}" class="form-control number judgment"/>
                                     </td>
 
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wcyysr" onblur="setTaxMoney(this)" onkeyup="num(this)" placeholder="请输入营业收入" name="reportedConsultantList[{{idx}}].wcyysr" value="{{row.wcyysr}}" class="form-control number judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysr" readonly="true"  onblur="setTaxMoney(this)" onkeyup="num(this)" placeholder="请输入营业收入" name="reportedConsultantList[{{idx}}].wcyysr" value="{{row.wcyysr}}" class="form-control number judgment"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_wordnr" readonly="true"  placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control judgment"/>
                                     </td>
                                 </tr>//-->
                         </script>
@@ -1246,32 +1246,32 @@
                                         <input id="reportedConsultantList{{idx}}_roleFlag" name="reportedConsultantList[{{idx}}].roleFlag" type="hidden" value="1"/>
                                         <input id="reportedConsultantList{{idx}}_remindId" name="reportedConsultantList[{{idx}}].remindId" type="hidden" value="{{row.remindId}}"/>
                                     	<input id="reportedConsultantList{{idx}}_zhucezigezhKey" name="reportedConsultantList[{{idx}}].zhucezigezhKey" type="hidden" value="{{row.zhucezigezhKey}}"/>
+                                        <input id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" type="hidden" value="{{row.zixunyuan}}"/>
                                     </td>
 
                                     <td width="60px">
                                         <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
                                     </td>
                                     <td>
-                                        <sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                        <input value="{{row.zixunyuanName}}" readonly="true" class="form-control"/>
                                     </td>
 
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="负责人" readonly="true" class="form-control"/>
 									</td>
 									<td>
-                                        <input id="reportedConsultantList{{idx}}_idCard" placeholder="请输入身份证号" name="reportedConsultantList[{{idx}}].idCard" value="{{row.idCard}}" class="form-control judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_idCard" readonly="true"  placeholder="请输入身份证号" name="reportedConsultantList[{{idx}}].idCard" value="{{row.idCard}}" class="form-control judgment"/>
                                     </td>
                                     <td>
                                         <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control judgment"/>
                                     </td>
 
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wcyysrbl" placeholder="请输入收入比例" onkeyup="num(this)" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysrbl" value="{{row.wcyysrbl}}" class="form-control number judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysrbl" readonly="true"  placeholder="请输入收入比例" onkeyup="num(this)" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysrbl" value="{{row.wcyysrbl}}" class="form-control number judgment"/>
                                     </td>
 
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wcyysr" onblur="setTaxMoney(this)" onkeyup="num(this)" placeholder="请输入营业收入" name="reportedConsultantList[{{idx}}].wcyysr" value="{{row.wcyysr}}" class="form-control number judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysr"  readonly="true" onblur="setTaxMoney(this)" onkeyup="num(this)" placeholder="请输入营业收入" name="reportedConsultantList[{{idx}}].wcyysr" value="{{row.wcyysr}}" class="form-control number judgment"/>
                                     </td>
                                     <td style="background-color:#f1f1f1">
                                     </td>

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

@@ -72,9 +72,11 @@
                     //审定价
                     if(!$("#ShenDingJia").is(":hidden")){
                         var ShenDingJia = $("#ShenDingJia").val();
-                        if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                            parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-                            return false;
+                        if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
+                            if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
+                                parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                                return false;
+                            }
                         }
                     }
                     //审核增减率
@@ -439,12 +441,28 @@
                 var projectType = $("#ProjectType").val()
                 if (projectType == "10") {
                     $("#ptDiv").show();
+                    $("#heTongJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>合同价(万元)：")
+                    $("#HeTongJia").attr("class","form-control layui-input number judgment")
+                    $("#songShenJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>送审价(万元)：")
+                    $("#SongShenJia").attr("class","form-control layui-input number judgment")
+                    $("#shenDingJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>审定价(万元)：")
+                    $("#ShenDingJia").attr("class","form-control layui-input number judgment")
                     $(".overallProcessDiv").hide();
                 }else if(projectType == "19"){
+                    $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                    $("#HeTongJia").attr("class","form-control layui-input number")
+                    $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                    $("#SongShenJia").attr("class","form-control layui-input number")
+                    $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                    $("#ShenDingJia").attr("class","form-control layui-input number")
                     $(".overallProcessDiv").show();
-                    $("#ptDiv").hide();
                 }else {
-                    $("#ptDiv").hide();
+                    $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                    $("#HeTongJia").attr("class","form-control layui-input number")
+                    $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                    $("#SongShenJia").attr("class","form-control layui-input number")
+                    $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                    $("#ShenDingJia").attr("class","form-control layui-input number")
                     $(".overallProcessDiv").hide();
                 }
                 //有无合同监听器
@@ -608,12 +626,28 @@
                 layui.form.on('select(ProjectType)',function(data) {
                     if (data.value == "10") {
                         $("#ptDiv").show();
+                        $("#heTongJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>合同价(万元)：")
+                        $("#HeTongJia").attr("class","form-control layui-input number judgment")
+                        $("#songShenJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>送审价(万元)：")
+                        $("#SongShenJia").attr("class","form-control layui-input number judgment")
+                        $("#shenDingJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>审定价(万元)：")
+                        $("#ShenDingJia").attr("class","form-control layui-input number judgment")
                         $(".overallProcessDiv").hide();
                     }else if(data.value == "19"){
+                        $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                        $("#HeTongJia").attr("class","form-control layui-input number")
+                        $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                        $("#SongShenJia").attr("class","form-control layui-input number")
+                        $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                        $("#ShenDingJia").attr("class","form-control layui-input number")
                         $(".overallProcessDiv").show();
-                        $("#ptDiv").hide();
-                    }else{
-                        $("#ptDiv").hide();
+                    }else {
+                        $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                        $("#HeTongJia").attr("class","form-control layui-input number")
+                        $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                        $("#SongShenJia").attr("class","form-control layui-input number")
+                        $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                        $("#ShenDingJia").attr("class","form-control layui-input number")
                         $(".overallProcessDiv").hide();
                     }
                     layui.form.render("select");
@@ -1343,36 +1377,34 @@
                     <span style="color: red">注：咨询标的额是指咨询项目编审后的最终造价，其中工程结算项目填审定价，标底编制填招标控制价，工程造价全过程管理填工程投资总额或审定价</span>
                 </div>
 
-                <div id="ptDiv">
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>合同价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input number"/>
-                        </div>
+                <div class="layui-item layui-col-sm6 lw6" id="heTongJiaDiv">
+                    <label class="layui-form-label double-line">合同价(万元)：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control layui-input number"/>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>送审价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="SongShenJia" placeholder="请输入送审价" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input number" onchange="JingHeJianValue()"/>
-                        </div>
+                </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>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>审定价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="ShenDingJia" placeholder="请输入审定价" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input number" onchange="JingHeJianValue()"/>
-                        </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>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">审核增减额(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="JingHeJianE" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-                        </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">
+                        <form:input path="JingHeJianE" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">审核增减率(%)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="JingHeJianLv" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-                        </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">
+                        <form:input path="JingHeJianLv" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                     </div>
                 </div>
             </div>

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

@@ -69,9 +69,11 @@
                     //审定价
                     if(!$("#ShenDingJia").is(":hidden")){
                         var ShenDingJia = $("#ShenDingJia").val();
-                        if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                            parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-                            return false;
+                        if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
+                            if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
+                                parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                                return false;
+                            }
                         }
                     }
                     //审核增减率
@@ -443,12 +445,28 @@
                 var projectType = $("#ProjectType").val()
                 if (projectType == "10") {
                     $("#ptDiv").show();
+                    $("#heTongJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>合同价(万元)：")
+                    $("#HeTongJia").attr("class","form-control layui-input number judgment")
+                    $("#songShenJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>送审价(万元)：")
+                    $("#SongShenJia").attr("class","form-control layui-input number judgment")
+                    $("#shenDingJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>审定价(万元)：")
+                    $("#ShenDingJia").attr("class","form-control layui-input number judgment")
                     $(".overallProcessDiv").hide();
                 }else if(projectType == "19"){
+                    $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                    $("#HeTongJia").attr("class","form-control layui-input number")
+                    $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                    $("#SongShenJia").attr("class","form-control layui-input number")
+                    $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                    $("#ShenDingJia").attr("class","form-control layui-input number")
                     $(".overallProcessDiv").show();
-                    $("#ptDiv").hide();
                 }else {
-                    $("#ptDiv").hide();
+                    $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                    $("#HeTongJia").attr("class","form-control layui-input number")
+                    $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                    $("#SongShenJia").attr("class","form-control layui-input number")
+                    $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                    $("#ShenDingJia").attr("class","form-control layui-input number")
                     $(".overallProcessDiv").hide();
                 }
                     //有无合同监听器
@@ -612,12 +630,28 @@
                 layui.form.on('select(ProjectType)',function(data) {
                     if (data.value == "10") {
                         $("#ptDiv").show();
+                        $("#heTongJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>合同价(万元)：")
+                        $("#HeTongJia").attr("class","form-control layui-input number judgment")
+                        $("#songShenJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>送审价(万元)：")
+                        $("#SongShenJia").attr("class","form-control layui-input number judgment")
+                        $("#shenDingJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>审定价(万元)：")
+                        $("#ShenDingJia").attr("class","form-control layui-input number judgment")
                         $(".overallProcessDiv").hide();
                     }else if(data.value == "19"){
+                        $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                        $("#HeTongJia").attr("class","form-control layui-input number")
+                        $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                        $("#SongShenJia").attr("class","form-control layui-input number")
+                        $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                        $("#ShenDingJia").attr("class","form-control layui-input number")
                         $(".overallProcessDiv").show();
-                        $("#ptDiv").hide();
-                    }else{
-                        $("#ptDiv").hide();
+                    }else {
+                        $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                        $("#HeTongJia").attr("class","form-control layui-input number")
+                        $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                        $("#SongShenJia").attr("class","form-control layui-input number")
+                        $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                        $("#ShenDingJia").attr("class","form-control layui-input number")
                         $(".overallProcessDiv").hide();
                     }
                     layui.form.render("select");
@@ -1355,36 +1389,34 @@
                     <span style="color: red">注：咨询标的额是指咨询项目编审后的最终造价，其中工程结算项目填审定价，标底编制填招标控制价，工程造价全过程管理填工程投资总额或审定价</span>
                 </div>
 
-                <div id="ptDiv">
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>合同价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input number"/>
-                        </div>
+                <div class="layui-item layui-col-sm6 lw6" id="heTongJiaDiv">
+                    <label class="layui-form-label double-line">合同价(万元)：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control layui-input number"/>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>送审价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="SongShenJia" placeholder="请输入送审价" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input number" onchange="JingHeJianValue()"/>
-                        </div>
+                </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>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>审定价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="ShenDingJia" placeholder="请输入审定价" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input number" onchange="JingHeJianValue()"/>
-                        </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>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">审核增减额(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="JingHeJianE" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-                        </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">
+                        <form:input path="JingHeJianE" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">审核增减率(%)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="JingHeJianLv" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-                        </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">
+                        <form:input path="JingHeJianLv" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                     </div>
                 </div>
             </div>

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

@@ -9,6 +9,7 @@
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
+    <script src="${ctxStatic}/common/html/js/script.js"></script>
     <style>
         #projectDesc-error{
             left:0;
@@ -43,6 +44,10 @@
         var clientCount = 0;
         function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
+                var flags=judgment();
+                if (!flags){
+                    return flags;
+                }
                 //咨询标的额
                 var ZiXunBDE = $("#ZiXunBDE").val();
                 var GCGMValue = $("#GCGMValue").val();
@@ -65,9 +70,11 @@
                 //审定价
                 if(!$("#ShenDingJia").is(":hidden")){
                     var ShenDingJia = $("#ShenDingJia").val();
-                    if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                        parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-                        return false;
+                    if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
+                        if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
+                            parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                            return false;
+                        }
                     }
                 }
                 //审核增减率
@@ -430,12 +437,28 @@
                 var projectType = $("#ProjectType").val()
                 if (projectType == "10") {
                     $("#ptDiv").show();
+                    $("#heTongJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>合同价(万元)：")
+                    $("#HeTongJia").attr("class","form-control layui-input number judgment")
+                    $("#songShenJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>送审价(万元)：")
+                    $("#SongShenJia").attr("class","form-control layui-input number judgment")
+                    $("#shenDingJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>审定价(万元)：")
+                    $("#ShenDingJia").attr("class","form-control layui-input number judgment")
                     $(".overallProcessDiv").hide();
                 }else if(projectType == "19"){
+                    $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                    $("#HeTongJia").attr("class","form-control layui-input number")
+                    $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                    $("#SongShenJia").attr("class","form-control layui-input number")
+                    $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                    $("#ShenDingJia").attr("class","form-control layui-input number")
                     $(".overallProcessDiv").show();
-                    $("#ptDiv").hide();
-                }else{
-                    $("#ptDiv").hide();
+                }else {
+                    $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                    $("#HeTongJia").attr("class","form-control layui-input number")
+                    $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                    $("#SongShenJia").attr("class","form-control layui-input number")
+                    $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                    $("#ShenDingJia").attr("class","form-control layui-input number")
                     $(".overallProcessDiv").hide();
                 }
                 //有无合同监听器
@@ -599,12 +622,28 @@
                 layui.form.on('select(ProjectType)',function(data) {
                     if (data.value == "10") {
                         $("#ptDiv").show();
+                        $("#heTongJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>合同价(万元)：")
+                        $("#HeTongJia").attr("class","form-control layui-input number judgment")
+                        $("#songShenJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>送审价(万元)：")
+                        $("#SongShenJia").attr("class","form-control layui-input number judgment")
+                        $("#shenDingJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>审定价(万元)：")
+                        $("#ShenDingJia").attr("class","form-control layui-input number judgment")
                         $(".overallProcessDiv").hide();
                     }else if(data.value == "19"){
+                        $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                        $("#HeTongJia").attr("class","form-control layui-input number")
+                        $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                        $("#SongShenJia").attr("class","form-control layui-input number")
+                        $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                        $("#ShenDingJia").attr("class","form-control layui-input number")
                         $(".overallProcessDiv").show();
-                        $("#ptDiv").hide();
-                    }else{
-                        $("#ptDiv").hide();
+                    }else {
+                        $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                        $("#HeTongJia").attr("class","form-control layui-input number")
+                        $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                        $("#SongShenJia").attr("class","form-control layui-input number")
+                        $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                        $("#ShenDingJia").attr("class","form-control layui-input number")
                         $(".overallProcessDiv").hide();
                     }
                     layui.form.render("select");
@@ -1340,36 +1379,34 @@
                     <span style="color: red">注：咨询标的额是指咨询项目编审后的最终造价，其中工程结算项目填审定价，标底编制填招标控制价，工程造价全过程管理填工程投资总额或审定价</span>
                 </div>
 
-                <div id="ptDiv">
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>合同价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number"/>
-                        </div>
+                <div class="layui-item layui-col-sm6 lw6" id="heTongJiaDiv">
+                    <label class="layui-form-label double-line">合同价(万元)：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control layui-input number"/>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>送审价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="SongShenJia" placeholder="请输入送审价" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number" onchange="JingHeJianValue()"/>
-                        </div>
+                </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>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>审定价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="ShenDingJia" placeholder="请输入审定价" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number" onchange="JingHeJianValue()"/>
-                        </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>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">审核增减额(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="JingHeJianE" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-                        </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">
+                        <form:input path="JingHeJianE" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">审核增减率(%)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="JingHeJianLv" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-                        </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">
+                        <form:input path="JingHeJianLv" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                     </div>
                 </div>
             </div>

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

@@ -72,9 +72,11 @@
                     //审定价
                     if(!$("#ShenDingJia").is(":hidden")){
                         var ShenDingJia = $("#ShenDingJia").val();
-                        if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                            parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-                            return false;
+                        if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
+                            if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
+                                parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                                return false;
+                            }
                         }
                     }
                     //审核增减率
@@ -439,12 +441,28 @@
                 var projectType = $("#ProjectType").val()
                 if (projectType == "10") {
                     $("#ptDiv").show();
+                    $("#heTongJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>合同价(万元)：")
+                    $("#HeTongJia").attr("class","form-control layui-input number judgment")
+                    $("#songShenJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>送审价(万元)：")
+                    $("#SongShenJia").attr("class","form-control layui-input number judgment")
+                    $("#shenDingJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>审定价(万元)：")
+                    $("#ShenDingJia").attr("class","form-control layui-input number judgment")
                     $(".overallProcessDiv").hide();
                 }else if(projectType == "19"){
+                    $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                    $("#HeTongJia").attr("class","form-control layui-input number")
+                    $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                    $("#SongShenJia").attr("class","form-control layui-input number")
+                    $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                    $("#ShenDingJia").attr("class","form-control layui-input number")
                     $(".overallProcessDiv").show();
-                    $("#ptDiv").hide();
                 }else {
-                    $("#ptDiv").hide();
+                    $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                    $("#HeTongJia").attr("class","form-control layui-input number")
+                    $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                    $("#SongShenJia").attr("class","form-control layui-input number")
+                    $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                    $("#ShenDingJia").attr("class","form-control layui-input number")
                     $(".overallProcessDiv").hide();
                 }
                 //有无合同监听器
@@ -608,12 +626,28 @@
                 layui.form.on('select(ProjectType)',function(data) {
                     if (data.value == "10") {
                         $("#ptDiv").show();
+                        $("#heTongJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>合同价(万元)：")
+                        $("#HeTongJia").attr("class","form-control layui-input number judgment")
+                        $("#songShenJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>送审价(万元)：")
+                        $("#SongShenJia").attr("class","form-control layui-input number judgment")
+                        $("#shenDingJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>审定价(万元)：")
+                        $("#ShenDingJia").attr("class","form-control layui-input number judgment")
                         $(".overallProcessDiv").hide();
                     }else if(data.value == "19"){
+                        $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                        $("#HeTongJia").attr("class","form-control layui-input number")
+                        $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                        $("#SongShenJia").attr("class","form-control layui-input number")
+                        $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                        $("#ShenDingJia").attr("class","form-control layui-input number")
                         $(".overallProcessDiv").show();
-                        $("#ptDiv").hide();
-                    }else{
-                        $("#ptDiv").hide();
+                    }else {
+                        $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                        $("#HeTongJia").attr("class","form-control layui-input number")
+                        $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                        $("#SongShenJia").attr("class","form-control layui-input number")
+                        $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                        $("#ShenDingJia").attr("class","form-control layui-input number")
                         $(".overallProcessDiv").hide();
                     }
                     layui.form.render("select");
@@ -1329,36 +1363,34 @@
                     <span style="color: red">注：咨询标的额是指咨询项目编审后的最终造价，其中工程结算项目填审定价，标底编制填招标控制价，工程造价全过程管理填工程投资总额或审定价</span>
                 </div>
 
-                <div id="ptDiv">
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>合同价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input number"/>
-                        </div>
+                <div class="layui-item layui-col-sm6 lw6" id="heTongJiaDiv">
+                    <label class="layui-form-label double-line">合同价(万元)：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control layui-input number"/>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>送审价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="SongShenJia" placeholder="请输入送审价" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input number" onchange="JingHeJianValue()"/>
-                        </div>
+                </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>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>审定价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="ShenDingJia" placeholder="请输入审定价" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input number" onchange="JingHeJianValue()"/>
-                        </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>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">审核增减额(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="JingHeJianE" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-                        </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">
+                        <form:input path="JingHeJianE" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">审核增减率(%)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="JingHeJianLv" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-                        </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">
+                        <form:input path="JingHeJianLv" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                     </div>
                 </div>
             </div>

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

@@ -9,6 +9,7 @@
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
+    <script src="${ctxStatic}/common/html/js/script.js"></script>
     <style>
         #projectDesc-error{
             left:0;
@@ -43,6 +44,10 @@
         var clientCount = 0;
         function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
+                var flags=judgment();
+                if (!flags){
+                    return flags;
+                }
                 //咨询标的额
                 var ZiXunBDE = $("#ZiXunBDE").val();
                 var GCGMValue = $("#GCGMValue").val();
@@ -65,9 +70,11 @@
                 //审定价
                 if(!$("#ShenDingJia").is(":hidden")){
                     var ShenDingJia = $("#ShenDingJia").val();
-                    if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                        parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-                        return false;
+                    if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
+                        if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
+                            parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                            return false;
+                        }
                     }
                 }
                 //审核增减率
@@ -429,12 +436,28 @@
                 var projectType = $("#ProjectType").val()
                 if (projectType == "10") {
                     $("#ptDiv").show();
+                    $("#heTongJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>合同价(万元)：")
+                    $("#HeTongJia").attr("class","form-control layui-input number judgment")
+                    $("#songShenJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>送审价(万元)：")
+                    $("#SongShenJia").attr("class","form-control layui-input number judgment")
+                    $("#shenDingJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>审定价(万元)：")
+                    $("#ShenDingJia").attr("class","form-control layui-input number judgment")
                     $(".overallProcessDiv").hide();
                 }else if(projectType == "19"){
+                    $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                    $("#HeTongJia").attr("class","form-control layui-input number")
+                    $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                    $("#SongShenJia").attr("class","form-control layui-input number")
+                    $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                    $("#ShenDingJia").attr("class","form-control layui-input number")
                     $(".overallProcessDiv").show();
-                    $("#ptDiv").hide();
                 }else {
-                    $("#ptDiv").hide();
+                    $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                    $("#HeTongJia").attr("class","form-control layui-input number")
+                    $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                    $("#SongShenJia").attr("class","form-control layui-input number")
+                    $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                    $("#ShenDingJia").attr("class","form-control layui-input number")
                     $(".overallProcessDiv").hide();
                 }
                     //有无合同监听器
@@ -598,12 +621,28 @@
                 layui.form.on('select(ProjectType)',function(data) {
                     if (data.value == "10") {
                         $("#ptDiv").show();
+                        $("#heTongJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>合同价(万元)：")
+                        $("#HeTongJia").attr("class","form-control layui-input number judgment")
+                        $("#songShenJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>送审价(万元)：")
+                        $("#SongShenJia").attr("class","form-control layui-input number judgment")
+                        $("#shenDingJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>审定价(万元)：")
+                        $("#ShenDingJia").attr("class","form-control layui-input number judgment")
                         $(".overallProcessDiv").hide();
                     }else if(data.value == "19"){
+                        $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                        $("#HeTongJia").attr("class","form-control layui-input number")
+                        $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                        $("#SongShenJia").attr("class","form-control layui-input number")
+                        $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                        $("#ShenDingJia").attr("class","form-control layui-input number")
                         $(".overallProcessDiv").show();
-                        $("#ptDiv").hide();
-                    }else{
-                        $("#ptDiv").hide();
+                    }else {
+                        $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                        $("#HeTongJia").attr("class","form-control layui-input number")
+                        $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                        $("#SongShenJia").attr("class","form-control layui-input number")
+                        $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                        $("#ShenDingJia").attr("class","form-control layui-input number")
                         $(".overallProcessDiv").hide();
                     }
                     layui.form.render("select");
@@ -1326,36 +1365,34 @@
                     <span style="color: red">注：咨询标的额是指咨询项目编审后的最终造价，其中工程结算项目填审定价，标底编制填招标控制价，工程造价全过程管理填工程投资总额或审定价</span>
                 </div>
 
-                <div id="ptDiv">
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>合同价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number"/>
-                        </div>
+                <div class="layui-item layui-col-sm6 lw6" id="heTongJiaDiv">
+                    <label class="layui-form-label double-line">合同价(万元)：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control layui-input number"/>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>送审价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="SongShenJia" placeholder="请输入送审价" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number" onchange="JingHeJianValue()"/>
-                        </div>
+                </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>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>审定价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="ShenDingJia" placeholder="请输入审定价" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number" onchange="JingHeJianValue()"/>
-                        </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>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">审核增减额(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="JingHeJianE" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-                        </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">
+                        <form:input path="JingHeJianE" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">审核增减率(%)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="JingHeJianLv" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-                        </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">
+                        <form:input path="JingHeJianLv" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                     </div>
                 </div>
             </div>

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

@@ -9,6 +9,7 @@
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
+    <script src="${ctxStatic}/common/html/js/script.js"></script>
     <style>
         #projectDesc-error{
             left:0;
@@ -43,6 +44,10 @@
         var clientCount = 0;
         function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
+                var flags=judgment();
+                if (!flags){
+                    return flags;
+                }
                 //咨询标的额
                 var ZiXunBDE = $("#ZiXunBDE").val();
                 var GCGMValue = $("#GCGMValue").val();
@@ -65,9 +70,11 @@
                 //审定价
                 if(!$("#ShenDingJia").is(":hidden")){
                     var ShenDingJia = $("#ShenDingJia").val();
-                    if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                        parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-                        return false;
+                    if(undefined != ShenDingJia && null != ShenDingJia && "" != ShenDingJia){
+                        if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
+                            parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                            return false;
+                        }
                     }
                 }
                 //审核增减率
@@ -429,12 +436,28 @@
                 var projectType = $("#ProjectType").val()
                 if (projectType == "10") {
                     $("#ptDiv").show();
+                    $("#heTongJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>合同价(万元)：")
+                    $("#HeTongJia").attr("class","form-control layui-input number judgment")
+                    $("#songShenJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>送审价(万元)：")
+                    $("#SongShenJia").attr("class","form-control layui-input number judgment")
+                    $("#shenDingJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>审定价(万元)：")
+                    $("#ShenDingJia").attr("class","form-control layui-input number judgment")
                     $(".overallProcessDiv").hide();
                 }else if(projectType == "19"){
+                    $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                    $("#HeTongJia").attr("class","form-control layui-input number")
+                    $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                    $("#SongShenJia").attr("class","form-control layui-input number")
+                    $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                    $("#ShenDingJia").attr("class","form-control layui-input number")
                     $(".overallProcessDiv").show();
-                    $("#ptDiv").hide();
                 }else {
-                    $("#ptDiv").hide();
+                    $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                    $("#HeTongJia").attr("class","form-control layui-input number")
+                    $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                    $("#SongShenJia").attr("class","form-control layui-input number")
+                    $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                    $("#ShenDingJia").attr("class","form-control layui-input number")
                     $(".overallProcessDiv").hide();
                 }
                     //有无合同监听器
@@ -598,12 +621,28 @@
                 layui.form.on('select(ProjectType)',function(data) {
                     if (data.value == "10") {
                         $("#ptDiv").show();
+                        $("#heTongJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>合同价(万元)：")
+                        $("#HeTongJia").attr("class","form-control layui-input number judgment")
+                        $("#songShenJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>送审价(万元)：")
+                        $("#SongShenJia").attr("class","form-control layui-input number judgment")
+                        $("#shenDingJiaDiv").find("label").eq(0).html("<span class=\"require-item\">*</span>审定价(万元)：")
+                        $("#ShenDingJia").attr("class","form-control layui-input number judgment")
                         $(".overallProcessDiv").hide();
                     }else if(data.value == "19"){
+                        $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                        $("#HeTongJia").attr("class","form-control layui-input number")
+                        $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                        $("#SongShenJia").attr("class","form-control layui-input number")
+                        $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                        $("#ShenDingJia").attr("class","form-control layui-input number")
                         $(".overallProcessDiv").show();
-                        $("#ptDiv").hide();
-                    }else{
-                        $("#ptDiv").hide();
+                    }else {
+                        $("#heTongJiaDiv").find("label").eq(0).html("合同价(万元)：")
+                        $("#HeTongJia").attr("class","form-control layui-input number")
+                        $("#songShenJiaDiv").find("label").eq(0).html("送审价(万元)：")
+                        $("#SongShenJia").attr("class","form-control layui-input number")
+                        $("#shenDingJiaDiv").find("label").eq(0).html("审定价(万元)：")
+                        $("#ShenDingJia").attr("class","form-control layui-input number")
                         $(".overallProcessDiv").hide();
                     }
                     layui.form.render("select");
@@ -1326,36 +1365,34 @@
                     <span style="color: red">注：咨询标的额是指咨询项目编审后的最终造价，其中工程结算项目填审定价，标底编制填招标控制价，工程造价全过程管理填工程投资总额或审定价</span>
                 </div>
 
-                <div id="ptDiv">
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>合同价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number"/>
-                        </div>
+                <div class="layui-item layui-col-sm6 lw6" id="heTongJiaDiv">
+                    <label class="layui-form-label double-line">合同价(万元)：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  onkeyup="num(this)" class="form-control layui-input number"/>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>送审价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="SongShenJia" placeholder="请输入送审价" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number" onchange="JingHeJianValue()"/>
-                        </div>
+                </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>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>审定价(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="ShenDingJia" placeholder="请输入审定价" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number" onchange="JingHeJianValue()"/>
-                        </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>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">审核增减额(万元)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="JingHeJianE" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-                        </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">
+                        <form:input path="JingHeJianE" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label double-line">审核增减率(%)：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="JingHeJianLv" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-                        </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">
+                        <form:input path="JingHeJianLv" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                     </div>
                 </div>
             </div>