项目上报

src/main/webapp/static/common/html/js/script.js

@@ -24,7 +24,7 @@ $(document).ready(function () {
         //         strLength += temp[i].length;
         //     }
         //     setSelectionPos($('.textcon li').eq(ind).find($('textarea'))[0], strLength);
-        //     // console.log(position)                
+        //     // console.log(position)
         //     // var potext =  $('.textcon li').eq(ind).find($('textarea')).text();
         //     // console.log(potext)
         //     // var potextArr = potext.split('');
@@ -45,7 +45,7 @@ $(document).ready(function () {
         //     }
         //     strLength += text.length;
         //     setSelectionPos($('.textcon li').eq(ind).find($('textarea'))[0], strLength);
-        // } 
+        // }
         }else {
             ev.preventDefault();
         }
@@ -89,7 +89,7 @@ $(document).ready(function () {
 
     //公式问题
 
-    //tab切换 
+    //tab切换
     function init(i) {
         $('.lists li').eq(i).addClass('actived').siblings().removeClass('actived');
         $('.textcon li').eq(i).show().siblings().hide();
@@ -134,7 +134,7 @@ $(document).ready(function () {
         // init(ind);
         // clickind(ind)
 
-        //封装弹窗  
+        //封装弹窗
         $('.mark').css('display','block');
     })
 
@@ -152,7 +152,7 @@ $(document).ready(function () {
     $('.surem').on('click',function(){
         var sname =  $('.setname').val();
         if(!sname.trim().length){
-            alert('这是必填项！');                    
+            alert('这是必填项！');
         }else{
             var newlis = document.createElement('li');
             $('.lists').append($(newlis).text(sname));
@@ -166,9 +166,9 @@ $(document).ready(function () {
             $('.setname').val('');
             $('.mark').css('display','none');
         }
-    
+
     });
-    
+
     //删除公式
     $('.delete').on('click', function () {
         $('.lists li').eq(ind).remove();
@@ -206,7 +206,7 @@ $(document).ready(function () {
         }
     })
 
-    
+
 
     //点击按钮获取文字
     $('.sels').on('click', 'li', function (e) {
@@ -289,7 +289,7 @@ $(document).ready(function () {
             strLength += text.length;
             setSelectionPos($('.textcon li').eq(ind).find($('textarea'))[0], strLength);
         }
-        
+
     })
 
     //点击转化按钮
@@ -357,7 +357,7 @@ $(document).ready(function () {
     //公式示例
     // bigArr[0] = ['如果','(','aaaa','>','1',')','那么','bbbb','*','3'];
     // $('.textcon li').eq(0).find($('textarea')).text(bigArr[0].join(''));
-    
+
 });
 
     //添加进去的元素如何转化成公式
@@ -369,8 +369,10 @@ function judgment(){
         var zhi=$(this).val();
         var s=$(this).parent().html();
         if (''==zhi || null == zhi){
-            $(this).css("border","1px solid red")
-            flag1=false;
+            if(!$("#"+this.id).is(":hidden")){
+                $(this).css("border","1px solid red")
+                flag1=false;
+            }
         }else{
             $(this).css("border","1px solid #f1f1f1")
         }
@@ -381,4 +383,4 @@ function judgment(){
     }else{
         return true;
     }
-}
+}

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

@@ -409,6 +409,7 @@
                     $("#ptDiv").hide();
                 }else {
                     $("#ptDiv").hide();
+                    $(".overallProcessDiv").hide();
                 }
                 //有无合同监听器
                 layui.form.on('radio(ext)', function(data){
@@ -854,7 +855,7 @@
             //咨询营业收入
             var mv = $("#ZiXunShouRu").val();
             if(mv != undefined && mv != null && mv != ""){
-                var m = parseFloat(mv)* 10000;
+                var m = parseFloat(mv);
                 var t2 = $("#" +  a ).val();
                 //完成营业收入比例触发
                 if(a.indexOf("_wcyysrbl") != -1){
@@ -893,7 +894,7 @@
                     parent.layer.msg("请填写正确的咨询营业收入",{icon:5});
                     return;
                 }
-                var m = parseFloat(mv)* 10000;
+                var m = parseFloat(mv);
                 var size = $("#reportedConsultantList tr").length;
                 if(size>0){
                     for (var i = 1;i<=50;i++){
@@ -1124,7 +1125,7 @@
                                 <th ><span class="require-item">*</span>身份证号</th>
                                 <th ><span class="require-item">*</span>注册/资格证号</th>
                                 <th ><span class="require-item">*</span>完成营业收入比例（%）</th>
-                                <th ><span class="require-item">*</span>完成营业收入（元）</th>
+                                <th ><span class="require-item">*</span>完成营业收入（万元）</th>
                                 <th width="150px"><span class="require-item">*</span>本人负责内容</th>
                                 <th width="100px">操作</th>
                             </tr>
@@ -1280,25 +1281,25 @@
 
                 <div id="ptDiv">
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">合同价(元)：</label>
+                        <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>
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
+                        <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">
-                        <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
+                        <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">
-                        <label class="layui-form-label double-line">审核增减额(元)：</label>
+                        <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>

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

@@ -184,6 +184,7 @@
                                     return false;
                                 }
                                 break;
+                                break;
                         }
                     };
                 }
@@ -852,7 +853,7 @@
             //咨询营业收入
             var mv = $("#ZiXunShouRu").val();
             if(mv != undefined && mv != null && mv != ""){
-                var m = parseFloat(mv)* 10000;
+                var m = parseFloat(mv);
                 var t2 = $("#" +  a ).val();
                 //完成营业收入比例触发
                 if(a.indexOf("_wcyysrbl") != -1){
@@ -891,7 +892,7 @@
                     parent.layer.msg("请填写正确的咨询营业收入",{icon:5});
                     return;
                 }
-                var m = parseFloat(mv)* 10000;
+                var m = parseFloat(mv);
                 var size = $("#reportedConsultantList tr").length;
                 if(size>0){
                     for (var i = 1;i<=50;i++){
@@ -1128,7 +1129,7 @@
                                 <th ><span class="require-item">*</span>身份证号</th>
                                 <th ><span class="require-item">*</span>注册/资格证号</th>
                                 <th ><span class="require-item">*</span>完成营业收入比例（%）</th>
-                                <th ><span class="require-item">*</span>完成营业收入（元）</th>
+                                <th ><span class="require-item">*</span>完成营业收入（万元）</th>
                                 <th width="150px"><span class="require-item">*</span>本人负责内容</th>
                                 <th width="100px">操作</th>
                             </tr>
@@ -1284,25 +1285,25 @@
 
                 <div id="ptDiv">
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">合同价(元)：</label>
+                        <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>
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
+                        <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">
-                        <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
+                        <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">
-                        <label class="layui-form-label double-line">审核增减额(元)：</label>
+                        <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>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedAudit.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;
@@ -45,189 +46,189 @@
             var ss= document.getElementById("iframe").contentWindow.document.getElementById("opinion").value
             $("#opinion").val(ss);
             if(validateForm.form()){
-                //咨询标的额
-                var ZiXunBDE = $("#ZiXunBDE").val();
-                var GCGMValue = $("#GCGMValue").val();
+                if(obj == 1){
+                    //咨询标的额
+                    var ZiXunBDE = $("#ZiXunBDE").val();
+                    var GCGMValue = $("#GCGMValue").val();
 
-                if(GCGMValue == 0){
-                    parent.layer.msg("建筑面积或规模必须大于0!", {icon: 5});
-                    return false;
-                }
-                if(ZiXunBDE == 0){
-                    parent.layer.msg("咨询标的额必须大于0!", {icon: 5});
-                    return false;
-                }
-                //咨询营业收入
-                var ZiXunShouRu = $("#ZiXunShouRu").val();
-                if(ZiXunShouRu == 0){
-                    parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
-                    return false;
-                }
-                //审定价
-                var ShenDingJia = $("#ShenDingJia").val();
-                if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                    parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-                    return false;
-                }
-                var list = [];
-                var size = $("#reportedConsultantList tr").length;
-                if(size <= 1){
-                    parent.layer.msg("咨询员数量至少有1个人!", {icon: 5});
-                    return false;
-                }
-                if(size>21){
-                    parent.layer.msg("咨询员数量不得超过20人!", {icon: 5});
-                    return false;
-                }
-                if(size>0){
-                    for (var i = 1;i<=99;i++){
-                        var zixunyuan = $("#reportedConsultantList"+i+"_zixunyuanId").val();
-                        if(zixunyuan!=undefined && zixunyuan != null && zixunyuan !=''){
-                            list.push(zixunyuan);
-                        }
+                    if(GCGMValue == 0){
+                        parent.layer.msg("建筑面积或规模必须大于0!", {icon: 5});
+                        return false;
                     }
-                    var nary = list.sort();
-                    for(var i = 0; i < nary.length - 1; i++) {
-                        if(nary[i] == nary[i + 1]) {
-                            parent.layer.msg("咨询员重复，请重新选择!", {icon: 5});
-                            return false;
-                        }
+                    if(ZiXunBDE == 0){
+                        parent.layer.msg("咨询标的额必须大于0!", {icon: 5});
+                        return false;
                     }
-                }
-
-                var team = $("input[name='s1']:checked").val();
-                var city = $("#city").val()
-                var county = $("#county").val()
-                var otherProvinces = $("#otherProvinces").val()
-                if(team ==undefined || team == null || team == ''){
-                    parent.layer.msg("请选择工程所在省份!", {icon: 5});
-                    return false;
-                }
-                if(team ==10){
-                    if(city ==undefined || city == null || city == ''){
-                        parent.layer.msg("请选择工程所在地级市!", {icon: 5});
+                    //咨询营业收入
+                    var ZiXunShouRu = $("#ZiXunShouRu").val();
+                    if(ZiXunShouRu == 0){
+                        parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
                         return false;
                     }
-                    if(county ==undefined || county == null || county == ''){
-                        parent.layer.msg("请选择工程所在区县!", {icon: 5});
+                    //审定价
+                    var ShenDingJia = $("#ShenDingJia").val();
+                    if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
+                        parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
                         return false;
                     }
-                }else{
-                    if(otherProvinces ==undefined || otherProvinces == null || otherProvinces == ''){
-                        parent.layer.msg("请选择外省省份!", {icon: 5});
+                    var list = [];
+                    var size = $("#reportedConsultantList tr").length;
+                    if(size <= 1){
+                        parent.layer.msg("咨询员数量至少有1个人!", {icon: 5});
                         return false;
                     }
-                }
-                var projectType = $("#ProjectType").val();
-                if(projectType == 19){
-                    var advisoryIncome = $("#advisoryIncome").val();
-                    var projectSupervisionIncome = $("#projectSupervisionIncome").val();
-                    var tenderingAgencyIncome = $("#tenderingAgencyIncome").val();
-                    var designIncome = $("#designIncome").val();
-                    var otherIncome = $("#otherIncome").val();
-                    var ziXunShouRu = $("#ZiXunShouRu").val();
-                    var total =  parseFloat(projectSupervisionIncome) + parseFloat(tenderingAgencyIncome) + parseFloat(designIncome) + parseFloat(otherIncome) + parseFloat(ziXunShouRu);
-                    if(parseFloat(total) > parseFloat(advisoryIncome)){
-                        parent.layer.msg("全过程各项收入填写不正确或不能超过全过程工程咨询收入!", {icon: 5});
+                    if(size>21){
+                        parent.layer.msg("咨询员数量不得超过20人!", {icon: 5});
                         return false;
                     }
-                }
-                var projectRecordId = $("#projectRecordId").val();
-                if("0" != projectRecordId && projectRecordId.length != 16){
-                    parent.layer.msg("项目编号填写错误!", {icon: 5});
-                    $("#projectRecordId").val("");
-                    return ;
-                }
+                    if(size>0){
+                        for (var i = 1;i<=99;i++){
+                            var zixunyuan = $("#reportedConsultantList"+i+"_zixunyuanId").val();
+                            if(zixunyuan!=undefined && zixunyuan != null && zixunyuan !=''){
+                                list.push(zixunyuan);
+                            }
+                        }
+                        var nary = list.sort();
+                        for(var i = 0; i < nary.length - 1; i++) {
+                            if(nary[i] == nary[i + 1]) {
+                                parent.layer.msg("咨询员重复，请重新选择!", {icon: 5});
+                                return false;
+                            }
+                        }
+                    }
 
-                var projectCode = $("#projectCode").val();
-                if("0" != projectCode){
-                    var strArr=projectCode.split("-");
-                    console.log(strArr.length)
-                    if(strArr.length !=5){
-                        parent.layer.msg("项目代码填写错误!", {icon: 5});
-                        $("#projectCode").val("");
+                    var team = $("input[name='s1']:checked").val();
+                    var city = $("#city").val()
+                    var county = $("#county").val()
+                    var otherProvinces = $("#otherProvinces").val()
+                    if(team ==undefined || team == null || team == ''){
+                        parent.layer.msg("请选择工程所在省份!", {icon: 5});
                         return false;
                     }
-                    for(var i = 0,len=strArr.length; i < len; i++) {
-                        console.log(strArr[i])
-                        switch(i) {
-                            case 0:
-                                if(strArr[0].length != 4){
-                                    parent.layer.msg("项目代码4位时间代码填写错误!", {icon: 5});
-                                    $("#projectCode").val("");
-                                    return false;
-                                }
-                                break;
-                            case 1:
-                                if(strArr[1].length != 6){
-                                    parent.layer.msg("项目代码6位地区代码填写错误!", {icon: 5});
-                                    $("#projectCode").val("");
-                                    return false;
-                                }
-                                break;
-                            case 2:
-                                if(strArr[2].length != 2){
-                                    parent.layer.msg("项目代码2位中央业务指导部门代码填写错误!", {icon: 5});
-                                    $("#projectCode").val("");
-                                    return false;
-                                }
-                                break;
-                            case 3:
-                                if(strArr[3].length != 2){
-                                    parent.layer.msg("项目代码2位项目类型代码填写错误!", {icon: 5});
-                                    $("#projectCode").val("");
-                                    return false;
-                                }
-                                break;
-                            case 4:
-                                if(strArr[4].length != 6){
-                                    parent.layer.msg("项目代码5位随机码和1位校验码填写错误!", {icon: 5});
-                                    $("#projectCode").val("");
-                                    return false;
-                                }
-                                break;
+                    if(team ==10){
+                        if(city ==undefined || city == null || city == ''){
+                            parent.layer.msg("请选择工程所在地级市!", {icon: 5});
+                            return false;
                         }
-                    };
-                }
+                        if(county ==undefined || county == null || county == ''){
+                            parent.layer.msg("请选择工程所在区县!", {icon: 5});
+                            return false;
+                        }
+                    }else{
+                        if(otherProvinces ==undefined || otherProvinces == null || otherProvinces == ''){
+                            parent.layer.msg("请选择外省省份!", {icon: 5});
+                            return false;
+                        }
+                    }
+                    var projectType = $("#ProjectType").val();
+                    if(projectType == 19){
+                        var advisoryIncome = $("#advisoryIncome").val();
+                        var projectSupervisionIncome = $("#projectSupervisionIncome").val();
+                        var tenderingAgencyIncome = $("#tenderingAgencyIncome").val();
+                        var designIncome = $("#designIncome").val();
+                        var otherIncome = $("#otherIncome").val();
+                        var ziXunShouRu = $("#ZiXunShouRu").val();
+                        var total =  parseFloat(projectSupervisionIncome) + parseFloat(tenderingAgencyIncome) + parseFloat(designIncome) + parseFloat(otherIncome) + parseFloat(ziXunShouRu);
+                        if(parseFloat(total) > parseFloat(advisoryIncome)){
+                            parent.layer.msg("全过程各项收入填写不正确或不能超过全过程工程咨询收入!", {icon: 5});
+                            return false;
+                        }
+                    }
+                    var projectRecordId = $("#projectRecordId").val();
+                    if("0" != projectRecordId && projectRecordId.length != 16){
+                        parent.layer.msg("项目编号填写错误!", {icon: 5});
+                        $("#projectRecordId").val("");
+                        return ;
+                    }
 
-                var PorjectUse = $("#PorjectUse").val();
-                if(PorjectUse ==undefined || PorjectUse == null || PorjectUse == ''){
-                    parent.layer.msg("请选择工程用途!", {icon: 5});
-                    return false;
-                }
+                    var projectCode = $("#projectCode").val();
+                    if("0" != projectCode){
+                        var strArr=projectCode.split("-");
+                        console.log(strArr.length)
+                        if(strArr.length !=5){
+                            parent.layer.msg("项目代码填写错误!", {icon: 5});
+                            $("#projectCode").val("");
+                            return false;
+                        }
+                        for(var i = 0,len=strArr.length; i < len; i++) {
+                            console.log(strArr[i])
+                            switch(i) {
+                                case 0:
+                                    if(strArr[0].length != 4){
+                                        parent.layer.msg("项目代码4位时间代码填写错误!", {icon: 5});
+                                        $("#projectCode").val("");
+                                        return false;
+                                    }
+                                    break;
+                                case 1:
+                                    if(strArr[1].length != 6){
+                                        parent.layer.msg("项目代码6位地区代码填写错误!", {icon: 5});
+                                        $("#projectCode").val("");
+                                        return false;
+                                    }
+                                    break;
+                                case 2:
+                                    if(strArr[2].length != 2){
+                                        parent.layer.msg("项目代码2位中央业务指导部门代码填写错误!", {icon: 5});
+                                        $("#projectCode").val("");
+                                        return false;
+                                    }
+                                    break;
+                                case 3:
+                                    if(strArr[3].length != 2){
+                                        parent.layer.msg("项目代码2位项目类型代码填写错误!", {icon: 5});
+                                        $("#projectCode").val("");
+                                        return false;
+                                    }
+                                    break;
+                                case 4:
+                                    if(strArr[4].length != 6){
+                                        parent.layer.msg("项目代码5位随机码和1位校验码填写错误!", {icon: 5});
+                                        $("#projectCode").val("");
+                                        return false;
+                                    }
+                                    break;
+                            }
+                        };
+                    }
 
-                /*var checkedCount = $('input[type=checkbox]:checked').length;
-                if(checkedCount == 0){
-                    parent.layer.msg("请选择咨询项目造价包含内容说明!", {icon: 5});
-                    return false;
-                }*/
-
-                var BaoGaoShuQianFaDate = $("#BaoGaoShuQianFaDate").val();
-                var s = BaoGaoShuQianFaDate.replace(/-/g,"/");
-                var baogaoDate = new Date(s );
-                var nowDate = new Date();
-                var a = nowDate - baogaoDate;
-                var days = Math.floor(a / (24 * 3600 * 1000));
-                if(days >37){
-                    parent.layer.msg("出具报告日期超期，请重新选择!", {icon: 5});
-                    return false;
-                }
-                var beginDateTime = $("#beginDate").val();
-                var endDateTime = $("#endDate").val();
-                if(beginDateTime != null && beginDateTime != undefined && beginDateTime != ''
-                    &&endDateTime != null && endDateTime != undefined && endDateTime != ''){
-                    var startDate = new Date(beginDateTime.replace(/-/g, "/"));
-                    var endDate = new Date(endDateTime.replace(/-/g, "/"));
-                    var time = endDate.getTime() - startDate.getTime();
-                    var days = parseInt(time / (1000 * 60 * 60 * 24));
-                    if(days<0){
-                        parent.layer.msg("作业期结束时间需大于开始时间!", {icon: 5});
-                        $("#endDate").val('');
-                        return;
+                    var PorjectUse = $("#PorjectUse").val();
+                    if(PorjectUse ==undefined || PorjectUse == null || PorjectUse == ''){
+                        parent.layer.msg("请选择工程用途!", {icon: 5});
+                        return false;
                     }
-                }
-                if(obj == 1){
-                    $('#flag').val('yes');
+
+                    var BaoGaoShuQianFaDate = $("#BaoGaoShuQianFaDate").val();
+                    var s = BaoGaoShuQianFaDate.replace(/-/g,"/");
+                    var baogaoDate = new Date(s );
+                    var nowDate = new Date();
+                    var a = nowDate - baogaoDate;
+                    var days = Math.floor(a / (24 * 3600 * 1000));
+                    if(days >37){
+                        parent.layer.msg("出具报告日期超期，请重新选择!", {icon: 5});
+                        return false;
+                    }
+                    var beginDateTime = $("#beginDate").val();
+                    var endDateTime = $("#endDate").val();
+                    if(beginDateTime != null && beginDateTime != undefined && beginDateTime != ''
+                        &&endDateTime != null && endDateTime != undefined && endDateTime != ''){
+                        var startDate = new Date(beginDateTime.replace(/-/g, "/"));
+                        var endDate = new Date(endDateTime.replace(/-/g, "/"));
+                        var time = endDate.getTime() - startDate.getTime();
+                        var days = parseInt(time / (1000 * 60 * 60 * 24));
+                        if(days<0){
+                            parent.layer.msg("作业期结束时间需大于开始时间!", {icon: 5});
+                            $("#endDate").val('');
+                            return;
+                        }
+                    }
+                    var flags=judgment();
+                    if (flags){
+                        $("#flag").val("yes");
+                    }else{
+                        return flags;
+                    }
+
                 }else{
                     $('#flag').val('no');
                 }
@@ -413,6 +414,7 @@
                     $("#ptDiv").hide();
                 }else {
                     $("#ptDiv").hide();
+                    $(".overallProcessDiv").hide();
                 }
                     //有无合同监听器
                 layui.form.on('radio(ext)', function(data){
@@ -858,7 +860,7 @@
             //咨询营业收入
             var mv = $("#ZiXunShouRu").val();
             if(mv != undefined && mv != null && mv != ""){
-                var m = parseFloat(mv)* 10000;
+                var m = parseFloat(mv);
                 var t2 = $("#" +  a ).val();
                 //完成营业收入比例触发
                 if(a.indexOf("_wcyysrbl") != -1){
@@ -897,7 +899,7 @@
                     parent.layer.msg("请填写正确的咨询营业收入",{icon:5});
                     return;
                 }
-                var m = parseFloat(mv)* 10000;
+                var m = parseFloat(mv);
                 var size = $("#reportedConsultantList tr").length;
                 if(size>0){
                     for (var i = 1;i<=50;i++){
@@ -1023,19 +1025,19 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>项目编号：</label>
                     <div class="layui-input-block">
-                        <form:input path="projectRecordId" placeholder="请输入项目编号" htmlEscape="false" maxlength="16"  class="form-control layui-input required number"/>
+                        <form:input path="projectRecordId" placeholder="请输入项目编号" htmlEscape="false" maxlength="16"  class="form-control layui-input judgment number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>项目名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="ProjectName" placeholder="请输入项目名称" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="ProjectName" placeholder="请输入项目名称" htmlEscape="false"  class="form-control layui-input judgment"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>项目分类：</label>
                     <div class="layui-input-block">
-                        <form:select path="projectClassify" class="form-control layui-input required simple-select">
+                        <form:select path="projectClassify" class="form-control layui-input judgment simple-select">
                             <form:options items="${fns:getMainDictList('project_classify')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
                     </div>
@@ -1049,7 +1051,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">
-                        <form:input path="projectCode" htmlEscape="false"  class="form-control layui-input required" maxlength="24"/>
+                        <form:input path="projectCode" htmlEscape="false"  class="form-control layui-input judgment" maxlength="24"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -1064,7 +1066,7 @@
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecordsReported.workContractInfo.id}"  title="选择合同" labelName="ZiXunHTBH"
-                                                cssStyle="background-color:#fff"     labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                                                cssStyle="background-color:#fff"     labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control judgment layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -1086,31 +1088,31 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>委托单位：</label>
                     <div class="layui-input-block">
-                        <form:input path="WeiTuoDW" placeholder="请输入委托单位" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="WeiTuoDW" placeholder="请输入委托单位" htmlEscape="false"  class="form-control layui-input judgment"/>
                     </div>
                 </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">
-                        <form:input path="LianXiDH" placeholder="请输入委托单位电话" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="LianXiDH" placeholder="请输入委托单位电话" htmlEscape="false"  class="form-control layui-input judgment"/>
                     </div>
                 </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">
-                        <form:input path="DangABH" placeholder="请输入造价记录编号" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="DangABH" placeholder="请输入造价记录编号" htmlEscape="false"  class="form-control layui-input judgment"/>
                     </div>
                 </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">
-                        <form:input path="BaoGaoShuQianFaDate" placeholder="请选择报告日期" htmlEscape="false"  class="laydate-icondate required form-control layui-input layer-date laydate-icon"/>
+                        <form:input path="BaoGaoShuQianFaDate" placeholder="请选择报告日期" htmlEscape="false"  class="laydate-icondate judgment form-control layui-input layer-date laydate-icon"/>
                     </div>
                 </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">
-                        <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onkeyup="num(this)" onchange="zxChange()" class="form-control required layui-input"/>
+                        <form:input path="ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onkeyup="num(this)" onchange="zxChange()" class="form-control judgment layui-input"/>
                     </div>
                 </div>
             </div>
@@ -1136,7 +1138,7 @@
                                 <th ><span class="require-item">*</span>身份证号</th>
                                 <th ><span class="require-item">*</span>注册/资格证号</th>
                                 <th ><span class="require-item">*</span>完成营业收入比例（%）</th>
-                                <th ><span class="require-item">*</span>完成营业收入（元）</th>
+                                <th ><span class="require-item">*</span>完成营业收入（万元）</th>
                                 <th width="150px"><span class="require-item">*</span>本人负责内容</th>
                                 <th width="100px">操作</th>
                             </tr>
@@ -1159,27 +1161,27 @@
                                     </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 required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </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 required"/>
+                                        <input id="reportedConsultantList{{idx}}_idCard" 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"/>
                                     </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 required"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysrbl" 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 required"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysr" 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 required"/>
+                                        <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control judgment"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -1202,25 +1204,25 @@
                                     </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 required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </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 required"/>
+                                        <input id="reportedConsultantList{{idx}}_idCard" 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 required"/>
+                                        <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 required"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysrbl" 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 required"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysr" 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>
@@ -1279,38 +1281,38 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <form:input path="GCGMValueParameter" placeholder="请输入建筑规模值" onkeyup="num(this)" htmlEscape="false" class="form-control required layui-input number"/>
+                    <form:input path="GCGMValueParameter" placeholder="请输入建筑规模值" onkeyup="num(this)" htmlEscape="false" class="form-control judgment layui-input number"/>
                 </div>
 
 
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line" title="注：指咨询项目编审后的最终造价，&#13;其中工程结算项目填审定价，标底编制填招标控制价，&#13;工程造价全过程管理填工程投资总额或审定价。"><span class="require-item">*咨询标的额(万元)：</span></label>
                     <div class="layui-input-block">
-                        <form:input path="ZiXunBDE" placeholder="请输入咨询表的额" htmlEscape="false" onkeyup="num(this)" class="form-control required layui-input number" onchange="ZiXunBDEChange()"/>
+                        <form:input path="ZiXunBDE" placeholder="请输入咨询表的额" htmlEscape="false" onkeyup="num(this)" class="form-control judgment layui-input number" onchange="ZiXunBDEChange()"/>
                     </div>
                 </div>
 
                 <div id="ptDiv">
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">合同价(元)：</label>
+                        <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>
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
+                        <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()"/>
+                            <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">
-                        <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
+                        <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()"/>
+                            <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">
-                        <label class="layui-form-label double-line">审核增减额(元)：</label>
+                        <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>
@@ -1340,30 +1342,30 @@
                     <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="projectTotalInvestment" placeholder="请输入工程项目总投资" onkeyup="num(this)" htmlEscape="false"  class="form-control required layui-input number"/>
+                            <form:input path="projectTotalInvestment" placeholder="请输入工程项目总投资" onkeyup="num(this)" disabled="true" htmlEscape="false"  class="form-control judgment layui-input number"/>
                         </div>
                     </div>
                     <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">
                             <sys:reportedtreeselectUser id="master" name="xmFZR" value="${ruralProjectRecords.projectMasterId}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.projectMasterName}"
-                                                        cssStyle="background-color:#fff" title="总咨询师" url="/sys/office/treeDataAll?type=4" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                                        cssStyle="background-color:#fff" title="总咨询师" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                         </div>
                     </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="archivesNo" placeholder="请输入咨询档案编号" htmlEscape="false"  class="form-control required layui-input number"/>
+                            <form:input path="archivesNo" placeholder="请输入咨询档案编号" htmlEscape="false"  class="form-control judgment layui-input number"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">
                         <label class="layui-form-label"><span class="require-item">*</span>作业期：</label>
                         <div class="layui-input-block">
-                            <input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group required"
+                            <input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group judgment"
                                    value="<fmt:formatDate value="${ruralProjectRecordsReported.beginDate}" pattern="yyyy-MM-dd"/>"/>
                             </input>
                             <span class="group-sep">-</span>
-                            <input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group required"
+                            <input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group judgment"
                                    value="<fmt:formatDate value="${ruralProjectRecordsReported.endDate}" pattern="yyyy-MM-dd"/>"/>
                             </input>
                         </div>
@@ -1371,31 +1373,31 @@
                     <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="advisoryIncome" placeholder="请输入全过程工程咨询收入" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number"/>
+                            <form:input path="advisoryIncome" placeholder="请输入全过程工程咨询收入" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input number"/>
                         </div>
                     </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="projectSupervisionIncome" placeholder="请输入工程监理收入" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number"/>
+                            <form:input path="projectSupervisionIncome" placeholder="请输入工程监理收入" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input number"/>
                         </div>
                     </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="tenderingAgencyIncome" placeholder="请输入招标代理收入" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number"/>
+                            <form:input path="tenderingAgencyIncome" placeholder="请输入招标代理收入" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input number"/>
                         </div>
                     </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="designIncome" placeholder="请输入设计收入" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number"/>
+                            <form:input path="designIncome" placeholder="请输入设计收入" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input number"/>
                         </div>
                     </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="otherIncome" placeholder="请输入其他收入" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number"/>
+                            <form:input path="otherIncome" placeholder="请输入其他收入" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input number"/>
                         </div>
                     </div>
                 </div>

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

@@ -409,6 +409,7 @@
                     $("#ptDiv").hide();
                 }else {
                     $("#ptDiv").hide();
+                    $(".overallProcessDiv").hide();
                 }
                 //有无合同监听器
                 layui.form.on('radio(ext)', function(data){
@@ -854,7 +855,7 @@
             //咨询营业收入
             var mv = $("#ZiXunShouRu").val();
             if(mv != undefined && mv != null && mv != ""){
-                var m = parseFloat(mv)* 10000;
+                var m = parseFloat(mv);
                 var t2 = $("#" +  a ).val();
                 //完成营业收入比例触发
                 if(a.indexOf("_wcyysrbl") != -1){
@@ -893,7 +894,7 @@
                     parent.layer.msg("请填写正确的咨询营业收入",{icon:5});
                     return;
                 }
-                var m = parseFloat(mv)* 10000;
+                var m = parseFloat(mv);
                 var size = $("#reportedConsultantList tr").length;
                 if(size>0){
                     for (var i = 1;i<=50;i++){
@@ -1110,7 +1111,7 @@
                                 <th ><span class="require-item">*</span>身份证号</th>
                                 <th ><span class="require-item">*</span>注册/资格证号</th>
                                 <th ><span class="require-item">*</span>完成营业收入比例（%）</th>
-                                <th ><span class="require-item">*</span>完成营业收入（元）</th>
+                                <th ><span class="require-item">*</span>完成营业收入（万元）</th>
                                 <th width="150px"><span class="require-item">*</span>本人负责内容</th>
                                 <th width="100px">操作</th>
                             </tr>
@@ -1266,25 +1267,25 @@
 
                 <div id="ptDiv">
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">合同价(元)：</label>
+                        <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>
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
+                        <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">
-                        <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
+                        <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">
-                        <label class="layui-form-label double-line">审核增减额(元)：</label>
+                        <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>

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

@@ -406,6 +406,7 @@
                     $("#ptDiv").hide();
                 }else {
                     $("#ptDiv").hide();
+                    $(".overallProcessDiv").hide();
                 }
                     //有无合同监听器
                 layui.form.on('radio(ext)', function(data){
@@ -851,7 +852,7 @@
             //咨询营业收入
             var mv = $("#ZiXunShouRu").val();
             if(mv != undefined && mv != null && mv != ""){
-                var m = parseFloat(mv)* 10000;
+                var m = parseFloat(mv);
                 var t2 = $("#" +  a ).val();
                 //完成营业收入比例触发
                 if(a.indexOf("_wcyysrbl") != -1){
@@ -890,7 +891,7 @@
                     parent.layer.msg("请填写正确的咨询营业收入",{icon:5});
                     return;
                 }
-                var m = parseFloat(mv)* 10000;
+                var m = parseFloat(mv);
                 var size = $("#reportedConsultantList tr").length;
                 if(size>0){
                     for (var i = 1;i<=50;i++){
@@ -1113,7 +1114,7 @@
                                 <th ><span class="require-item">*</span>身份证号</th>
                                 <th ><span class="require-item">*</span>注册/资格证号</th>
                                 <th ><span class="require-item">*</span>完成营业收入比例（%）</th>
-                                <th ><span class="require-item">*</span>完成营业收入（元）</th>
+                                <th ><span class="require-item">*</span>完成营业收入（万元）</th>
                                 <th width="150px"><span class="require-item">*</span>本人负责内容</th>
                                 <th width="100px">操作</th>
                             </tr>
@@ -1269,25 +1270,25 @@
 
                 <div id="ptDiv">
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">合同价(元)：</label>
+                        <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>
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
+                        <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">
-                        <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
+                        <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">
-                        <label class="layui-form-label double-line">审核增减额(元)：</label>
+                        <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>