Selaa lähdekoodia

上报添加暂存功能修改

user5 4 vuotta sitten
vanhempi
commit
b545dd5555

+ 34 - 2
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -32,6 +32,7 @@ import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordsReported;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectcontentinfo;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
+import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.sys.entity.Area;
@@ -1852,9 +1853,9 @@ public class RuralCostProjectMessageController extends BaseController {
             ruralProjectMessageService.disposeList(reported);
             RuralProjectRecordsReported t = ruralProjectMessageService.getRuralProjectRecordsReportedById(reported.getId());;//从数据库取出记录的值
             MyBeanUtils.copyBeanNotNull2Bean(reported, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
-            str = ruralProjectMessageService.saveReportedInfo(t);
+            str = ruralProjectMessageService.saveReportedInfo(t, ProjectStatusEnum.IN_APRL);
         }else{//新增表单保存
-            str = ruralProjectMessageService.saveReportedInfo(reported);
+            str = ruralProjectMessageService.saveReportedInfo(reported,ProjectStatusEnum.IN_APRL);
         }
 
 
@@ -1867,6 +1868,37 @@ public class RuralCostProjectMessageController extends BaseController {
     }
 
     /**
+     * 保存报告并提交审核
+     * @param reported
+     * @param redirectAttributes
+     * @return
+     */
+    @RequestMapping(value = "tstore")
+    public String tstore(RuralProjectRecordsReported reported,  RedirectAttributes redirectAttributes) throws Exception {
+        if(!BaseController.REPORTSWITCH){
+            addMessage(redirectAttributes, "项目上报失败:上报管理员已关闭上报模块");
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+        }
+        String str = "";
+        if(!reported.getIsNewRecord()){//编辑表单保存
+            ruralProjectMessageService.disposeList(reported);
+            RuralProjectRecordsReported t = ruralProjectMessageService.getRuralProjectRecordsReportedById(reported.getId());;//从数据库取出记录的值
+            MyBeanUtils.copyBeanNotNull2Bean(reported, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+            str = ruralProjectMessageService.saveReportedInfo(t, ProjectStatusEnum.TSTORE);
+        }else{//新增表单保存
+            str = ruralProjectMessageService.saveReportedInfo(reported,ProjectStatusEnum.TSTORE);
+        }
+
+
+        if (StringUtils.isNotBlank(str)){
+            addMessage(redirectAttributes, "项目上报暂存失败:"+str);
+        }else {
+            addMessage(redirectAttributes, "项目上报暂存成功");
+        }
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+    }
+
+    /**
      * 读取单个实体流程
      * @return
      */

+ 34 - 2
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -34,6 +34,7 @@ import com.jeeplus.modules.projectrecord.entity.ProjectImplementEarly;
 import com.jeeplus.modules.projectrecord.entity.ProjectPlanInfo;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
+import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
 import com.jeeplus.modules.projectrecord.service.ProjectPlanService;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectRecordsReportedDao;
@@ -1871,9 +1872,9 @@ public class RuralProjectMessageController extends BaseController {
             ruralProjectMessageService.disposeList(reported);
             RuralProjectRecordsReported t = ruralProjectMessageService.getRuralProjectRecordsReportedById(reported.getId());;//从数据库取出记录的值
             MyBeanUtils.copyBeanNotNull2Bean(reported, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
-            str = ruralProjectMessageService.saveReportedInfo(t);
+            str = ruralProjectMessageService.saveReportedInfo(t, ProjectStatusEnum.IN_APRL);
         }else{//新增表单保存
-            str = ruralProjectMessageService.saveReportedInfo(reported);
+            str = ruralProjectMessageService.saveReportedInfo(reported, ProjectStatusEnum.IN_APRL);
         }
 
 
@@ -1885,6 +1886,37 @@ public class RuralProjectMessageController extends BaseController {
         return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
     }
 
+    /**
+     * 保存报告并提交审核
+     * @param reported
+     * @param redirectAttributes
+     * @return
+     */
+    @RequestMapping(value = "tstore")
+    public String tstore(RuralProjectRecordsReported reported,  RedirectAttributes redirectAttributes) throws Exception {
+        if(!BaseController.REPORTSWITCH){
+            addMessage(redirectAttributes, "项目上报失败:上报管理员已关闭上报模块");
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+        }
+        String str = "";
+        if(!reported.getIsNewRecord()){//编辑表单保存
+            ruralProjectMessageService.disposeList(reported);
+            RuralProjectRecordsReported t = ruralProjectMessageService.getRuralProjectRecordsReportedById(reported.getId());;//从数据库取出记录的值
+            MyBeanUtils.copyBeanNotNull2Bean(reported, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+            str = ruralProjectMessageService.saveReportedInfo(t, ProjectStatusEnum.TSTORE);
+        }else{//新增表单保存
+            str = ruralProjectMessageService.saveReportedInfo(reported, ProjectStatusEnum.TSTORE);
+        }
+
+
+        if (StringUtils.isNotBlank(str)){
+            addMessage(redirectAttributes, "项目上报暂存失败:"+str);
+        }else {
+            addMessage(redirectAttributes, "项目上报暂存成功");
+        }
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+    }
+
 
     /**
      * 读取单个实体流程

+ 221 - 213
src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReportedForm.jsp

@@ -8,6 +8,7 @@
     <script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
     <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>
+    <script src="${ctxStatic}/common/html/js/script.js"></script>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
     <style>
         #projectDesc-error{
@@ -43,216 +44,223 @@
         var clientCount = 0;
         function doSubmit(i){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
             if(validateForm.form()){
-                //咨询标的额
-                var ZiXunBDE = $("#ZiXunBDE").val();
-                var GCGMValue = $("#GCGMValue").val();
+                if(i == 2){
+                    $("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessage/tstore");
+                }else{
+                    var flags=judgment();
+                    if (!flags){
+                        return flags;
+                    }
+                    //咨询标的额
+                    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;
-                }
-                //审定价
-                if(!$("#ShenDingJia").is(":hidden")){
-                    var ShenDingJia = $("#ShenDingJia").val();
-                    if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                        parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                    if(GCGMValue == 0){
+                        parent.layer.msg("建筑面积或规模必须大于0!", {icon: 5});
                         return false;
                     }
-                }
-                //审核增减率
-                if(!$("#JingHeJianLv").is(":hidden")){
-                    var JingHeJianLv = $("#JingHeJianLv").val();
-                    if(parseFloat(JingHeJianLv) >30){
-                        parent.layer.msg("审核增减率不得大于30%!", {icon: 5});
+                    if(ZiXunBDE == 0){
+                        parent.layer.msg("咨询标的额必须大于0!", {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);
+                    //咨询营业收入
+                    var ZiXunShouRu = $("#ZiXunShouRu").val();
+                    if(ZiXunShouRu == 0){
+                        parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
+                        return false;
+                    }
+                    //审定价
+                    if(!$("#ShenDingJia").is(":hidden")){
+                        var ShenDingJia = $("#ShenDingJia").val();
+                        if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
+                            parent.layer.msg("咨询营业收入金额应小于审定价!", {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});
+                    //审核增减率
+                    if(!$("#JingHeJianLv").is(":hidden")){
+                        var JingHeJianLv = $("#JingHeJianLv").val();
+                        if(parseFloat(JingHeJianLv) >30){
+                            parent.layer.msg("审核增减率不得大于30%!", {icon: 5});
                             return false;
                         }
                     }
-                    var totalWcyysrbl = 0;
-                    for (var i = 1;i<=99;i++){
-                        var wcyysrbl = $("#reportedConsultantList"+i+"_wcyysrbl").val();
-                        if(wcyysrbl!=undefined && wcyysrbl != null && wcyysrbl !=''){
-                            totalWcyysrbl = parseFloat(totalWcyysrbl) + parseFloat(wcyysrbl)*100;
-                            if(parseFloat(wcyysrbl)>100 || parseFloat(wcyysrbl)<=0){
-                                parent.layer.msg("咨询员收入比例不得大于100或者小于等于0!", {icon: 5});
+                    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);
+                            }
+                        }
+                        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 totalWcyysrbl = 0;
+                        for (var i = 1;i<=99;i++){
+                            var wcyysrbl = $("#reportedConsultantList"+i+"_wcyysrbl").val();
+                            if(wcyysrbl!=undefined && wcyysrbl != null && wcyysrbl !=''){
+                                totalWcyysrbl = parseFloat(totalWcyysrbl) + parseFloat(wcyysrbl)*100;
+                                if(parseFloat(wcyysrbl)>100 || parseFloat(wcyysrbl)<=0){
+                                    parent.layer.msg("咨询员收入比例不得大于100或者小于等于0!", {icon: 5});
+                                    return false;
+                                }
+                            }
+                        }
+                        totalWcyysrbl = totalWcyysrbl/100;
+                        if(totalWcyysrbl != 100){
+                            parent.layer.msg("咨询员收入比例总和必须为100%!您当前收入比例总和为:"+ totalWcyysrbl+ "%", {icon: 5});
+                            return false;
+                        }
                     }
-                    totalWcyysrbl = totalWcyysrbl/100;
-                    if(totalWcyysrbl != 100){
-                        parent.layer.msg("咨询员收入比例总和必须为100%!您当前收入比例总和为:"+ totalWcyysrbl+ "%", {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 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(county ==undefined || county == null || county == ''){
-                        parent.layer.msg("请选择工程所在区县!", {icon: 5});
-                        return false;
+                    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;
+                        }
                     }
-                }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 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 projectRecordId = $("#projectRecordId").val();
-                if("0" != projectRecordId && projectRecordId.length != 16){
-                    parent.layer.msg("项目编号填写错误!", {icon: 5});
-                    $("#projectRecordId").val("");
-                    return ;
-                }
 
-                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 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 PorjectUse = $("#PorjectUse").val();
-                if(PorjectUse ==undefined || PorjectUse == null || PorjectUse == ''){
-                    parent.layer.msg("请选择工程用途!", {icon: 5});
-                    return false;
-                }
+                    var PorjectUse = $("#PorjectUse").val();
+                    if(PorjectUse ==undefined || PorjectUse == null || PorjectUse == ''){
+                        parent.layer.msg("请选择工程用途!", {icon: 5});
+                        return false;
+                    }
 
-                var checkedCount = $('input[type=checkbox]:checked').length;
-                if(checkedCount == 0){
-                    parent.layer.msg("请选择咨询项目造价包含内容说明!", {icon: 5});
-                    return false;
-                }
+                    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 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 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;
+                        }
                     }
                 }
-
                 $("#inputForm").submit();
                 return true;
             }else{
@@ -1059,7 +1067,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="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">
@@ -1068,7 +1076,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="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">
@@ -1082,7 +1090,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" placeholder="请输入项目代码" class="form-control layui-input required" maxlength="24"/>
+                        <form:input path="projectCode" htmlEscape="false" placeholder="请输入项目代码" class="form-control layui-input judgment" maxlength="24"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -1128,31 +1136,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>
@@ -1201,27 +1209,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">
@@ -1244,25 +1252,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>
@@ -1321,14 +1329,14 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <form:input path="GCGMValueParameter" placeholder="请输入建筑规模值" onkeyup="numGCGN(this)" htmlEscape="false" class="form-control required layui-input number"/>
+                    <form:input path="GCGMValueParameter" placeholder="请输入建筑规模值" onkeyup="numGCGN(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 class="layui-item layui-col-sm6 lw6">
@@ -1339,19 +1347,19 @@
                     <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"/>
+                            <form:input path="HeTongJia" 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="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 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">
@@ -1388,7 +1396,7 @@
                     <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="请输入工程项目总投资" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number"/>
+                            <form:input path="projectTotalInvestment" placeholder="请输入工程项目总投资" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input number"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">
@@ -1401,17 +1409,17 @@
                     <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"/>
                         </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>
@@ -1419,31 +1427,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>

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

@@ -2415,7 +2415,7 @@
 							<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="recordsReported.archivesNo" placeholder="请输入咨询档案编号" htmlEscape="false"  class="form-control required layui-input number"/>
+									<form:input path="recordsReported.archivesNo" placeholder="请输入咨询档案编号" htmlEscape="false"  class="form-control required layui-input"/>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6 lw6">

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedModify.jsp

@@ -1406,7 +1406,7 @@
                     <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 required layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">

+ 4 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageLists.jsp

@@ -1006,10 +1006,13 @@
 						if(d.syncStatus == 0){
 							if(d.reportStatus == 0){
 								if(d.reportedState == 0 || d.reportedState == 6){
-									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 上报</a>";
 									/*xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 个人上报</a>";*/
 								}
 							}else{
+								if(d.reportedState == 1){
+									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
+								}
 								if(d.reportedState == 2){
 									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateByReported?id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗?', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回上报</a>";
 								}

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

@@ -2414,7 +2414,7 @@
 						<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="recordsReported.archivesNo" placeholder="请输入咨询档案编号" htmlEscape="false"  class="form-control required layui-input number"/>
+								<form:input path="recordsReported.archivesNo" placeholder="请输入咨询档案编号" htmlEscape="false"  class="form-control required layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6 lw6">

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedAudit.jsp

@@ -1421,7 +1421,7 @@
                     <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 judgment layui-input number"/>
+                            <form:input path="archivesNo" placeholder="请输入咨询档案编号" htmlEscape="false"  class="form-control judgment layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">

+ 222 - 215
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedForm.jsp

@@ -8,6 +8,7 @@
     <script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
     <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>
+    <script src="${ctxStatic}/common/html/js/script.js"></script>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
     <style>
         #projectDesc-error{
@@ -43,217 +44,223 @@
         var clientCount = 0;
         function doSubmit(i){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
             if(validateForm.form()){
-                //咨询标的额
-                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;
-                }
+                if(i == 2){
+                    $("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessage/tstore");
+                }else{
+                    var flags=judgment();
+                    if (!flags){
+                        return flags;
+                    }
+                    //咨询标的额
+                    var ZiXunBDE = $("#ZiXunBDE").val();
+                    var GCGMValue = $("#GCGMValue").val();
 
-                //审定价
-                if(!$("#ShenDingJia").is(":hidden")){
-                    var ShenDingJia = $("#ShenDingJia").val();
-                    if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                        parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                    if(GCGMValue == 0){
+                        parent.layer.msg("建筑面积或规模必须大于0!", {icon: 5});
                         return false;
                     }
-                }
-                //审核增减率
-                if(!$("#JingHeJianLv").is(":hidden")){
-                    var JingHeJianLv = $("#JingHeJianLv").val();
-                    if(parseFloat(JingHeJianLv) >30){
-                        parent.layer.msg("审核增减率不得大于30%!", {icon: 5});
+                    if(ZiXunBDE == 0){
+                        parent.layer.msg("咨询标的额必须大于0!", {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);
+                    //咨询营业收入
+                    var ZiXunShouRu = $("#ZiXunShouRu").val();
+                    if(ZiXunShouRu == 0){
+                        parent.layer.msg("咨询营业收入金额必须大于0!", {icon: 5});
+                        return false;
+                    }
+                    //审定价
+                    if(!$("#ShenDingJia").is(":hidden")){
+                        var ShenDingJia = $("#ShenDingJia").val();
+                        if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
+                            parent.layer.msg("咨询营业收入金额应小于审定价!", {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});
+                    //审核增减率
+                    if(!$("#JingHeJianLv").is(":hidden")){
+                        var JingHeJianLv = $("#JingHeJianLv").val();
+                        if(parseFloat(JingHeJianLv) >30){
+                            parent.layer.msg("审核增减率不得大于30%!", {icon: 5});
                             return false;
                         }
                     }
-                    var totalWcyysrbl = 0;
-                    for (var i = 1;i<=99;i++){
-                        var wcyysrbl = $("#reportedConsultantList"+i+"_wcyysrbl").val();
-                        if(wcyysrbl!=undefined && wcyysrbl != null && wcyysrbl !=''){
-                            totalWcyysrbl = parseFloat(totalWcyysrbl) + parseFloat(wcyysrbl)*100;
-                            if(parseFloat(wcyysrbl)>100 || parseFloat(wcyysrbl)<=0){
-                                parent.layer.msg("咨询员收入比例不得大于100或者小于等于0!", {icon: 5});
+                    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);
+                            }
+                        }
+                        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 totalWcyysrbl = 0;
+                        for (var i = 1;i<=99;i++){
+                            var wcyysrbl = $("#reportedConsultantList"+i+"_wcyysrbl").val();
+                            if(wcyysrbl!=undefined && wcyysrbl != null && wcyysrbl !=''){
+                                totalWcyysrbl = parseFloat(totalWcyysrbl) + parseFloat(wcyysrbl)*100;
+                                if(parseFloat(wcyysrbl)>100 || parseFloat(wcyysrbl)<=0){
+                                    parent.layer.msg("咨询员收入比例不得大于100或者小于等于0!", {icon: 5});
+                                    return false;
+                                }
+                            }
+                        }
+                        totalWcyysrbl = totalWcyysrbl/100;
+                        if(totalWcyysrbl != 100){
+                            parent.layer.msg("咨询员收入比例总和必须为100%!您当前收入比例总和为:"+ totalWcyysrbl+ "%", {icon: 5});
+                            return false;
+                        }
                     }
-                    totalWcyysrbl = totalWcyysrbl/100;
-                    if(totalWcyysrbl != 100){
-                        parent.layer.msg("咨询员收入比例总和必须为100%!您当前收入比例总和为:"+ totalWcyysrbl+ "%", {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 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(county ==undefined || county == null || county == ''){
-                        parent.layer.msg("请选择工程所在区县!", {icon: 5});
-                        return false;
+                    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;
+                        }
                     }
-                }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 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 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 projectRecordId = $("#projectRecordId").val();
-                if("0" != projectRecordId && projectRecordId.length != 16){
-                    parent.layer.msg("项目编号填写错误!", {icon: 5});
-                    $("#projectRecordId").val("");
-                    return ;
-                }
 
-                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 PorjectUse = $("#PorjectUse").val();
+                    if(PorjectUse ==undefined || PorjectUse == null || PorjectUse == ''){
+                        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;
-                        }
-                    };
-                }
 
-                var PorjectUse = $("#PorjectUse").val();
-                if(PorjectUse ==undefined || PorjectUse == null || PorjectUse == ''){
-                    parent.layer.msg("请选择工程用途!", {icon: 5});
-                    return false;
-                }
-
-                var checkedCount = $('input[type=checkbox]:checked').length;
-                if(checkedCount == 0){
-                    parent.layer.msg("请选择咨询项目造价包含内容说明!", {icon: 5});
-                    return false;
-                }
+                    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 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 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;
+                        }
                     }
                 }
-
                 $("#inputForm").submit();
                 return true;
             }else{
@@ -1046,7 +1053,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="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">
@@ -1055,7 +1062,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="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">
@@ -1069,7 +1076,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" placeholder="请输入项目代码" class="form-control layui-input required" maxlength="24"/>
+                        <form:input path="projectCode" htmlEscape="false" placeholder="请输入项目代码" class="form-control layui-input judgment" maxlength="24"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -1093,7 +1100,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">
@@ -1115,31 +1122,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>
@@ -1188,27 +1195,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">
@@ -1231,25 +1238,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>
@@ -1308,14 +1315,14 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <form:input path="GCGMValueParameter" placeholder="请输入建筑规模值" onkeyup="numGCGN(this)" htmlEscape="false" class="form-control required layui-input number"/>
+                    <form:input path="GCGMValueParameter" placeholder="请输入建筑规模值" onkeyup="numGCGN(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 class="layui-item layui-col-sm6 lw6">
@@ -1326,19 +1333,19 @@
                     <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"/>
+                            <form:input path="HeTongJia" 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="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 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">
@@ -1375,7 +1382,7 @@
                     <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="请输入工程项目总投资" htmlEscape="false"  onkeyup="num(this)" class="form-control required layui-input number"/>
+                            <form:input path="projectTotalInvestment" placeholder="请输入工程项目总投资" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input number"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">
@@ -1388,17 +1395,17 @@
                     <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"/>
                         </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>
@@ -1406,31 +1413,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>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedModify.jsp

@@ -1392,7 +1392,7 @@
                     <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 required layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedView.jsp

@@ -418,7 +418,7 @@
                     <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="archivesNo" readonly="true" placeholder="请输入咨询档案编号" htmlEscape="false"  class="form-control required layui-input number"/>
+                            <form:input path="archivesNo" readonly="true" placeholder="请输入咨询档案编号" htmlEscape="false"  class="form-control required layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">

+ 4 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageLists.jsp

@@ -1005,10 +1005,13 @@
 						if(d.syncStatus == 0){
 							if(d.reportStatus == 0){
 								if(d.reportedState == 0 || d.reportedState == 6){
-									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上报</a>";
 									/*xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 个人上报</a>";*/
 								}
 							}else{
+								if(d.reportedState == 1){
+									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
+								}
 								if(d.reportedState == 2){
 									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidateByReported?id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗?', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回上报</a>";
 								}

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/view/reportedView.jsp

@@ -451,7 +451,7 @@
                     <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="archivesNo" readonly="true" placeholder="请输入咨询档案编号" htmlEscape="false"  class="form-control required layui-input number"/>
+                            <form:input path="archivesNo" readonly="true" placeholder="请输入咨询档案编号" htmlEscape="false"  class="form-control required layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">