项目查看-tab页

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

@@ -1,33 +1,56 @@
 package com.jeeplus.modules.ruralprojectrecords.web;
 
 import com.google.common.collect.Lists;
+import com.jeeplus.common.config.Global;
+import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.alterinfo.entity.AlterInfo;
 import com.jeeplus.modules.alterinfo.service.AlterInfoService;
+import com.jeeplus.modules.act.entity.Act;
+import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
+import com.jeeplus.modules.projectAccessory.service.ProjectAccessoryRelationService;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
+import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
 import com.jeeplus.modules.projectrecord.entity.ProjectPlanInfo;
 import com.jeeplus.modules.projectrecord.service.ProjectPlanService;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordsReported;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectcontentinfo;
+import com.jeeplus.modules.ruralprojectrecords.entity.SubProjectInfo;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
+import com.jeeplus.modules.ruralprojectrecords.service.SubProjectInfoService;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.service.UserService;
 import com.jeeplus.modules.sys.utils.DictUtils;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workactivity.service.ActivityService;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workbidproject.entity.WorkBidProject;
 import com.jeeplus.modules.workbidproject.service.WorkBidProjectService;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
+import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import java.util.Arrays;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -54,6 +77,16 @@ public class RuralProjectViewController extends BaseController {
     private WorkContractInfoService workContractInfoService;
     @Autowired
     private WorkClientInfoService workClientInfoService;
+    @Autowired
+    private ProjectcontentinfoService projectcontentinfoService;
+    @Autowired
+    private ProjectAccessoryRelationService projectAccessoryRelationService;
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private RuralProjectRecordsService ruralProjectRecordsService;
+    @Autowired
+    private SubProjectInfoService subProjectInfoService;
 
     /**
      * 项目查看
@@ -62,7 +95,7 @@ public class RuralProjectViewController extends BaseController {
      * @param model
      * @return
      */
-    @RequiresPermissions(value={"ruralProject:ruralProjectView:view"})
+//    @RequiresPermissions(value={"ruralProject:ruralProjectView:view"})
     @RequestMapping(value = "view")
     public String view(RuralProjectRecords projectRecords, Model model) {
         if (projectRecords!=null&& StringUtils.isNotBlank(projectRecords.getId())) {
@@ -107,8 +140,15 @@ public class RuralProjectViewController extends BaseController {
                     model.addAttribute("projectId", "");
                 }
             }
+
+            model.addAttribute("flagProjectReportData",projectReportData);
+
         }
         model.addAttribute("projectRecords", projectRecords);
+        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
+        if (null!=reported){
+            model.addAttribute("reportedId",reported.getId());
+        }
         return "modules/ruralprojectrecords/view/ruralProjectRecordsView";
     }
 
@@ -116,9 +156,14 @@ public class RuralProjectViewController extends BaseController {
      * 客户合同信息查看
      * 传参：合同id
      */
-    @RequiresPermissions(value={"ruralProject:ruralProjectView:view"})
+//    @RequiresPermissions(value={"ruralProject:ruralProjectView:view"})
     @RequestMapping(value = "workContractView")
-    public String lookForm(WorkContractInfo workContractInfo, Model model) {
+    public String lookForm(WorkContractInfo workContractInfo,String projectId, Model model) {
+        RuralProjectRecords projectRecords=new RuralProjectRecords();
+        if (null!=projectId){
+            projectRecords = projectRecordsService.get(projectId);
+            model.addAttribute("projectRecords", projectRecords);
+        }
         workContractInfo = workContractInfoService.get(workContractInfo.getId());
         if("0".equals(workContractInfo.getExt())){
             WorkBidProject workBidProject = workBidProjectService.get(workContractInfo.getProject().getId());
@@ -139,7 +184,293 @@ public class RuralProjectViewController extends BaseController {
         AlterInfo alterInfo = alterInfoService.getByContractInfo(workContractInfo);
         model.addAttribute("alterInfo",alterInfo);
         model.addAttribute("workContractInfo", workContractInfo);
+        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
+        if (null!=reported){
+            model.addAttribute("reportedId",reported.getId());
+        }
+        //查询项目报告信息
+        ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
+        model.addAttribute("flagProjectReportData",projectReportData);
         return "modules/ruralprojectrecords/view/workClientAndContractView";
     }
 
+    /**
+     * 三级校审
+     * 项目报告信息页面
+     */
+//    @RequiresPermissions(value={"ruralProject:ruralProjectView:view"})
+    @RequestMapping(value = "modify")
+    public String modify(RuralProjectcontentinfo projectcontentinfo,String projectId, Integer status, Model model, RedirectAttributes redirectAttributes) {
+        RuralProjectRecords projectRecords=new RuralProjectRecords();
+        if (null!=projectId){
+            projectRecords = projectRecordsService.get(projectId);
+            model.addAttribute("projectRecords", projectRecords);
+        }
+        Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
+        ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
+        projectReportData = projectReportDataService.get(projectReportData.getId());
+        RuralProjectRecords ruralProjectRecords = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
+        Projectcontentinfo projectcontent = projectcontentinfoService.getByInfoId(projectReportData.getId());
+        projectcontent.setProjectReportData(projectReportData);
+        //根据条件查询附件必填项
+        //判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
+        /*Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+
+        Boolean flag = false;
+        //如果是打包项目或者报告送审价不为null则可进行查询附件类型
+        if(1 == projectSort || null != projectReportData.getReviewFee()){
+            flag = true;
+        }
+        if(flag) {*/
+        ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+        //添加项目类型
+        relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+        relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+        //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+        /*if(0 == projectSort){*/
+        //查看送审金额是否为500w以上金额
+        Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
+        approvalMoney = 2;
+        switch (approvalMoney){
+            case 0:
+                //金额为0
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+                break;
+            case 1:
+                //500w以下金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("1");
+                break;
+            case 2:
+                //500w以上金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("2");
+                break;
+        }
+            /*}else{
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+            }*/
+
+        //添加报告类型
+        relateInfo.setRequiredStage(1);
+        relateInfo.setId(ruralProjectRecords.getId());
+        //查询报告文件、依据性文件、其他文件必填列表以及数据
+//        List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+//        for (MainDictDetail mainDict : mainDictDetails) {
+//            relateInfo.setAttachType(mainDict.getValue());
+//            switch (mainDict.getValue()) {
+//                case "11":
+//                    projectcontent.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+//                    break;
+//                case "12":
+//                    projectcontent.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+//                    break;
+//                case "13":
+//                    projectcontent.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
+//                    break;
+//            }
+//
+//        }
+        /*}*/
+
+        //查询总审人员信息
+        List<User> auditUserList = userService.getAuditUserList();
+        ruralProjectRecords.setBzshbUserList(auditUserList);
+        model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
+        model.addAttribute("projectReportData",projectReportData);
+        model.addAttribute("projectId", projectcontentinfo1.getProject().getId());
+        model.addAttribute("project", projectcontentinfo1.getProject());
+        model.addAttribute("reportedId", projectcontentinfo.getReportedId());
+        model.addAttribute("projectRecords", ruralProjectRecords);
+        model.addAttribute("id", projectcontentinfo.getId());
+        model.addAttribute("projectcontentinfo", projectcontent);
+        //获取是否含有上报信息
+        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReportedById(projectcontentinfo.getReportedId());
+        if(null != reported){
+            model.addAttribute("reportedView", 1);
+        }
+
+        List<MainDictDetail> achievementTypes = DictUtils.getMainDictList("achievement_type");
+        if(null != achievementTypes){
+            for (MainDictDetail achievementType:achievementTypes) {
+                if(achievementType.getValue().equals(projectReportData.getAchievementType())){
+                    projectReportData.setAchievementType(achievementType.getLabel());
+                    break;
+                }
+            }
+        }
+//            projectcontent.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontent.getFileAttachmentList()));
+//            projectcontent.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontent.getFileGistdataList()));
+//            projectcontent.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontent.getFileOtherList()));
+        return "modules/ruralprojectrecords/view/reportView";
+    }
+
+    /**
+     * 项目计划查看
+     * @param projectRecords
+     * @param model
+     * @return
+     */
+//    @RequiresPermissions(value={"ruralProject:ruralProjectView:view"})
+    @RequestMapping(value = {"planView"})
+    public String planView(RuralProjectRecords projectRecords, Model model) {
+        boolean flag = false;
+        //判断是否为查看信息操作
+        if("view".equals(projectRecords.getView())){
+            flag = true;
+        }
+        //获取项目信息
+        //如果没有id则为新增 添加创建人信息和当前创建时间信息
+        if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
+            //projectRecords = ruralProjectRecordsService.get(projectRecords.getId());
+            projectRecords = ruralProjectRecordsService.getMasters(projectRecords.getId());
+        }else {
+            projectRecords.setCreateBy(UserUtils.getUser());
+            projectRecords.setCreateDate(new Date());
+        }
+
+        ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
+        //将项目id放入项目计划表中
+        projectPlanInfo.setProjectId(projectRecords.getId());
+        //获取项目计划信息
+        List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+        if(projectPlanList.size() == 0 && !flag){
+            //获取项目计划信息
+            List<MainDictDetail> mainDictList = DictUtils.getMainDictList("projectPlan");
+            if(mainDictList.size()>0){
+                for (MainDictDetail mainDict : mainDictList) {
+                    ProjectPlanInfo projectPlan = new ProjectPlanInfo();
+                    projectPlan.setProjectStage(mainDict.getLabel());
+                    //将项目负责人添加到展示栏
+                    if(null != projectRecords.getProjectLeaders()) {
+                        projectPlan.setRemindName(projectRecords.getProjectLeaders().get(0).getName());
+                        projectPlan.setRemindId(projectRecords.getProjectLeaders().get(0).getId());
+                    }
+                    //将项目等级人信息添加到完成人控件中
+                    User user = UserUtils.get(projectRecords.getCreateBy().getId());
+                    projectPlan.setFinishId(user.getId());
+                    projectPlan.setFinishName(user.getName());
+                    projectPlanList.add(projectPlan);
+                }
+            }
+        }
+        //获取 项目计划附件信息
+        List<WorkClientAttachment> workAttachmentList = projectPlanService.getWorkAttachment(projectRecords.getId());
+        projectRecords.setProjectPlanList(projectPlanList);
+        projectRecords.setWorkAttachments(workAttachmentList);
+        model.addAttribute("projectRecords", projectRecords);
+        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
+        if (null!=reported){
+            model.addAttribute("reportedId",reported.getId());
+        }
+        //查询项目报告信息
+        ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
+        model.addAttribute("flagProjectReportData",projectReportData);
+        return "modules/ruralprojectrecords/view/projectPlanView";
+    }
+
+    /**
+     * 上报信息查看
+     * @param reported
+     * @param model
+     * @return
+     */
+//    @RequiresPermissions(value={"ruralProject:ruralProjectView:view"})
+    @RequestMapping(value = "getReportedView")
+    public String getReportedView(RuralProjectRecordsReported reported,Model model){
+        model.addAttribute("projectId",reported.getProjectId());
+        RuralProjectRecords projectRecords=new RuralProjectRecords();
+        if (null!=reported.getProjectId()){
+            projectRecords = projectRecordsService.get(reported.getProjectId());
+            model.addAttribute("projectRecords", projectRecords);
+        }
+        reported = ruralProjectMessageService.getRuralProjectRecordsReported(reported.getProjectId());
+        if (null!=reported){
+            ruralProjectMessageService.getInfoByView(reported);
+            model.addAttribute("reportedId",reported.getId());
+        }
+        model.addAttribute("ruralProjectRecordsReported",reported);
+        //查询项目报告信息
+        ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
+        model.addAttribute("flagProjectReportData",projectReportData);
+        return "modules/ruralprojectrecords/view/reportedView";
+
+    }
+
+    /**
+     * 子项目信息查看
+     * @param subProjectInfo
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
+//    @RequiresPermissions(value={"ruralProject:ruralProjectView:view"})
+    @RequestMapping(value = {"list"})
+    public String list(SubProjectInfo subProjectInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+        RuralProjectRecords projectRecords=new RuralProjectRecords();
+        if (null!=subProjectInfo.getParentProId()){
+            projectRecords = projectRecordsService.get(subProjectInfo.getParentProId());
+            model.addAttribute("projectRecords", projectRecords);
+        }
+        //获取子项目信息
+        Page<SubProjectInfo> page = subProjectInfoService.findPage(new Page<SubProjectInfo>(request, response), subProjectInfo);
+
+        //查询项目报告信息
+        ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(subProjectInfo.getParentProId());
+        //如果项目报告不为空，则查询项目线上归档信息
+        if(null != projectReportData){
+            ProjectReportRecord projectReportRecord = ruralProjectMessageService.getProjectReportRecord(projectReportData.getId());
+            if(null != projectReportRecord){
+                model.addAttribute("projectId", subProjectInfo.getParentProId());
+            }else{
+                model.addAttribute("projectId", "");
+            }
+        }
+        model.addAttribute("page", page);
+        model.addAttribute("parentProId", subProjectInfo.getParentProId());
+        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
+        if (null!=reported){
+            model.addAttribute("reportedId",reported.getId());
+        }
+        model.addAttribute("flagProjectReportData",projectReportData);
+        return "modules/ruralprojectrecords/subProjectInfo/subProjectInfoList";
+    }
+    /**
+     * 文件上传查看页面
+     * 附件信息
+     * @param projectRecords
+     * @param model
+     * @return
+     */
+//    @RequiresPermissions(value={"ruralProject:ruralProjectView:view"})
+    @RequestMapping(value = "getAccessoryView")
+    public String getAccessoryView(RuralProjectRecords projectRecords, Model model) {
+        if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
+            projectRecords = projectRecordsService.getQueryProjectUsers(projectRecords.getId());
+            RuralProjectcontentinfo ruralProjectcontentinfo = projectRecordsService.formAccessory(projectRecords);
+            projectRecordsService.disposeData(ruralProjectcontentinfo);
+            //查询项目报告信息
+            ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
+            //如果项目报告不为空，则查询项目线上归档信息
+            if(null != projectReportData){
+                ProjectReportRecord projectReportRecord = ruralProjectMessageService.getProjectReportRecord(projectReportData.getId());
+                if(null != projectReportRecord){
+                    model.addAttribute("projectId", projectRecords.getId());
+                }else{
+                    model.addAttribute("projectId", "");
+                }
+            }
+            model.addAttribute("projectcontentinfo", ruralProjectcontentinfo);
+            model.addAttribute("projectRecords", projectRecords);
+        }else {
+            return "redirect:"+ Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+        }
+        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
+        if (null!=reported){
+            model.addAttribute("reportedId",reported.getId());
+        }
+        //查询项目报告信息
+        ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
+        model.addAttribute("flagProjectReportData",projectReportData);
+        return "modules/ruralprojectrecords/view/projectAccessoryView";
+    }
 }

src/main/resources/mappings/modules/workreimbursement/WorkReimbursementDao.xml

@@ -61,6 +61,7 @@
 		,wa.project_radio as "workAccount.projectRadio"
 		,wa.reimburse_remarks as "workAccount.reimburseRemarks"
 		,(select office_id from sys_user where id = wa.reimbursement_name) AS "officeId"
+		,p.id AS "project.projectId"
 		FROM work_reimbursement a
 		left join work_account wa on wa.work_reimbursement_id =a.id
 		left join rural_project_records p on p.id = wa.project_id

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchList.jsp

@@ -308,7 +308,15 @@
                             if(0 == d.pid){
                                 return "<a class=\"attention-info pid\" title=\"" + d.filingName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/view?id=" + d.id +"','95%', '95%')\">" + d.filingName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" title=\"" + d.filingName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.projectId +"','95%', '95%')\">" + d.filingName + "</a>";
+                                var xml="";
+                                <shiro:hasPermission name="ruralProject:ruralProjectView:filingBatchView">
+                                    xml+="<a class=\"attention-info\" title=\"" + d.filingName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.projectId +"','95%', '95%')\">";
+                                </shiro:hasPermission>
+                                xml+=d.filingName
+                                <shiro:hasPermission name="ruralProject:ruralProjectView:filingBatchView">
+                                    xml+= "</a>";
+                                </shiro:hasPermission>
+                                return xml;
                             }
                         }},
                     {field: 'createName', align:'center', title: '创建人',width:80,templet: function(d){

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingList.jsp

@@ -230,7 +230,12 @@
 				// {checkbox: true, fixed: true},
 				{field:'index',align:'center', title: '序号',width:40}
 				,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
-						return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+						if(1 == d.showView && d.showView != undefined){
+							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+						}else{
+							return "<span title='"+ d.projName +"'>" +d.projName+ "</span>";
+						}
+					<%--return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";--%>
 					}}
 				,{field:'projId',align:'center', title: '项目编号',minWidth:150}
 				,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
@@ -252,7 +257,7 @@
 						var xml="";
 						if(d.canedit3 != undefined && d.canedit3 =="1")
 						{
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看项目计划信息', '${ctx}/project/projectPlanConsulting/form?view=view&id='+encodeURIComponent('" + d.id + "'),'95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-search-plus\"></i> 详情</a>";
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看项目计划信息', '${ctx}/ruralProject/ruralProjectView/planView?id='+encodeURIComponent('" + d.id + "'),'95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-search-plus\"></i> 详情</a>";
 						}
 						if(d.canedit4 != undefined && d.canedit4 =="1")
 						{
@@ -277,10 +282,15 @@
 					,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
 					,"projectStatus":"${projectRecords.projectStatus}"
 					,"procId":"${projectRecords.processInstanceId}"
-					<shiro:hasPermission name="project:projectPlanConsulting:edit">
+					<shiro:hasPermission name="ruralProject:ruralProjectView:view">
 						,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+					</shiro:hasPermission>
+					<shiro:hasPermission name="project:projectPlanConsulting:edit">
 						,"canedit4":<c:choose><c:when test="${projectRecords.projectStatus == 5 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					</shiro:hasPermission>
+					<shiro:hasPermission name="ruralProject:ruralProjectView:consultingPlanView">
+					,"showView":1
+					</shiro:hasPermission>
 				}
 				</c:forEach>
 				</c:if>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostList.jsp

@@ -230,7 +230,12 @@
 				// {checkbox: true, fixed: true},
 				{field:'index',align:'center', title: '序号',width:40}
 				,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
-						return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+						if(1 == d.showView && d.showView != undefined){
+							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+						}else{
+							return "<span title='"+ d.projName +"'>" +d.projName+ "</span>";
+						}
+					<%--return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";--%>
 					}}
 				,{field:'projId',align:'center', title: '项目编号',minWidth:150}
 				,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
@@ -252,7 +257,7 @@
 						var xml="";
 						if(d.canedit3 != undefined && d.canedit3 =="1")
 						{
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看项目计划信息', '${ctx}/project/projectPlanCost/form?view=view&id='+encodeURIComponent('" + d.id + "'),'95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-search-plus\"></i> 详情</a>";
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看项目计划信息', '${ctx}/ruralProject/ruralProjectView/planView?id='+encodeURIComponent('" + d.id + "'),'95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-search-plus\"></i> 详情</a>";
 						}
 						if(d.canedit4 != undefined && d.canedit4 =="1")
 						{
@@ -277,10 +282,15 @@
 					,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
 					,"projectStatus":"${projectRecords.projectStatus}"
 					,"procId":"${projectRecords.processInstanceId}"
-					<shiro:hasPermission name="project:projectPlanCost:edit">
+					<shiro:hasPermission name="ruralProject:ruralProjectView:view">
 						,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+					</shiro:hasPermission>
+					<shiro:hasPermission name="project:projectPlanCost:edit">
 						,"canedit4":<c:choose><c:when test="${projectRecords.projectStatus == 5 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					</shiro:hasPermission>
+					<shiro:hasPermission name="ruralProject:ruralProjectView:costPlanView">
+					,"showView":1
+					</shiro:hasPermission>
 				}
 				</c:forEach>
 				</c:if>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanList.jsp

@@ -230,7 +230,11 @@
 				// {checkbox: true, fixed: true},
 				{field:'index',align:'center', title: '序号',width:40}
 				,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
-						return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+						if(1 == d.showView && d.showView != undefined){
+							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+						}else{
+							return "<span title='"+ d.projName +"'>" +d.projName+ "</span>";
+						}
 					}}
 				,{field:'projId',align:'center', title: '项目编号',minWidth:150}
 				,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
@@ -252,7 +256,7 @@
 						var xml="";
 						if(d.canedit3 != undefined && d.canedit3 =="1")
 						{
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看项目计划信息', '${ctx}/project/projectPlan/form?view=view&id='+encodeURIComponent('" + d.id + "'),'95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-search-plus\"></i> 详情</a>";
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看项目计划信息', '${ctx}/ruralProject/ruralProjectView/planView?id='+encodeURIComponent('" + d.id + "'),'95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-search-plus\"></i> 详情</a>";
 						}
 						if(d.canedit4 != undefined && d.canedit4 =="1")
 						{
@@ -277,10 +281,15 @@
 					,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
 					,"projectStatus":"${projectRecords.projectStatus}"
 					,"procId":"${projectRecords.processInstanceId}"
-					<shiro:hasPermission name="project:projectPlan:edit">
+					<shiro:hasPermission name="ruralProject:ruralProjectView:view">
 						,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+					</shiro:hasPermission>
+					<shiro:hasPermission name="project:projectPlan:edit">
 						,"canedit4":<c:choose><c:when test="${projectRecords.projectStatus == 5 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					</shiro:hasPermission>
+					<shiro:hasPermission name="ruralProject:ruralProjectView:planView">
+					,"showView":1
+					</shiro:hasPermission>
 				}
 				</c:forEach>
 				</c:if>

src/main/webapp/webpage/modules/ruralprojectrecords/check/all/ruralProjectRecordsAllList.jsp

@@ -301,11 +301,17 @@
 				{field:'index',align:'center', title: '序号',width:40}
 				,{field:'projId',align:'center', title: '项目编号',  width:150}
 				,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
-						return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+						if(1 == d.showView && d.showView != undefined){
+							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+						}else{
+							return "<span title='"+ d.projName +"'>" +d.projName+ "</span>";
+						}
+					<%--return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";--%>
 					}}
 				,{field: 'projectReportNumber', align:'center', title: '报告号',width:170,templet: function(d){
 						if(""!= d.projectReportNumber){
-							return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";
+							<%--return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";--%>
+							return  d.projectReportNumber ;
 						}else{
 							return "<span title='暂无报告'  style='color: #009688'>暂无报告</span>";
 						}
@@ -399,6 +405,9 @@
 					,"canedit2":<c:choose><c:when test="${projectRecords.checkStatus == 4}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					,"canrecall":<c:choose><c:when test="${projectRecords.checkStatus == 3}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					</shiro:hasPermission>
+					<shiro:hasPermission name="ruralProject:ruralProjectView:searchAllView">
+					,"showView":1
+					</shiro:hasPermission>
 					,"cancancel":<c:choose><c:when test="${projectRecords.checkStatus == 2}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
                 }
                 </c:forEach>

src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsList.jsp

@@ -301,11 +301,17 @@
                 {field:'index',align:'center', title: '序号',width:40}
 				,{field:'projId',align:'center', title: '项目编号',  width:150}
                 ,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
-                        return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+						if(1 == d.showView && d.showView != undefined){
+							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+						}else{
+							return "<span title='"+ d.projName +"'>" +d.projName+ "</span>";
+						}
+                	<%--return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";--%>
                     }}
 				,{field: 'projectReportNumber', align:'center', title: '报告号',width:170,templet: function(d){
 						if(""!= d.projectReportNumber){
-							return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";
+							<%--return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";--%>
+							return  d.projectReportNumber ;
 						}else{
 							return "<span title='暂无报告'  style='color: #009688'>暂无报告</span>";
 						}
@@ -398,6 +404,9 @@
 					,"canedit2":<c:choose><c:when test="${projectRecords.checkStatus == 4}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					,"canrecall":<c:choose><c:when test="${projectRecords.checkStatus == 3}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					</shiro:hasPermission>
+					<shiro:hasPermission name="ruralProject:ruralProjectView:searchView">
+					,"showView":1
+					</shiro:hasPermission>
 					,"cancancel":<c:choose><c:when test="${projectRecords.checkStatus == 2}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
                 }
                 </c:forEach>

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

@@ -521,7 +521,16 @@
                     {field: 'projectId', title: '项目编号/项目定义号',width:160},
                     {field: 'projectName', align:'center', title: '项目名称',width:200,templet:function(d){
                     	if(0 == d.pid){
-							return "<a class=\"attention-info pid\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";
+							var xml="";
+							<shiro:hasPermission name="ruralProject:ruralProjectView:costlistView">
+							xml+="<a class=\"attention-info pid\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">"
+							</shiro:hasPermission>
+							xml+=d.projectName
+							<shiro:hasPermission name="ruralProject:ruralProjectView:costlistView">
+							xml+="</a>";
+							</shiro:hasPermission>
+							return xml;
+							<%--return "<a class=\"attention-info pid\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";--%>
 						}else{
 							return "<a class=\"attention-info\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/subProject/subProject/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";
 						}
@@ -529,7 +538,8 @@
 					{field: 'projectReportNumber', align:'center', title: '报告号',width:170,templet: function(d){
 							if(0 == d.pid){
 								if(""!= d.projectReportNumber){
-									return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";
+									<%--return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";--%>
+									return d.projectReportNumber;
 								}else{
 									return "<span title='暂无报告'  style='color: #009688'>暂无报告</span>";
 								}
@@ -540,7 +550,8 @@
                     {field: 'contractName', align:'center', title: '合同名称',width:180,templet: function(d){
 							if(0 == d.pid){
 								if(""!= d.contractName){
-									return "<a class=\"attention-info pid\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contractName + "</a>";
+									<%--return "<a class=\"attention-info pid\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contractName + "</a>";--%>
+									return d.contractName;
 								}else{
 									return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
 								}

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

@@ -322,7 +322,11 @@
 				{checkbox: true, fixed: true},
                 {field:'index',align:'center', title: '序号',width:40}
                 ,{field:'projName',align:'center', title: '项目名称',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>";
+						if(1 == d.showView && d.showView != undefined){
+							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+						}else{
+							return "<span title='"+ d.projName +"'>" +d.projName+ "</span>";
+						}
                     }}
 				,{field:'projId',align:'center', title: '项目编号',  width:150}
                 /*,{field:'projId',align:'center', title: '项目编号',minWidth:150,templet:function(d){
@@ -330,7 +334,8 @@
                     }}*/
 				,{field: 'clientName', align:'center', title: '报告号',width:170,templet: function(d){
 						if(""!= d.projectReportNumber){
-							return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";
+							<%--return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";--%>
+							return  d.projectReportNumber;
 						}else{
 							return "<span title='暂无报告'  style='color: #009688'>暂无报告</span>";
 						}
@@ -444,6 +449,9 @@
 								<c:otherwise>"0"</c:otherwise>
 							</c:choose>
 					</shiro:hasPermission>
+					<shiro:hasPermission name="ruralProject:ruralProjectView:costView">
+					,"showView":1
+					</shiro:hasPermission>
                 }
                 </c:forEach>
                 </c:if>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -359,7 +359,7 @@
                     }}*/
 				,{field: 'clientName', align:'center', title: '报告号',width:170,templet: function(d){
 						if(""!= d.projectReportNumber){
-							return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";
+							return d.projectReportNumber;
 						}else{
 							return "<span title='暂无报告'  style='color: #009688'>暂无报告</span>";
 						}
@@ -477,7 +477,7 @@
 							<c:otherwise>"0"</c:otherwise>
 					</c:choose>
 					</shiro:hasPermission>
-					<shiro:hasPermission name="ruralProject:ruralProjectView:view">
+					<shiro:hasPermission name="ruralProject:ruralProjectView:consultingView">
 					,"showView":1
 					</shiro:hasPermission>
                 }

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectReport/cost/ruralCostProjectReportList.jsp

@@ -154,7 +154,11 @@
                 ,{field:'month',align:'center', sort:true,title: '月份'}
 				,{field:'clientName',align:'center', title: '委托单位',width:220}
                 ,{field:'projectName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
-                        return "<a class=\"attention-info\" title=\""+d.projectName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id + "','95%', '95%')\">" + d.projectName + "</a>";
+						if(1 == d.showView && d.showView != undefined){
+							return "<a class=\"attention-info\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";
+						}else{
+							return "<span title='"+ d.projectName +"'>" +d.projectName+ "</span>";
+						}
                     }}
 				,{field:'projectId', align:'center',minWidth:110,title: '项目编号'}
 				,{field:'reportNum',align:'center',minWidth:150, title: '报告号'}
@@ -190,6 +194,9 @@
 					,"verifyRate":"${workContractInfo.verifyRate}"
 					,"principalUser":"${workContractInfo.principalUser}"
 					,"officeName":"${workContractInfo.officeName}"
+					<shiro:hasPermission name="ruralProject:ruralProjectView:view">
+					,"showView":1
+					</shiro:hasPermission>
                 }
                 </c:forEach>
                 </c:if>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectReport/cost/ruralProjectCostRecordReportList.jsp

@@ -159,7 +159,11 @@
                 ,{field:'year',align:'center', sort:true,title: '年份'}
                 ,{field:'month',align:'center', sort:true,title: '月份'}
                 ,{field:'projectName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
-                        return "<a class=\"attention-info\" title=\""+d.projectName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id + "','95%', '95%')\">" + d.projectName + "</a>";
+						if(1 == d.showView && d.showView != undefined){
+							return "<a class=\"attention-info\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";
+						}else{
+							return "<span title='"+ d.projectName +"'>" +d.projectName+ "</span>";
+						}
                     }}
 				,{field:'reportNum',align:'center',minWidth:150, title: '报告号'}
 				,{field:'principalUser',align:'center', title: '项目负责人'}
@@ -184,6 +188,9 @@
 					,"officeName":"${workContractInfo.officeName}"
 					,"recordStatus":"${workContractInfo.recordStatus}"
 					,"reportedStatus":"${workContractInfo.reportedStatus}"
+					<shiro:hasPermission name="ruralProject:ruralProjectView:view">
+					,"showView":1
+					</shiro:hasPermission>
                 }
                 </c:forEach>
                 </c:if>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllLists.jsp

@@ -520,21 +520,32 @@
                     {field: 'projectId', title: '项目编号/项目定义号',width:160},
                     {field: 'projectName', align:'center', title: '项目名称',width:200,templet:function(d){
                     	if(0 == d.pid){
-							return "<a class=\"attention-info pid\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";
+							var xml="";
+							<shiro:hasPermission name="ruralProject:ruralProjectView:listAllView">
+							xml+="<a class=\"attention-info\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">";
+							</shiro:hasPermission>
+							xml+=d.projectName
+							<shiro:hasPermission name="ruralProject:ruralProjectView:listAllView">
+							xml+= "</a>";
+							</shiro:hasPermission>
+							return xml;
+							<%--return "<a class=\"attention-info pid\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";--%>
 						}else{
 							return "<a class=\"attention-info\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/subProject/subProject/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";
 						}
 						}},
 					{field: 'clientName', align:'center', title: '报告号',width:170,templet: function(d){
 							if(0 == d.pid){
-								return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";
+								<%--return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";--%>
+								return  d.projectReportNumber;
 							}else{
 								return "<font></font>";
 							}
 						}},
                     {field: 'projectLeader', align:'center', title: '合同名称',width:180,templet: function(d){
 							if(0 == d.pid){
-								return "<a class=\"attention-info pid\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contractName + "</a>";
+								<%--return "<a class=\"attention-info pid\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contractName + "</a>";--%>
+								return  d.contractName;
 							}else{
 								return "<font></font>";
 							}

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

@@ -459,7 +459,7 @@
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
 					<label class="layui-form-label double-line">项目负责人审核意见：</label>
 					<div class="layui-input-block">
-						<form:textarea path="projectReportData.principalRemarks" csstyle="background-color: #f1f1f1" readonly="true" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea path="projectReportData.principalRemarks" cssStyle="background-color: #f1f1f1" readonly="true" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">

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

@@ -521,15 +521,28 @@
                     {field: 'projectId', title: '项目编号/项目定义号',width:160},
                     {field: 'projectName', align:'center', title: '项目名称',width:200,templet:function(d){
                     	if(0 == d.pid){
-							return "<a class=\"attention-info pid\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";
+                    		var xml="";
+							<shiro:hasPermission name="ruralProject:ruralProjectView:consultinglistView">
+							xml+="<a class=\"attention-info pid\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">"
+							</shiro:hasPermission>
+								xml+=d.projectName
+							<shiro:hasPermission name="ruralProject:ruralProjectView:consultinglistView">
+							xml+="</a>";
+							</shiro:hasPermission>
+
+								return xml;
 						}else{
-							return "<a class=\"attention-info\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/subProject/subProject/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";
+							if(1 == d.showView && d.showView != undefined){
+								return "<a class=\"attention-info\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/subProject/subProject/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";
+							}else{
+								return "<span title='"+ d.projName +"'>" +d.projName+ "</span>";
+							}
 						}
 						}},
 					{field: 'projectReportNumber', align:'center', title: '报告号',width:170,templet: function(d){
 							if(0 == d.pid){
 								if(""!= d.projectReportNumber){
-									return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";
+									return  d.projectReportNumber ;
 								}else{
 									return "<span title='暂无报告'  style='color: #009688'>暂无报告</span>";
 								}
@@ -540,7 +553,7 @@
                     {field: 'contractName', align:'center', title: '合同名称',width:180,templet: function(d){
 							if(0 == d.pid){
 								if(""!= d.contractName){
-									return "<a class=\"attention-info pid\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contractName + "</a>";
+									return  d.contractName ;
 								}else{
 									return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
 								}

src/main/webapp/webpage/modules/ruralprojectrecords/subProjectInfo/subProjectInfoList.jsp

@@ -217,13 +217,31 @@
 <div class="wrapper wrapper-content">
 	<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 		<ul class="list-tabs" >
-			<li><a href="${ctx}/ruralProject/ruralProjectRecords/view?id=${subProjectInfo.parentProId}">项目详情</a></li>
-			<li class="active"><a href="${ctx}/subProject/subProject/list?parentProId=${subProjectInfo.parentProId}&projectType=${subProjectInfo.projectType}">子项目列表</a></li>
-			<c:if test="${not empty projectId}">
-				<li><a href="${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=${projectId}&view=view">项目线上归档信息</a></li>
-				<li><a href="${ctx}/ruralProject/ruralProjectRecords/getAccessoryView?id=${subProjectInfo.parentProId}">附件信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
+			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+			<c:if test="${projectRecords.workContractInfo.id!=''}">
+				<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>
 			</c:if>
+			<c:if test="${flagProjectReportData.id!=null}">
+				<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
+			</c:if>
+			<c:if test="${reportedId!=null}">
+				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+			</c:if>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>
 		</ul>
+<%--		<ul class="list-tabs" >--%>
+<%--			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
+<%--			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>--%>
+<%--			<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>--%>
+<%--			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>--%>
+<%--			<c:if test="${reportedId!=null}">--%>
+<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>--%>
+<%--			</c:if>--%>
+<%--			<li ><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>--%>
+<%--			<li><a href="${ctx}/ruralProject/ruralProjectRecords/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
+<%--		</ul>--%>
 	</div>
 	<sys:message content="${message}"/>
 	<div class="layui-row">

src/main/webapp/webpage/modules/ruralprojectrecords/view/projectAccessoryView.jsp

@@ -0,0 +1,312 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>报告详情管理</title>
+	<meta name="decorator" content="default"/>
+	<%--<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />--%>
+	<%@include file="/webpage/include/treetable.jsp" %>
+	<style>
+		label.error{
+			top:40px;
+			left:0;
+		}
+	</style>
+	<script type="text/javascript">
+        var validateForm;
+        var dataList;
+        function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+            if(validateForm.form()){
+				if(obj == 1){
+					$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessage/saveReport");
+				}else{
+					$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessage/holdSaveReport");
+				}
+				$("#inputForm").submit();
+				return true;
+            }else {
+				parent.layer.msg("信息未填写完整!", {icon: 5});
+			}
+            return false;
+        }
+        $(document).ready(function() {
+			$("#upTable").treeTable({expandLevel : 5},{ expandable: true });
+			$("#gistdata_upTable").treeTable({expandLevel : 5},{ expandable: true });
+			$("#upTable_other").treeTable({expandLevel : 5},{ expandable: true });
+            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);
+                    }
+                }
+            });
+        });
+	</script>
+</head>
+<body>
+<div class="single-form">
+	<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
+		<ul class="list-tabs" >
+			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+			<c:if test="${projectRecords.workContractInfo.id!=''}">
+				<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>
+			</c:if>
+			<c:if test="${flagProjectReportData.id!=null}">
+				<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
+			</c:if>
+			<c:if test="${reportedId!=null}">
+				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+			</c:if>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
+			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>
+		</ul>
+<%--		<ul class="list-tabs" >--%>
+<%--			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
+<%--			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>--%>
+<%--			<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>--%>
+<%--			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>--%>
+<%--			<c:if test="${reportedId!=null}">--%>
+<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>--%>
+<%--			</c:if>--%>
+<%--			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>--%>
+<%--			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
+<%--		</ul>--%>
+	</div>
+	<div class="container${container}">
+		<form:form id="inputForm" modelAttribute="projectcontentinfo" action="${ctx}/ruralProject/ruralProjectMessage/saveReport" method="post" class="form-horizontal">
+		<form:hidden path="id"/>
+		<form:hidden path="name"/>
+		<form:hidden path="parentIds"/>
+		<form:hidden path="edit"/>
+		<form:hidden path="projectReportData.id"/>
+		<form:hidden path="projectReportData.createBy.id"/>
+		<form:hidden path="project.id"/>
+			<input type="hidden" id="reviewFee" value="${projectcontentinfo.projectReportData.reviewFee}">
+		<sys:message content="${message}"/>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>成果文件</h2></div>
+				<div id="addFile_attachment" style="display: none" class="upload-progress">
+					<span id="fileName_attachment" ></span>
+					<span id="_attachment" ></span>
+					<b><span id="baifenbi_attachment" ></span></b>
+					<div class="progress">
+						<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
+						</div>
+					</div>
+				</div>
+				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
+				<span id="attachment_title"></span>
+				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
+					<table id="upTable" class="table table-bordered table-condensed details">
+						<thead>
+						<tr>
+								<%-- <th>序号</th>--%>
+							<th width="55%">文件类型</th>
+							<th width="">文件名</th>
+							<th width="100px">操作</th>
+						</tr>
+						</thead>
+						<tbody id="file_attachment">
+						<c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
+							<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
+								<c:choose>
+									<c:when test="${fileAttachment.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<c:choose>
+											<c:when test="${fileAttachment.flag == 0}">
+												<td>${fileAttachment.attachName}</td>
+											</c:when>
+											<c:otherwise>
+												<td></td>
+											</c:otherwise>
+										</c:choose>
+									</c:otherwise>
+								</c:choose>
+								<td style="text-align:center;">
+									<c:choose>
+										<c:when test="${fileAttachment.flag == 0}">
+											${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}
+										</c:when>
+										<c:otherwise>
+											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.url}','90%','90%')">${fileAttachment.attachName} ; </a>
+										</c:otherwise>
+									</c:choose>
+								</td>
+								<td class="op-td" style="text-align:center;">
+									<div class="op-btn-box" >
+										<c:choose>
+											<c:when test="${fileAttachment.flag == 0}">
+
+											</c:when>
+											<c:otherwise>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+											</c:otherwise>
+										</c:choose>
+									</div>
+								</td>
+							</tr>
+						</c:forEach>
+						</tbody>
+					</table>
+				</div>
+			</div>
+
+
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>依据性资料</h2></div>
+				<div id="addFile_gistdata" style="display: none" class="upload-progress">
+					<span id="fileName_gistdata" ></span>
+					<span id="_gistdata" ></span>
+					<b><span id="baifenbi_gistdata" ></span></b>
+					<div class="progress">
+						<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
+						</div>
+					</div>
+				</div>
+				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
+				<span id="gistdata_title"></span>
+				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
+						<thead>
+						<tr>
+								<%-- <th>序号</th>--%>
+							<th width="55%">文件类型</th>
+							<th width="">文件名</th>
+							<th width="100px">操作</th>
+						</tr>
+						</thead>
+						<tbody id="file_gistdata">
+						<c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
+							<tr id="${fileGistdata.id}" pid="${fileGistdata.parent.id}">
+									<%-- <td>${status.index + 1}</td>--%>
+										<c:choose>
+											<c:when test="${fileGistdata.mustFlag == 1}">
+												<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+											</c:when>
+											<c:otherwise>
+												<c:choose>
+													<c:when test="${fileGistdata.flag == 0}">
+														<td>${fileGistdata.attachName}</td>
+													</c:when>
+													<c:otherwise>
+														<td></td>
+													</c:otherwise>
+												</c:choose>
+											</c:otherwise>
+										</c:choose>
+								<td style="text-align:center;">
+									<c:choose>
+										<c:when test="${fileGistdata.flag == 0}">
+												${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}
+											</c:when>
+											<c:otherwise>
+												<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>
+										</c:otherwise>
+									</c:choose>
+								</td>
+								<td class="op-td"  style="text-align:center;">
+									<div class="op-btn-box" >
+										<c:choose>
+											<c:when test="${fileGistdata.flag == 0}">
+
+											</c:when>
+											<c:otherwise>
+												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+											</c:otherwise>
+										</c:choose>
+									</div>
+								</td>
+							</tr>
+						</c:forEach>
+						</tbody>
+					</table>
+				</div>
+			</div>
+
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>其他文件</h2></div>
+				<div id="addFile_other" style="display: none" class="upload-progress">
+					<span id="fileName_other" ></span>
+					<span id="_other" ></span>
+					<b><span id="baifenbi_other" ></span></b>
+					<div class="progress">
+						<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
+						</div>
+					</div>
+				</div>
+				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
+				<span id="other_title"></span>
+				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
+					<table id="upTable_other" class="table table-bordered table-condensed details">
+						<thead>
+						<tr>
+								<%-- <th>序号</th>--%>
+							<th width="55%">文件类型</th>
+							<th width="">文件名</th>
+							<th width="100px">操作</th>
+						</tr>
+						</thead>
+						<tbody id="file_other">
+						<c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
+							<tr id="${fileOther.id}" pid="${fileOther.parent.id}">
+									<%-- <td>${status.index + 1}</td>--%>
+										<c:choose>
+											<c:when test="${fileOther.mustFlag == 1}">
+												<td><span style="color: red">* </span>${fileOther.attachName}</td>
+											</c:when>
+											<c:otherwise>
+												<c:choose>
+													<c:when test="${fileOther.flag == 0}">
+														<td>${fileOther.attachName}</td>
+													</c:when>
+													<c:otherwise>
+														<td></td>
+													</c:otherwise>
+												</c:choose>
+											</c:otherwise>
+										</c:choose>
+										<td style="text-align:center;">
+											<c:choose>
+												<c:when test="${fileOther.flag == 0}">
+													${fileOther.attachLength}M;  ${fileOther.attachTypes}
+												</c:when>
+												<c:otherwise>
+													<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>
+												</c:otherwise>
+											</c:choose>
+										</td>
+										<td class="op-td" style="text-align:center;">
+											<div class="op-btn-box" >
+												<c:choose>
+													<c:when test="${fileOther.flag == 0}">
+
+													</c:when>
+													<c:otherwise>
+														<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+													</c:otherwise>
+												</c:choose>
+											</div>
+										</td>
+							</tr>
+						</c:forEach>
+						</tbody>
+					</table>
+				</div>
+			</div>
+		<div class="form-group layui-row page-end"></div>
+		</form:form>
+	</div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/ruralprojectrecords/view/projectPlanView.jsp

@@ -0,0 +1,335 @@
+<%@ 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"/>
+
+    <link rel='layuicss' type="text/css" href="${ctxp}/static/layui/css/layui.css"/>
+    <style>
+        #projectDesc-error{
+            left:0;
+            top:82px;
+        }
+        .layui-layer-dialog{
+            background: red;
+        }
+        td input{
+            margin-left:0px !important;
+            height: 42px !important;
+        }
+    </style>
+    <script type="text/javascript">
+        var validateForm;
+        function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+            if(validateForm.form()){
+                if(i==2){
+                    $("#inputForm").attr("action","${ctx}/project/projectPlan/save");
+                }
+                $("#inputForm").submit();
+                return true;
+            }
+
+            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);
+                    }
+                }
+            });
+
+        });
+
+        function insertTitle(tValue){
+            var files = $("#attachment_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
+                var attachmentId = "";
+                var attachmentFlag = "131";
+                /*console.log(file);*/
+                var timestamp=new Date().getTime();
+
+                var storeAs = "projectPlan";
+                var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
+                var divId = "_attachment";
+                $("#addFile"+divId).show();
+                multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,0);}
+        }
+
+
+        laydate.render({
+            elem: '#beginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+            event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+            type : 'date'
+, trigger: 'click'
+        });
+        laydate.render({
+            elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+            event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+            type : 'date'
+, trigger: 'click'
+        });
+
+        function func(idx){
+            var ids = "projectPlanList";
+            //获取被选中的option标签
+            var vs = document.getElementById("projectPlanList"+idx+"_projectStage").value;
+        }
+
+        function addFile() {
+            $("#attachment_file").click();
+        }
+
+        function addRow(list, idx, tpl, row){
+            var idx1 = $("#projectPlanList tr").length;
+            idx+=1;
+            bornTemplete(list, idx, tpl, row, idx1);
+        }
+
+        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 delRow(obj, prefix){
+            var id = $(prefix+"_id");
+            var delFlag = $(prefix+"_delFlag");
+            if (id.val() == ""){
+                $(obj).parent().parent().remove();
+            }else if(delFlag.val() == "0"){
+                delFlag.val("1");
+                $(obj).html("&divide;").attr("title", "撤回删除");
+                $(obj).parent().parent().addClass("error");
+                $(obj).parent().parent().addClass("hide");
+            }else if(delFlag.val() == "1"){
+                delFlag.val("0");
+                $(obj).html("&times;").attr("title", "删除");
+                $(obj).parent().parent().removeClass("error");
+            }
+
+        }
+
+
+    </script>
+</head>
+<body>
+<div class="single-form">
+    <div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
+        <ul class="list-tabs" >
+            <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+            <c:if test="${projectRecords.workContractInfo.id!=''}">
+                <li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>
+            </c:if>
+            <c:if test="${flagProjectReportData.id!=null}">
+                <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
+            </c:if>
+            <c:if test="${reportedId!=null}">
+                <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+            </c:if>
+            <li class="active"><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>
+        </ul>
+<%--        <ul class="list-tabs" >--%>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>--%>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>--%>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>--%>
+<%--            <c:if test="${reportedId!=null}">--%>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>--%>
+<%--            </c:if>--%>
+<%--            <li class="active"><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>--%>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
+<%--        </ul>--%>
+    </div>
+    <div class="container">
+        <sys:message content="${message}"/>
+        <form:form id="inputForm" modelAttribute="projectRecords" action="${ctx}/project/projectPlan/save" method="post" class="form-horizontal">
+            <form:hidden path="id"/>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>项目计划信息</h2></div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">项目名称：</label>
+                    <div class="layui-input-block">
+                        <form:input path="projectName" htmlEscape="false" readonly="true" class="form-control layui-input required"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">项目编号：</label>
+                    <div class="layui-input-block">
+                        <div class="input-group">
+                            <form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">创建人：</label>
+                    <div class="layui-input-block">
+                        <form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
+                        <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">创建日期：</label>
+                    <div class="layui-input-block">
+                        <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  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 lw7">
+                <div class="layui-item nav-btns">
+                    <table id="bankinfo" class="table table-bordered table-condensed can-edit">
+                        <thead>
+                        <tr>
+                            <th width="80px">任务编码</th>
+                            <th >任务阶段</th>
+                            <th >计划开始时间</th>
+                            <th >计划结束时间</th>
+                            <th >提醒人</th>
+                            <th >完成人</th>
+                        </tr>
+                        </thead>
+                        <tbody id="projectPlanList">
+
+                        </tbody>
+                    </table>
+                    <script type="text/template" id="workClientBankTpl">//<!--
+                                <tr id="projectPlanList{{idx}}">
+                                    <td class="hide">
+                                        <input id="projectPlanList{{idx}}_id" name="projectPlanList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
+                                        <input id="projectPlanList{{idx}}_delFlag" name="projectPlanList[{{idx}}].delFlag" type="hidden" value="0"/>
+                                    </td>
+
+                                    <td width="60px">
+                                        <input id="projectPlanList{{idx}}_costNum" name="projectPlanList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
+                                    </td>
+                                    <td>
+                                       <input id="projectPlanList{{idx}}_projectStage" name="projectPlanList[{{idx}}].projectStage" readonly="readonly" value="{{row.projectStage}}" type="text" class="form-control contentDetail"/>
+                                    </td>
+
+                                    <td>
+                                        <input lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_beginDate" readonly="readonly" name="projectPlanList[{{idx}}].beginDate" type="text" value="{{row.beginDate}}"  class="form-control required datetime"/>
+                                    </td>
+                                    <td>
+                                        <input lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off" id="projectPlanList{{idx}}_endDate" readonly="readonly" name="projectPlanList[{{idx}}].endDate" type="text" value="{{row.endDate}}"  class="form-control required datetime"/>
+                                    </td>
+
+                                    <td>
+                                        <input id="projectPlanList{{idx}}_remindName" name="projectPlanList[{{idx}}].remindName" readonly="readonly" style="text-align: center"  value="{{row.remindName}}" type="text" class="form-control contentDetail"/>
+                                    </td>
+
+                                    <td>
+                                        <input id="projectPlanList{{idx}}_finishName" name="projectPlanList[{{idx}}].finishName" readonly="readonly" style="text-align: center"  value="{{row.finishName}}" type="text" class="form-control contentDetail"/>
+                                    </td>
+                                </tr>//-->
+                    </script>
+                </div>
+            </div>
+        </div>
+
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>项目计划附件信息</h2></div>
+                <div id="addFile_attachment" style="display: none" class="upload-progress">
+                    <span id="fileName_attachment" ></span>
+                    <b><span id="baifenbi_attachment" ></span></b>
+                    <div class="progress">
+                        <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
+                        </div>
+                    </div>
+                </div>
+                <input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
+                <span id="attachment_title"></span>
+                <div class="layui-item layui-col-xs12 form-table-container">
+                    <table id="listAttachment" class="table table-bordered table-condensed details">
+                        <thead>
+                        <tr>
+                                <%-- <th>序号</th>--%>
+                            <th width="25%">文件</th>
+                            <th width="25%">上传人</th>
+                            <th width="25%">上传时间</th>
+                            <th width="150px">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody id="file_attachment">
+                        <c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
+                            <tr class="trIdAdds">
+                                    <%-- <td>${status.index + 1}</td>--%>
+                                <c:choose>
+                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                    </c:when>
+                                    <c:otherwise>
+                                        <c:choose>
+                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
+                                            </c:when>
+                                            <c:otherwise>
+                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>
+                                            </c:otherwise>
+                                        </c:choose>
+                                    </c:otherwise>
+                                </c:choose>
+                                <td>${workClientAttachment.createBy.name}</td>
+                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+                                <td class="op-td">
+                                    <div class="op-btn-box" >
+                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                    </div>
+                                </td>
+                            </tr>
+                        </c:forEach>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+            <div class="form-group layui-row page-end"></div>
+        </form:form>
+    </div>
+</div>
+<script type="text/javascript">
+    var workClientBankRowIdx = 0,
+        workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
+    $(document).ready(function () {
+        var dataBank = ${fns:toJson(projectRecords.projectPlanList)};
+        for (var i = 0; i < dataBank.length; i++) {
+            addRow('#projectPlanList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);
+            workClientBankRowIdx = workClientBankRowIdx + 1;
+        }
+    });
+
+</script>
+</body>
+</html>

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp

@@ -0,0 +1,415 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>报告详情管理</title>
+	<meta name="decorator" content="default"/>
+	<%@include file="/webpage/include/treetable.jsp" %>
+	<script type="text/javascript">
+
+		$(document).ready(function() {
+			$("#upTable").treeTable({expandLevel : 5},{ expandable: true });
+			$("#gistdata_upTable").treeTable({expandLevel : 5},{ expandable: true });
+			$("#upTable_other").treeTable({expandLevel : 5},{ expandable: true });
+			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);
+					}
+				}
+			});
+			$("#attachment_btn").click(function () {
+				$("#attachment_file").click();
+			});
+			$("#gistdata_btn").click(function () {
+				$("#gistdata_file").click();
+			});
+			$("#other_btn").click(function () {
+				$("#other_file").click();
+			});
+		});
+
+		function openDialogre(title,url,width,height,target,buttons) {
+
+			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+				width = 'auto';
+				height = 'auto';
+			} else {//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			var split = buttons.split(",");
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				maxmin: true, //开启最大化最小化按钮
+				skin: 'three-btns',
+				content: url,
+				btn: split,
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(1) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},
+				btn2:function(index,layero){
+					if(split.length==2){return}
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(2) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}else {
+						return false;
+					}
+				},
+				btn3: function (index) {
+				}
+			});
+		}
+	</script>
+</head>
+
+<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/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>--%>
+
+		<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
+			<ul class="list-tabs" >
+				<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+				<c:if test="${projectRecords.workContractInfo.id!=''}">
+					<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>
+				</c:if>
+<%--				<c:if test="${flagProjectReportData!=null and flagProjectReportData.id!=''}">--%>
+					<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
+<%--				</c:if>--%>
+				<c:if test="${reportedId!=null}">
+					<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+				</c:if>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>
+			</ul>
+<%--			<ul class="list-tabs" >--%>
+<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
+<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>--%>
+<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>--%>
+<%--				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}&projectId=${projectRecords.id}">报告信息</a></li>--%>
+<%--				<c:if test="${reportedId!=null}">--%>
+<%--					<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${projectcontentinfo.id}">上报信息</a></li>--%>
+<%--				</c:if>--%>
+<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>--%>
+<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
+<%--			</ul>--%>
+		</div>
+<%--	</c:if>--%>
+	<div class="container${container}  view-form">
+		<form:form id="inputForm" modelAttribute="projectcontentinfo"  method="post" class="form-horizontal">
+			<div class="form-group layui-row first lw12">
+				<div class="form-group-label"><h2>基本信息</h2></div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>成果类型：</label>
+					<div class="layui-input-block">
+						<form:input path="projectReportData.achievementType" cssStyle="background-color: #f1f1f1" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+					<%--<div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">签章类型：</label>
+                        <div class="layui-input-block">
+                            <form:input path="projectReportData.ReportType" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                        </div>
+                    </div>--%>
+			</div>
+			<div class="form-group layui-row first lw12">
+				<div class="form-group-label">
+					<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="nav-btn layui-btn" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+					<h2>报告信息</h2>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">送审价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="reviewFee" path="projectReportData.reviewFee" cssStyle="background-color: #f1f1f1" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">审定价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="approvalFee" cssStyle="background-color: #f1f1f1" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">合同价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="contractFee" cssStyle="background-color: #f1f1f1" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">核增核减额(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="verifyFee" cssStyle="background-color: #f1f1f1" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">核增核减率(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="verifyRate" cssStyle="background-color: #f1f1f1" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">咨询标的额(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="consultFee" cssStyle="background-color: #f1f1f1" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">土建造价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="buildingFee" cssStyle="background-color: #f1f1f1" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">安装造价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="installFee" cssStyle="background-color: #f1f1f1" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">土建比例(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="buildingRate" cssStyle="background-color: #f1f1f1" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">安装比例(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="installRate" cssStyle="background-color: #f1f1f1" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">工作开始日期：</label>
+					<div class="layui-input-block with-icon">
+						<input class=" form-control layui-input" style="background-color: #f1f1f1" readonly="readonly" id="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">工作结束日期：</label>
+					<div class="layui-input-block with-icon">
+						<input class=" form-control layui-input" style="background-color: #f1f1f1" readonly="readonly" id="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+					</div>
+				</div>
+			</div>
+			<div class="form-group layui-row first lw12">
+				<div class="form-group-label">
+					<div style="float: right"> <a href="${ctx}/workfullmanage/workFullManage/downloadMassControl?id=${projectReportData.id}"  onclick="return confirmx('确认要下载控制流程单吗？', this.href)" class="nav-btn layui-btn" ><i class="fa fa-file-excel-o"></i> 下载流程单</a></div>
+					<h2>咨询质量控制信息</h2>
+				</div>
+
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">专业咨询员：</label>
+					<div class="layui-input-block  with-icon">
+						<input id="projectReportDataConsultantName" style="background-color: #f1f1f1" class="form-control layui-input" readonly="readonly" value="${projectReportData.consultant.name}">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+					<label class="layui-form-label double-line">专业咨询员审核意见：</label>
+					<div class="layui-input-block">
+						<form:textarea path="projectReportData.consultantRemarks" cssStyle="background-color: #f1f1f1" readonly="true" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">项目负责人：</label>
+					<div class="layui-input-block">
+						<input id="projectReportDataPrincipalName" style="background-color: #f1f1f1" class="form-control layui-input" readonly="readonly" value="${projectReportData.principal.name}">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+					<label class="layui-form-label double-line">项目负责人审核意见：</label>
+					<div class="layui-input-block">
+						<form:textarea path="projectReportData.principalRemarks" cssStyle="background-color: #f1f1f1" readonly="true" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">专业咨询员：</label>
+					<div class="layui-input-block  with-icon">
+						<input id="projectReportDataTechnicistName" style="background-color: #f1f1f1" class="form-control layui-input" readonly="true" value="${projectReportData.technicist.name}">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+					<label class="layui-form-label double-line">专业咨询员审核意见：</label>
+					<div class="layui-input-block">
+						<form:textarea path="projectReportData.technicistRemarks" cssStyle="background-color: #f1f1f1" readonly="true" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+					</div>
+				</div>
+			</div>
+			<c:if test="${not empty projectcontentinfo.projectReportData.act.procInsId}">
+				<div class="form-group layui-row">
+					<div class="form-group-label"><h2>审批流程</h2></div>
+					<div class="layui-item layui-col-xs12 form-table-container" >
+						<act:flowChart procInsId="${projectcontentinfo.projectReportData.act.procInsId}"/>
+						<act:histoicFlow procInsId="${projectcontentinfo.projectReportData.act.procInsId}"/>
+					</div>
+				</div>
+			</c:if>
+			<div class="form-group layui-row page-end"></div>
+		</form:form>
+	</div>
+</div>
+<script>
+	function openBill2(title,url,width,height,target,formId,tableId){
+		var rows = $(this).parent().prevAll().length + 1;
+		var frameIndex = parent.layer.getFrameIndex(window.name);
+		var urls = url+"&index="+frameIndex;
+		if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+			width='auto';
+			height='auto';
+		}else{//如果是PC端，根据用户设置的width和height显示。
+
+		}
+		top.layer.open({
+			type: 2,
+			area: [width, height],
+			title: title,
+			skin:"two-btns",
+			maxmin: false, //开启最大化最小化按钮
+			content: urls ,
+			btn: ['确定','关闭'],
+			yes: function(index, layero){
+				var body = top.layer.getChildFrame('body', index);
+				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var inputForm = body.find('#inputForm');
+				var top_iframe;
+				if(target){
+					top_iframe = target;//如果指定了iframe，则在改frame中跳转
+				}else{
+					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+				}
+				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+				inputForm.attr("action","${ctx}/projectAccessory/projectAccessory/saveWorkAttachment");//表单提交成功后，从服务器返回的url在当前tab中展示
+				var $document = iframeWin.contentWindow.document;
+
+				formSubmit2($document,formId,index,tableId);
+
+			},
+			cancel: function(index){
+			}
+		});
+	}
+	function formSubmit2($document,inputForm,index,tableId){
+
+		var validateForm = $($document.getElementById(inputForm)).validate({
+			submitHandler: function(form){
+				loading('正在提交，请稍等...');
+				form.submit();
+			},
+			errorContainer: "#messageBox",
+			errorPlacement: function(error, element) {
+				$($document.getElementById("#messageBox")).text("输入有误，请先更正。");
+				if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+					error.appendTo(element.parent().parent());
+				} else {
+					error.insertAfter(element);
+				}
+			}
+		});
+		if(validateForm.form()){
+			$($document.getElementById(inputForm)).ajaxSubmit({
+				success:function(data) {
+					var d = data;
+					//输出提示信息
+					if(d.str.length>0){
+						parent.layer.msg(d.str,{icon:1});
+					}
+					$("#"+tableId).load(location.href + " #"+tableId);
+					//关闭当前页
+					top.layer.close(index)
+				}
+			});
+		}
+	}
+
+	function formAttachment(title,url,width,height,target,formId){
+		var rows = $(this).parent().prevAll().length + 1;
+		var frameIndex = parent.layer.getFrameIndex(window.name);
+		var urls = url;
+		if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+			width='auto';
+			height='auto';
+		}else{//如果是PC端，根据用户设置的width和height显示。
+
+		}
+		top.layer.open({
+			type: 2,
+			area: [width, height],
+			title: title,
+			skin:"two-btns",
+			maxmin: false, //开启最大化最小化按钮
+			content: urls ,
+			btn: ['确定','关闭'],
+			yes: function(index, layero){
+				var body = top.layer.getChildFrame('body', index);
+				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var inputForm = body.find('#inputForm');
+				var top_iframe;
+				if(target){
+					top_iframe = target;//如果指定了iframe，则在改frame中跳转
+				}else{
+					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+				}
+				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+				inputForm.attr("action","${ctx}/projectAccessory/projectAccessory/saveWorkAttachment");//表单提交成功后，从服务器返回的url在当前tab中展示
+				var $document = iframeWin.contentWindow.document;
+				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var item = iframeWin.getSelectedItem();
+				setValuee(item);
+
+			},
+			cancel: function(index){
+			}
+		});
+	}
+	function setValuee(obj){
+		for(var i=0;i<obj.length;i++){
+			var idArr = $("#file_attachment tr:visible .clientId");
+			if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
+				addRowBaseData("#workBaseDataList",workBaseDataRowIdx,workBaseDataTpl,obj[i]);
+				$("#workBaseDataList"+workBaseDataRowIdx+"_nature").html("引用");
+				workBaseDataRowIdx=workBaseDataRowIdx+1;
+			}
+		}
+	}
+</script>
+</body>
+</html>

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportedView.jsp

@@ -0,0 +1,479 @@
+<%@ 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;
+        }
+        #reportedConsultantList tr td{
+            vertical-align: middle;
+            text-align:center;
+        }
+    </style>
+    <script type="text/javascript">
+        var validateForm;
+        var isMasterClient = true;//是否是委托方
+        var clientCount = 0;
+        function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+            if(validateForm.form()){
+                $("#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);
+                    }
+                }
+            });
+
+
+        });
+    </script>
+</head>
+<body>
+<div class="single-form">
+    <div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
+        <ul class="list-tabs" >
+            <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+            <c:if test="${projectRecords.workContractInfo.id!=''}">
+                <li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>
+            </c:if>
+            <c:if test="${flagProjectReportData.id!=null}">
+                <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
+            </c:if>
+            <c:if test="${reportedId!=null}">
+                <li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+            </c:if>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>
+        </ul>
+<%--        <ul class="list-tabs" >--%>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>--%>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>--%>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>--%>
+<%--            <c:if test="${reportedId!=null}">--%>
+<%--                <li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>--%>
+<%--            </c:if>--%>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>--%>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
+<%--        </ul>--%>
+    </div>
+    <div class="container">
+        <sys:message content="${message}"/>
+        <form:form id="inputForm" modelAttribute="ruralProjectRecordsReported" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectMessage/auditSaveReported" method="post" class="form-horizontal layui-form">
+            <form:hidden path="id"/>
+            <form:hidden path="projectId"/>
+
+            <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">咨询项目名称：</label>
+                    <div class="layui-input-block">
+                        <form:input path="ProjectName" htmlEscape="false" readonly="true" class="form-control layui-input" style="background-color: #ffffff;"/>
+                    </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">
+                        <input type="text" readonly="readonly" class="form-control layui-input" value="${ruralProjectRecordsReported.leaderNameStr}" style="background-color: #ffffff;">
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label">投资性质：</label>
+                    <div class="layui-input-block">
+                        <form:input path="TouZiXZ" htmlEscape="false" readonly="true" class="form-control required layui-input" style="background-color: #ffffff;"/>
+                    </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="ProjectType" htmlEscape="false" readonly="true" class="form-control required layui-input" style="background-color: #ffffff;"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label">合同类型：</label>
+                    <div class="layui-input-block">
+                        <form:input path="HeTongLeiXing" htmlEscape="false" readonly="true" class="form-control required layui-input" style="background-color: #ffffff;"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label">合同编号：</label>
+                    <div class="layui-input-block">
+                        <input type="text" htmlEscape="false" readonly="true" value="${ruralProjectRecordsReported.ziXunHTBH}" class="form-control layui-input required" style="background-color: #ffffff;">
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label">委托单位：</label>
+                    <div class="layui-input-block">
+                        <form:input path="WeiTuoDW" htmlEscape="false" readonly="true" class="form-control layui-input required" style="background-color: #ffffff;"/>
+                    </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="LianXiDH" htmlEscape="false" readonly="true"  class="form-control layui-input required" style="background-color: #ffffff;"/>
+                    </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="DangABH" htmlEscape="false" readonly="true" class="form-control layui-input required" style="background-color: #ffffff;"/>
+                    </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="BaoGaoShuQianFaDate" htmlEscape="false" readonly="true" class="laydate-icondate required form-control layui-input layer-date laydate-icon" style="background-color: #ffffff;"/>
+                    </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="ZiXunShouRu" htmlEscape="false" readonly="true" onchange="zxChange()" class="form-control required layui-input" style="background-color: #ffffff;"/>
+                    </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="zaoJiaShiZhengHao" htmlEscape="false" readonly="true" class="form-control required layui-input" style="background-color: #ffffff;"/>
+                    </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">
+                        <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>
+                            </tr>
+                            </thead>
+                            <tbody id="reportedConsultantList">
+                            <c:choose>
+                                <c:when test="${not empty ruralProjectRecordsReported.reportedConsultantList}">
+                                    <c:forEach items="${ruralProjectRecordsReported.reportedConsultantList}" var="consultant" varStatus="status">
+                                        <tr>
+                                            <td>${status.index + 1}</td>
+                                            <td>${consultant.zixunyuanName}</td>
+                                            <td>${consultant.zhucezigezhID}</td>
+                                            <td>${consultant.wordnr}</td>
+                                            <td>${consultant.wcyysrbl}</td>
+                                            <td>${consultant.wcyysr}</td>
+
+                                        </tr>
+                                    </c:forEach>
+                                </c:when>
+                                <c:otherwise>
+                                    <tr>
+                                        <td colspan="6" align="center">暂无数据</td>
+                                    </tr>
+                                </c:otherwise>
+                            </c:choose>
+                            </tbody>
+                        </table>
+                    </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">工程所在省份</label>
+                    <div class="layui-input-block with-icon">
+                        <input type="text" readonly="readonly" class="form-control layui-input" value="${ruralProjectRecordsReported.province}" style="background-color: #ffffff;">
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line">工程所在地级市</label>
+                    <div class="layui-input-block">
+                        <input type="text" readonly="readonly" class="form-control layui-input" value="${ruralProjectRecordsReported.city}" style="background-color: #ffffff;">
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line">工程所在区县</label>
+                    <div class="layui-input-block">
+                        <input type="text" readonly="readonly" class="form-control layui-input" value="${ruralProjectRecordsReported.county}" style="background-color: #ffffff;">
+                    </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="PorjectStruct" htmlEscape="false" readonly="true" class="form-control required layui-input" style="background-color: #ffffff;"/>
+                    </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" readonly="true" class="form-control layui-input number" style="background-color: #ffffff;"/>
+                    </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" readonly="true" class="form-control layui-input number" style="background-color: #ffffff;"/>
+                    </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="GCGMValue" htmlEscape="false" readonly="true" class="form-control layui-input required number" style="background-color: #ffffff;"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label">计量单位：</label>
+                    <div class="layui-input-block">
+                        <form:input path="GCGMUnit" htmlEscape="false" readonly="true" class="form-control required layui-input" style="background-color: #ffffff;"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label">工程用途：</label>
+                    <div class="layui-input-block">
+                        <form:input path="PorjectUse" htmlEscape="false" readonly="true" class="form-control required layui-input" style="background-color: #ffffff;"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line" title="注：指咨询项目编审后的最终造价，&#13;其中工程结算项目填审定价，标底编制填招标控制价，&#13;工程造价全过程管理填工程投资总额或审定价。"><span class="require-item">咨询标的额(万元)：</span></label>
+                    <div class="layui-input-block">
+                        <form:input path="ZiXunBDE" htmlEscape="false" readonly="true" class="form-control required layui-input number" style="background-color: #ffffff;"/>
+                    </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" readonly="true" class="form-control layui-input" style="background-color: #ffffff;"/>
+                    </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" readonly="true" class="form-control layui-input" style="background-color: #ffffff;"/>
+                    </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" style="background-color: #ffffff;"/>
+                    </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" style="background-color: #ffffff;"/>
+                    </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" style="background-color: #ffffff;"/>
+                    </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" style="background-color: #ffffff;"/>
+                    </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" style="background-color: #ffffff;"/>
+                    </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" readonly="true" class="form-control layui-input number" style="background-color: #ffffff;"/>
+                    </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="SongShenJia" htmlEscape="false" readonly="true" class="form-control required layui-input number" style="background-color: #ffffff;"/>
+                    </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="ShenDingJia" htmlEscape="false" readonly="true" class="form-control required layui-input number" style="background-color: #ffffff;"/>
+                    </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" style="background-color: #ffffff;"/>
+                    </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" style="background-color: #ffffff;"/>
+                    </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" readonly="true" style="background-color: #ffffff;"/>
+                    </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" readonly="true" style="background-color: #ffffff;"/>
+                    </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" readonly="true" style="background-color: #ffffff;"/>
+                    </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" readonly="true" style="background-color: #ffffff;"/>
+                    </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" style="background-color: #ffffff;"/>
+                    </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" style="background-color: #ffffff;"/>
+                    </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" style="background-color: #ffffff;"/>
+                    </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" style="background-color: #ffffff;"/>
+                    </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" disabled="true" 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" disabled="true" 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" disabled="true" 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" disabled="true" 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" disabled="true" 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" readonly="true" rows="4"  maxlength="255"  class="form-control " style="background-color: #ffffff;"/>
+                    </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();
+    })
+</script>
+</body>
+</html>

src/main/webapp/webpage/modules/ruralprojectrecords/view/ruralProjectRecordsView.jsp

@@ -26,16 +26,23 @@
 <div class="single-form">
 	<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 		<ul class="list-tabs" >
-			<li class="active"><a href="${ctx}/ruralProject/ruralProjectRecords/view?id=${projectRecords.id}">项目详情</a></li>
-			<li><a href="${ctx}/subProject/subProject/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
-			<c:if test="${not empty projectId}">
-				<li><a href="${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=${projectId}&view=view">项目线上归档信息</a></li>
+			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+			<c:if test="${projectRecords.workContractInfo!=null and projectRecords.workContractInfo.id!=''}">
+				<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>
 			</c:if>
-			<li><a href="${ctx}/ruralProject/ruralProjectRecords/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>
+			<c:if test="${flagProjectReportData.id!=null}">
+				<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
+			</c:if>
+			<c:if test="${reportedId!=null}">
+				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+			</c:if>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>
 		</ul>
 	</div>
 	<div class="container view-form">
-		<form:form id="inputForm" modelAttribute="projectRecords" action="${ctx}/ruralProject/ruralProjectRecords/saveAudit" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectRecords" method="post" class="form-horizontal">
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>项目合同信息</h2></div>
                <div id="divv">

src/main/webapp/webpage/modules/ruralprojectrecords/view/workClientAndContractView.jsp

@@ -13,6 +13,34 @@
 </head>
 <body >
 <div class="single-form view-form">
+    <div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
+        <ul class="list-tabs" >
+            <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+            <c:if test="${projectRecords.workContractInfo.id!=''}">
+                <li  class="active"><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>
+            </c:if>
+            <c:if test="${flagProjectReportData.id!=null}">
+                <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
+            </c:if>
+            <c:if test="${reportedId!=null}">
+                <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+            </c:if>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>
+        </ul>
+<%--        <ul class="list-tabs" >--%>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>--%>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>--%>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>--%>
+<%--            <c:if test="${reportedId!=null}">--%>
+<%--                <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>--%>
+<%--            </c:if>--%>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>--%>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
+<%--        </ul>--%>
+    </div>
     <form class="container">
         <form:form id="inputForm" modelAttribute="workContractInfo"  method="post" class="form-horizontal layui-form">
         <div class="form-group layui-row first">

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllList.jsp

@@ -512,7 +512,12 @@
 				//{checkbox: true, fixed: true},
                 {field:'index',align:'center', title: '序号',width:40}
 				,{field:'projName',align:'center', title: '项目名称', minWidth:160,templet:function(d){
-						return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.projectId +"','95%', '95%')\">" + d.projName + "</a>";
+						if(1 == d.showView && d.showView != undefined){
+							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.projectId +"','95%', '95%')\">" + d.projName + "</a>";
+						}else{
+							return "<span title='"+ d.projName +"'>" +d.projName+ "</span>";
+						}
+					<%--return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.projectId +"','95%', '95%')\">" + d.projName + "</a>";--%>
 					}}
                 ,{field:'invoiceNum',align:'center', sort:true,title: '发票申请编号', minWidth:130,templet:function(d){
                         return "<a class=\"attention-info\" title=\""+ d.invoiceNum +"\"href=\"javascript:void(0);\" onclick=\"openDialogListView('查看发票管理', '${ctx}/workinvoiceAll/workInvoiceAll/form?id=" + d.id + "&tabId=1','"+ d.id +"','95%', '95%')\">" + d.invoiceNum + "</a>";
@@ -682,6 +687,9 @@
 								<c:otherwise>"0"</c:otherwise>
 						</c:choose>
 					</shiro:hasPermission>
+					<shiro:hasPermission name="ruralProject:ruralProjectView:workInvoiceAllView">
+					,"showView":1
+					</shiro:hasPermission>
                 }
                 </c:forEach>
                 </c:if>

src/main/webapp/webpage/modules/workinvoice/workInvoiceList.jsp

@@ -512,7 +512,11 @@
 				//{checkbox: true, fixed: true},
                 {field:'index',align:'center', title: '序号',width:40}
 				,{field:'projName',align:'center', title: '项目名称', minWidth:160,templet:function(d){
-						return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.projectId +"','95%', '95%')\">" + d.projName + "</a>";
+						if(1 == d.showView && d.showView != undefined){
+							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.projectId +"','95%', '95%')\">" + d.projName + "</a>";
+						}else{
+							return "<span title='"+ d.projName +"'>" +d.projName+ "</span>";
+						}
 					}}
                 ,{field:'invoiceNum',align:'center', sort:true,title: '发票申请编号', minWidth:130,templet:function(d){
                         return "<a class=\"attention-info\" title=\""+ d.invoiceNum +"\"href=\"javascript:void(0);\" onclick=\"openDialogListView('查看发票管理', '${ctx}/workinvoice/workInvoice/form?id=" + d.id + "&tabId=1','"+ d.id +"','95%', '95%')\">" + d.invoiceNum + "</a>";
@@ -661,6 +665,9 @@
 							<c:when test="${workInvoice.invoiceState == '7'}">"是"</c:when>
 					<c:otherwise>"否"</c:otherwise>
 					</c:choose>
+					<shiro:hasPermission name="ruralProject:ruralProjectView:workInvoiceView">
+					,"showView":1
+					</shiro:hasPermission>
 <%--					<shiro:hasPermission name="workinvoice:workInvoice:receipt">--%>
 <%--						,"financeFlag":--%>
 <%--							<c:choose>--%>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementAllList.jsp

@@ -156,7 +156,12 @@
                         return xml;
                     }}
                 ,{field:'projectId', align:'center',title: '报销项目', minWidth:150,templet:function(d){
-                        return "<span title='"+ d.projectId +"'>" + d.projectId + "</span>";
+                        if(1 == d.showView && d.showView != undefined){
+                            return "<a class=\"attention-info\" title=\"" + d.projectId + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.proId +"','95%', '95%')\">" + d.projectId + "</a>";
+                        }else{
+                            return "<span title='"+ d.projectId +"'>" +d.projectId+ "</span>";
+                        }
+                    // return "<span title='"+ d.projectId +"'>" + d.projectId + "</span>";
                     }}
                 ,{field:'handleName',align:'center', title: '经办人', width:100,templet:function(d){
                         return "<span title='"+ d.handleName +"'>" + d.handleName + "</span>";
@@ -218,6 +223,7 @@
                     ,"submitterName":"<c:out value="${fns:getUserById(workReimbursement.submitterId).name}" escapeXml="true"/>"
                     ,"handleName":"<c:out value="${fns:getUserById(workReimbursement.handleId).name}" escapeXml="true"/>"
                     ,"officeId":"${fns:getOfficeById(workReimbursement.officeId).name}"
+                    ,"proId":"${workReimbursement.project.projectId}"
                     ,"projectId":
                         <c:if test="${workReimbursement.ext == 1}">
                             "<c:out value="${workReimbursement.projectName}" escapeXml="true"/>"
@@ -254,6 +260,9 @@
                         <c:if test="${workReimbursement.status == '3' && fns:getUser().id == workReimbursement.createBy.id}">"1"</c:if>
                     <c:if test="${workReimbursement.status != '3' || fns:getUser().id != workReimbursement.createBy.id}">"0"</c:if>
                     </shiro:hasPermission>
+                    <shiro:hasPermission name="ruralProject:ruralProjectView:reimbursementAllView">
+                    ,"showView":1
+                    </shiro:hasPermission>
                 }
                 </c:forEach>
                 </c:if>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementList.jsp

@@ -156,7 +156,12 @@
                         return xml;
                     }}
                 ,{field:'projectId', align:'center',title: '报销项目', minWidth:150,templet:function(d){
-                        return "<span title='"+ d.projectId +"'>" + d.projectId + "</span>";
+                        if(1 == d.showView && d.showView != undefined){
+                            return "<a class=\"attention-info\" title=\"" + d.projectId + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.proId +"','95%', '95%')\">" + d.projectId + "</a>";
+                        }else{
+                            return "<span title='"+ d.projectId +"'>" +d.projectId+ "</span>";
+                        }
+                    // return "<span title='"+ d.projectId +"'>" + d.projectId + "</span>";
                     }}
                 ,{field:'handleName',align:'center', title: '经办人', width:100,templet:function(d){
                         return "<span title='"+ d.handleName +"'>" + d.handleName + "</span>";
@@ -218,6 +223,7 @@
                     ,"submitterName":"<c:out value="${fns:getUserById(workReimbursement.submitterId).name}" escapeXml="true"/>"
                     ,"handleName":"<c:out value="${fns:getUserById(workReimbursement.handleId).name}" escapeXml="true"/>"
                     ,"officeId":"${fns:getOfficeById(workReimbursement.officeId).name}"
+                    ,"proId":"${workReimbursement.project.projectId}"
                     ,"projectId":
                         <c:if test="${workReimbursement.ext == 1}">
                             "<c:out value="${workReimbursement.projectName}" escapeXml="true"/>"
@@ -254,6 +260,9 @@
                         <c:if test="${workReimbursement.status == '3' && fns:getUser().id == workReimbursement.createBy.id}">"1"</c:if>
                     <c:if test="${workReimbursement.status != '3' || fns:getUser().id != workReimbursement.createBy.id}">"0"</c:if>
                     </shiro:hasPermission>
+                    <shiro:hasPermission name="ruralProject:ruralProjectView:reimbursementView">
+                    ,"showView":1
+                    </shiro:hasPermission>
                 }
                 </c:forEach>
                 </c:if>