项目上报功能

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

@@ -1926,7 +1926,10 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             if (String.valueOf(ProjectStatusEnum.REJECTED.getValue()).equals(reported.getReportStatus()) ){
                 comment = ("yes".equals(reported.getAct().getFlag())?"[重新申请] ":"[已撤销] ");
             }else {
-                comment = ("yes".equals(reported.getAct().getFlag())?"[同意] ":"[驳回] ")+ reported.getAct().getComment();
+                comment = ("yes".equals(reported.getAct().getFlag())?"[同意] ":"[驳回] ");
+                if(StringUtils.isNotBlank(reported.getAct().getComment())){
+                    comment += reported.getAct().getComment();
+                }
             }
             //yes 的时候状态为审核通过 否则为未通过
             //1 审核中 2 未通过
@@ -2018,14 +2021,14 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                         if ("yes".equals(reported.getAct().getFlag())) {
                             notifyRole = "审批通过";
                             workActivityProcess.setIsApproval("1");
-                            //处理上报数据
+                            /*//处理上报数据
                             Map<String,String> map  = RuralProjectReportedUtil.reportedDataManage(reported);
-                            str = MapToXmlUtil.getMapToXML(map);
+                            String mapStr = MapToXmlUtil.getMapToXML(map);
                             //进行上报
-                            String client = RuralProjectReportedUtil.client(str);
+                            String client = RuralProjectReportedUtil.client(mapStr);
                             if(!"Success".equals(client)){
                                 return "上报失败！";
-                            }
+                            }*/
                         } else {
                             notifyRole = "调整上报信息";
                             workActivityProcess.setIsApproval("2");

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

@@ -336,9 +336,16 @@ public class RuralCostProjectMessageController extends BaseController {
         }
         model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
         model.addAttribute("projectId", projectcontentinfo1.getProject().getId());
+        model.addAttribute("reportedId", projectcontentinfo.getReportedId());
         model.addAttribute("projectRecords", projectcontentinfo1.getProject());
         model.addAttribute("id", projectcontentinfo.getId());
         model.addAttribute("projectcontentinfo", projectcontent);
+        //获取是否含有上报信息
+        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReportedById(projectcontentinfo.getReportedId());
+        if(null != reported){
+            model.addAttribute("reportedView", 1);
+        }
+
         if (StringUtils.isNotBlank(projectcontentinfo.getView()) && projectcontentinfo.getView().contains("view")) {
             List<MainDictDetail> achievementTypes = DictUtils.getMainDictList("achievement_type");
             if(null != achievementTypes){
@@ -975,14 +982,147 @@ public class RuralCostProjectMessageController extends BaseController {
         return "modules/ruralprojectrecords/cost/reportedForm";
     }
 
+
+
+
     /**
-     * 保存报告归档
+     * 项目上报
+     * @param projectRecords
+     * @return
+     */
+    @RequestMapping(value = "reportedModify")
+    public String reportedModify(RuralProjectRecords projectRecords, Model model) {
+        //查询上报信息表中是否含有数据，没有则进行获取基础数据
+        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
+        ProcessInstance processInstance = actTaskService.getProcIns(reported.getProcessInstanceId());
+        if (processInstance!=null) {
+            Task taskInfok = actTaskService.getCurrentTaskInfo(processInstance);
+            Act act = new Act();
+            act.setTaskId(taskInfok.getId());
+            act.setTaskName(taskInfok.getName());
+            act.setTaskDefKey(taskInfok.getTaskDefinitionKey());
+            act.setProcDefId(taskInfok.getProcessDefinitionId());
+            act.setProcInsId(taskInfok.getProcessInstanceId());
+            act.setTask(taskInfok);
+            reported.setAct(act);
+        }
+        model.addAttribute("ruralProjectRecordsReported", reported);
+        return "modules/ruralprojectrecords/cost/reportedModify";
+    }
+
+    /**
+     * 保存报告并提交审核
+     * @param reported
+     * @param redirectAttributes
+     * @return
      */
     @RequestMapping(value = "saveReported")
-    public String saveReported(RuralProjectRecordsReported reported,  RedirectAttributes redirectAttributes) {
-        ruralProjectMessageService.saveReportedInfo(reported);
-        addMessage(redirectAttributes, "项目上报成功");
+    public String saveReported(RuralProjectRecordsReported reported,  RedirectAttributes redirectAttributes) throws Exception {
+        String str = "";
+        if(!reported.getIsNewRecord()){//编辑表单保存
+            ruralProjectMessageService.disposeList(reported);
+            RuralProjectRecordsReported t = ruralProjectMessageService.getRuralProjectRecordsReportedById(reported.getId());;//从数据库取出记录的值
+            MyBeanUtils.copyBeanNotNull2Bean(reported, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+            str = ruralProjectMessageService.saveReportedInfo(t);
+        }else{//新增表单保存
+            str = ruralProjectMessageService.saveReportedInfo(reported);
+        }
+
+
+        if (StringUtils.isNotBlank(str)){
+            addMessage(redirectAttributes, "项目上报失败:"+str);
+        }else {
+            addMessage(redirectAttributes, "项目上报成功");
+        }
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+    }
+
+    /**
+     * 读取单个实体流程
+     * @return
+     */
+    @RequestMapping(value = "getReportedProcess")
+    public String getReportedProcess(RuralProjectRecordsReported reported,Model model) {
+        model.addAttribute("processInstanceId", reported.getProcessInstanceId());
+        return "modules/workreimbursement/workReimbursementTrack";
+    }
+
+    @RequestMapping(value = "getReportedView")
+    public String getReportedView(RuralProjectRecordsReported reported,Model model){
+        model.addAttribute("projectId",reported.getProjectId());
+        reported = ruralProjectMessageService.getRuralProjectRecordsReported(reported.getId());
+        ruralProjectMessageService.getInfoByView(reported);
+        model.addAttribute("ruralProjectRecordsReported",reported);
+        model.addAttribute("reportedId",reported.getId());
+        return "modules/ruralprojectrecords/ruralporjectmessage/reportedView";
+    }
+
+    /**
+     * 报告归档：强制撤回
+     */
+    @RequestMapping("cancelInvalidateByReported")
+    public String cancelInvalidateByReported(RuralProjectRecordsReported reported,RedirectAttributes redirectAttributes){
+        reported = ruralProjectMessageService.getRuralProjectRecordsReportedById(reported.getId());
+        try {
+            if(reported.getReportStatus().equals("5")){
+                addMessage(redirectAttributes, "报告归档已审批通过，无法撤回");
+            }else{
+                if(reported.getReportStatus().equals("2")){
+                    ruralProjectMessageService.cancelInvalidateByReported(reported);
+                    addMessage(redirectAttributes, "强制撤回报告归档成功");
+                }else{
+                    addMessage(redirectAttributes, "报告归档不是送审状态，无法撤回");
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                }
+            }
+        }catch (Exception e){
+            addMessage(redirectAttributes, "强制撤回报告归档失败");
+        }
         return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
     }
 
+
+
+    /**
+     * 工单执行（完成任务）
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = "auditSaveReported")
+    public String auditSaveReported(RuralProjectRecordsReported reported, Model model,
+                                    RedirectAttributes redirectAttributes) {
+        try {
+            ruralProjectMessageService.disposeList(reported);
+            RuralProjectRecordsReported t = ruralProjectMessageService.getRuralProjectRecordsReportedById(reported.getId());;//从数据库取出记录的值
+            MyBeanUtils.copyBeanNotNull2Bean(reported, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+
+            String taskDefKey =  t.getAct().getTaskDefKey();
+            List<User> users = null;
+            if ("bmzr".equals(taskDefKey)){
+                users = UserUtils.getByProssType(t.getProcessInstanceId(),2);
+                if (users==null )
+                    users = UserUtils.getByRoleActivityEnname("sbglyyjla",3,t.getOffice().getId(),"4",t.getCreateBy());
+            }else if ("modifyApply".equals(taskDefKey)){
+                users = UserUtils.getByProssType(t.getProcessInstanceId(),1);
+            }
+
+            String flag = reported.getAct().getFlag();
+            if ("yes".equals(flag) && (users==null || users.size()==0)){
+                addMessage(redirectAttributes, "审批失败,审批人为空,请联系管理员！");
+            }else {
+                String str = ruralProjectMessageService.auditSaveReported(t, users);
+
+                addMessage(redirectAttributes, str);
+            }
+        }catch (Exception e){
+            addMessage(redirectAttributes, "公告流程审批失败");
+        }
+
+        if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
+            return "redirect:" + Global.getAdminPath() + "/home/?repage";
+        }else {
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+        }
+    }
+
 }

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

@@ -342,6 +342,12 @@ public class RuralProjectMessageController extends BaseController {
         model.addAttribute("projectRecords", projectcontentinfo1.getProject());
         model.addAttribute("id", projectcontentinfo.getId());
         model.addAttribute("projectcontentinfo", projectcontent);
+        //获取是否含有上报信息
+        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReportedById(projectcontentinfo.getReportedId());
+        if(null != reported){
+            model.addAttribute("reportedView", 1);
+        }
+
         if (StringUtils.isNotBlank(projectcontentinfo.getView()) && projectcontentinfo.getView().contains("view")) {
             List<MainDictDetail> achievementTypes = DictUtils.getMainDictList("achievement_type");
             if(null != achievementTypes){

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

@@ -11,6 +11,14 @@
 
 <body>
 <div class="single-form">
+	<c:if test="${reportedView==1}">
+		<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
+			<ul class="list-tabs" >
+				<li class="active"><a href="${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=${projectId}&view=view&reportedId=${reportedId}">报告详情</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectMessage/getReportedView?id=${reportedId}&projectId=${projectId}">上报信息详情</a></li>
+			</ul>
+		</div>
+	</c:if>
 	<div class="container${container}  view-form">
 		<form:form id="inputForm" modelAttribute="projectcontentinfo" action="${ctx}/ruralProject/ruralCostProjectMessage/reportAudit" method="post" class="form-horizontal">
 		<div class="form-group layui-row first lw12">

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

@@ -184,21 +184,21 @@
             if(ZiXunBDE != ''){
                 //判断土建造价的值
                 if(ZiXunBDETJ != ''){
-                    var CalTJPercent = (Math.round(parseInt(ZiXunBDETJ) / parseInt(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    var CalTJPercent = ((parseFloat(ZiXunBDETJ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
                     $("#CalTJPercent").val(CalTJPercent);
                 }else{
                     $("#CalTJPercent").val('');
                 }
                 //判断土建造价的值
                 if(ZiXunBDEAZ != ''){
-                    var CalAZPercent = (Math.round(parseInt(ZiXunBDEAZ) / parseInt(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    var CalAZPercent = ((parseFloat(ZiXunBDEAZ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
                     $("#CalAZPercent").val(CalAZPercent);
                 }else{
                     $("#CalAZPercent").val('');
                 }
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var CalZZJUnit = (Math.round(parseInt(ZiXunBDE) / parseInt(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJUnit = ((parseFloat(ZiXunBDE) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJUnit").val(CalZZJUnit);
                 }else{
                     $("#CalZZJUnit").val('');
@@ -208,42 +208,42 @@
             if(GCGMValue != ''){
                 //判断土建造价
                 if(ZiXunBDETJ != ''){
-                    var CalZZJTJUnit = (Math.round(parseInt(ZiXunBDETJ) / parseInt(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJTJUnit = ((parseFloat(ZiXunBDETJ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJTJUnit").val(CalZZJTJUnit);
                 }else{
                     $("#CalZZJTJUnit").val('');
                 }
                 //判断安装造价
                 if(ZiXunBDEAZ != ''){
-                    var CalZZJAZUnit = (Math.round(parseInt(ZiXunBDEAZ) / parseInt(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJAZUnit = ((parseFloat(ZiXunBDEAZ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJAZUnit").val(CalZZJAZUnit);
                 }else{
                     $("#CalZZJAZUnit").val('');
                 }
                 //判断钢材用量
                 if(GCYL != ''){
-                    var GCYLPerUnit = (Math.round(parseInt(GCYL) / parseInt(GCGMValue) * 100) * 10).toFixed(2);
+                    var GCYLPerUnit = ((parseFloat(GCYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
                     $("#GCYLPerUnit").val(GCYLPerUnit);
                 }else{
                     $("#GCYLPerUnit").val('');
                 }
                 //判断水泥用量
                 if(SNYL != ''){
-                    var SNYLPerUnit = (Math.round(parseInt(SNYL) / parseInt(GCGMValue) * 100) * 10).toFixed(2);
+                    var SNYLPerUnit = ((parseFloat(SNYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
                     $("#SNYLPerUnit").val(SNYLPerUnit);
                 }else{
                     $("#SNYLPerUnit").val('');
                 }
                 //判断预拌砼用量
                 if(YBTYL != ''){
-                    var YBTYLPerUnit = Math.round(parseInt(YBTYL) / parseInt(GCGMValue)).toFixed(2);
+                    var YBTYLPerUnit = (parseFloat(YBTYL) / parseFloat(GCGMValue)).toFixed(2);
                     $("#YBTYLPerUnit").val(YBTYLPerUnit);
                 }else{
                     $("#YBTYLPerUnit").val('');
                 }
                 //判断人工工日用量
                 if(RGGRYL != ''){
-                    var RGGRYLPerUnit = Math.round(parseInt(RGGRYL) / parseInt(GCGMValue)).toFixed(2);
+                    var RGGRYLPerUnit = (parseFloat(RGGRYL) / parseFloat(GCGMValue)).toFixed(2);
                     $("#RGGRYLPerUnit").val(RGGRYLPerUnit);
                 }else{
                     $("#RGGRYLPerUnit").val('');
@@ -253,14 +253,14 @@
             if(ZiXunBDETJ !=''){
                 //判断咨询标的额
                 if(ZiXunBDE != ''){
-                    var CalTJPercent = (Math.round(parseInt(ZiXunBDETJ) / parseInt(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    var CalTJPercent = ((parseFloat(ZiXunBDETJ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
                     $("#CalTJPercent").val(CalTJPercent);
                 }else{
                     $("#CalTJPercent").val('');
                 }
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var CalZZJTJUnit = (Math.round(parseInt(ZiXunBDETJ) / parseInt(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJTJUnit = ((parseFloat(ZiXunBDETJ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJTJUnit").val(CalZZJTJUnit);
                 }else{
                     $("#CalZZJTJUnit").val('');
@@ -270,14 +270,14 @@
             if(ZiXunBDEAZ !=''){
                 //判断咨询标的额
                 if(ZiXunBDE != ''){
-                    var CalAZPercent = (Math.round(parseInt(ZiXunBDEAZ) / parseInt(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    var CalAZPercent = ((parseFloat(ZiXunBDEAZ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
                     $("#CalAZPercent").val(CalAZPercent);
                 }else{
                     $("#CalAZPercent").val('');
                 }
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var CalZZJAZUnit = (Math.round(parseInt(ZiXunBDEAZ) / parseInt(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJAZUnit = ((parseFloat(ZiXunBDEAZ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJAZUnit").val(CalZZJAZUnit);
                 }else{
                     $("#CalZZJAZUnit").val('');
@@ -287,7 +287,7 @@
             if(GCYL !=''){
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var GCYLPerUnit = (Math.round(parseInt(GCYL) / parseInt(GCGMValue) * 100) * 10).toFixed(2);
+                    var GCYLPerUnit = ((parseFloat(GCYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
                     $("#GCYLPerUnit").val(GCYLPerUnit);
                 }else{
                     $("#GCYLPerUnit").val('');
@@ -297,7 +297,7 @@
             if(SNYL !=''){
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var SNYLPerUnit = (Math.round(parseInt(SNYL) / parseInt(GCGMValue) * 100) * 10).toFixed(2);
+                    var SNYLPerUnit = ((parseFloat(SNYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
                     $("#SNYLPerUnit").val(SNYLPerUnit);
                 }else{
                     $("#SNYLPerUnit").val('');
@@ -307,7 +307,7 @@
             if(YBTYL !=''){
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var YBTYLPerUnit = (Math.round(parseInt(YBTYL) / parseInt(GCGMValue) * 100) * 10).toFixed(2);
+                    var YBTYLPerUnit = (parseFloat(YBTYL) / parseFloat(GCGMValue)).toFixed(2);
                     $("#YBTYLPerUnit").val(YBTYLPerUnit);
                 }else{
                     $("#YBTYLPerUnit").val('');
@@ -317,7 +317,7 @@
             if(RGGRYL !=''){
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var RGGRYLPerUnit = Math.round(parseInt(RGGRYL) / parseInt(GCGMValue)).toFixed(2);
+                    var RGGRYLPerUnit = (parseFloat(RGGRYL) / parseFloat(GCGMValue)).toFixed(2);
                     $("#RGGRYLPerUnit").val(RGGRYLPerUnit);
                 }else{
                     $("#RGGRYLPerUnit").val('');
@@ -325,6 +325,25 @@
             }
         }
 
+
+        function JingHeJianValue() {
+            //送审价
+            var SongShenJia = $("#SongShenJia").val();
+            //审定价
+            var ShenDingJia = $("#ShenDingJia").val();
+            if(SongShenJia !='' && ShenDingJia != ''){
+                //审核增减额
+                var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
+                $("#JingHeJianE").val(JingHeJianE);
+                //审核增减率
+                var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+                $("#JingHeJianLv").val(JingHeJianLv);
+            }else{
+                $("#JingHeJianE").val('');
+                $("#JingHeJianLv").val('');
+            }
+        }
+
         function addRow(list, idx, tpl, row){
             // var idx1 = $("#workClientLinkmanList tr").length;
             idx +=1;
@@ -700,13 +719,13 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="SongShenJia" htmlEscape="false"  class="form-control required layui-input number"/>
+                        <form:input path="SongShenJia" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="ShenDingJia" htmlEscape="false"  class="form-control required layui-input number"/>
+                        <form:input path="ShenDingJia" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">

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

@@ -0,0 +1,961 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+    <title>项目管理</title>
+    <meta name="decorator" content="default"/>
+    <script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
+    <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"/>
+    <style>
+        #projectDesc-error{
+            left:0;
+            top:82px;
+        }
+        .layui-layer-dialog{
+            background: red;
+        }
+        td input{
+            height: 42px !important;
+        }
+        .disables {
+            pointer-events: none;
+        }
+        .notDisables {
+            pointer-events: all;
+        }
+        .forbidden{
+             background-color:#c2c2c2;
+         }
+
+        .notForbidden{
+             background-color:#3ca2e0;
+         }
+        .paddingDiv span{
+            padding-left: 28px;
+        }
+    </style>
+    <script type="text/javascript">
+        var validateForm;
+        var isMasterClient = true;//是否是委托方
+        var clientCount = 0;
+        function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+            if(validateForm.form()){
+                //咨询标的额
+                var ZiXunBDE = $("#ZiXunBDE").val();
+                if(ZiXunBDE!= undefined && ZiXunBDE!= '' && ZiXunBDE>=500){
+                    //人工工日用量
+                    var RGGRYL = $("#RGGRYL").val();
+                    var GCGMValue = $("#GCGMValue").val();
+                    if(RGGRYL== undefined || RGGRYL== null || RGGRYL == '' || RGGRYL == 0){
+                        parent.layer.msg("咨询标的额大于500万,请填写人工工日用量!", {icon: 5});
+                        return false;
+                    }
+                    if(GCGMValue== undefined || GCGMValue== null || GCGMValue == '' || GCGMValue == 0){
+                        parent.layer.msg("咨询标的额大于500万,建筑面积回魔必须大于0!", {icon: 5});
+                        return false;
+                    }
+                }
+                //咨询营业收入
+                var ZiXunShouRu = $("#ZiXunShouRu").val();
+                //审定价
+                var ShenDingJia = $("#ShenDingJia").val();
+                if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
+                    parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
+                    return false;
+                }
+                var list = [];
+                var size = $("#reportedConsultantList tr").length;
+                if(size>20){
+                    parent.layer.msg("咨询员数量不得超过20人!", {icon: 5});
+                    return false;
+                }
+                if(size>0){
+                    for (var i = 1;i<=50;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 team = $("#team").val()
+                var city = $("#city").val()
+                var county = $("#county").val()
+                if(team ==undefined || team == null || team == ''){
+                    parent.layer.msg("请选择工程所在省份!", {icon: 5});
+                    return false;
+                }
+                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;
+                }
+
+                var checkedCount = $('input[type=checkbox]:checked').length;
+                if(checkedCount == 0){
+                    parent.layer.msg("请选择咨询项目造价包含内容说明!", {icon: 5});
+                    return false;
+                }
+                $("#inputForm").submit();
+                return true;
+            }else{
+                parent.layer.msg("信息未填写完整!", {icon: 5});
+            }
+
+            return false;
+        }
+        $(document).ready(function() {
+            var radioVal ;
+            validateForm = $("#inputForm").validate({
+                submitHandler: function(form){
+                    loading('正在提交，请稍等...');
+                    form.submit();
+                },
+                errorContainer: "#messageBox",
+                errorPlacement: function(error, element) {
+                    $("#messageBox").text("输入有误，请先更正。");
+                    if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+                        error.appendTo(element.parent().parent());
+                    } else {
+                        error.insertAfter(element);
+                    }
+                }
+            });
+
+            if($("#FloorUp").val() == undefined || $("#FloorUp").val() == null || $("#FloorUp").val() == ''){
+                $("#FloorUp").val(0);
+            }
+            if($("#FloorDown").val() == undefined || $("#FloorDown").val() == null || $("#FloorDown").val() == ''){
+                $("#FloorDown").val(0);
+            }
+            if($("#ZiXunBDETJ").val() == undefined || $("#ZiXunBDETJ").val() == null || $("#ZiXunBDETJ").val() == ''){
+                $("#ZiXunBDETJ").val(0);
+            }
+            if($("#ZiXunBDEAZ").val() == undefined || $("#ZiXunBDEAZ").val() == null || $("#ZiXunBDEAZ").val() == ''){
+                $("#ZiXunBDEAZ").val(0);
+            }
+            if($("#GCYL").val() == undefined || $("#GCYL").val() == null || $("#GCYL").val() == ''){
+                $("#GCYL").val(0);
+            }
+            if($("#SNYL").val() == undefined || $("#SNYL").val() == null || $("#SNYL").val() == ''){
+                $("#SNYL").val(0);
+            }
+            if($("#YBTYL").val() == undefined || $("#YBTYL").val() == null || $("#YBTYL").val() == ''){
+                $("#YBTYL").val(0);
+            }
+            if($("#RGGRYL").val() == undefined || $("#RGGRYL").val() == null || $("#RGGRYL").val() == ''){
+                $("#RGGRYL").val(0);
+            }
+            if($("#GCYLPerUnit").val() == undefined || $("#GCYLPerUnit").val() == null || $("#GCYLPerUnit").val() == ''){
+                $("#GCYLPerUnit").val(0);
+            }
+            if($("#SNYLPerUnit").val() == undefined || $("#SNYLPerUnit").val() == null || $("#SNYLPerUnit").val() == ''){
+                $("#SNYLPerUnit").val(0);
+            }
+            if($("#YBTYLPerUnit").val() == undefined || $("#YBTYLPerUnit").val() == null || $("#YBTYLPerUnit").val() == ''){
+                $("#YBTYLPerUnit").val(0);
+            }
+            if($("#RGGRYLPerUnit").val() == undefined || $("#RGGRYLPerUnit").val() == null || $("#RGGRYLPerUnit").val() == ''){
+                $("#RGGRYLPerUnit").val(0);
+            }
+
+            //送审价
+            var SongShenJia = $("#SongShenJia").val();
+            //审定价
+            var ShenDingJia = $("#ShenDingJia").val();
+            if(SongShenJia !='' && ShenDingJia != ''){
+                //审核增减额
+                var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
+                $("#JingHeJianE").val(JingHeJianE);
+                //审核增减率
+                var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+                $("#JingHeJianLv").val(JingHeJianLv);
+            }else{
+                $("#JingHeJianE").val('');
+                $("#JingHeJianLv").val('');
+            }
+
+            laydate.render({
+                elem: '#BaoGaoShuQianFaDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+                type : 'date'
+                , trigger: 'click'
+                ,max: 38 //38天后
+            });
+
+
+            $('#city').html('<option value="${ruralProjectRecordsReported.s2}">${ruralProjectRecordsReported.city}</option>')
+            $('#county').html('<option value="${ruralProjectRecordsReported.s3}">${ruralProjectRecordsReported.county}</option>')
+            layui.form.render("select");
+
+        });
+
+        function ZiXunBDEChange(){
+            //咨询标的额
+            var ZiXunBDE = $("#ZiXunBDE").val();
+            //建筑面积或规模
+            var GCGMValue = $("#GCGMValue").val();
+            //土建造价
+            var ZiXunBDETJ = $("#ZiXunBDETJ").val();
+            //安装造价
+            var ZiXunBDEAZ = $("#ZiXunBDEAZ").val();
+            //钢材用量
+            var GCYL = $("#GCYL").val();
+            //水泥用量
+            var SNYL = $("#SNYL").val();
+            //预拌砼用量
+            var YBTYL = $("#YBTYL").val();
+            //人工工日用量
+            var RGGRYL = $("#RGGRYL").val();
+
+            //判断咨询标的额的值
+            if(ZiXunBDE != ''){
+                //判断土建造价的值
+                if(ZiXunBDETJ != ''){
+                    var CalTJPercent = ((parseFloat(ZiXunBDETJ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    $("#CalTJPercent").val(CalTJPercent);
+                }else{
+                    $("#CalTJPercent").val('');
+                }
+                //判断土建造价的值
+                if(ZiXunBDEAZ != ''){
+                    var CalAZPercent = ((parseFloat(ZiXunBDEAZ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    $("#CalAZPercent").val(CalAZPercent);
+                }else{
+                    $("#CalAZPercent").val('');
+                }
+                //判断建筑面积或规模
+                if(GCGMValue != ''){
+                    var CalZZJUnit = ((parseFloat(ZiXunBDE) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    $("#CalZZJUnit").val(CalZZJUnit);
+                }else{
+                    $("#CalZZJUnit").val('');
+                }
+            }
+            //判断建筑面积或规模
+            if(GCGMValue != ''){
+                //判断土建造价
+                if(ZiXunBDETJ != ''){
+                    var CalZZJTJUnit = ((parseFloat(ZiXunBDETJ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    $("#CalZZJTJUnit").val(CalZZJTJUnit);
+                }else{
+                    $("#CalZZJTJUnit").val('');
+                }
+                //判断安装造价
+                if(ZiXunBDEAZ != ''){
+                    var CalZZJAZUnit = ((parseFloat(ZiXunBDEAZ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    $("#CalZZJAZUnit").val(CalZZJAZUnit);
+                }else{
+                    $("#CalZZJAZUnit").val('');
+                }
+                //判断钢材用量
+                if(GCYL != ''){
+                    var GCYLPerUnit = ((parseFloat(GCYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
+                    $("#GCYLPerUnit").val(GCYLPerUnit);
+                }else{
+                    $("#GCYLPerUnit").val('');
+                }
+                //判断水泥用量
+                if(SNYL != ''){
+                    var SNYLPerUnit = ((parseFloat(SNYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
+                    $("#SNYLPerUnit").val(SNYLPerUnit);
+                }else{
+                    $("#SNYLPerUnit").val('');
+                }
+                //判断预拌砼用量
+                if(YBTYL != ''){
+                    var YBTYLPerUnit = (parseFloat(YBTYL) / parseFloat(GCGMValue)).toFixed(2);
+                    $("#YBTYLPerUnit").val(YBTYLPerUnit);
+                }else{
+                    $("#YBTYLPerUnit").val('');
+                }
+                //判断人工工日用量
+                if(RGGRYL != ''){
+                    var RGGRYLPerUnit = (parseFloat(RGGRYL) / parseFloat(GCGMValue)).toFixed(2);
+                    $("#RGGRYLPerUnit").val(RGGRYLPerUnit);
+                }else{
+                    $("#RGGRYLPerUnit").val('');
+                }
+            }
+            //判断土建造价
+            if(ZiXunBDETJ !=''){
+                //判断咨询标的额
+                if(ZiXunBDE != ''){
+                    var CalTJPercent = ((parseFloat(ZiXunBDETJ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    $("#CalTJPercent").val(CalTJPercent);
+                }else{
+                    $("#CalTJPercent").val('');
+                }
+                //判断建筑面积或规模
+                if(GCGMValue != ''){
+                    var CalZZJTJUnit = ((parseFloat(ZiXunBDETJ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    $("#CalZZJTJUnit").val(CalZZJTJUnit);
+                }else{
+                    $("#CalZZJTJUnit").val('');
+                }
+            }
+            //判断安装造价
+            if(ZiXunBDEAZ !=''){
+                //判断咨询标的额
+                if(ZiXunBDE != ''){
+                    var CalAZPercent = ((parseFloat(ZiXunBDEAZ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    $("#CalAZPercent").val(CalAZPercent);
+                }else{
+                    $("#CalAZPercent").val('');
+                }
+                //判断建筑面积或规模
+                if(GCGMValue != ''){
+                    var CalZZJAZUnit = ((parseFloat(ZiXunBDEAZ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    $("#CalZZJAZUnit").val(CalZZJAZUnit);
+                }else{
+                    $("#CalZZJAZUnit").val('');
+                }
+            }
+            //判断钢材用量
+            if(GCYL !=''){
+                //判断建筑面积或规模
+                if(GCGMValue != ''){
+                    var GCYLPerUnit = ((parseFloat(GCYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
+                    $("#GCYLPerUnit").val(GCYLPerUnit);
+                }else{
+                    $("#GCYLPerUnit").val('');
+                }
+            }
+            //判断水泥用量
+            if(SNYL !=''){
+                //判断建筑面积或规模
+                if(GCGMValue != ''){
+                    var SNYLPerUnit = ((parseFloat(SNYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
+                    $("#SNYLPerUnit").val(SNYLPerUnit);
+                }else{
+                    $("#SNYLPerUnit").val('');
+                }
+            }
+            //判断预拌砼用量
+            if(YBTYL !=''){
+                //判断建筑面积或规模
+                if(GCGMValue != ''){
+                    var YBTYLPerUnit = ((parseFloat(YBTYL) / parseFloat(GCGMValue))).toFixed(2);
+                    $("#YBTYLPerUnit").val(YBTYLPerUnit);
+                }else{
+                    $("#YBTYLPerUnit").val('');
+                }
+            }
+            //判断人工工日用量
+            if(RGGRYL !=''){
+                //判断建筑面积或规模
+                if(GCGMValue != ''){
+                    var RGGRYLPerUnit = (parseFloat(RGGRYL) / parseFloat(GCGMValue)).toFixed(2);
+                    $("#RGGRYLPerUnit").val(RGGRYLPerUnit);
+                }else{
+                    $("#RGGRYLPerUnit").val('');
+                }
+            }
+        }
+
+        function JingHeJianValue() {
+            //送审价
+            var SongShenJia = $("#SongShenJia").val();
+            //审定价
+            var ShenDingJia = $("#ShenDingJia").val();
+            if(SongShenJia !='' && ShenDingJia != ''){
+                //审核增减额
+                var JingHeJianE = parseFloat(ShenDingJia) - parseFloat(SongShenJia);
+                $("#JingHeJianE").val(JingHeJianE);
+                //审核增减率
+                var JingHeJianLv =(parseFloat(ShenDingJia) - parseFloat(SongShenJia)) * 100 / parseFloat(SongShenJia);
+                $("#JingHeJianLv").val(JingHeJianLv);
+            }else{
+                $("#JingHeJianE").val('');
+                $("#JingHeJianLv").val('');
+            }
+        }
+
+        function addRow(list, idx, tpl, row){
+            // var idx1 = $("#workClientLinkmanList tr").length;
+            idx +=1;
+            bornTemplete(list, idx, tpl, row, idx);
+        }
+
+        function bornTemplete(list, idx, tpl, row, idx1){
+            $(list).append(Mustache.render(tpl, {
+                idx: idx, delBtn: true, row: row,
+                order:idx1 + 1
+            }));
+            $(list+idx).find("select").each(function(){
+                $(this).val($(this).attr("data-value"));
+            });
+            $(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
+                var ss = $(this).attr("data-value").split(',');
+                for (var i=0; i<ss.length; i++){
+                    if($(this).val() == ss[i]){
+                        $(this).attr("checked","checked");
+                    }
+                }
+            });
+        }
+
+        function delEntrustRow(obj, prefix){
+            var id = $(prefix+"_id");
+            var delFlag = $(prefix+"_delFlag");
+            $(obj).parent().parent().remove();
+        }
+
+        function delRow(obj, prefix){
+            var id = $(prefix+"_id");
+            var delFlag = $(prefix+"_delFlag");
+            $(obj).parent().parent().remove();
+        }
+        function formatNum(obj) {
+            var val = $(obj).val();
+            if(val==null||val==''|| isNaN(val))return;
+            var money = parseFloat((val + "").replace(/[^\d\.-]/g, "")).toFixed(2) + "";
+            var l = money.split(".")[0].split("").reverse(),
+                r = money.split(".")[1];
+            t = "";
+            for(i = 0; i < l.length; i ++ )
+            {
+                t += l[i] + ((i + 1) % 3 == 0 && (i + 1) != l.length ? "," : "");
+            }
+            $(obj).val(t.split("").reverse().join("") + "." + r);
+        }
+
+
+
+        function setTaxMoney(obj){
+            var a = $(obj).attr("id");
+            //咨询营业收入
+            var mv = $("#ZiXunShouRu").val();
+            var m = parseFloat(mv)* 10000;
+
+            var t2 = $("#" +  a ).val();
+
+            //完成营业收入
+            var t = a.replace('wcyysrbl','wcyysr');
+            if(!/^\d+(\.\d{1,4})?$/.test( t2 )){
+                $("#" +  t ).val("");
+                parent.layer.msg("请填写正确完成营业收入比例",{icon:5});
+                return;
+            }else {
+                var wcyysr = m * t2 /100;
+                $("#" +  t ).val(parseFloat(wcyysr.toFixed(2)));
+            }
+        }
+
+        function zxChange() {
+            //咨询营业收入
+            var mv = $("#ZiXunShouRu").val();
+            if(!/^\d+(\.\d{1,4})?$/.test( mv )){
+                $("#" +  t ).val("");
+                parent.layer.msg("请填写正确的咨询营业收入",{icon:5});
+                return;
+            }
+            var m = parseFloat(mv)* 10000;
+            var size = $("#reportedConsultantList tr").length;
+            if(size>0){
+                for (var i = 1;i<=50;i++){
+                    var wcyysrbl = $("#reportedConsultantList"+i+"_wcyysrbl").val();
+
+                    if(wcyysrbl != undefined && wcyysrbl!=''){
+                        var wcyysr = m * wcyysrbl /100;
+                        $("#reportedConsultantList"+i+"_wcyysr").val(wcyysr);
+                    }
+                }
+            }
+        }
+    </script>
+</head>
+<body>
+<div class="single-form">
+    <div class="container">
+        <sys:message content="${message}"/>
+        <form:form id="inputForm" modelAttribute="ruralProjectRecordsReported" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralCostProjectMessage/auditSaveReported" method="post" class="form-horizontal layui-form">
+            <form:hidden path="id"/>
+            <form:hidden path="projectId"/>
+            <form:hidden path="act.taskId"/>
+            <form:hidden path="act.taskName"/>
+            <form:hidden path="act.taskDefKey"/>
+            <form:hidden path="act.procInsId"/>
+            <form:hidden path="act.procDefId"/>
+            <form:hidden id="flag" path="act.flag"/>
+            <form:hidden path="home"/>
+            <form:hidden path="workContractInfo.client.id" id="contractClientId" value="${workContractInfo.client.id}"/>
+            <input type="hidden" id="flagFile" value="">
+
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>项目信息</h2></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="ProjectName" htmlEscape="false"  class="form-control layui-input required"/>
+                    </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">
+                        <sys:treeselect id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
+                                        title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label"><span class="require-item">*</span>委托单位：</label>
+                    <div class="layui-input-block">
+                        <form:input path="WeiTuoDW" htmlEscape="false"  class="form-control layui-input required"/>
+                    </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" htmlEscape="false"  class="form-control layui-input required"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label"><span class="require-item">*</span>投资性质：</label>
+                    <div class="layui-input-block">
+                        <form:select path="TouZiXZ" class="form-control layui-input required simple-select">
+                            <form:options items="${fns:getMainDictList('TouZiXZ')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </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:select path="ProjectType" class="form-control layui-input required simple-select">
+                            <form:options items="${fns:getMainDictList('ProjectType')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>
+                    <div class="layui-input-block">
+                        <form:select path="HeTongLeiXing" class="form-control layui-input required simple-select">
+                            <form:options items="${fns:getMainDictList('HeTongLeiXing')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
+                    <div class="layui-input-block">
+                        <form:input path="ZiXunHTBH" htmlEscape="false"  class="form-control layui-input required"/>
+                    </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" htmlEscape="false"  class="form-control layui-input required"/>
+                    </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" htmlEscape="false"  class="laydate-icondate required 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" htmlEscape="false" onchange="zxChange()" class="form-control required layui-input"/>
+                    </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="zaoJiaShiZhengHao" htmlEscape="false"  class="form-control required layui-input"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>咨询员</h2></div>
+                <div class="layui-item layui-col-sm12 lw6">
+                    <div class="layui-item nav-btns">
+                        <div class="layui-item nav-btns" style="padding-left:0px;">
+                            <a class="nav-btn nav-btn-add"
+                               onclick="addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTpl);workClientBankRowIdx = workClientBankRowIdx + 1;"
+                               title="新增"><i class="fa fa-plus"></i> 新增</a>
+                        </div>
+                        <table id="bankinfo" class="table table-bordered table-condensed can-edit">
+                            <thead>
+                            <tr>
+                                <th width="60px">编号</th>
+                                <th >咨询员名称</th>
+                                <th >注册/资格证号</th>
+                                <th >本人负责内容</th>
+                                <th >完成营业收入比例（%）</th>
+                                <th >完成营业收入（元）</th>
+                                <th width="100px">操作</th>
+                            </tr>
+                            </thead>
+                            <tbody id="reportedConsultantList">
+
+                            </tbody>
+                        </table>
+                        <script type="text/template" id="workClientBankTpl">//<!--
+                                <tr id="reportedConsultantList{{idx}}">
+                                    <td class="hide">
+                                        <input id="reportedConsultantList{{idx}}_id" name="reportedConsultantList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+                                        <input id="reportedConsultantList{{idx}}_delFlag" name="reportedConsultantList[{{idx}}].delFlag" type="hidden" value="0"/>
+                                        <input id="reportedConsultantList{{idx}}_remindId" name="reportedConsultantList[{{idx}}].remindId" type="hidden" value="{{row.remindId}}"/>
+                                    </td>
+
+                                    <td width="60px">
+                                        <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
+                                    </td>
+                                    <td>
+                                        <sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+                                            title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                    </td>
+
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
+                                    </td>
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_wordnr"  name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
+                                    </td>
+
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_wcyysrbl" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysrbl" value="{{row.wcyysrbl}}" class="form-control number required"/>
+                                    </td>
+
+                                    <td>
+                                        <input id="reportedConsultantList{{idx}}_wcyysr"  name="reportedConsultantList[{{idx}}].wcyysr" value="{{row.wcyysr}}" class="form-control number required"/>
+                                    </td>
+
+                                    <td class="text-center op-td" width="10">
+                                        {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}
+                                    </td>
+                                </tr>//-->
+                        </script>
+                    </div>
+                </div>
+            </div>
+
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>项目信息</h2></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">
+                        <select name="s1" id="team" lay-verify="required" lay-filter="cityfilter">
+                            <option value=""></option>
+                            <option value="1" <c:if test="${ruralProjectRecordsReported.s1=='1'}">selected</c:if>>江苏省</option>
+                            <option value="2" <c:if test="${ruralProjectRecordsReported.s1=='2'}">selected</c:if>>外省</option>
+                        </select>
+                    </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">
+                        <select id="city" name="s2" value="${city}" lay-verify="required" lay-filter="quyufilter"></select>
+                    </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">
+                        <select id="county" name="s3" value="${county}" lay-verify="required" lay-filter="countyfilter"></select>
+                    </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:select path="PorjectStruct" class="form-control layui-input required simple-select">
+                            <form:options items="${fns:getMainDictList('PorjectStruct')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label">地上层数：</label>
+                    <div class="layui-input-block">
+                        <form:input path="FloorUp" htmlEscape="false"  class="form-control layui-input number"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label">底下层数：</label>
+                    <div class="layui-input-block">
+                        <form:input path="FloorDown" htmlEscape="false"  class="form-control 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">
+                        <form:input path="GCGMValue" htmlEscape="false"  class="form-control layui-input required number" onchange="ZiXunBDEChange()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label"><span class="require-item">*</span>计量单位：</label>
+                    <div class="layui-input-block">
+                        <form:select path="GCGMUnit" class="form-control layui-input required simple-select">
+                            <form:options items="${fns:getMainDictList('GCGM_Unit')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label"><span class="require-item">*</span>工程用途：</label>
+                    <div class="layui-input-block">
+                        <form:select path="PorjectUse" class="form-control layui-input required simple-select">
+                            <form:options items="${fns:getMainDictList('PorjectUse')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </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="ZiXunBDE" htmlEscape="false" class="form-control required layui-input number" onchange="ZiXunBDEChange()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line">其中土建造价(万元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="ZiXunBDETJ" htmlEscape="false" class="form-control layui-input" onchange="ZiXunBDEChange()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line">其中安装造价(万元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="ZiXunBDEAZ" htmlEscape="false" class="form-control layui-input" onchange="ZiXunBDEChange()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line">其中土建百分比(%)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="CalTJPercent" htmlEscape="false" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line">其中安装百分比(%)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="CalAZPercent" htmlEscape="false" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line">单位造价(元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="CalZZJUnit" htmlEscape="false" readonly="true" class="form-control layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line">其中土建单位造价(元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="CalZZJTJUnit" htmlEscape="false" readonly="true" class="form-control layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line">其中装修单位造价(元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="CalZZJAZUnit" htmlEscape="false" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label">合同价(元)：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input path="HeTongJia" htmlEscape="false"  class="form-control layui-input number"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input path="SongShenJia" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input path="ShenDingJia" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line">审核增减额(元)：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input path="JingHeJianE" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line">审核增减率(%)：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input path="JingHeJianLv" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>主要材料和人工消耗量指标</h2></div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label">钢材用量(t)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="GCYL" htmlEscape="false" class="form-control layui-input number" onchange="ZiXunBDEChange()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label">水泥用量(t)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="SNYL" htmlEscape="false" class="form-control layui-input number" onchange="ZiXunBDEChange()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line">预拌砼用量(m³)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="YBTYL" htmlEscape="false" class="form-control layui-input number" onchange="ZiXunBDEChange()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line">人工工日用量(工日)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="RGGRYL" htmlEscape="false" class="form-control layui-input number" onchange="ZiXunBDEChange()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line">钢材消耗指标(kg)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="GCYLPerUnit" htmlEscape="false" class="form-control layui-input number" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line">水泥消耗指标(kg)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="SNYLPerUnit" htmlEscape="false" class="form-control layui-input number" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line">预拌砼消耗指标(m³)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="YBTYLPerUnit" htmlEscape="false" class="form-control layui-input number" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line">人工工日消耗指标(工日)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="RGGRYLPerUnit" htmlEscape="false" class="form-control layui-input number" readonly="true"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="form-group layui-row first lw9">
+                <div class="form-group-label"><h2>咨询项目造价包含内容说明</h2></div>
+
+                <div class="layui-item layui-col-sm12 lw6">
+                    <label class="layui-form-label">土建工程：</label>
+                    <div class="layui-input-block paddingDiv">
+                        <form:checkboxes path="TJProjectList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="false" items="${fns:getMainDictList('civil_project')}" />
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm12 lw6">
+                    <label class="layui-form-label">装饰工程：</label>
+                    <div class="layui-input-block paddingDiv">
+                        <form:checkboxes path="ZSProjectList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="false" items="${fns:getMainDictList('decorate_project')}" />
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm12 lw6">
+                    <label class="layui-form-label">安装工程：</label>
+                    <div class="layui-input-block paddingDiv">
+                        <form:checkboxes path="AZProjectList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="false" items="${fns:getMainDictList('install_project')}" />
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm12 lw6">
+                    <label class="layui-form-label">市政工程：</label>
+                    <div class="layui-input-block paddingDiv">
+                        <form:checkboxes path="SZProjectList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="false" items="${fns:getMainDictList('services_project')}" />
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm12 lw6">
+                    <label class="layui-form-label">仿古园林工程：</label>
+                    <div class="layui-input-block paddingDiv">
+                        <form:checkboxes path="FGYLProjectList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="false" items="${fns:getMainDictList('park_project')}" />
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm12 lw6 with-textarea">
+                    <label class="layui-form-label double-line">其他专业工程咨询项目造价包含内容说明：</label>
+                    <div class="layui-input-block">
+                        <form:textarea path="QTProjec" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="form-group layui-row page-end"></div>
+        </form:form>
+    </div>
+</div>
+
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script>
+
+    layui.use(['table','form'], function(){
+
+        var form = layui.form;
+        form.render();
+
+        layui.form.on('select(cityfilter)',function(data) {
+            if (data.value == "") {
+                $('#city').html('<option value="">请选择工程所在地级市</option>');
+                $('#county').html('<option value="">请选择工程所在区县</option>')
+                layui.form.render("select");
+            } else {
+                $('#city').html('<option value="">请选择工程所在地级市</option>')
+                $('#county').html('<option value="">请选择工程所在区县</option>')
+                $.ajax({
+                    type:"post",
+                    url:'${ctx}/ruralProject/ruralProjectMessage/getArea',
+                    data:{"id":data.value},
+                    dataType:"json",
+                    async: false,
+                    success:function(data){
+                        if(data.success) {
+                            for (var info in data.data){
+                                $('#city').append(new Option(data.data[info].name,data.data[info].id));
+                            }
+                        }
+                    }
+                })
+                layui.form.render("select");
+            }
+        });
+
+        layui.form.on('select(quyufilter)',function(data) {
+            if (data.value == "") {
+                $('#county').html('<option value="">请选择工程所在区县</option>');
+                layui.form.render("select");
+            } else {
+                $('#county').html('<option value="">请选择工程所在区县</option>')
+                $.ajax({
+                    type:"post",
+                    url:'${ctx}/ruralProject/ruralProjectMessage/getArea',
+                    data:{"id":data.value},
+                    dataType:"json",
+                    async: false,
+                    success:function(data){
+                        if(data.success) {
+                            for (var info in data.data){
+                                $('#county').append(new Option(data.data[info].name,data.data[info].id));
+                            }
+                        }
+                    }
+                })
+                layui.form.render("select");
+            }
+        });
+
+    })
+</script>
+<script type="text/javascript">
+    var workClientBankRowIdx = 0,
+        workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
+    $(document).ready(function () {
+        var dataBank = ${fns:toJson(ruralProjectRecordsReported.reportedConsultantList)};
+        for (var i = 0; i < dataBank.length; i++) {
+            addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);
+            workClientBankRowIdx = workClientBankRowIdx + 1;
+        }
+    });
+
+</script>
+</body>
+</html>

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

@@ -283,7 +283,7 @@
                 // {checkbox: true, fixed: true},
                 {field:'index',align:'center', fixed: 'left', title: '序号',width:40}
 				,{field:'projectReportNumber',align:'center', fixed: 'left', title: '报告号',minWidth:180,templet:function(d){
-						return "<a class=\"attention-info\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=view','95%', '95%')\">" + d.projectReportNumber + "</a>";
+						return "<a class=\"attention-info\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','95%', '95%')\">" + d.projectReportNumber + "</a>";
 					}}
                 ,{field:'projName',align:'center', title: '项目名称', fixed: 'left',minWidth:200,templet:function(d){
                         return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralCostProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
@@ -323,7 +323,7 @@
 				,{align:'center', title: '上报状态',  width:90,templet:function(d){
 						var st = getReportedState(d.reportedState);
 						if(st.action)
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						else
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
@@ -395,13 +395,21 @@
 						if(d.projectReportRecordStatus == 5 || d.projectReportStatus == 5){
 							if(d.syncStatus == 0){
 								if(d.reportStatus == 0){
-									if(d.reportedState == 0 || d.reportedState == 6){
+									if(d.reportedAdd != undefined && d.reportedAdd =="1"){
 										xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"op-btn op-btn-delete\" ><i class=\"fa fa-plus\"></i> 上报</a>";
 									}
 								}else{
-									if(d.reportedState == 2){
+									if(d.reportedRecall != undefined && d.reportedRecall =="1"){
+										xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateByReported?id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回上报</a>";
+									}
+									/*撤回修改*/
+									if(d.reportedUpdate != undefined && d.reportedUpdate =="1"){
 										xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改上报</a>";
 									}
+									/*驳回修改*/
+									if(d.reportedModify != undefined && d.reportedModify =="1"){
+										xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改上报</a>";
+									}
 								}
 							}
 						}
@@ -434,6 +442,7 @@
                     ,"projectReportStatus":"${projectRecords.projectReportStatus}"
                     ,"projectReportRecordStatus":"${projectRecords.projectReportRecordStatus}"
                     ,"prrProcessInstanceId":"${projectRecords.prrProcessInstanceId}"
+					,"reportedProcessInstanceId":"${projectRecords.reportedProcessInstanceId}"
                     ,"prrId":"${projectRecords.prrId}"
                     ,"procId":"${projectRecords.processInstanceId}"
 					,"projectReportName":"${projectRecords.projectReportName}"
@@ -486,6 +495,29 @@
                                 <c:when test="${projectRecords.projectReportRecordStatus == 2 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
                             <c:otherwise>"0"</c:otherwise>
                             </c:choose>
+                            ,"reportedAdd":<c:choose>
+                                <c:when test="${(projectRecords.reportedState == 0 || rojectRecords.reportedState == 6) && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
+                            <c:otherwise>"0"</c:otherwise>
+                            </c:choose>
+                            ,"reportedRecall":<c:choose>
+                                <c:when test="${projectRecords.reportedState == 2 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
+                            <c:otherwise>"0"</c:otherwise>
+                            </c:choose>
+                            ,"reportedUpdate":<c:choose>
+                                <c:when test="${projectRecords.reportedState == 3 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
+                            <c:otherwise>"0"</c:otherwise>
+                            </c:choose>
+                            ,"reportedModify":<c:choose>
+                                <c:when test="${projectRecords.reportedState == 4 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
+                            <c:otherwise>"0"</c:otherwise>
+                            </c:choose>
+
+
+
+
+
+
+
                         </c:when>
                     <c:otherwise>
                     ,"canAdd":"0"
@@ -498,6 +530,10 @@
                     ,"recordedit2":"0"
                     ,"recordrecall":"0"
                     ,"recordcancel":"0"
+					,"reportedAdd":"0"
+					,"reportedRecall":"0"
+					,"reportedUpdate":"0"
+					,"reportedModify":"0"
                     </c:otherwise>
                     </c:choose>
 					,"deleteAdmin":<c:choose><c:when test="${'1' == projectRecords.flagAdmin && projectRecords.projectReportStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>

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

@@ -11,12 +11,14 @@
 
 <body>
 <div class="single-form">
-	<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
-		<ul class="list-tabs" >
-			<li class="active"><a href="${ctx}/ruralProject/ruralProjectMessage/modify?projectId=${projectId}&view=view&reportedId=${reportedId}">报告详情</a></li>
-			<li><a href="${ctx}/ruralProject/ruralProjectMessage/getReportedView?id=${reportedId}&projectId=${projectId}">上报信息详情</a></li>
-		</ul>
-	</div>
+	<c:if test="${reportedView==1}">
+		<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
+			<ul class="list-tabs" >
+				<li class="active"><a href="${ctx}/ruralProject/ruralProjectMessage/modify?projectId=${projectId}&view=view&reportedId=${reportedId}">报告详情</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectMessage/getReportedView?id=${reportedId}&projectId=${projectId}">上报信息详情</a></li>
+			</ul>
+		</div>
+	</c:if>
 	<div class="container${container}  view-form">
 		<form:form id="inputForm" modelAttribute="projectcontentinfo" action="${ctx}/ruralProject/ruralProjectMessage/reportAudit" method="post" class="form-horizontal">
 		<div class="form-group layui-row first lw12">

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

@@ -229,21 +229,21 @@
             if(ZiXunBDE != ''){
                 //判断土建造价的值
                 if(ZiXunBDETJ != ''){
-                    var CalTJPercent = (Math.round(parseFloat(ZiXunBDETJ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    var CalTJPercent = ((parseFloat(ZiXunBDETJ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
                     $("#CalTJPercent").val(CalTJPercent);
                 }else{
                     $("#CalTJPercent").val('');
                 }
                 //判断土建造价的值
                 if(ZiXunBDEAZ != ''){
-                    var CalAZPercent = (Math.round(parseFloat(ZiXunBDEAZ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    var CalAZPercent = ((parseFloat(ZiXunBDEAZ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
                     $("#CalAZPercent").val(CalAZPercent);
                 }else{
                     $("#CalAZPercent").val('');
                 }
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var CalZZJUnit = (Math.round(parseFloat(ZiXunBDE) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJUnit = ((parseFloat(ZiXunBDE) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJUnit").val(CalZZJUnit);
                 }else{
                     $("#CalZZJUnit").val('');
@@ -253,42 +253,42 @@
             if(GCGMValue != ''){
                 //判断土建造价
                 if(ZiXunBDETJ != ''){
-                    var CalZZJTJUnit = (Math.round(parseFloat(ZiXunBDETJ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJTJUnit = ((parseFloat(ZiXunBDETJ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJTJUnit").val(CalZZJTJUnit);
                 }else{
                     $("#CalZZJTJUnit").val('');
                 }
                 //判断安装造价
                 if(ZiXunBDEAZ != ''){
-                    var CalZZJAZUnit = (Math.round(parseFloat(ZiXunBDEAZ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJAZUnit = ((parseFloat(ZiXunBDEAZ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJAZUnit").val(CalZZJAZUnit);
                 }else{
                     $("#CalZZJAZUnit").val('');
                 }
                 //判断钢材用量
                 if(GCYL != ''){
-                    var GCYLPerUnit = (Math.round(parseFloat(GCYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
+                    var GCYLPerUnit = ((parseFloat(GCYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
                     $("#GCYLPerUnit").val(GCYLPerUnit);
                 }else{
                     $("#GCYLPerUnit").val('');
                 }
                 //判断水泥用量
                 if(SNYL != ''){
-                    var SNYLPerUnit = (Math.round(parseFloat(SNYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
+                    var SNYLPerUnit = ((parseFloat(SNYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
                     $("#SNYLPerUnit").val(SNYLPerUnit);
                 }else{
                     $("#SNYLPerUnit").val('');
                 }
                 //判断预拌砼用量
                 if(YBTYL != ''){
-                    var YBTYLPerUnit = Math.round(parseFloat(YBTYL) / parseFloat(GCGMValue)).toFixed(2);
+                    var YBTYLPerUnit = (parseFloat(YBTYL) / parseFloat(GCGMValue)).toFixed(2);
                     $("#YBTYLPerUnit").val(YBTYLPerUnit);
                 }else{
                     $("#YBTYLPerUnit").val('');
                 }
                 //判断人工工日用量
                 if(RGGRYL != ''){
-                    var RGGRYLPerUnit = Math.round(parseFloat(RGGRYL) / parseFloat(GCGMValue)).toFixed(2);
+                    var RGGRYLPerUnit = (parseFloat(RGGRYL) / parseFloat(GCGMValue)).toFixed(2);
                     $("#RGGRYLPerUnit").val(RGGRYLPerUnit);
                 }else{
                     $("#RGGRYLPerUnit").val('');
@@ -298,14 +298,14 @@
             if(ZiXunBDETJ !=''){
                 //判断咨询标的额
                 if(ZiXunBDE != ''){
-                    var CalTJPercent = (Math.round(parseFloat(ZiXunBDETJ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    var CalTJPercent = ((parseFloat(ZiXunBDETJ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
                     $("#CalTJPercent").val(CalTJPercent);
                 }else{
                     $("#CalTJPercent").val('');
                 }
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var CalZZJTJUnit = (Math.round(parseFloat(ZiXunBDETJ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJTJUnit = ((parseFloat(ZiXunBDETJ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJTJUnit").val(CalZZJTJUnit);
                 }else{
                     $("#CalZZJTJUnit").val('');
@@ -315,14 +315,14 @@
             if(ZiXunBDEAZ !=''){
                 //判断咨询标的额
                 if(ZiXunBDE != ''){
-                    var CalAZPercent = (Math.round(parseFloat(ZiXunBDEAZ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    var CalAZPercent = ((parseFloat(ZiXunBDEAZ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
                     $("#CalAZPercent").val(CalAZPercent);
                 }else{
                     $("#CalAZPercent").val('');
                 }
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var CalZZJAZUnit = (Math.round(parseFloat(ZiXunBDEAZ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJAZUnit = ((parseFloat(ZiXunBDEAZ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJAZUnit").val(CalZZJAZUnit);
                 }else{
                     $("#CalZZJAZUnit").val('');
@@ -332,7 +332,7 @@
             if(GCYL !=''){
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var GCYLPerUnit = (Math.round(parseFloat(GCYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
+                    var GCYLPerUnit = ((parseFloat(GCYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
                     $("#GCYLPerUnit").val(GCYLPerUnit);
                 }else{
                     $("#GCYLPerUnit").val('');
@@ -342,7 +342,7 @@
             if(SNYL !=''){
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var SNYLPerUnit = (Math.round(parseFloat(SNYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
+                    var SNYLPerUnit = ((parseFloat(SNYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
                     $("#SNYLPerUnit").val(SNYLPerUnit);
                 }else{
                     $("#SNYLPerUnit").val('');
@@ -352,7 +352,7 @@
             if(YBTYL !=''){
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var YBTYLPerUnit = (Math.round(parseFloat(YBTYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
+                    var YBTYLPerUnit = ((parseFloat(YBTYL) / parseFloat(GCGMValue))).toFixed(2);
                     $("#YBTYLPerUnit").val(YBTYLPerUnit);
                 }else{
                     $("#YBTYLPerUnit").val('');
@@ -362,7 +362,7 @@
             if(RGGRYL !=''){
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var RGGRYLPerUnit = Math.round(parseFloat(RGGRYL) / parseFloat(GCGMValue)).toFixed(2);
+                    var RGGRYLPerUnit = (parseFloat(RGGRYL) / parseFloat(GCGMValue)).toFixed(2);
                     $("#RGGRYLPerUnit").val(RGGRYLPerUnit);
                 }else{
                     $("#RGGRYLPerUnit").val('');

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

@@ -225,21 +225,21 @@
             if(ZiXunBDE != ''){
                 //判断土建造价的值
                 if(ZiXunBDETJ != ''){
-                    var CalTJPercent = (Math.round(parseFloat(ZiXunBDETJ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    var CalTJPercent = ((parseFloat(ZiXunBDETJ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
                     $("#CalTJPercent").val(CalTJPercent);
                 }else{
                     $("#CalTJPercent").val('');
                 }
                 //判断土建造价的值
                 if(ZiXunBDEAZ != ''){
-                    var CalAZPercent = (Math.round(parseFloat(ZiXunBDEAZ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    var CalAZPercent = ((parseFloat(ZiXunBDEAZ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
                     $("#CalAZPercent").val(CalAZPercent);
                 }else{
                     $("#CalAZPercent").val('');
                 }
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var CalZZJUnit = (Math.round(parseFloat(ZiXunBDE) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJUnit = ((parseFloat(ZiXunBDE) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJUnit").val(CalZZJUnit);
                 }else{
                     $("#CalZZJUnit").val('');
@@ -249,42 +249,42 @@
             if(GCGMValue != ''){
                 //判断土建造价
                 if(ZiXunBDETJ != ''){
-                    var CalZZJTJUnit = (Math.round(parseFloat(ZiXunBDETJ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJTJUnit = ((parseFloat(ZiXunBDETJ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJTJUnit").val(CalZZJTJUnit);
                 }else{
                     $("#CalZZJTJUnit").val('');
                 }
                 //判断安装造价
                 if(ZiXunBDEAZ != ''){
-                    var CalZZJAZUnit = (Math.round(parseFloat(ZiXunBDEAZ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJAZUnit = ((parseFloat(ZiXunBDEAZ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJAZUnit").val(CalZZJAZUnit);
                 }else{
                     $("#CalZZJAZUnit").val('');
                 }
                 //判断钢材用量
                 if(GCYL != ''){
-                    var GCYLPerUnit = (Math.round(parseFloat(GCYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
+                    var GCYLPerUnit = ((parseFloat(GCYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
                     $("#GCYLPerUnit").val(GCYLPerUnit);
                 }else{
                     $("#GCYLPerUnit").val('');
                 }
                 //判断水泥用量
                 if(SNYL != ''){
-                    var SNYLPerUnit = (Math.round(parseFloat(SNYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
+                    var SNYLPerUnit = ((parseFloat(SNYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
                     $("#SNYLPerUnit").val(SNYLPerUnit);
                 }else{
                     $("#SNYLPerUnit").val('');
                 }
                 //判断预拌砼用量
                 if(YBTYL != ''){
-                    var YBTYLPerUnit = Math.round(parseFloat(YBTYL) / parseFloat(GCGMValue)).toFixed(2);
+                    var YBTYLPerUnit = (parseFloat(YBTYL) / parseFloat(GCGMValue)).toFixed(2);
                     $("#YBTYLPerUnit").val(YBTYLPerUnit);
                 }else{
                     $("#YBTYLPerUnit").val('');
                 }
                 //判断人工工日用量
                 if(RGGRYL != ''){
-                    var RGGRYLPerUnit = Math.round(parseFloat(RGGRYL) / parseFloat(GCGMValue)).toFixed(2);
+                    var RGGRYLPerUnit = (parseFloat(RGGRYL) / parseFloat(GCGMValue)).toFixed(2);
                     $("#RGGRYLPerUnit").val(RGGRYLPerUnit);
                 }else{
                     $("#RGGRYLPerUnit").val('');
@@ -294,14 +294,14 @@
             if(ZiXunBDETJ !=''){
                 //判断咨询标的额
                 if(ZiXunBDE != ''){
-                    var CalTJPercent = (Math.round(parseFloat(ZiXunBDETJ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    var CalTJPercent = ((parseFloat(ZiXunBDETJ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
                     $("#CalTJPercent").val(CalTJPercent);
                 }else{
                     $("#CalTJPercent").val('');
                 }
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var CalZZJTJUnit = (Math.round(parseFloat(ZiXunBDETJ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJTJUnit = ((parseFloat(ZiXunBDETJ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJTJUnit").val(CalZZJTJUnit);
                 }else{
                     $("#CalZZJTJUnit").val('');
@@ -311,14 +311,14 @@
             if(ZiXunBDEAZ !=''){
                 //判断咨询标的额
                 if(ZiXunBDE != ''){
-                    var CalAZPercent = (Math.round(parseFloat(ZiXunBDEAZ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    var CalAZPercent = ((parseFloat(ZiXunBDEAZ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
                     $("#CalAZPercent").val(CalAZPercent);
                 }else{
                     $("#CalAZPercent").val('');
                 }
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var CalZZJAZUnit = (Math.round(parseFloat(ZiXunBDEAZ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJAZUnit = ((parseFloat(ZiXunBDEAZ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJAZUnit").val(CalZZJAZUnit);
                 }else{
                     $("#CalZZJAZUnit").val('');
@@ -328,7 +328,7 @@
             if(GCYL !=''){
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var GCYLPerUnit = (Math.round(parseFloat(GCYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
+                    var GCYLPerUnit = ((parseFloat(GCYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
                     $("#GCYLPerUnit").val(GCYLPerUnit);
                 }else{
                     $("#GCYLPerUnit").val('');
@@ -338,7 +338,7 @@
             if(SNYL !=''){
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var SNYLPerUnit = (Math.round(parseFloat(SNYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
+                    var SNYLPerUnit = ((parseFloat(SNYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
                     $("#SNYLPerUnit").val(SNYLPerUnit);
                 }else{
                     $("#SNYLPerUnit").val('');
@@ -348,7 +348,7 @@
             if(YBTYL !=''){
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var YBTYLPerUnit = (Math.round(parseFloat(YBTYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
+                    var YBTYLPerUnit = ((parseFloat(YBTYL) / parseFloat(GCGMValue))).toFixed(2);
                     $("#YBTYLPerUnit").val(YBTYLPerUnit);
                 }else{
                     $("#YBTYLPerUnit").val('');
@@ -358,7 +358,7 @@
             if(RGGRYL !=''){
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var RGGRYLPerUnit = Math.round(parseFloat(RGGRYL) / parseFloat(GCGMValue)).toFixed(2);
+                    var RGGRYLPerUnit = (parseFloat(RGGRYL) / parseFloat(GCGMValue)).toFixed(2);
                     $("#RGGRYLPerUnit").val(RGGRYLPerUnit);
                 }else{
                     $("#RGGRYLPerUnit").val('');

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

@@ -223,21 +223,21 @@
             if(ZiXunBDE != ''){
                 //判断土建造价的值
                 if(ZiXunBDETJ != ''){
-                    var CalTJPercent = (Math.round(parseFloat(ZiXunBDETJ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    var CalTJPercent = ((parseFloat(ZiXunBDETJ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
                     $("#CalTJPercent").val(CalTJPercent);
                 }else{
                     $("#CalTJPercent").val('');
                 }
                 //判断土建造价的值
                 if(ZiXunBDEAZ != ''){
-                    var CalAZPercent = (Math.round(parseFloat(ZiXunBDEAZ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    var CalAZPercent = ((parseFloat(ZiXunBDEAZ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
                     $("#CalAZPercent").val(CalAZPercent);
                 }else{
                     $("#CalAZPercent").val('');
                 }
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var CalZZJUnit = (Math.round(parseFloat(ZiXunBDE) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJUnit = ((parseFloat(ZiXunBDE) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJUnit").val(CalZZJUnit);
                 }else{
                     $("#CalZZJUnit").val('');
@@ -247,42 +247,42 @@
             if(GCGMValue != ''){
                 //判断土建造价
                 if(ZiXunBDETJ != ''){
-                    var CalZZJTJUnit = (Math.round(parseFloat(ZiXunBDETJ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJTJUnit = ((parseFloat(ZiXunBDETJ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJTJUnit").val(CalZZJTJUnit);
                 }else{
                     $("#CalZZJTJUnit").val('');
                 }
                 //判断安装造价
                 if(ZiXunBDEAZ != ''){
-                    var CalZZJAZUnit = (Math.round(parseFloat(ZiXunBDEAZ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJAZUnit = ((parseFloat(ZiXunBDEAZ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJAZUnit").val(CalZZJAZUnit);
                 }else{
                     $("#CalZZJAZUnit").val('');
                 }
                 //判断钢材用量
                 if(GCYL != ''){
-                    var GCYLPerUnit = (Math.round(parseFloat(GCYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
+                    var GCYLPerUnit = ((parseFloat(GCYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
                     $("#GCYLPerUnit").val(GCYLPerUnit);
                 }else{
                     $("#GCYLPerUnit").val('');
                 }
                 //判断水泥用量
                 if(SNYL != ''){
-                    var SNYLPerUnit = (Math.round(parseFloat(SNYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
+                    var SNYLPerUnit = ((parseFloat(SNYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
                     $("#SNYLPerUnit").val(SNYLPerUnit);
                 }else{
                     $("#SNYLPerUnit").val('');
                 }
                 //判断预拌砼用量
                 if(YBTYL != ''){
-                    var YBTYLPerUnit = Math.round(parseFloat(YBTYL) / parseFloat(GCGMValue)).toFixed(2);
+                    var YBTYLPerUnit = (parseFloat(YBTYL) / parseFloat(GCGMValue)).toFixed(2);
                     $("#YBTYLPerUnit").val(YBTYLPerUnit);
                 }else{
                     $("#YBTYLPerUnit").val('');
                 }
                 //判断人工工日用量
                 if(RGGRYL != ''){
-                    var RGGRYLPerUnit = Math.round(parseFloat(RGGRYL) / parseFloat(GCGMValue)).toFixed(2);
+                    var RGGRYLPerUnit = (parseFloat(RGGRYL) / parseFloat(GCGMValue)).toFixed(2);
                     $("#RGGRYLPerUnit").val(RGGRYLPerUnit);
                 }else{
                     $("#RGGRYLPerUnit").val('');
@@ -292,14 +292,14 @@
             if(ZiXunBDETJ !=''){
                 //判断咨询标的额
                 if(ZiXunBDE != ''){
-                    var CalTJPercent = (Math.round(parseFloat(ZiXunBDETJ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    var CalTJPercent = ((parseFloat(ZiXunBDETJ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
                     $("#CalTJPercent").val(CalTJPercent);
                 }else{
                     $("#CalTJPercent").val('');
                 }
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var CalZZJTJUnit = (Math.round(parseFloat(ZiXunBDETJ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJTJUnit = ((parseFloat(ZiXunBDETJ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJTJUnit").val(CalZZJTJUnit);
                 }else{
                     $("#CalZZJTJUnit").val('');
@@ -309,14 +309,14 @@
             if(ZiXunBDEAZ !=''){
                 //判断咨询标的额
                 if(ZiXunBDE != ''){
-                    var CalAZPercent = (Math.round(parseFloat(ZiXunBDEAZ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
+                    var CalAZPercent = ((parseFloat(ZiXunBDEAZ) / parseFloat(ZiXunBDE) * 100) / 100 * 100).toFixed(2);
                     $("#CalAZPercent").val(CalAZPercent);
                 }else{
                     $("#CalAZPercent").val('');
                 }
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var CalZZJAZUnit = (Math.round(parseFloat(ZiXunBDEAZ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
+                    var CalZZJAZUnit = ((parseFloat(ZiXunBDEAZ) / parseFloat(GCGMValue) * 100) * 100).toFixed(2);
                     $("#CalZZJAZUnit").val(CalZZJAZUnit);
                 }else{
                     $("#CalZZJAZUnit").val('');
@@ -326,7 +326,7 @@
             if(GCYL !=''){
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var GCYLPerUnit = (Math.round(parseFloat(GCYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
+                    var GCYLPerUnit = ((parseFloat(GCYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
                     $("#GCYLPerUnit").val(GCYLPerUnit);
                 }else{
                     $("#GCYLPerUnit").val('');
@@ -336,7 +336,7 @@
             if(SNYL !=''){
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var SNYLPerUnit = (Math.round(parseFloat(SNYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
+                    var SNYLPerUnit = ((parseFloat(SNYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
                     $("#SNYLPerUnit").val(SNYLPerUnit);
                 }else{
                     $("#SNYLPerUnit").val('');
@@ -346,7 +346,7 @@
             if(YBTYL !=''){
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var YBTYLPerUnit = (Math.round(parseFloat(YBTYL) / parseFloat(GCGMValue) * 100) * 10).toFixed(2);
+                    var YBTYLPerUnit = ((parseFloat(YBTYL) / parseFloat(GCGMValue))).toFixed(2);
                     $("#YBTYLPerUnit").val(YBTYLPerUnit);
                 }else{
                     $("#YBTYLPerUnit").val('');
@@ -356,7 +356,7 @@
             if(RGGRYL !=''){
                 //判断建筑面积或规模
                 if(GCGMValue != ''){
-                    var RGGRYLPerUnit = Math.round(parseFloat(RGGRYL) / parseFloat(GCGMValue)).toFixed(2);
+                    var RGGRYLPerUnit = (parseFloat(RGGRYL) / parseFloat(GCGMValue)).toFixed(2);
                     $("#RGGRYLPerUnit").val(RGGRYLPerUnit);
                 }else{
                     $("#RGGRYLPerUnit").val('');

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

@@ -395,19 +395,19 @@
 						if(d.projectReportRecordStatus == 5 || d.projectReportStatus == 5){
 							if(d.syncStatus == 0){
 								if(d.reportStatus == 0){
-									if(d.reportedState == 0 || d.reportedState == 6){
+									if(d.reportedAdd != undefined && d.reportedAdd =="1"){
 										xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"op-btn op-btn-delete\" ><i class=\"fa fa-plus\"></i> 上报</a>";
 									}
 								}else{
-									if(d.reportedState == 2){
+									if(d.reportedRecall != undefined && d.reportedRecall =="1"){
 										xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidateByReported?id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回上报</a>";
 									}
 									/*撤回修改*/
-									if(d.reportedState == 3){
+									if(d.reportedUpdate != undefined && d.reportedUpdate =="1"){
 									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改上报</a>";
 									}
 									/*驳回修改*/
-									if(d.reportedState == 4){
+									if(d.reportedModify != undefined && d.reportedModify =="1"){
 									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改上报</a>";
 									}
 								}
@@ -495,6 +495,23 @@
                                 <c:when test="${projectRecords.projectReportRecordStatus == 2 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when>
                             <c:otherwise>"0"</c:otherwise>
                             </c:choose>
+							,"reportedAdd":<c:choose>
+									<c:when test="${(projectRecords.reportedState == 0 || rojectRecords.reportedState == 6) && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
+							<c:otherwise>"0"</c:otherwise>
+							</c:choose>
+							,"reportedRecall":<c:choose>
+									<c:when test="${projectRecords.reportedState == 2 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
+							<c:otherwise>"0"</c:otherwise>
+							</c:choose>
+							,"reportedUpdate":<c:choose>
+									<c:when test="${projectRecords.reportedState == 3 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
+							<c:otherwise>"0"</c:otherwise>
+							</c:choose>
+							,"reportedModify":<c:choose>
+									<c:when test="${projectRecords.reportedState == 4 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
+							<c:otherwise>"0"</c:otherwise>
+							</c:choose>
+
                         </c:when>
                     <c:otherwise>
                     ,"canAdd":"0"
@@ -507,6 +524,10 @@
                     ,"recordedit2":"0"
                     ,"recordrecall":"0"
                     ,"recordcancel":"0"
+                    ,"reportedAdd":"0"
+                    ,"reportedRecall":"0"
+                    ,"reportedUpdate":"0"
+                    ,"reportedModify":"0"
                     </c:otherwise>
                     </c:choose>
 					,"deleteAdmin":<c:choose><c:when test="${'1' == projectRecords.flagAdmin && projectRecords.projectReportStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>