项目列表子项目树形图功能开发

src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecordTreeData.java

@@ -18,10 +18,13 @@ public class ProjectRecordTreeData extends DataEntity<ProjectRecordTreeData> {
     private String createId;        //创建者id
     private String status;          //状态
     private String reportId;        //报告id
+    private String projectReportNumber;        //报告号
     private String reportName;      //报告名称
     private String projectTypeId;      //项目类型id
+    private String recodeNum; //归档申请编号
 
     private String contentPId;      //保留工作内容id
+    private String projectLeaders;      //负责人
 
     private String dictType;
     private String parentIds;
@@ -37,6 +40,22 @@ public class ProjectRecordTreeData extends DataEntity<ProjectRecordTreeData> {
     private double trueAmt;//有效合同金额
     private Date date;   //时间控件
 
+    private Integer projectReportStatus; //报告状态
+    private Integer projectReportRecordStatus; //归档状态
+    private Integer downProjectReportRecordStatus; //线下归档状态
+    private String reportedState;   //上报状态
+    private String contractId;   //合同id
+    private String prrdId;
+    private String prrId;
+    private String prrProcessInstanceId;
+    private Integer flag;
+    private String flagAdmin;
+    private String flagArchive;
+    private String syncStatus;
+    private String reportStatus;
+    private String prrdProcessInstanceId;
+    private String reportedProcessInstanceId;
+
 
 
 
@@ -247,4 +266,148 @@ public class ProjectRecordTreeData extends DataEntity<ProjectRecordTreeData> {
     public void setProjectTypeId(String projectTypeId) {
         this.projectTypeId = projectTypeId;
     }
+
+    public String getProjectReportNumber() {
+        return projectReportNumber;
+    }
+
+    public void setProjectReportNumber(String projectReportNumber) {
+        this.projectReportNumber = projectReportNumber;
+    }
+
+    public String getRecodeNum() {
+        return recodeNum;
+    }
+
+    public void setRecodeNum(String recodeNum) {
+        this.recodeNum = recodeNum;
+    }
+
+    public Integer getProjectReportStatus() {
+        return projectReportStatus;
+    }
+
+    public void setProjectReportStatus(Integer projectReportStatus) {
+        this.projectReportStatus = projectReportStatus;
+    }
+
+    public Integer getProjectReportRecordStatus() {
+        return projectReportRecordStatus;
+    }
+
+    public void setProjectReportRecordStatus(Integer projectReportRecordStatus) {
+        this.projectReportRecordStatus = projectReportRecordStatus;
+    }
+
+    public Integer getDownProjectReportRecordStatus() {
+        return downProjectReportRecordStatus;
+    }
+
+    public void setDownProjectReportRecordStatus(Integer downProjectReportRecordStatus) {
+        this.downProjectReportRecordStatus = downProjectReportRecordStatus;
+    }
+
+    public String getReportedState() {
+        return reportedState;
+    }
+
+    public void setReportedState(String reportedState) {
+        this.reportedState = reportedState;
+    }
+
+    public String getProjectLeaders() {
+        return projectLeaders;
+    }
+
+    public void setProjectLeaders(String projectLeaders) {
+        this.projectLeaders = projectLeaders;
+    }
+
+    public String getContractId() {
+        return contractId;
+    }
+
+    public void setContractId(String contractId) {
+        this.contractId = contractId;
+    }
+
+    public String getPrrdId() {
+        return prrdId;
+    }
+
+    public void setPrrdId(String prrdId) {
+        this.prrdId = prrdId;
+    }
+
+    public String getPrrId() {
+        return prrId;
+    }
+
+    public void setPrrId(String prrId) {
+        this.prrId = prrId;
+    }
+
+    public String getPrrProcessInstanceId() {
+        return prrProcessInstanceId;
+    }
+
+    public void setPrrProcessInstanceId(String prrProcessInstanceId) {
+        this.prrProcessInstanceId = prrProcessInstanceId;
+    }
+
+    public Integer getFlag() {
+        return flag;
+    }
+
+    public void setFlag(Integer flag) {
+        this.flag = flag;
+    }
+
+    public String getFlagAdmin() {
+        return flagAdmin;
+    }
+
+    public void setFlagAdmin(String flagAdmin) {
+        this.flagAdmin = flagAdmin;
+    }
+
+    public String getFlagArchive() {
+        return flagArchive;
+    }
+
+    public void setFlagArchive(String flagArchive) {
+        this.flagArchive = flagArchive;
+    }
+
+    public String getSyncStatus() {
+        return syncStatus;
+    }
+
+    public void setSyncStatus(String syncStatus) {
+        this.syncStatus = syncStatus;
+    }
+
+    public String getReportStatus() {
+        return reportStatus;
+    }
+
+    public void setReportStatus(String reportStatus) {
+        this.reportStatus = reportStatus;
+    }
+
+    public String getPrrdProcessInstanceId() {
+        return prrdProcessInstanceId;
+    }
+
+    public void setPrrdProcessInstanceId(String prrdProcessInstanceId) {
+        this.prrdProcessInstanceId = prrdProcessInstanceId;
+    }
+
+    public String getReportedProcessInstanceId() {
+        return reportedProcessInstanceId;
+    }
+
+    public void setReportedProcessInstanceId(String reportedProcessInstanceId) {
+        this.reportedProcessInstanceId = reportedProcessInstanceId;
+    }
 }

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

@@ -23,6 +23,8 @@ 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.dao.WorkProjectUserDao;
+import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
@@ -69,8 +71,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.ui.Model;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -142,6 +146,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
     private ProjectcontentinfoService projectcontentinfoService;
     @Autowired
     private ProjectTemplateService projectTemplateService;
+    @Autowired
+    private SubProjectInfoService subProjectInfoService;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -216,6 +222,219 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         return page;
     }
 
+    @Transactional(readOnly = false)
+    public Map<String,List> getProjectList(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response) {
+        //添加查询类型(工程咨询)
+        Page<RuralProjectRecords> page = this.findPage(new Page<RuralProjectRecords>(request, response), projectRecords);
+        //无合同状态下，获取委托方的名称
+        List<RuralProjectRecords> list = page.getList();
+        List<ProjectRecordTreeData> projectRecordTreeDataList = new ArrayList<>();
+        Map<String,List> map = new HashMap<>();
+        for (int i = 0; i < list.size(); i++) {
+            ProjectRecordTreeData projectRecordTreeData = new ProjectRecordTreeData();
+            RuralProjectRecords records1 = list.get(i);
+            if (records1.getWorkContractInfo() == null) {
+                if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
+                    WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
+                    WorkContractInfo contractInfo = new WorkContractInfo();
+                    contractInfo.setClient(linkman.getClientId());
+                    records1.setWorkContractInfo(contractInfo);
+                }
+            }
+
+            projectRecordTreeData = getParentInfo(records1);
+
+            projectRecordTreeDataList.add(projectRecordTreeData);
+
+        }
+
+        //获取子项目信息
+        SubProjectInfo subProjectInfo = new SubProjectInfo();
+        subProjectInfo.setProjectName(projectRecords.getProjectName());
+        //查询所有子项目数据
+        Page<SubProjectInfo> subProjectList = subProjectInfoService.findPage(new Page<SubProjectInfo>(request, response), subProjectInfo);
+        List<SubProjectInfo> reportDataList = subProjectList.getList();
+
+        /*for (SubProjectInfo subProject: reportDataList) {
+                ProjectRecordTreeData treeData = getSubInfo(subProject);
+                projectRecordTreeDataList.add(treeData);
+            }*/
+
+        //降所有已查询到的项目数据id放到list中
+        Set parentIdSet = new HashSet();
+        for (ProjectRecordTreeData treeData:projectRecordTreeDataList) {
+            parentIdSet.add(treeData.getId());
+        }
+        //Set转List
+        List<String> parentIdList = new ArrayList<>(parentIdSet);
+
+        /*Iterator<SubProjectInfo> iterator = reportDataList.iterator();
+        while(iterator.hasNext()){
+            SubProjectInfo subInfo = iterator.next();
+            if(parentIdList.contains(subInfo.getParentProId())) {
+                ProjectRecordTreeData treeData = getSubInfo(subInfo);
+                projectRecordTreeDataList.add(treeData);
+                parentIdList.add(subInfo.getId());
+                iterator.remove();
+            }
+        }*/
+
+        //项目名称不为空则进行所有项目的查询和处理
+        //if(StringUtils.isNotBlank(projectRecords.getProjectName())){
+            for (SubProjectInfo subProject: reportDataList) {
+                //如果子项目的父项目id不存在于已查找的父项目中则在总list中添加父项目
+                if(!parentIdList.contains(subProject.getParentProId())) {
+                    RuralProjectRecords parentProjectInfo = this.get(subProject.getParentProId());
+                    ProjectRecordTreeData info = getParentInfo(parentProjectInfo);
+                    if (projectRecords.getProjectType().equals(parentProjectInfo.getProjectType())){
+                        projectRecordTreeDataList.add(info);
+                        parentIdList.add(parentProjectInfo.getId());
+                    }
+                }
+
+                ProjectRecordTreeData treeData = getSubInfo(subProject);
+                projectRecordTreeDataList.add(treeData);
+                parentIdList.add(subProject.getId());
+            }
+        //}
+
+        map.put("data",projectRecordTreeDataList);
+        return map;
+    }
+
+
+
+    private ProjectRecordTreeData getParentInfo(RuralProjectRecords info){
+
+        ProjectRecordTreeData projectRecordTreeData = new ProjectRecordTreeData();
+        //将界面需要展示数据放入类中
+        //项目id
+        projectRecordTreeData.setId(info.getId());
+        //项目名称
+        projectRecordTreeData.setProjectName(info.getProjectName());
+        //项目编号
+        projectRecordTreeData.setProjectId(info.getProjectId());
+        //报告号
+        projectRecordTreeData.setProjectReportNumber(info.getProjectReportNumber());
+        //合同名称
+        projectRecordTreeData.setContractName(info.getContractName());
+        //归档号
+        if(com.jeeplus.common.utils.StringUtils.isNotBlank(info.getRecodeNum())){
+            projectRecordTreeData.setRecodeNum(info.getRecodeNum());
+        }else{
+            projectRecordTreeData.setRecodeNum("");
+        }
+        //新增报告状态
+        projectRecordTreeData.setProjectReportStatus(info.getProjectReportStatus());
+        //线上归档状态
+        projectRecordTreeData.setProjectReportRecordStatus(info.getProjectReportRecordStatus());
+        //线下归档状态
+        projectRecordTreeData.setDownProjectReportRecordStatus(info.getDownProjectReportRecordStatus());
+        //上报状态
+        projectRecordTreeData.setReportedState(info.getReportedState());
+        //委托方
+        if(null != info.getWorkContractInfo()){
+            if(null != info.getWorkContractInfo().getClient()){
+                projectRecordTreeData.setClientName(info.getWorkContractInfo().getClient().getName());
+            }
+        }
+        //负责人
+        StringBuilder sb = new StringBuilder();
+        if(null != info.getProjectLeaders()){
+            for (int u = 0; u < info.getProjectLeaders().size(); u++) {
+                sb.append(info.getProjectLeaders().get(u).getName());
+                if (u < info.getProjectLeaders().size() - 1) {
+                    sb.append(",");
+                }
+            }
+        }
+        projectRecordTreeData.setProjectLeaders(sb.toString());
+        //合同名称
+        if(null != info.getWorkContractInfo()){
+            projectRecordTreeData.setContractName(info.getWorkContractInfo().getName());
+            projectRecordTreeData.setContractId(info.getWorkContractInfo().getId());
+        }
+        projectRecordTreeData.setPrrdId(info.getPrrdId());
+        projectRecordTreeData.setPrrId(info.getPrrId());
+        projectRecordTreeData.setPrrProcessInstanceId(info.getPrrProcessInstanceId());
+        projectRecordTreeData.setSyncStatus(info.getSyncStatus());
+        projectRecordTreeData.setReportStatus(info.getReportStatus());
+        projectRecordTreeData.setPrrdProcessInstanceId(info.getPrrdProcessInstanceId());
+        projectRecordTreeData.setReportedProcessInstanceId(info.getReportedProcessInstanceId());
+
+        //判断是否为admin
+        if (UserUtils.getUser().isAdmin()){
+            projectRecordTreeData.setFlagAdmin("1");
+        }else{
+            projectRecordTreeData.setFlagAdmin("0");
+        }
+        //判断是否为归档员
+        if (UserUtils.getArchiveUserRole()){
+            projectRecordTreeData.setFlagArchive("1");
+        }else{
+            projectRecordTreeData.setFlagArchive("0");
+        }
+
+        //判断当前登陆人是否有操作权限
+        if(UserUtils.getUser().getId().equals(info.getLeaderIds()) || UserUtils.getUser().getId().equals(info.getCreateBy().getId())){
+            projectRecordTreeData.setFlag(1);
+        }else {
+            projectRecordTreeData.setFlag(0);
+        }
+
+        if(null!= info.getWorkContractInfo()){
+            projectRecordTreeData.setContractName(info.getWorkContractInfo().getName());
+            projectRecordTreeData.setClientName(info.getWorkContractInfo().getClient().getName());
+        }else{
+            projectRecordTreeData.setContractName("");
+            projectRecordTreeData.setClientName("");
+        }
+        projectRecordTreeData.setCreateDate(info.getCreateDate());
+        projectRecordTreeData.setCreateId(info.getCreateBy().getId());
+        //父节点的pid设置为0
+        projectRecordTreeData.setPid("0");
+
+        return projectRecordTreeData;
+    }
+    private ProjectRecordTreeData getSubInfo(SubProjectInfo reportData){
+
+        ProjectRecordTreeData treeData = new ProjectRecordTreeData();
+
+        //将界面需要展示数据放入类中
+        //项目id
+        treeData.setId(reportData.getId());
+        //项目名称
+        treeData.setProjectName(reportData.getProjectName());
+        //项目定义号
+        treeData.setProjectId(reportData.getProjectId());
+        //报告号
+        treeData.setProjectReportNumber("");
+        //合同名称
+        treeData.setContractName("");
+        //归档号
+        treeData.setRecodeNum("");
+        //委托方
+        treeData.setClientName("");
+        //合同名称
+        treeData.setContractName("");
+        treeData.setCreateDate(reportData.getPackTime());
+
+        //添加工作内容id
+        treeData.setParentIds(reportData.getParentProId());
+        //添加登陆者id
+        treeData.setLoginId(UserUtils.getUser().getId());
+        treeData.setPid(reportData.getParentProId());
+        treeData.setCreateId(reportData.getCreateBy().getId());
+
+        //判断当前登陆人是否有操作权限
+        if(UserUtils.getUser().getId().equals(reportData.getCreateBy().getId())){
+            treeData.setFlag(1);
+        }else {
+            treeData.setFlag(0);
+        }
+        return treeData;
+    }
+
 
 
 

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

@@ -120,43 +120,16 @@ public class RuralCostProjectMessageController extends BaseController {
         //添加查询类型(造价审核)
         projectRecords.setProjectType("2");
         Page<RuralProjectRecords> page = ruralProjectMessageService.findPage(new Page<RuralProjectRecords>(request, response), projectRecords);
-        //无合同状态下，获取委托方的名称
-        List<RuralProjectRecords> list = page.getList();
-        for (int i = 0; i < list.size(); i++) {
-            RuralProjectRecords records1 = list.get(i);
-            if (records1.getWorkContractInfo() == null) {
-                projectRecordsService.queryLinkmanInfos(records1);
-                if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
-                    WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
-                    WorkContractInfo contractInfo = new WorkContractInfo();
-                    contractInfo.setClient(linkman.getClientId());
-                    records1.setWorkContractInfo(contractInfo);
-                }
-            }
-            ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
-            projectPlanInfo.setProjectId(records1.getId());
-            //获取项目计划信息
-            List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
-            if(projectPlanList.size()>0){
-                records1.setView("true");
-            }else{
-                records1.setView("false");
-            }
-            //判断是否为admin
-            if (UserUtils.getUser().isAdmin()){
-                records1.setFlagAdmin("1");
-            }else{
-                records1.setFlagAdmin("0");
-            }
-            //判断是否为归档员
-            if (UserUtils.getArchiveUserRole()){
-                records1.setFlagArchive("1");
-            }else{
-                records1.setFlagArchive("0");
+        model.addAttribute("page", page);
+        if(null != projectRecords.getWorkContractInfo()){
+            model.addAttribute("workContractInfoName", projectRecords.getWorkContractInfo().getName());
+            if(null != projectRecords.getWorkContractInfo().getClient()){
+                model.addAttribute("workContractInfoClientName", projectRecords.getWorkContractInfo().getClient().getName());
             }
         }
-        model.addAttribute("page", page);
-        return "modules/ruralprojectrecords/cost/ruralCostProjectMessageList";
+        model.addAttribute("beginDate", projectRecords.getBeginDate());
+        model.addAttribute("endDate", projectRecords.getEndDate());
+        return "modules/ruralprojectrecords/cost/ruralCostProjectMessageLists";
     }
 
     /**

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

@@ -22,15 +22,20 @@ import com.jeeplus.modules.projectcontentinfo.service.ProjectReportChangeService
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportRecordService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
+import com.jeeplus.modules.projectrecord.dao.WorkProjectUserDao;
+import com.jeeplus.modules.projectrecord.entity.ProjectImplementEarly;
 import com.jeeplus.modules.projectrecord.entity.ProjectPlanInfo;
+import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.service.ProjectPlanService;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 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.Area;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.User;
@@ -55,10 +60,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 项目列表Controller
@@ -121,43 +123,26 @@ public class RuralProjectMessageController extends BaseController {
         //添加查询类型(工程咨询)
         projectRecords.setProjectType("1");
         Page<RuralProjectRecords> page = ruralProjectMessageService.findPage(new Page<RuralProjectRecords>(request, response), projectRecords);
-        //无合同状态下，获取委托方的名称
-        List<RuralProjectRecords> list = page.getList();
-        for (int i = 0; i < list.size(); i++) {
-            RuralProjectRecords records1 = list.get(i);
-            if (records1.getWorkContractInfo() == null) {
-                projectRecordsService.queryLinkmanInfos(records1);
-                if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
-                    WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
-                    WorkContractInfo contractInfo = new WorkContractInfo();
-                    contractInfo.setClient(linkman.getClientId());
-                    records1.setWorkContractInfo(contractInfo);
-                }
-            }
-            ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
-            projectPlanInfo.setProjectId(records1.getId());
-            //获取项目计划信息
-            List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
-            if(projectPlanList.size()>0){
-                records1.setView("true");
-            }else{
-                records1.setView("false");
-            }
-            //判断是否为admin
-            if (UserUtils.getUser().isAdmin()){
-                records1.setFlagAdmin("1");
-            }else{
-                records1.setFlagAdmin("0");
-            }
-            //判断是否为归档员
-            if (UserUtils.getArchiveUserRole()){
-                records1.setFlagArchive("1");
-            }else{
-                records1.setFlagArchive("0");
+        model.addAttribute("page", page);
+        if(null != projectRecords.getWorkContractInfo()){
+            model.addAttribute("workContractInfoName", projectRecords.getWorkContractInfo().getName());
+            if(null != projectRecords.getWorkContractInfo().getClient()){
+                model.addAttribute("workContractInfoClientName", projectRecords.getWorkContractInfo().getClient().getName());
             }
         }
-        model.addAttribute("page", page);
-        return "modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList";
+        model.addAttribute("beginDate", projectRecords.getBeginDate());
+        model.addAttribute("endDate", projectRecords.getEndDate());
+        return "modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageLists";
+    }
+
+    /**
+     * 项目列表页面
+     */
+    @RequestMapping(value = "getProjectList")
+    @ResponseBody
+    public Map<String,List> getProjectList(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Map<String, List> map = ruralProjectMessageService.getProjectList(projectRecords, request, response);
+        return map;
     }
 
     /**

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

@@ -356,6 +356,7 @@ public class RuralProjectRecordsDownMessageController extends BaseController {
      */
     @RequestMapping("cancelInvalidate")
     public String cancelInvalidate(ProjectReportRecord projectReportRecord,RedirectAttributes redirectAttributes){
+        String flag = projectReportRecord.getFlag();
         projectReportRecord = projectRecordsService.get(projectReportRecord.getId());
         try {
             if(projectReportRecord.getStatus().equals("5")){
@@ -366,7 +367,7 @@ public class RuralProjectRecordsDownMessageController extends BaseController {
                     addMessage(redirectAttributes, "强制撤回报告归档成功");
                 }else{
                     addMessage(redirectAttributes, "报告归档不是送审状态，无法撤回");
-                    if("1".equals(projectReportRecord.getFlag())){
+                    if("1".equals(flag)){
                         return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
                     }else{
                         return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
@@ -376,7 +377,7 @@ public class RuralProjectRecordsDownMessageController extends BaseController {
         }catch (Exception e){
             addMessage(redirectAttributes, "强制撤回报告归档失败");
         }
-        if("1".equals(projectReportRecord.getFlag())){
+        if("1".equals(flag)){
             return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
         }else{
             return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";

src/main/java/com/jeeplus/modules/workclientinfo/entity/WorkClientInfo.java

@@ -64,6 +64,7 @@ public class WorkClientInfo extends DataEntity<WorkClientInfo> {
 	private String errInfo;
 	private String unitIntroduction;
 	private String createName;   //创建人
+	private String createNameStr;   //创建人
 	private String createId;     //创建人id
 
 	private String jobTypeStr;
@@ -525,6 +526,14 @@ public class WorkClientInfo extends DataEntity<WorkClientInfo> {
 		this.createName = createName;
 	}
 
+	public String getCreateNameStr() {
+		return createNameStr;
+	}
+
+	public void setCreateNameStr(String createNameStr) {
+		this.createNameStr = createNameStr;
+	}
+
 	public String getCreateId() {
 		return createId;
 	}

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml

@@ -125,13 +125,26 @@
 	<select id="get" resultType="RuralProjectRecords" >
 		SELECT
 			<include refid="projectRecordsColumns"/>
+		,a.project_type as projectType
 		,wci.name AS "workContractInfo.name",
 		wct.id AS "workContractInfo.client.id",
 		wct.name AS "workContractInfo.client.name",
-		o.top_company AS "office.name",
 		ifnull(prd.number ,"") as "projectReportNumber"
 		,ifnull(prd.status,0) as "projectReportStatus"
         ,o.top_company AS "office.name"
+		,ifnull(prd.name,"") as "projectReportName"
+		,ifnull(prr.status,0) as "projectReportRecordStatus"
+		,ifnull(prrd.status,0) as "downProjectReportRecordStatus",
+		prrd.file_num as recodeNum,
+		prr.process_instance_id as prrProcessInstanceId,
+		prrd.process_instance_id as prrdProcessInstanceId
+		,prr.id as prrId
+		,prrd.id as prrdId
+		,prd.audit_pass_date as auditPassDate
+		,if(date_add(prd.audit_pass_date,interval #{endingCount} day) >now(),"0","1") as reportedType
+		,ifnull(rprr.report_status,0) as "reportStatus"
+		,ifnull(rprr.sync_status,0) as "syncStatus"
+		,rprr.process_instance_id as "reportedProcessInstanceId"
         FROM rural_project_records a
 		LEFT JOIN sys_area area ON area.id = a.area_id
 		LEFT JOIN work_project_user w on a.id = w.project_id
@@ -141,6 +154,9 @@
 		LEFT JOIN sys_office o ON o.id = a.office_id
 		left join project_report_data prd on prd.project_id = a.id
 		LEFT JOIN sys_user su on w.user_id = su.id
+		left join rural_project_report_record prr on prr.report_id = prd.id
+		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
+		left join rural_project_records_reported rprr on rprr.id = a.id
 		WHERE a.id = #{id}
 	</select>
 
@@ -210,6 +226,7 @@
 		SELECT
 			<include refid="projectRecordsColumns"/>
 		,
+		a.project_type as projectType,
 		wci.name AS "workContractInfo.name",
 		wct.id AS "workContractInfo.client.id",
 		wct.name AS "workContractInfo.client.name",

src/main/resources/mappings/modules/workclientinfo/WorkClientInfoDao.xml

@@ -163,8 +163,8 @@
             <if test="endDate !=null">
                 AND a.create_date &lt; #{endDate}
             </if>
-			<if test="createId != null and createId != ''">
-				AND a.create_by = #{createId}
+			<if test="(createId != null and createId != '') or (createNameStr != null and createNameStr != '')">
+				AND (a.create_by = #{createId} or su.name = #{createNameStr})
 			</if>
             AND a.company_id = #{currentUser.company.id}
 			and   c.job_type_id = '1'
@@ -187,6 +187,7 @@
             LEFT JOIN work_client_linkman b ON a.id = b.client_id
         </if>
 		left join work_client_job_type_info c on c.work_client_id=a.id
+		left join sys_user su on su.id = a.create_by
         <where>
             a.del_flag = #{DEL_FLAG_NORMAL}
             <if test="name != null and name != ''">
@@ -228,8 +229,8 @@
             <if test="endDate !=null">
                 AND a.create_date &lt; #{endDate}
             </if>
-			<if test="createId != null and createId != ''">
-				AND a.create_by = #{createId}
+			<if test="(createId != null and createId != '') or (createNameStr != null and createNameStr != '')">
+				AND (a.create_by = #{createId} or su.name = #{createNameStr})
 			</if>
             AND a.company_id = #{currentUser.company.id}
 			AND c.job_type_id = "1"

src/main/webapp/WEB-INF/tags/sys/clienttreeselect.tag

@@ -0,0 +1,106 @@
+<%@ tag language="java" pageEncoding="UTF-8"%>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ attribute name="id" type="java.lang.String" required="true" description="编号"%>
+<%@ attribute name="name" type="java.lang.String" required="true" description="隐藏域名称（ID）"%>
+<%@ attribute name="value" type="java.lang.String" required="true" description="隐藏域值（ID）"%>
+<%@ attribute name="labelName" type="java.lang.String" required="true" description="输入框名称（Name）"%>
+<%@ attribute name="labelValue" type="java.lang.String" required="true" description="输入框值（Name）"%>
+<%@ attribute name="title" type="java.lang.String" required="true" description="选择框标题"%>
+<%@ attribute name="url" type="java.lang.String" required="true" description="树结构数据地址"%>
+<%@ attribute name="checked" type="java.lang.Boolean" required="false" description="是否显示复选框，如果不需要返回父节点，请设置notAllowSelectParent为true"%>
+<%@ attribute name="extId" type="java.lang.String" required="false" description="排除掉的编号（不能选择的编号）"%>
+<%@ attribute name="isAll" type="java.lang.Boolean" required="false" description="是否列出全部数据，设置true则不进行数据权限过滤（目前仅对Office有效）"%>
+<%@ attribute name="notAllowSelectRoot" type="java.lang.Boolean" required="false" description="不允许选择根节点"%>
+<%@ attribute name="notAllowSelectParent" type="java.lang.Boolean" required="false" description="不允许选择父节点"%>
+<%@ attribute name="module" type="java.lang.String" required="false" description="过滤栏目模型（只显示指定模型，仅针对CMS的Category树）"%>
+<%@ attribute name="selectScopeModule" type="java.lang.Boolean" required="false" description="选择范围内的模型（控制不能选择公共模型，不能选择本栏目外的模型）（仅针对CMS的Category树）"%>
+<%@ attribute name="allowClear" type="java.lang.Boolean" required="false" description="是否允许清除"%>
+<%@ attribute name="allowInput" type="java.lang.Boolean" required="false" description="文本框可填写"%>
+<%@ attribute name="cssClass" type="java.lang.String" required="false" description="css样式"%>
+<%@ attribute name="cssStyle" type="java.lang.String" required="false" description="css样式"%>
+<%@ attribute name="smallBtn" type="java.lang.Boolean" required="false" description="缩小按钮显示"%>
+<%@ attribute name="hideBtn" type="java.lang.Boolean" required="false" description="是否显示按钮"%>
+<%@ attribute name="disabled" type="java.lang.String" required="false" description="是否限制选择，如果限制，设置为disabled"%>
+<%@ attribute name="dataMsgRequired" type="java.lang.String" required="false" description=""%>
+<%@ attribute name="rule" type="java.lang.String" required="false" description="考勤规则模块用"%>
+	<input id="${id}Id" name="${name}" class="${cssClass}" type="hidden" value="${value}"/>
+	<div class="input-group">
+		<input id="${id}Name" name="${labelName}"   type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		class="${cssClass} required" style="${cssStyle}"/>
+       		 <span class="input-group-btn">
+	       		 <button type="button"  id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>
+	             </button> 
+       		 </span>
+
+    </div>
+	 <label id="${id}Name-error" class="error" for="${id}Name" style="display:none"></label>
+<script type="text/javascript">
+	$("#${id}Button").click(function(){
+		// 是否限制选择，如果限制，设置为disabled
+		if ($("#${id}Button").hasClass("disabled")){
+			return true;
+		}
+		// 正常打开
+		top.layer.open({
+		    type: 2,
+		    area: ['300px', '420px'],
+		    title:"选择${title}",
+		    ajaxData:{selectIds: $("#${id}Id").val()},
+		    content: "${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}&unit=${unit}" ,
+		    btn: ['确定', '关闭']
+    	       ,yes: function(index, layero){ //或者使用btn1
+						var tree = layero.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents();
+						var ids = [], names = [], nodes = [];
+						if ("${checked}" == "true"){
+							nodes = tree.getCheckedNodes(true);
+						}else{
+							nodes = tree.getSelectedNodes();
+						}
+						for(var i=0; i<nodes.length; i++) {//<c:if test="${checked && notAllowSelectParent}">
+							if (nodes[i].isParent){
+								continue; // 如果为复选框选择，则过滤掉父节点
+							}//</c:if><c:if test="${notAllowSelectRoot}">
+							if (nodes[i].level == 0){
+								//top.$.jBox.tip("不能选择根节点（"+nodes[i].name+"）请重新选择。");
+								top.layer.msg("不能选择根节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
+								return false;
+							}//</c:if><c:if test="${notAllowSelectParent}">
+							if (nodes[i].isParent){
+								//top.$.jBox.tip("不能选择父节点（"+nodes[i].name+"）请重新选择。");
+								//layer.msg('有表情地提示');
+								top.layer.msg("不能选择父节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
+								return false;
+							}//</c:if><c:if test="${not empty module && selectScopeModule}">
+							if (nodes[i].module == ""){
+								//top.$.jBox.tip("不能选择公共模型（"+nodes[i].name+"）请重新选择。");
+								top.layer.msg("不能选择公共模型（"+nodes[i].name+"）请重新选择。", {icon: 0});
+								return false;
+							}else if (nodes[i].module != "${module}"){
+								//top.$.jBox.tip("不能选择当前栏目以外的栏目模型，请重新选择。");
+								top.layer.msg("不能选择当前栏目以外的栏目模型，请重新选择。", {icon: 0});
+								return false;
+							}//</c:if>
+							ids.push(nodes[i].id);
+							names.push(nodes[i].name);//<c:if test="${!checked}">
+							break; // 如果为非复选框选择，则返回第一个选择  </c:if>
+						}
+						$("#${id}Id").val(ids.join(",").replace(/u_/ig,"")).change();
+						$("#${id}Name").val(names.join(",")).change();
+						$("#${id}Name").focus();
+						var rule="${rule}";
+						var id="${id}";
+						if(rule=='rule'){
+                            var _placeName =  id.split("_")[0]+"_placeName";
+                            var _itude =  id.split("_")[0]+"_itude";
+                            $("#"+_placeName).val("");
+                            $("#"+_itude).val("");
+						}
+						top.layer.close(index);
+				    	       },
+    	cancel: function(index){ //或者使用btn2
+    	           //按钮【按钮二】的回调
+    	       }
+		});
+
+	});
+</script>

src/main/webapp/static/layer-v2.3/layim/layui/lay/pc/modules/layim.js

@@ -462,7 +462,9 @@ layui.define(['jquery', 'layer', 'laytpl', 'upload'], function(exports){
       ,closeBtn: false
       ,shift: 2
       ,offset: 'rb'
-      ,content: '<img src="'+ (cache.mine.avatar||(layui.cache.dir+'css/pc/layim/skin/logo.jpg')) +'">'
+      /*首页右下角聊天框头像*/
+      /*,content: '<img src="'+ (cache.mine.avatar||(layui.cache.dir+'css/pc/layim/skin/logo.jpg')) +'">'*/
+      ,content: '<img src="'+ (layui.cache.dir+'css/pc/layim/skin/05.png') +'">'
       ,success: function(layero, index){
         layimClose = layero;
         if(cache.base.right){

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordAudit.jsp

@@ -212,7 +212,7 @@
 			</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div class="layui-item nav-btns">
 				</div>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordModifyApply.jsp

@@ -26,7 +26,7 @@
 							}).success(function (result) {
 								if(result == 0){
 									boolFlag = false;
-									top.layer.msg("请上传报告文件！", {icon: 0});
+									top.layer.msg("请上传成果文件！", {icon: 0});
 									return false;
 								}
 							}).error(function () {
@@ -297,7 +297,7 @@
 			</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<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>

src/main/webapp/webpage/modules/projectcontentinfo/reportChange.jsp

@@ -830,7 +830,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div class="layui-item nav-btns">
 					<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
 				</div>

src/main/webapp/webpage/modules/projectcontentinfo/reportChangeModifyApply.jsp

@@ -719,7 +719,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div class="layui-item nav-btns">
 					<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
 				</div>

src/main/webapp/webpage/modules/projectcontentinfo/reportForm.jsp

@@ -891,7 +891,7 @@
 			</div>
 		</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div class="layui-item nav-btns">
 					<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
 				</div>

src/main/webapp/webpage/modules/projectcontentinfo/reportInvalid.jsp

@@ -282,7 +282,7 @@
 			</div>
 		</div>
 		<div class="form-group layui-row">
-			<div class="form-group-label"><h2>报告文件</h2></div>
+			<div class="form-group-label"><h2>成果文件</h2></div>
 			<div class="layui-item layui-col-xs12" style="padding:0 16px;">
 				<table id="upTable" class="table table-bordered table-condensed details">
 					<thead>

src/main/webapp/webpage/modules/projectcontentinfo/reportInvalidAudit.jsp

@@ -266,7 +266,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
 					<table id="upTable" class="table table-bordered table-condensed details">
 						<thead>

src/main/webapp/webpage/modules/projectcontentinfo/reportInvalidModifyApply.jsp

@@ -521,7 +521,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
 					<table id="upTable" class="table table-bordered table-condensed details">
 						<thead>

src/main/webapp/webpage/modules/projectcontentinfo/reportModifyApply.jsp

@@ -724,7 +724,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div class="layui-item nav-btns">
 					<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
 				</div>

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

@@ -225,7 +225,7 @@
 			</div>
 		</div>
 		<div class="form-group layui-row">
-			<div class="form-group-label"><h2>报告文件</h2></div>
+			<div class="form-group-label"><h2>成果文件</h2></div>
 			<div class="layui-item layui-col-xs12" style="padding:0 16px;">
 				<table id="upTable" class="table table-bordered table-condensed details">
 					<thead>

src/main/webapp/webpage/modules/projectrecord/check/reportForm.jsp

@@ -920,7 +920,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div class="layui-item nav-btns">
 					<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
 				</div>

src/main/webapp/webpage/modules/projectrecord/check/reportView.jsp

@@ -268,7 +268,7 @@
 			</div>
 		</div>
 		<div class="form-group layui-row">
-			<div class="form-group-label"><h2>报告文件</h2></div>
+			<div class="form-group-label"><h2>成果文件</h2></div>
 			<div class="layui-item layui-col-xs12" style="padding:0 16px;">
 				<table id="upTable" class="table table-bordered table-condensed details">
 					<thead>

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/reportForm.jsp

@@ -987,7 +987,7 @@
 			</div>
 		</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div class="layui-item nav-btns">
 					<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
 				</div>

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/reportView.jsp

@@ -268,7 +268,7 @@
 			</div>
 		</div>
 		<div class="form-group layui-row">
-			<div class="form-group-label"><h2>报告文件</h2></div>
+			<div class="form-group-label"><h2>成果文件</h2></div>
 			<div class="layui-item layui-col-xs12" style="padding:0 16px;">
 				<table id="upTable" class="table table-bordered table-condensed details">
 					<thead>

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/workContentView.jsp

@@ -1011,7 +1011,7 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>报告文件</h2></div>
+                <div class="form-group-label"><h2>成果文件</h2></div>
                 <div class="layui-item layui-col-xs12" style="padding:0 16px;">
                     <table id="upTable" class="table table-bordered table-condensed details">
                         <thead>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordAdminModify.jsp

@@ -145,7 +145,7 @@
 			</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<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>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordForm.jsp

@@ -44,7 +44,7 @@
 							}).success(function (result) {
 								if(result == 0){
 									boolFlag = false;
-									top.layer.msg("请上传报告文件！", {icon: 0});
+									top.layer.msg("请上传成果文件！", {icon: 0});
 									return false;
 								}
 							}).error(function () {
@@ -289,7 +289,7 @@
 			</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div class="layui-item nav-btns">
 					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordModify.jsp

@@ -44,7 +44,7 @@
 							}).success(function (result) {
 								if(result == 0){
 									boolFlag = false;
-									top.layer.msg("请上传报告文件！", {icon: 0});
+									top.layer.msg("请上传成果文件！", {icon: 0});
 									return false;
 								}
 							}).error(function () {
@@ -322,7 +322,7 @@
 			</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div class="layui-item nav-btns">
 					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordView.jsp

@@ -158,7 +158,7 @@
 			</div>
 		</div>
 		<div class="form-group layui-row">
-			<div class="form-group-label"><h2>报告文件</h2></div>
+			<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>

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

@@ -33,7 +33,7 @@
 						}).success(function (result) {
 							if(result == 0){
 								boolFlag = false;
-								top.layer.msg("请上传报告文件！", {icon: 0});
+								top.layer.msg("请上传成果文件！", {icon: 0});
 								return false;
 							}
 						}).error(function () {
@@ -554,7 +554,7 @@
 				</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div class="layui-item nav-btns">
 					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${projectRecords.id}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>

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

@@ -196,7 +196,7 @@
 			</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<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>

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

@@ -266,7 +266,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>报告文件</h2></div>
+                <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>

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

@@ -32,7 +32,7 @@
 							}).success(function (result) {
 								if(result == 0){
 									boolFlag = false;
-									top.layer.msg("请上传报告文件！", {icon: 0});
+									top.layer.msg("请上传成果文件！", {icon: 0});
 									return false;
 								}
 							}).error(function () {
@@ -568,7 +568,7 @@
 				</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div class="layui-item nav-btns">
 					<%--<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
 					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${projectRecords.id}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>

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

@@ -32,7 +32,7 @@
 							}).success(function (result) {
 								if(result == 0){
 									boolFlag = false;
-									top.layer.msg("请上传报告文件！", {icon: 0});
+									top.layer.msg("请上传成果文件！", {icon: 0});
 									return false;
 								}
 							}).error(function () {
@@ -541,7 +541,7 @@
 				</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div class="layui-item nav-btns">
 					<%--<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
 						<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${projectId}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>

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

@@ -100,7 +100,7 @@
 			</div>
 		</div>
 		<div class="form-group layui-row">
-			<div class="form-group-label"><h2>报告文件</h2></div>
+			<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>

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

@@ -0,0 +1,903 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>项目登记</title>
+	<meta name="decorator" content="default"/>
+	<script src="${ctxStatic}/layer-v2.3/layim/layui/layui.js"></script>
+    <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%--<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>--%>
+    <style>
+        .layui-table th{
+            font-size: 14px;
+            /*表头内容居中显示*/
+            text-align: center;
+        }
+		.pid{
+			font-size:14px;
+			font-weight:400;
+		}
+    </style>
+	<script type="text/javascript">
+        $(document).ready(function() {
+
+            //搜索框收放
+            $('#moresee').click(function(){
+                if($('#moresees').is(':visible'))
+                {
+                    $('#moresees').slideUp(0,resizeListWindow2);
+                    $('#moresee i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
+                }else{
+                    $('#moresees').slideDown(0,resizeListWindow2);
+                    $('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
+                }
+            });
+			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 reset() {
+            $("#searchForm").resetForm();
+        }
+
+		function openDialog(title,url,width,height,target) {
+
+			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,
+				maxmin: true, //开启最大化最小化按钮
+				content: url,
+				skin: 'three-btns',
+				btn: ['送审', '暂存', '关闭'],
+				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){
+					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) {
+				}
+			});
+		}
+
+		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) {
+				}
+			});
+		}
+
+
+		function openDialogreSub(title,url,width,height,target,formId,tableId) {
+			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: url ,
+				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}/subProject/subProject/save");//表单提交成功后，从服务器返回的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});
+						}
+						window.location.reload();
+						//关闭当前页
+						top.layer.close(index)
+					}
+				});
+			}
+		}
+
+		//打开对话框(查看)
+		function openDialogReportView(title,url,id,width,height){
+
+
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			$.ajax({
+				async: false,
+				url: "${ctx}/ruralProject/ruralCostProjectMessage/getReportExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						top.layer.open({
+							type: 2,
+							skin: 'one-btn',
+							area: [width, height],
+							title: title,
+							maxmin: true, //开启最大化最小化按钮
+							content: url ,
+							btn: ['关闭'],
+							cancel: function(index){
+							}
+						});
+					}else{
+						top.layer.msg("该项目报告信息已删除！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+
+		}
+
+
+
+		function openDialogreReport(title,url,id,width,height,target,buttons) {
+
+			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+				width = 'auto';
+				height = 'auto';
+			} else {//如果是PC端，根据用户设置的width和height显示。
+
+			}
+
+			$.ajax({
+				async: false,
+				url: "${ctx}/ruralProject/ruralCostProjectMessage/getReportExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						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) {
+							}
+						});
+					}else{
+						top.layer.msg("该项目报告信息已删除！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+		}
+	</script>
+	<style>
+		body{
+			background-color:transparent;
+			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
+			color:#ffffff;
+			background-color:rgba(255,255,255,0);
+			height:100%;
+		}
+	</style>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<sys:message content="${message}"/>
+	<div class="layui-row">
+		<div class="full-width fl">
+			<div class="layui-row contentShadow shadowLR" id="queryDiv">
+				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralCostProjectMessage/" method="post" class="form-inline">
+					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
+					<div class="commonQuery lw6">
+						<div class="layui-item query athird">
+							<label class="layui-form-label">项目编号：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="projectId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">项目名称：</label>
+							<div class="layui-input-block">
+								<form:input path="projectName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item athird">
+							<div class="input-group">
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
+								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							</div>
+						</div>
+						<div style="    clear:both;"></div>
+					</div>
+					<div id="moresees" style="clear:both;display:none;" class="lw6">
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">项目负责人：</label>
+							<div class="layui-input-block">
+								<form:input path="leaderNameStr" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">合同名称：</label>
+							<div class="layui-input-block">
+								<input id="workContractInfoName" name="workContractInfo.name" value="${workContractInfoName}" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">委托方：</label>
+							<div class="layui-input-block">
+								<input id="workContractInfoClientName" name="workContractInfo.client.name" value="${workContractInfoClientName}" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">创建时间：</label>
+							<div class="layui-input-block">
+								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${beginDate}" pattern="yyyy-MM-dd"/>"/>
+								</input>
+								<span class="group-sep">-</span>
+								<input id="endDate" name="endDate" placeholder="结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${endDate}" pattern="yyyy-MM-dd"/>"/>
+								</input>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">报告状态：</label>
+							<div class="layui-input-block">
+								<form:select path="projectReportStatus" class=" form-control  simple-select">
+									<form:option value="" label=""/>
+									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								</form:select>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">归档状态：</label>
+							<div class="layui-input-block">
+								<form:select path="projectReportRecordStatus" class=" form-control  simple-select">
+									<form:option value="" label=""/>
+									<form:options items="${fns:getDictList('archive_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								</form:select>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">上报状态：</label>
+							<div class="layui-input-block">
+								<form:select path="reportedState" class=" form-control  simple-select">
+									<form:option value="" label=""/>
+									<form:options items="${fns:getDictList('reported_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								</form:select>
+							</div>
+						</div>
+						<div style="clear:both;"></div>
+					</div>
+				</form:form>
+			</div>
+		</div>
+		<div class="full-width fl">
+			<div class="layui-form contentDetails contentShadow shadowLBR">
+				<div class="nav-btns">
+					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
+					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+
+                    <div style="clear: both;"></div>
+				</div>
+                <table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
+				<!-- 分页代码 -->
+				<table:page page="${page}"></table:page>
+				<div style="clear: both;"></div>
+			</div>
+		</div>
+	</div>
+	<div id="changewidth"></div>
+</div>
+
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script>
+
+    resizeListTable();
+    $("a").on("click",addLinkVisied);
+</script>
+<script>
+    resizeListWindow2();
+    $(window).resize(function(){
+        resizeListWindow2();
+    });
+</script>
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script src="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.js" charset="utf-8"></script>
+<script>
+    /*使用模块加载的方式 加载文件*/
+    layui.config({
+        base: '${ctx}/resoueces/css/layui/module/'
+    }).extend({
+        treetable: 'treetable-lay/treetable'
+    }).use(['layer', 'table', 'treetable'], function () {
+        var $ = layui.jquery;
+        var table = layui.table;
+        var layer = layui.layer;
+        var treetable = layui.treetable;
+
+        // 渲染表格
+        var renderTable = function () {
+        	var projectId = $("#projectId").val();
+        	var projectName = $("#projectName").val();
+        	var leaderNameStr = $("#leaderNameStr").val();
+        	var workContractInfoName = $("#workContractInfoName").val();
+        	var workContractInfoClientName = $("#workContractInfoClientName").val();
+        	var beginDate = $("#beginDate").val();
+        	var endDate = $("#endDate").val();
+        	var projectReportStatus = $("#projectReportStatus").val();
+        	var projectReportRecordStatus = $("#projectReportRecordStatus").val();
+        	var reportedState = $("#reportedState").val();
+            layer.load(2);
+            treetable.render({
+                treeColIndex: 1,//树形图标显示在第几列
+                treeSpid: 0,//最上级的父级id
+                treeIdName: 'permissionId',//id字段的名称
+                treePidName: 'pid',//pid字段的名称
+                treeDefaultClose: true,//是否默认折叠
+                treeLinkage: true,//父级展开时是否自动展开所有子级
+                elem: '#permissionTable',
+                url: '${ctx}/ruralProject/ruralProjectMessage/getProjectList?projectId='+projectId+'&pageNo=${page.pageNo}&projectName='+projectName+'&leaderNameStr='+leaderNameStr+'&workContractInfo.name='+workContractInfoName+'&workContractInfo.client.name='+workContractInfoClientName+'&beginDate='+beginDate+'&endDate='+endDate+'&projectReportStatus='+projectReportStatus+'&projectReportRecordStatus='+projectReportRecordStatus+'&reportedState='+reportedState+'&projectType=2',
+                page: false,
+                cols: [[
+                    {type: 'numbers', align:'center', title: '序号' ,width:80},
+                    {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>";
+						}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/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";
+							}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>";
+							}else{
+								return "<font></font>";
+							}
+						}},
+                    {field: 'projectLeader', align:'center', title: '案卷号',width:120,templet: function(d){
+							if(0 == d.pid){
+								return "<a class=\"attention-info pid\" title=\"" + d.recodeNum + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看归档信息', '${ctx}/ruralProject/ruralProjectDownMessage/view?id=" + d.prrdId + "&view=view','95%', '95%')\">" + d.recodeNum + "</a>";
+							}else{
+								return "<font></font>";
+							}
+						}},
+                    {field: 'projectLeader', align:'center', title: '负责人',width:80,templet: function(d){
+							if(0 == d.pid){
+								return "<font style = 'font-size:14px;'>"+d.projectLeaders+"</font>";
+							}else{
+								return "<font></font>";
+							}
+						}},
+                    {field: 'projectLeader', align:'center', title: '委托方',width:160,templet: function(d){
+							if(0 == d.pid){
+								return "<font style = 'font-size:14px;font-weight:500;'>"+d.clientName+"</font>";
+							}else{
+								return "<font></font>";
+							}
+						}},
+                    {field: 'createDate', align:'center', title: '创建日期/打包时间',width:100,templet: function(d){
+							var date=d.createDate;
+
+							if(0 == d.pid){
+								return "<font style = 'font-size:14px;font-weight:500;'>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
+							}else{
+								return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
+							}
+						}},
+					{align:'center', title: '报告状态',  width:70,templet:function(d){
+							var st = getAuditState(""+d.projectReportStatus);
+							if(d.pid ==0){
+								if(st.action)
+									var xml = "<span onclick=\"openDialogReportView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+d.id+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								else
+									var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								return xml;
+							}else{
+								return '';
+							}
+						}},
+					{align:'center', title: '线上归档状态',  width:70,templet:function(d){
+							var st = getRuralProjectArchiveState(""+d.projectReportRecordStatus);
+							if(d.pid ==0){
+								if(st.action)
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								else
+									var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								return xml;
+							}else{
+								return '';
+							}
+						}},
+					{align:'center', title: '线下归档状态',  width:70,templet:function(d){
+							var st = getRuralProjectArchiveState(""+d.downProjectReportRecordStatus);
+							if(d.pid ==0){
+								if(st.action)
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								else
+									var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								return xml;
+							}else{
+								return '';
+							}
+						}},
+					{align:'center', title: '上报状态',  width:70,templet:function(d){
+							var st = getReportedState(""+d.reportedState);
+							if(d.pid ==0){
+								if(st.action)
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								else
+									var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								return xml;
+							}else{
+								return '';
+							}
+						}},
+                    {templet: complain, align:'center', title: '操作' ,width:350}
+                ]],
+                done: function () {
+                    layer.closeAll('loading');
+                }
+            });
+        };
+
+        renderTable();
+
+        //触发三个button按钮
+        $('#btn-expand').click(function () {
+            treetable.expandAll('#permissionTable');
+        });
+
+        $('#btn-fold').click(function () {
+            treetable.foldAll('#permissionTable');
+        });
+
+        $('#btn-refresh').click(function () {
+            renderTable();
+        });
+
+
+        function complain(d){//操作中显示的内容
+        	var xml = '';
+			if(d.pid=="0") {
+				if(d.flag == 1){
+					if(d.projectReportStatus == 0){
+						xml+="<a href=\"#\" onclick=\"openDialogre('新增报告', '${ctx}/ruralProject/ruralCostProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 新增报告</a>";
+					}
+					if(d.projectReportStatus == 1){
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
+						xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除报告</a>";
+					}
+					if(d.projectReportStatus == 2){
+						xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目报告审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回报告</a>";
+					}
+					if(d.projectReportStatus == 3){
+						//撤回操作
+						xml+="<a href=\"#\" onclick=\"openDialogre('调整报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
+						xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除报告</a>";
+					}
+					if(d.projectReportStatus == 4){
+						//驳回操作
+						xml+="<a href=\"#\" onclick=\"openDialogreReport('调整报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
+						xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除报告</a>";
+					}
+
+					//线上归档操作
+					if(d.projectReportStatus == 5){
+						xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";
+						if(d.projectReportRecordStatus == 0){
+							xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 线上归档</a>";
+						}
+						if(d.projectReportRecordStatus == 1){
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 线上重新归档</a>";
+						}
+						if(d.projectReportRecordStatus == 2){
+							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回线上归档</a>";
+						}
+						if(d.projectReportRecordStatus == 3){
+							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 线上重新归档</a>";
+						}
+						if(d.projectReportRecordStatus == 4){
+							xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 线上重新归档</a>";
+						}
+					}
+
+					//线下归档操作
+					if(d.projectReportStatus == 5){
+						if(d.downProjectReportRecordStatus == 0){
+							xml+="<a href=\"#\" onclick=\"openDialogre('新增线下归档信息', '${ctx}/ruralProject/ruralProjectDownMessage/formRecord?reportId=" + d.id +"&flag=2','95%', '95%','','送审,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 线下归档</a>";
+						}
+						if(d.downProjectReportRecordStatus == 1){
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralProjectDownMessage/formRecordModify?id=" + d.prrdId +"&flag=2','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 线下重新归档</a>";
+						}
+						if(d.downProjectReportRecordStatus == 2){
+							xml+="<a href=\"${ctx}/ruralProject/ruralProjectDownMessage/cancelInvalidate?id=" + d.prrdId + "&flag=2&processInstanceId=" + d.prrdProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线下报告归档审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回线下归档</a>";
+						}
+						if(d.downProjectReportRecordStatus == 3){
+							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralProjectDownMessage/formRecordModify?id=" + d.prrdId + "&flag=2','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 线下重新归档</a>";
+						}
+						if(d.downProjectReportRecordStatus == 4){
+							xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectDownMessage/formRecordModify?id=" + d.prrdId + "&view=modify&flag=2','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 线下重新归档</a>";
+						}
+					}
+
+					/*上报相关按钮*/
+					if(d.projectReportRecordStatus == 5 || d.projectReportStatus == 5){
+						if(d.syncStatus == 0){
+							if(d.reportStatus == 0){
+								if(d.reportedState == 0 || d.reportedState == 6){
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"op-btn op-btn-delete\" ><i class=\"fa fa-plus\"></i> 上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"op-btn op-btn-delete\" ><i class=\"fa fa-plus\"></i> 个人上报</a>";
+								}
+							}else{
+								if(d.reportedState == 2){
+									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateByReported?id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回上报</a>";
+								}
+								/*撤回修改*/
+								if(d.reportedState == 3){
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改上报</a>";
+								}
+								/*驳回修改*/
+								if(d.reportedState == 4){
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改上报</a>";
+								}
+							}
+						}
+					}
+					if('1' == d.flagAdmin && d.projectReportStatus == 5)
+					{
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralCostProjectMessage/adminModifyForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogView('历史报告', '${ctx}/ruralProject/ruralCostProjectMessage/getReportModifyList?projectId=" + d.id + "','95%', '95%')\" class=\"op-btn op-btn-delete\" style=\"background-color:#5FB878;\" ><i class=\"fa fa-eye\"></i> 历史报告</a>";
+					}
+					if('1' == d.flagArchive && d.projectReportRecordStatus == 5)
+					{
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改归档案卷号', '${ctx}/ruralProject/ruralCostProjectMessage/adminRecordModifyForm?id=" + d.prrId + "','95%', '95%','','提交,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改归档</a>";
+					}
+				}
+				return[xml].join('');
+			}else{
+				var xml = '';
+				if(d.flag ==1){
+					xml+="<a href=\"#\" onclick=\"openDialogreSub('修改项目', '${ctx}/subProject/subProject/form?id=" + d.id + "','95%', '95%','','inputForm','layui-border-box')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+					xml+="<a href=\"${ctx}/subProject/subProject/delete?id=" + d.id + "\" onclick=\"return subConfirmx('确认要删除该子项目信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+				}
+				return[xml].join('');
+			}
+        }
+        //监听工具条
+        table.on('tool(permissionTable)', function (obj) {
+            var data = obj.data;
+            var layEvent = obj.event;
+            if(data.permissionName!=null){
+                if (layEvent === 'del') {
+                    layer.msg('删除' + data.id);
+                } else if (layEvent === 'edit') {
+                    layer.msg('修改' + data.id);
+                }
+            }
+        });
+    });
+
+</script>
+<script>
+	function openDialogres(title,url,width,height,target){
+
+		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: 'three-btns',
+			maxmin: true, //开启最大化最小化按钮
+			content: url ,
+			btn: ['提交','暂存','关闭'],
+			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){
+				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
+				}
+				return false;
+			},
+			btn3: function(index){
+			}
+		});
+	}
+	function openDialogreAudit(title,url,width,height,target){
+
+		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: 'three-btns',
+			maxmin: true, //开启最大化最小化按钮
+			content: url ,
+			btn: ['提交','关闭'],
+			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){
+			}
+		});
+	}
+	// 确认对话框
+	function confirmxRefresh(mess, href){
+		top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
+			//do something
+			if (typeof href == 'function') {
+				href();
+			}else{
+				resetTip(); //loading();
+				$.ajax({
+					url:href,
+					data:$('#loginForm').serialize(),
+					type:"post",
+					success:function(data){
+						if(data.status){
+							parent.layer.msg(data.msg,{icon:1});
+						}else {
+							parent.layer.msg(data.msg,{icon:2});
+						}
+						//parent.refreshTrees();
+						location = '${ctx}/project/projectRecords/list';
+					}
+				});
+			}
+			top.layer.close(index);
+		});
+		return false;
+	}
+
+	// 确认对话框
+	function confirmxHintContent(mess, href){
+		$.ajax({
+			url:href,
+			data:$('#loginForm').serialize(),
+			type:"post",
+			success:function(data){
+				parent.layer.open({
+					title: '提示内容'
+					,shade: 0
+					,maxmin: true
+					,content: data.msg
+				});
+			}
+		});
+	}
+</script>
+</body>
+</html>

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

@@ -724,15 +724,15 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</label>
+                    <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作结束日期：</label>
+                    <label class="layui-form-label double-line">工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -795,7 +795,7 @@
                         </form:select>
                     </div>
                 </div>--%>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>预估总投资额(万元)：</label>
                     <div class="layui-input-block">
                         <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number" onchange="getApprovalFee()"/>
@@ -830,7 +830,7 @@
                     <div class="layui-input-block">
                         <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                     </div>
-                </div>
+                </div>--%>
                 <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">单位造价(元)：</label>
                     <div class="layui-input-block">
@@ -961,7 +961,7 @@
             </div>
 
 
-            <div class="form-group layui-row">
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目报告</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <table id="upTable" class="table table-bordered table-condensed details">
@@ -996,18 +996,18 @@
                                             <fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
                                         </td>
                                         <td class="op-td">
-                                                <%--<c:choose>--%>
-                                                <%--<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">--%>
-                                                <%--<div style="text-align: center">--%>
-                                                <%--<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
-                                                <%--</div>--%>
-                                                <%--</c:when>--%>
-                                                <%--<c:otherwise>--%>
-                                                <%--<div style="text-align: center">--%>
-                                                <%--<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
-                                                <%--</div>--%>
-                                                <%--</c:otherwise>--%>
-                                                <%--</c:choose>--%>
+                                                &lt;%&ndash;<c:choose>&ndash;%&gt;
+                                                &lt;%&ndash;<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">&ndash;%&gt;
+                                                &lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
+                                                &lt;%&ndash;<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
+                                                &lt;%&ndash;</div>&ndash;%&gt;
+                                                &lt;%&ndash;</c:when>&ndash;%&gt;
+                                                &lt;%&ndash;<c:otherwise>&ndash;%&gt;
+                                                &lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
+                                                &lt;%&ndash;<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
+                                                &lt;%&ndash;</div>&ndash;%&gt;
+                                                &lt;%&ndash;</c:otherwise>&ndash;%&gt;
+                                                &lt;%&ndash;</c:choose>&ndash;%&gt;
                                             <div style="text-align: center" id="status_td_${index.index+1}">
                                             </div>
                                             <script>
@@ -1028,7 +1028,7 @@
                         </tbody>
                     </table>
                 </div>
-            </div>
+            </div>--%>
 
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目计划附件信息</h2></div>

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

@@ -813,15 +813,15 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</label>
+                    <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作结束日期：</label>
+                    <label class="layui-form-label double-line">工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -884,7 +884,7 @@
                         </form:select>
                     </div>
                 </div>--%>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>预估总投资额(万元)：</label>
                     <div class="layui-input-block">
                         <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number" onchange="getApprovalFee()"/>
@@ -919,7 +919,7 @@
                     <div class="layui-input-block">
                         <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">施工单位：</label>
                     <div class="layui-input-block">
@@ -1105,7 +1105,7 @@
                 </div>
             </div>
 
-            <div class="form-group layui-row">
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目报告</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <table id="upTable" class="table table-bordered table-condensed details">
@@ -1140,18 +1140,18 @@
                                             <fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
                                         </td>
                                         <td class="op-td">
-                                                <%--<c:choose>--%>
-                                                <%--<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">--%>
-                                                <%--<div style="text-align: center">--%>
-                                                <%--<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
-                                                <%--</div>--%>
-                                                <%--</c:when>--%>
-                                                <%--<c:otherwise>--%>
-                                                <%--<div style="text-align: center">--%>
-                                                <%--<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
-                                                <%--</div>--%>
-                                                <%--</c:otherwise>--%>
-                                                <%--</c:choose>--%>
+                                                &lt;%&ndash;<c:choose>&ndash;%&gt;
+                                                &lt;%&ndash;<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">&ndash;%&gt;
+                                                &lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
+                                                &lt;%&ndash;<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
+                                                &lt;%&ndash;</div>&ndash;%&gt;
+                                                &lt;%&ndash;</c:when>&ndash;%&gt;
+                                                &lt;%&ndash;<c:otherwise>&ndash;%&gt;
+                                                &lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
+                                                &lt;%&ndash;<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
+                                                &lt;%&ndash;</div>&ndash;%&gt;
+                                                &lt;%&ndash;</c:otherwise>&ndash;%&gt;
+                                                &lt;%&ndash;</c:choose>&ndash;%&gt;
                                             <div style="text-align: center" id="status_td_${index.index+1}">
                                             </div>
                                             <script>
@@ -1172,7 +1172,7 @@
                         </tbody>
                     </table>
                 </div>
-            </div>
+            </div>--%>
 
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目计划附件信息</h2></div>

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

@@ -836,15 +836,15 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</label>
+                    <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作结束日期：</label>
+                    <label class="layui-form-label double-line">工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -907,7 +907,7 @@
                         </form:select>
                     </div>
                 </div>--%>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>预估总投资额(万元)：</label>
                     <div class="layui-input-block">
                         <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number" onchange="getApprovalFee()"/>
@@ -936,7 +936,7 @@
                     <div class="layui-input-block">
                         <form:input path="buildingPercent" htmlEscape="false" id="buildingPercent" class="form-control layui-input" readonly="true"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">其中安装百分比(%)：</label>
                     <div class="layui-input-block">
@@ -1101,7 +1101,7 @@
                 </div>
             </div>
 
-            <div class="form-group layui-row">
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目报告</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <table id="upTable" class="table table-bordered table-condensed details">
@@ -1136,18 +1136,18 @@
                                             <fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
                                         </td>
                                         <td class="op-td">
-                                                <%--<c:choose>--%>
-                                                <%--<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">--%>
-                                                <%--<div style="text-align: center">--%>
-                                                <%--<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
-                                                <%--</div>--%>
-                                                <%--</c:when>--%>
-                                                <%--<c:otherwise>--%>
-                                                <%--<div style="text-align: center">--%>
-                                                <%--<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
-                                                <%--</div>--%>
-                                                <%--</c:otherwise>--%>
-                                                <%--</c:choose>--%>
+                                                &lt;%&ndash;<c:choose>&ndash;%&gt;
+                                                &lt;%&ndash;<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">&ndash;%&gt;
+                                                &lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
+                                                &lt;%&ndash;<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
+                                                &lt;%&ndash;</div>&ndash;%&gt;
+                                                &lt;%&ndash;</c:when>&ndash;%&gt;
+                                                &lt;%&ndash;<c:otherwise>&ndash;%&gt;
+                                                &lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
+                                                &lt;%&ndash;<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
+                                                &lt;%&ndash;</div>&ndash;%&gt;
+                                                &lt;%&ndash;</c:otherwise>&ndash;%&gt;
+                                                &lt;%&ndash;</c:choose>&ndash;%&gt;
                                             <div style="text-align: center" id="status_td_${index.index+1}">
                                             </div>
                                             <script>
@@ -1168,7 +1168,7 @@
                         </tbody>
                     </table>
                 </div>
-            </div>
+            </div>--%>
 
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目计划附件信息</h2></div>

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

@@ -214,13 +214,13 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作开始日期：</label>
 					<div class="layui-input-block">
-						<input class="laydate-icondate required form-control layui-input layer-date " readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+						<input class="laydate-icondate form-control layui-input layer-date " readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作结束日期：</label>
 					<div class="layui-input-block">
-						<input class="laydate-icondate required form-control layui-input layer-date " readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+						<input class="laydate-icondate form-control layui-input layer-date " readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -272,7 +272,7 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
 					</div>
 				</div>--%>
-				<div class="layui-item layui-col-sm6 lw6">
+				<%--<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">预估总投资额(万元)：</label>
 					<div class="layui-input-block">
 						<input value="<fmt:formatNumber value="${projectRecords.estimateTotalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="estimateTotalFees" class="form-control layui-input required number"  readonly="true"/>
@@ -307,7 +307,7 @@
 					<div class="layui-input-block">
 						<form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">施工单位：</label>
 					<div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordAdminModify.jsp

@@ -145,7 +145,7 @@
 			</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<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>

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordForm.jsp

@@ -45,7 +45,7 @@
 							}).success(function (result) {
 								if(result == 0){
 									boolFlag = false;
-									top.layer.msg("请上传报告文件！", {icon: 0});
+									top.layer.msg("请上传成果文件！", {icon: 0});
 									return false;
 								}
 							}).error(function () {
@@ -290,7 +290,7 @@
 			</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div class="layui-item nav-btns">
 					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordModify.jsp

@@ -44,7 +44,7 @@
 							}).success(function (result) {
 								if(result == 0){
 									boolFlag = false;
-									top.layer.msg("请上传报告文件！", {icon: 0});
+									top.layer.msg("请上传成果文件！", {icon: 0});
 									return false;
 								}
 							}).error(function () {
@@ -321,7 +321,7 @@
 			</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div class="layui-item nav-btns">
 					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordView.jsp

@@ -168,7 +168,7 @@
 		</div>
 
 		<div class="form-group layui-row">
-			<div class="form-group-label"><h2>报告文件</h2></div>
+			<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>

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

@@ -724,15 +724,15 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</label>
+                    <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作结束日期：</label>
+                    <label class="layui-form-label double-line">工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -795,7 +795,7 @@
                         </form:select>
                     </div>
                 </div>--%>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>预估总投资额(万元)：</label>
                     <div class="layui-input-block">
                         <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number" onchange="getApprovalFee()"/>
@@ -830,7 +830,7 @@
                     <div class="layui-input-block">
                         <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                     </div>
-                </div>
+                </div>--%>
                 <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">单位造价(元)：</label>
                     <div class="layui-input-block">
@@ -959,7 +959,7 @@
                 </script>
                 </div>
             </div>
-            <div class="form-group layui-row">
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目报告</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <table id="upTable" class="table table-bordered table-condensed details">
@@ -994,18 +994,18 @@
                                             <fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
                                         </td>
                                         <td class="op-td">
-                                                <%--<c:choose>--%>
-                                                <%--<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">--%>
-                                                <%--<div style="text-align: center">--%>
-                                                <%--<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
-                                                <%--</div>--%>
-                                                <%--</c:when>--%>
-                                                <%--<c:otherwise>--%>
-                                                <%--<div style="text-align: center">--%>
-                                                <%--<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
-                                                <%--</div>--%>
-                                                <%--</c:otherwise>--%>
-                                                <%--</c:choose>--%>
+                                                &lt;%&ndash;<c:choose>&ndash;%&gt;
+                                                &lt;%&ndash;<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">&ndash;%&gt;
+                                                &lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
+                                                &lt;%&ndash;<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
+                                                &lt;%&ndash;</div>&ndash;%&gt;
+                                                &lt;%&ndash;</c:when>&ndash;%&gt;
+                                                &lt;%&ndash;<c:otherwise>&ndash;%&gt;
+                                                &lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
+                                                &lt;%&ndash;<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
+                                                &lt;%&ndash;</div>&ndash;%&gt;
+                                                &lt;%&ndash;</c:otherwise>&ndash;%&gt;
+                                                &lt;%&ndash;</c:choose>&ndash;%&gt;
                                             <div style="text-align: center" id="status_td_${index.index+1}">
                                             </div>
                                             <script>
@@ -1026,7 +1026,7 @@
                         </tbody>
                     </table>
                 </div>
-            </div>
+            </div>--%>
 
 
             <div class="form-group layui-row">

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

@@ -260,13 +260,13 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作开始日期：</label>
 					<div class="layui-input-block">
-						<input class=" required form-control layui-input " readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+						<input class=" form-control layui-input " readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作结束日期：</label>
 					<div class="layui-input-block">
-						<input class=" required form-control layui-input " readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+						<input class=" form-control layui-input " readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -317,7 +317,7 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
 					</div>
 				</div>--%>
-				<div class="layui-item layui-col-sm6 lw6">
+				<%--<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">预估总投资额(万元)：</label>
 					<div class="layui-input-block">
 						<input value="<fmt:formatNumber value="${projectRecords.estimateTotalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="estimateTotalFees" class="form-control layui-input number"  readonly="true"/>
@@ -352,7 +352,7 @@
 					<div class="layui-input-block">
 						<form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">施工单位：</label>
 					<div class="layui-input-block">
@@ -475,7 +475,7 @@
 				</div>
 			</div>
 
-			<div class="form-group layui-row">
+			<%--<div class="form-group layui-row">
 				<div class="form-group-label"><h2>项目报告</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<table id="upTable" class="table table-bordered table-condensed details">
@@ -510,18 +510,18 @@
 											<fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
 										</td>
 										<td class="op-td">
-												<%--<c:choose>--%>
-												<%--<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">--%>
-												<%--<div style="text-align: center">--%>
-												<%--<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
-												<%--</div>--%>
-												<%--</c:when>--%>
-												<%--<c:otherwise>--%>
-												<%--<div style="text-align: center">--%>
-												<%--<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
-												<%--</div>--%>
-												<%--</c:otherwise>--%>
-												<%--</c:choose>--%>
+												&lt;%&ndash;<c:choose>&ndash;%&gt;
+												&lt;%&ndash;<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">&ndash;%&gt;
+												&lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
+												&lt;%&ndash;<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
+												&lt;%&ndash;</div>&ndash;%&gt;
+												&lt;%&ndash;</c:when>&ndash;%&gt;
+												&lt;%&ndash;<c:otherwise>&ndash;%&gt;
+												&lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
+												&lt;%&ndash;<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
+												&lt;%&ndash;</div>&ndash;%&gt;
+												&lt;%&ndash;</c:otherwise>&ndash;%&gt;
+												&lt;%&ndash;</c:choose>&ndash;%&gt;
 											<div style="text-align: center" id="status_td_${index.index+1}">
 											</div>
 											<script>
@@ -542,7 +542,7 @@
 						</tbody>
 					</table>
 				</div>
-			</div>
+			</div>--%>
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>项目计划附件信息</h2></div>

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

@@ -834,15 +834,15 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</label>
+                    <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作结束日期：</label>
+                    <label class="layui-form-label double-line">工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -896,7 +896,7 @@
                             </form:select>
                         </div>
                     </div>--%>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>预估总投资额(万元)：</label>
                     <div class="layui-input-block">
                         <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number" onchange="getApprovalFee()"/>
@@ -931,7 +931,7 @@
                     <div class="layui-input-block">
                         <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">施工单位：</label>
                     <div class="layui-input-block">
@@ -1117,7 +1117,7 @@
                 </div>
             </div>
 
-            <div class="form-group layui-row">
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目报告</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <table id="upTable" class="table table-bordered table-condensed details">
@@ -1152,18 +1152,18 @@
                                             <fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
                                         </td>
                                         <td class="op-td">
-                                                <%--<c:choose>--%>
-                                                <%--<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">--%>
-                                                <%--<div style="text-align: center">--%>
-                                                <%--<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
-                                                <%--</div>--%>
-                                                <%--</c:when>--%>
-                                                <%--<c:otherwise>--%>
-                                                <%--<div style="text-align: center">--%>
-                                                <%--<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
-                                                <%--</div>--%>
-                                                <%--</c:otherwise>--%>
-                                                <%--</c:choose>--%>
+                                                &lt;%&ndash;<c:choose>&ndash;%&gt;
+                                                &lt;%&ndash;<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">&ndash;%&gt;
+                                                &lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
+                                                &lt;%&ndash;<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
+                                                &lt;%&ndash;</div>&ndash;%&gt;
+                                                &lt;%&ndash;</c:when>&ndash;%&gt;
+                                                &lt;%&ndash;<c:otherwise>&ndash;%&gt;
+                                                &lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
+                                                &lt;%&ndash;<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
+                                                &lt;%&ndash;</div>&ndash;%&gt;
+                                                &lt;%&ndash;</c:otherwise>&ndash;%&gt;
+                                                &lt;%&ndash;</c:choose>&ndash;%&gt;
                                             <div style="text-align: center" id="status_td_${index.index+1}">
                                             </div>
                                             <script>
@@ -1184,7 +1184,7 @@
                         </tbody>
                     </table>
                 </div>
-            </div>
+            </div>--%>
 
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目计划附件信息</h2></div>

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

@@ -826,15 +826,15 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</label>
+                    <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>工作结束日期：</label>
+                    <label class="layui-form-label double-line">工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -897,7 +897,7 @@
                         </form:select>
                     </div>
                 </div>--%>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>预估总投资额(万元)：</label>
                     <div class="layui-input-block">
                         <form:input path="estimateTotalFees" htmlEscape="false" id="estimateTotalFees" class="form-control required layui-input number" onchange="getApprovalFee()"/>
@@ -932,7 +932,7 @@
                     <div class="layui-input-block">
                         <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">施工单位：</label>
                     <div class="layui-input-block">
@@ -1091,7 +1091,7 @@
                 </div>
             </div>
 
-            <div class="form-group layui-row">
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目报告</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <table id="upTable" class="table table-bordered table-condensed details">
@@ -1126,18 +1126,18 @@
                                             <fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
                                         </td>
                                         <td class="op-td">
-                                                <%--<c:choose>--%>
-                                                <%--<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">--%>
-                                                <%--<div style="text-align: center">--%>
-                                                <%--<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
-                                                <%--</div>--%>
-                                                <%--</c:when>--%>
-                                                <%--<c:otherwise>--%>
-                                                <%--<div style="text-align: center">--%>
-                                                <%--<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
-                                                <%--</div>--%>
-                                                <%--</c:otherwise>--%>
-                                                <%--</c:choose>--%>
+                                                &lt;%&ndash;<c:choose>&ndash;%&gt;
+                                                &lt;%&ndash;<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">&ndash;%&gt;
+                                                &lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
+                                                &lt;%&ndash;<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
+                                                &lt;%&ndash;</div>&ndash;%&gt;
+                                                &lt;%&ndash;</c:when>&ndash;%&gt;
+                                                &lt;%&ndash;<c:otherwise>&ndash;%&gt;
+                                                &lt;%&ndash;<div style="text-align: center">&ndash;%&gt;
+                                                &lt;%&ndash;<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>&ndash;%&gt;
+                                                &lt;%&ndash;</div>&ndash;%&gt;
+                                                &lt;%&ndash;</c:otherwise>&ndash;%&gt;
+                                                &lt;%&ndash;</c:choose>&ndash;%&gt;
                                             <div style="text-align: center" id="status_td_${index.index+1}">
                                             </div>
                                             <script>
@@ -1158,7 +1158,7 @@
                         </tbody>
                     </table>
                 </div>
-            </div>
+            </div>--%>
 
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目计划附件信息</h2></div>

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

@@ -214,13 +214,13 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作开始日期：</label>
 					<div class="layui-input-block">
-						<input class="laydate-icondate required form-control layui-input layer-date " readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+						<input class="laydate-icondate form-control layui-input layer-date " readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作结束日期：</label>
 					<div class="layui-input-block">
-						<input class="laydate-icondate required form-control layui-input layer-date " readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+						<input class="laydate-icondate form-control layui-input layer-date " readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -271,7 +271,7 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
 					</div>
 				</div>--%>
-				<div class="layui-item layui-col-sm6 lw6">
+				<%--<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">预估总投资额(万元)：</label>
 					<div class="layui-input-block">
 						<input value="<fmt:formatNumber value="${projectRecords.estimateTotalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="estimateTotalFees" class="form-control layui-input required number"  readonly="true"/>
@@ -306,7 +306,7 @@
 					<div class="layui-input-block">
 						<form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">施工单位：</label>
 					<div class="layui-input-block">

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

@@ -33,7 +33,7 @@
 						}).success(function (result) {
 							if(result == 0){
 								boolFlag = false;
-								top.layer.msg("请上传报告文件！", {icon: 0});
+								top.layer.msg("请上传成果文件！", {icon: 0});
 								return false;
 							}
 						}).error(function () {
@@ -554,7 +554,7 @@
 				</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div class="layui-item nav-btns">
 					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${projectRecords.id}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>

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

@@ -196,7 +196,7 @@
 			</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<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>

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

@@ -27,7 +27,7 @@
                             }).success(function (result) {
                                 if(result == 0){
                                     boolFlag = false;
-                                    top.layer.msg("请上传报告文件！", {icon: 0});
+                                    top.layer.msg("请上传成果文件！", {icon: 0});
                                     return false;
                                 }
                             }).error(function () {
@@ -348,7 +348,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>报告文件</h2></div>
+                <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>

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

@@ -92,7 +92,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<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>

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

@@ -33,7 +33,7 @@
 						}).success(function (result) {
 							if(result == 0){
 								boolFlag = false;
-								top.layer.msg("请上传报告文件！", {icon: 0});
+								top.layer.msg("请上传成果文件！", {icon: 0});
 								return false;
 							}
 						}).error(function () {
@@ -571,7 +571,7 @@
 				</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div class="layui-item nav-btns">
 					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${projectRecords.id}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
 				</div>

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

@@ -92,7 +92,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<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>

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

@@ -33,7 +33,7 @@
 							}).success(function (result) {
 								if(result == 0){
 									boolFlag = false;
-									top.layer.msg("请上传报告文件！", {icon: 0});
+									top.layer.msg("请上传成果文件！", {icon: 0});
 									return false;
 								}
 							}).error(function () {
@@ -541,7 +541,7 @@
 				</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报告文件</h2></div>
+				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div class="layui-item nav-btns">
 					<%--<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
 					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${projectId}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>

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

@@ -100,7 +100,7 @@
 			</div>
 		</div>
 		<div class="form-group layui-row">
-			<div class="form-group-label"><h2>报告文件</h2></div>
+			<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>

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

@@ -0,0 +1,903 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>项目登记</title>
+	<meta name="decorator" content="default"/>
+	<script src="${ctxStatic}/layer-v2.3/layim/layui/layui.js"></script>
+    <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%--<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>--%>
+    <style>
+        .layui-table th{
+            font-size: 14px;
+            /*表头内容居中显示*/
+            text-align: center;
+        }
+		.pid{
+			font-size:14px;
+			font-weight:400;
+		}
+    </style>
+	<script type="text/javascript">
+        $(document).ready(function() {
+
+            //搜索框收放
+            $('#moresee').click(function(){
+                if($('#moresees').is(':visible'))
+                {
+                    $('#moresees').slideUp(0,resizeListWindow2);
+                    $('#moresee i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
+                }else{
+                    $('#moresees').slideDown(0,resizeListWindow2);
+                    $('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
+                }
+            });
+			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 reset() {
+            $("#searchForm").resetForm();
+        }
+
+		function openDialog(title,url,width,height,target) {
+
+			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,
+				maxmin: true, //开启最大化最小化按钮
+				content: url,
+				skin: 'three-btns',
+				btn: ['送审', '暂存', '关闭'],
+				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){
+					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) {
+				}
+			});
+		}
+
+		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) {
+				}
+			});
+		}
+
+
+		function openDialogreSub(title,url,width,height,target,formId,tableId) {
+			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: url ,
+				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}/subProject/subProject/save");//表单提交成功后，从服务器返回的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});
+						}
+						window.location.reload();
+						//关闭当前页
+						top.layer.close(index)
+					}
+				});
+			}
+		}
+
+		//打开对话框(查看)
+		function openDialogReportView(title,url,id,width,height){
+
+
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			$.ajax({
+				async: false,
+				url: "${ctx}/ruralProject/ruralProjectMessage/getReportExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						top.layer.open({
+							type: 2,
+							skin: 'one-btn',
+							area: [width, height],
+							title: title,
+							maxmin: true, //开启最大化最小化按钮
+							content: url ,
+							btn: ['关闭'],
+							cancel: function(index){
+							}
+						});
+					}else{
+						top.layer.msg("该项目报告信息已删除！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+
+		}
+
+
+
+		function openDialogreReport(title,url,id,width,height,target,buttons) {
+
+			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+				width = 'auto';
+				height = 'auto';
+			} else {//如果是PC端，根据用户设置的width和height显示。
+
+			}
+
+			$.ajax({
+				async: false,
+				url: "${ctx}/ruralProject/ruralProjectMessage/getReportExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						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) {
+							}
+						});
+					}else{
+						top.layer.msg("该项目报告信息已删除！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+		}
+	</script>
+	<style>
+		body{
+			background-color:transparent;
+			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
+			color:#ffffff;
+			background-color:rgba(255,255,255,0);
+			height:100%;
+		}
+	</style>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<sys:message content="${message}"/>
+	<div class="layui-row">
+		<div class="full-width fl">
+			<div class="layui-row contentShadow shadowLR" id="queryDiv">
+				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralProjectMessage/" method="post" class="form-inline">
+					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
+					<div class="commonQuery lw6">
+						<div class="layui-item query athird">
+							<label class="layui-form-label">项目编号：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="projectId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">项目名称：</label>
+							<div class="layui-input-block">
+								<form:input path="projectName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item athird">
+							<div class="input-group">
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
+								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							</div>
+						</div>
+						<div style="    clear:both;"></div>
+					</div>
+					<div id="moresees" style="clear:both;display:none;" class="lw6">
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">项目负责人：</label>
+							<div class="layui-input-block">
+								<form:input path="leaderNameStr" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">合同名称：</label>
+							<div class="layui-input-block">
+								<input id="workContractInfoName" name="workContractInfo.name" value="${workContractInfoName}" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">委托方：</label>
+							<div class="layui-input-block">
+								<input id="workContractInfoClientName" name="workContractInfo.client.name" value="${workContractInfoClientName}" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">创建时间：</label>
+							<div class="layui-input-block">
+								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${beginDate}" pattern="yyyy-MM-dd"/>"/>
+								</input>
+								<span class="group-sep">-</span>
+								<input id="endDate" name="endDate" placeholder="结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${endDate}" pattern="yyyy-MM-dd"/>"/>
+								</input>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">报告状态：</label>
+							<div class="layui-input-block">
+								<form:select path="projectReportStatus" class=" form-control  simple-select">
+									<form:option value="" label=""/>
+									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								</form:select>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">归档状态：</label>
+							<div class="layui-input-block">
+								<form:select path="projectReportRecordStatus" class=" form-control  simple-select">
+									<form:option value="" label=""/>
+									<form:options items="${fns:getDictList('archive_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								</form:select>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">上报状态：</label>
+							<div class="layui-input-block">
+								<form:select path="reportedState" class=" form-control  simple-select">
+									<form:option value="" label=""/>
+									<form:options items="${fns:getDictList('reported_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								</form:select>
+							</div>
+						</div>
+						<div style="clear:both;"></div>
+					</div>
+				</form:form>
+			</div>
+		</div>
+		<div class="full-width fl">
+			<div class="layui-form contentDetails contentShadow shadowLBR">
+				<div class="nav-btns">
+					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
+					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+
+                    <div style="clear: both;"></div>
+				</div>
+                <table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
+				<!-- 分页代码 -->
+				<table:page page="${page}"></table:page>
+				<div style="clear: both;"></div>
+			</div>
+		</div>
+	</div>
+	<div id="changewidth"></div>
+</div>
+
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script>
+
+    resizeListTable();
+    $("a").on("click",addLinkVisied);
+</script>
+<script>
+    resizeListWindow2();
+    $(window).resize(function(){
+        resizeListWindow2();
+    });
+</script>
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script src="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.js" charset="utf-8"></script>
+<script>
+    /*使用模块加载的方式 加载文件*/
+    layui.config({
+        base: '${ctx}/resoueces/css/layui/module/'
+    }).extend({
+        treetable: 'treetable-lay/treetable'
+    }).use(['layer', 'table', 'treetable'], function () {
+        var $ = layui.jquery;
+        var table = layui.table;
+        var layer = layui.layer;
+        var treetable = layui.treetable;
+
+        // 渲染表格
+        var renderTable = function () {
+        	var projectId = $("#projectId").val();
+        	var projectName = $("#projectName").val();
+        	var leaderNameStr = $("#leaderNameStr").val();
+        	var workContractInfoName = $("#workContractInfoName").val();
+        	var workContractInfoClientName = $("#workContractInfoClientName").val();
+        	var beginDate = $("#beginDate").val();
+        	var endDate = $("#endDate").val();
+        	var projectReportStatus = $("#projectReportStatus").val();
+        	var projectReportRecordStatus = $("#projectReportRecordStatus").val();
+        	var reportedState = $("#reportedState").val();
+            layer.load(2);
+            treetable.render({
+                treeColIndex: 1,//树形图标显示在第几列
+                treeSpid: 0,//最上级的父级id
+                treeIdName: 'permissionId',//id字段的名称
+                treePidName: 'pid',//pid字段的名称
+                treeDefaultClose: true,//是否默认折叠
+                treeLinkage: true,//父级展开时是否自动展开所有子级
+                elem: '#permissionTable',
+                url: '${ctx}/ruralProject/ruralProjectMessage/getProjectList?projectId='+projectId+'&pageNo=${page.pageNo}&projectName='+projectName+'&leaderNameStr='+leaderNameStr+'&workContractInfo.name='+workContractInfoName+'&workContractInfo.client.name='+workContractInfoClientName+'&beginDate='+beginDate+'&endDate='+endDate+'&projectReportStatus='+projectReportStatus+'&projectReportRecordStatus='+projectReportRecordStatus+'&reportedState='+reportedState+'&projectType=1',
+                page: false,
+                cols: [[
+                    {type: 'numbers', align:'center', title: '序号' ,width:80},
+                    {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>";
+						}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>";
+							}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>";
+							}else{
+								return "<font></font>";
+							}
+						}},
+                    {field: 'projectLeader', align:'center', title: '案卷号',width:120,templet: function(d){
+							if(0 == d.pid){
+								return "<a class=\"attention-info pid\" title=\"" + d.recodeNum + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看归档信息', '${ctx}/ruralProject/ruralProjectDownMessage/view?id=" + d.prrdId + "&view=view','95%', '95%')\">" + d.recodeNum + "</a>";
+							}else{
+								return "<font></font>";
+							}
+						}},
+                    {field: 'projectLeader', align:'center', title: '负责人',width:80,templet: function(d){
+							if(0 == d.pid){
+								return "<font style = 'font-size:14px;'>"+d.projectLeaders+"</font>";
+							}else{
+								return "<font></font>";
+							}
+						}},
+                    {field: 'projectLeader', align:'center', title: '委托方',width:160,templet: function(d){
+							if(0 == d.pid){
+								return "<font style = 'font-size:14px;font-weight:500;'>"+d.clientName+"</font>";
+							}else{
+								return "<font></font>";
+							}
+						}},
+                    {field: 'createDate', align:'center', title: '创建日期/打包时间',width:100,templet: function(d){
+							var date=d.createDate;
+
+							if(0 == d.pid){
+								return "<font style = 'font-size:14px;font-weight:500;'>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
+							}else{
+								return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
+							}
+						}},
+					{align:'center', title: '报告状态',  width:70,templet:function(d){
+							var st = getAuditState(""+d.projectReportStatus);
+							if(d.pid ==0){
+								if(st.action)
+									var xml = "<span onclick=\"openDialogReportView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+d.id+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								else
+									var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								return xml;
+							}else{
+								return '';
+							}
+						}},
+					{align:'center', title: '线上归档状态',  width:70,templet:function(d){
+							var st = getRuralProjectArchiveState(""+d.projectReportRecordStatus);
+							if(d.pid ==0){
+								if(st.action)
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								else
+									var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								return xml;
+							}else{
+								return '';
+							}
+						}},
+					{align:'center', title: '线下归档状态',  width:70,templet:function(d){
+							var st = getRuralProjectArchiveState(""+d.downProjectReportRecordStatus);
+							if(d.pid ==0){
+								if(st.action)
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								else
+									var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								return xml;
+							}else{
+								return '';
+							}
+						}},
+					{align:'center', title: '上报状态',  width:70,templet:function(d){
+							var st = getReportedState(""+d.reportedState);
+							if(d.pid ==0){
+								if(st.action)
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								else
+									var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								return xml;
+							}else{
+								return '';
+							}
+						}},
+                    {templet: complain, align:'center', title: '操作' ,width:350}
+                ]],
+                done: function () {
+                    layer.closeAll('loading');
+                }
+            });
+        };
+
+        renderTable();
+
+        //触发三个button按钮
+        $('#btn-expand').click(function () {
+            treetable.expandAll('#permissionTable');
+        });
+
+        $('#btn-fold').click(function () {
+            treetable.foldAll('#permissionTable');
+        });
+
+        $('#btn-refresh').click(function () {
+            renderTable();
+        });
+
+
+        function complain(d){//操作中显示的内容
+        	var xml = '';
+			if(d.pid=="0") {
+				if(d.flag == 1){
+					if(d.projectReportStatus == 0){
+						xml+="<a href=\"#\" onclick=\"openDialogre('新增报告', '${ctx}/ruralProject/ruralProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 新增报告</a>";
+					}
+					if(d.projectReportStatus == 1){
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
+						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除报告</a>";
+					}
+					if(d.projectReportStatus == 2){
+						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目报告审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回报告</a>";
+					}
+					if(d.projectReportStatus == 3){
+						//撤回操作
+						xml+="<a href=\"#\" onclick=\"openDialogre('调整报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
+						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除报告</a>";
+					}
+					if(d.projectReportStatus == 4){
+						//驳回操作
+						xml+="<a href=\"#\" onclick=\"openDialogreReport('调整报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
+						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除报告</a>";
+					}
+
+					//线上归档操作
+					if(d.projectReportStatus == 5){
+						xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";
+						if(d.projectReportRecordStatus == 0){
+							xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 线上归档</a>";
+						}
+						if(d.projectReportRecordStatus == 1){
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 线上重新归档</a>";
+						}
+						if(d.projectReportRecordStatus == 2){
+							xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线上报告归档审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回线上归档</a>";
+						}
+						if(d.projectReportRecordStatus == 3){
+							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 线上重新归档</a>";
+						}
+						if(d.projectReportRecordStatus == 4){
+							xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 线上重新归档</a>";
+						}
+					}
+
+					//线下归档操作
+					if(d.projectReportStatus == 5){
+						if(d.downProjectReportRecordStatus == 0){
+							xml+="<a href=\"#\" onclick=\"openDialogre('新增线下归档信息', '${ctx}/ruralProject/ruralProjectDownMessage/formRecord?reportId=" + d.id +"&flag=1','95%', '95%','','送审,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 线下归档</a>";
+						}
+						if(d.downProjectReportRecordStatus == 1){
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralProjectDownMessage/formRecordModify?id=" + d.prrdId +"&flag=1','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 线下重新归档</a>";
+						}
+						if(d.downProjectReportRecordStatus == 2){
+							xml+="<a href=\"${ctx}/ruralProject/ruralProjectDownMessage/cancelInvalidate?id=" + d.prrdId + "&flag=1&processInstanceId=" + d.prrdProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线下报告归档审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回线下归档</a>";
+						}
+						if(d.downProjectReportRecordStatus == 3){
+							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralProjectDownMessage/formRecordModify?id=" + d.prrdId + "&flag=1','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 线下重新归档</a>";
+						}
+						if(d.downProjectReportRecordStatus == 4){
+							xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectDownMessage/formRecordModify?id=" + d.prrdId + "&view=modify&flag=1','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 线下重新归档</a>";
+						}
+					}
+
+					/*上报相关按钮*/
+					if(d.projectReportRecordStatus == 5 || d.projectReportStatus == 5){
+						if(d.syncStatus == 0){
+							if(d.reportStatus == 0){
+								if(d.reportedState == 0 || d.reportedState == 6){
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"op-btn op-btn-delete\" ><i class=\"fa fa-plus\"></i> 上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"op-btn op-btn-delete\" ><i class=\"fa fa-plus\"></i> 个人上报</a>";
+								}
+							}else{
+								if(d.reportedState == 2){
+									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidateByReported?id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回上报</a>";
+								}
+								/*撤回修改*/
+								if(d.reportedState == 3){
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改上报</a>";
+								}
+								/*驳回修改*/
+								if(d.reportedState == 4){
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改上报</a>";
+								}
+							}
+						}
+					}
+					if('1' == d.flagAdmin && d.projectReportStatus == 5)
+					{
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralProjectMessage/adminModifyForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogView('历史报告', '${ctx}/ruralProject/ruralProjectMessage/getReportModifyList?projectId=" + d.id + "','95%', '95%')\" class=\"op-btn op-btn-delete\" style=\"background-color:#5FB878;\" ><i class=\"fa fa-eye\"></i> 历史报告</a>";
+					}
+					if('1' == d.flagArchive && d.projectReportRecordStatus == 5)
+					{
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改归档案卷号', '${ctx}/ruralProject/ruralProjectMessage/adminRecordModifyForm?id=" + d.prrId + "','95%', '95%','','提交,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改归档</a>";
+					}
+				}
+				return[xml].join('');
+			}else{
+				var xml = '';
+				if(d.flag ==1){
+					xml+="<a href=\"#\" onclick=\"openDialogreSub('修改项目', '${ctx}/subProject/subProject/form?id=" + d.id + "','95%', '95%','','inputForm','layui-border-box')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+					xml+="<a href=\"${ctx}/subProject/subProject/delete?id=" + d.id + "\" onclick=\"return subConfirmx('确认要删除该子项目信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+				}
+				return[xml].join('');
+			}
+        }
+        //监听工具条
+        table.on('tool(permissionTable)', function (obj) {
+            var data = obj.data;
+            var layEvent = obj.event;
+            if(data.permissionName!=null){
+                if (layEvent === 'del') {
+                    layer.msg('删除' + data.id);
+                } else if (layEvent === 'edit') {
+                    layer.msg('修改' + data.id);
+                }
+            }
+        });
+    });
+
+</script>
+<script>
+	function openDialogres(title,url,width,height,target){
+
+		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: 'three-btns',
+			maxmin: true, //开启最大化最小化按钮
+			content: url ,
+			btn: ['提交','暂存','关闭'],
+			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){
+				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
+				}
+				return false;
+			},
+			btn3: function(index){
+			}
+		});
+	}
+	function openDialogreAudit(title,url,width,height,target){
+
+		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: 'three-btns',
+			maxmin: true, //开启最大化最小化按钮
+			content: url ,
+			btn: ['提交','关闭'],
+			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){
+			}
+		});
+	}
+	// 确认对话框
+	function confirmxRefresh(mess, href){
+		top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
+			//do something
+			if (typeof href == 'function') {
+				href();
+			}else{
+				resetTip(); //loading();
+				$.ajax({
+					url:href,
+					data:$('#loginForm').serialize(),
+					type:"post",
+					success:function(data){
+						if(data.status){
+							parent.layer.msg(data.msg,{icon:1});
+						}else {
+							parent.layer.msg(data.msg,{icon:2});
+						}
+						//parent.refreshTrees();
+						location = '${ctx}/project/projectRecords/list';
+					}
+				});
+			}
+			top.layer.close(index);
+		});
+		return false;
+	}
+
+	// 确认对话框
+	function confirmxHintContent(mess, href){
+		$.ajax({
+			url:href,
+			data:$('#loginForm').serialize(),
+			type:"post",
+			success:function(data){
+				parent.layer.open({
+					title: '提示内容'
+					,shade: 0
+					,maxmin: true
+					,content: data.msg
+				});
+			}
+		});
+	}
+</script>
+</body>
+</html>

src/main/webapp/webpage/modules/sys/sysIndex.jsp

@@ -151,7 +151,7 @@
             <ul class="nav" id="side-menu">
                 <li class="nav-header" id="nav-header" style="border-bottom:solid 2px #0f92fb;">
                     <div class="dropdown profile-element">
-                        <span><img alt="image" class="img-circle profile" style="height:90px;width:90px;" src="${fns:getUser().photo }" /></span>
+                        <span><img alt="image" class="img-circle profile" style="height:90px;width:90px;" src="${ctxStatic}/common/login/images/portrait.png" /></span>
                         <%--<a data-toggle="dropdown" class="dropdown-toggle" href="javascript:void(0)">--%>
                                 <span class="clear">
                                <span class="block m-t-xs" style="font-size: 14px;cursor:default">${fns:getUser().name}</span>
@@ -181,7 +181,7 @@
                         </ul>
                     </div>
                     <div class="logo-element">
-                        <span><img alt="image" class="img-circle profile" style="height:50px;width:50px;" src="${fns:getUser().photo }" /></span>
+                        <span><img alt="image" class="img-circle profile" style="height:50px;width:50px;" src="${ctxStatic}/common/login/images/portrait.png" /></span>
                         <span class="block m-t-xs" style="font-size: 12px;">${fns:getUser().name}</span>
                     </div>
                 </li>

src/main/webapp/webpage/modules/sys/sysLogin.jsp

@@ -549,7 +549,7 @@
 					<div style="margin-top: 100px;">
 
 						<div style="width:600px;margin:auto">
-							<img src="${ctxp}/static/common/login/images/top-name2.png">
+							<img src="${ctxp}/static/common/login/images/top-name3.png">
 							<div id="login-box" class="login-box visible widget-box">
 								<div class="login-title">
 									<span>用户登录</span>

src/main/webapp/webpage/modules/sys/userInfo.jsp

@@ -366,14 +366,14 @@
                                                                    value="${user.mobile}"/>
                                                         </div>
                                                     </div>
-                                                    <div class="layui-item layui-col-sm12">
+                                                    <%--<div class="layui-item layui-col-sm12">
                                                         <label class="layui-form-label">座机：</label>
                                                         <div class="layui-input-block">
                                                             <input htmlEscape="false" style="background: #fff;" readonly="true"
                                                                    class="form-control layui-input"
                                                                    value="${user.phone}"/>
                                                         </div>
-                                                    </div>
+                                                    </div>--%>
                                                 </div>
 
                                                 <div class="layui-item layui-col-sm6 lw7">
@@ -564,7 +564,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-item layui-col-sm6 lw7">
-                                        <label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>
+                                        <label class="layui-form-label double-line">是否 TS人员：</label>
                                         <div class="layui-input-block">
                                             <input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />
                                             <input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" class="form-control  layui-input" />

src/main/webapp/webpage/modules/workclientinfo/workClientInfoForm.jsp

@@ -537,10 +537,10 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>公司电话：</label>
+                    <label class="layui-form-label">公司电话：</label>
                     <div class="layui-input-block">
                         <form:input path="telephone" id="telephone" htmlEscape="false" maxlength="11"
-                                    class="form-control isTel required layui-input"/>
+                                    class="form-control isTel layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -560,10 +560,10 @@
                 </div>
 
                 <div class="layui-item layui-col-sm12 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>注册地址：</label>
+                    <label class="layui-form-label">注册地址：</label>
                     <div class="layui-input-block">
                         <form:input path="registerAddress" id="registerAddress" htmlEscape="false"
-                                    class="form-control required layui-input"/>
+                                    class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12 lw7">

src/main/webapp/webpage/modules/workclientinfo/workClientInfoFormType.jsp

@@ -501,10 +501,10 @@
                 </div>
 
                 <div class="layui-item layui-col-sm12 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>注册地址：</label>
+                    <label class="layui-form-label">注册地址：</label>
                     <div class="layui-input-block">
                         <form:input readonly="true" path="registerAddress" id="registerAddress" htmlEscape="false"
-                                    class="form-control required layui-input"/>
+                                    class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12 lw7">

src/main/webapp/webpage/modules/workclientinfo/workClientInfoList.jsp

@@ -190,8 +190,8 @@
 						<div class="layui-item query athird">
 							<label class="layui-form-label">创建人：</label>
 							<div class="layui-input-block  with-icon">
-								<sys:treeselect id="create" name="createId" value="${createId}" labelName="createNameStr" labelValue="${createName}"
-												title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+								<sys:clienttreeselect id="create" name="createId" value="${createId}" labelName="createNameStr" labelValue="${createName}"
+													  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 							</div>
 						</div>
 					</div>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -606,13 +606,13 @@
                 ,{field:'clientName',align:'center', title: '客户名称',minWidth:160,templet:function(d){
                         return "<a class=\"attention-info\" title=\""+d.clientName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看客户管理', '${ctx}/workclientinfo/workClientInfo/detail?id=" + d.clientId +"','95%', '95%')\">" + d.clientName + "</a>";
                     }}
-                ,{field:'contractPrice', align:'center',sort:true,title: '合同金额(元)',width:100,templet:function(d){
+                ,{field:'contractPrice', align:'center',title: '合同金额(元)',width:100,templet:function(d){
                         return "<span title='"+ d.contractPrice2 +"'>" + d.contractPrice2 + "</span>";
                     }}
                 ,{field:'createBy',align:'center', title: '创建人',  width:80,templet:function(d){
                         return "<span title='"+ d.createBy +"'>" + d.createBy + "</span>";
                     }}
-                ,{field:'signDate',align:'center', sort:true,title: '签订日期',  width:80}
+                ,{field:'signDate',align:'center', title: '签订日期',  width:80}
                 ,{align:'center', title: '状态',  width:70,templet:function(d){
                         <%--var st = getAuditState(d.status);--%>
                         <%--var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/workcontractinfo/workContractInfo/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>

src/main/webapp/webpage/modules/workengineeringproject/workEngineeringRecordForm.jsp

@@ -106,7 +106,7 @@
 				<table class="table table-striped table-bordered table-hover table-condensed dataTables-example">
 					<tbody>
 					<tr>
-						<td class="width-15 active" ><label class="pull-right">报告文件：</label></td>
+						<td class="width-15 active" ><label class="pull-right">成果文件：</label></td>
 						<td class="width-35" colspan="3">
 							<table id="workReportList"  style="text-align: center;width: 100%;margin-top:10px;"  class="table table-striped table-bordered table-condensed" >
 								<tr>

src/main/webapp/webpage/modules/workengineeringproject/workEngineeringRecordView.jsp

@@ -106,7 +106,7 @@
 				<table class="table table-striped table-bordered table-hover table-condensed dataTables-example">
 					<tbody>
 					<tr>
-						<td class="width-15 active" ><label class="pull-right">报告文件：</label></td>
+						<td class="width-15 active" ><label class="pull-right">成果文件：</label></td>
 						<td class="width-35" colspan="3">
 							<table id="workReportList"  style="text-align: center;width: 100%;margin-top:10px;"  class="table table-striped table-bordered table-condensed" >
 								<tr>

src/main/webapp/webpage/modules/workprojectManagement/startThreeGradeExamination.jsp

@@ -265,7 +265,7 @@
                 </div>
                 <div class="col-sm-10 " >
                     <tr>
-                        <td class="width-15 active" ><label class="pull-left">报告文件：</label></td>
+                        <td class="width-15 active" ><label class="pull-left">成果文件：</label></td>
                         <td class="width-35" colspan="3">
                             <div style="display: inline-block">
                                 <div id="addFile_attachment_report" style="display: none">

src/main/webapp/webpage/modules/workprojectManagement/workAttachmentListView.jsp

@@ -46,7 +46,7 @@
                         <tbody>
                         <tr>
                             <td class="width-35" colspan="4">
-                                <label class="pull-left">报告文件：</label>
+                                <label class="pull-left">成果文件：</label>
                                 <table id="workReportList"  style="text-align: center;width: 100%;margin-top:10px;"  class="table table-striped table-bordered table-condensed" >
                                     <tr>
                                        <%-- <td>序号</td>--%><td>文件名</td><td>上传人</td><td>上传时间</td><td>操作</td>

src/main/webapp/webpage/modules/workprojectManagement/workThreeExamination.jsp

@@ -265,7 +265,7 @@
                 </div>
                 <div class="col-sm-10 " >
                     <tr>
-                        <td class="width-15 active" ><label class="pull-left">报告文件：</label></td>
+                        <td class="width-15 active" ><label class="pull-left">成果文件：</label></td>
                         <td class="width-35" colspan="3">
                             <div style="display: inline-block">
                                 <div id="addFile_attachment_report" style="display: none">

src/main/webapp/webpage/modules/workprojectManagement/workThreeExaminationView.jsp

@@ -171,7 +171,7 @@
                         <tbody>
                         <tr>
                             <td class="width-35" colspan="4">
-                                <label class="pull-left">报告文件：</label>
+                                <label class="pull-left">成果文件：</label>
                                 <table id="workReportList"  style="text-align: center;width: 100%;margin-top:10px;"  class="table table-striped table-bordered table-condensed" >
                                     <tr>
                                         <%--<td>序号</td>--%><td>文件名</td><td>上传人</td><td>上传时间</td><td>操作</td>

src/main/webapp/webpage/modules/workprojectManagement/workThreeGradeExamination.jsp

@@ -265,7 +265,7 @@
                 </div>
                 <div class="col-sm-10 " >
                     <tr>
-                        <td class="width-15 active" ><label class="pull-left">报告文件：</label></td>
+                        <td class="width-15 active" ><label class="pull-left">成果文件：</label></td>
                         <td class="width-35" colspan="3">
                             <div style="display: inline-block">
                                 <div id="addFile_attachment_report" style="display: none">

src/main/webapp/webpage/modules/workprojectManagement/workThreeGradeExaminationView.jsp

@@ -171,7 +171,7 @@
                         <tbody>
                         <tr>
                             <td class="width-35" colspan="4">
-                                <label class="pull-left">报告文件：</label>
+                                <label class="pull-left">成果文件：</label>
                                 <table id="workReportList"  style="text-align: center;width: 100%;margin-top:10px;"  class="table table-striped table-bordered table-condensed" >
                                     <tr>
                                        <%-- <td>序号</td>--%><td>文件名</td><td>上传人</td><td>上传时间</td><td>操作</td>

src/main/webapp/webpage/modules/workstaff/workStaffBasicDetailForm.jsp

@@ -287,13 +287,13 @@
                             <input name="birthday" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
+                    <%--<div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>公历/农历：</label>
                         <div class="layui-input-block">
                             <input value="${fns:getDictLabel(workStaffBasicInfo.calendar,'calendar_type','')}" type="text" readonly="true" class="form-control  layui-input" />
                             <input value="${workStaffBasicInfo.calendar}" type="hidden" 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">
@@ -403,7 +403,7 @@
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">籍    贯：</label>
+                        <label class="layui-form-label"><span class="require-item">*</span>籍    贯：</label>
                         <div class="layui-input-block with-icon">
                             <sys:treeselect id="nativePlace" name="nativePlace.id" value="${workStaffBasicInfo.nativePlace.id}" labelName="" labelValue="${workStaffBasicInfo.nativePlace.name}"
                                             title="区域" url="/sys/area/treeData" cssClass="form-control layui-input basicInfo" allowClear="true" notAllowSelectParent="true"/>

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -425,14 +425,14 @@
                                value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>公历/农历：</label>
                     <div class="layui-input-block">
                         <form:select path="calendar" class="form-control simple-select required">
                             <form:options items="${fns:getDictList('calendar_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">电子邮箱：</label>
                     <div class="layui-input-block">
@@ -569,7 +569,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">籍    贯：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>籍    贯：</label>
                     <div class="layui-input-block with-icon">
                         <sys:treeselect id="nativePlace" name="nativePlace.id" value="${workStaffBasicInfo.nativePlace.id}" labelName="" labelValue="${workStaffBasicInfo.nativePlace.name}"
                                         title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoView.jsp

@@ -120,13 +120,13 @@
                             <input name="birthday" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
+                    <%--<div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>公历/农历：</label>
                         <div class="layui-input-block">
                             <input value="${fns:getDictLabel(workStaffBasicInfo.calendar,'calendar_type','')}" type="text" readonly="true" class="form-control  layui-input" />
                             <input value="${workStaffBasicInfo.calendar}" type="hidden" 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">
@@ -239,7 +239,7 @@
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">籍    贯：</label>
+                        <label class="layui-form-label"><span class="require-item">*</span>籍    贯：</label>
                         <div class="layui-input-block">
                             <input name="nativePlace.name" value="${workStaffBasicInfo.nativePlace.name}" type="text" readonly="true" class="form-control  layui-input" />
                         </div>