全过程实施阶段代码上传

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectClaimController.java

@@ -49,7 +49,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
-//实施阶段-索赔管理
+//实施阶段-索赔审核
 @Controller
 @RequestMapping(value = "${adminPath}/project/projectClaim")
 public class ProjectClaimController extends BaseController {
@@ -86,7 +86,7 @@ public class ProjectClaimController extends BaseController {
     }
 
     /**
-     * 索赔管理跳转
+     * 索赔审核跳转
      * @param constructionContract
      * @param request
      * @param response
@@ -112,14 +112,14 @@ public class ProjectClaimController extends BaseController {
         }
         //查询施工合同列表信息
         //Page<ConstructionContract> page = contractService.findPage(new Page<ConstructionContract>(request, response), constructionContract);
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         model.addAttribute("overallProjectTypeId", "46");
         return "modules/projectrecord/claim/projectClaimList";
     }
 
     /**
-     * 获取索赔管理树状图信息
+     * 获取索赔审核树状图信息
      * @param constructionContract
      * @param request
      * @param response
@@ -140,7 +140,7 @@ public class ProjectClaimController extends BaseController {
             workContractInfo.setName(constructionContract.getContractName());
             projectRecords.setWorkContractInfo(workContractInfo);
         }
-        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();
         //新建树形列表集合
@@ -266,7 +266,7 @@ public class ProjectClaimController extends BaseController {
     }
 
     /**
-     * 添加索赔管理页面
+     * 添加索赔审核页面
      * @param concealProjectInfo
      * @param model
      * @return
@@ -491,9 +491,9 @@ public class ProjectClaimController extends BaseController {
             }
             responseEntity.setData(listAll);
         } catch (Exception e) {
-            logger.error("导入索赔管理一览表失败！",e);
+            logger.error("导入索赔审核一览表失败！",e);
             responseEntity.setCode(400);
-            responseEntity.setMessage("导入索赔管理一览表失败！"+e.getMessage());
+            responseEntity.setMessage("导入索赔审核一览表失败！"+e.getMessage());
         }
         return responseEntity;
     }
@@ -505,9 +505,9 @@ public class ProjectClaimController extends BaseController {
     public String importFileTemplate(HttpServletResponse response, HttpServletRequest request, RedirectAttributes redirectAttributes) {
         try {
             ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
-            download.download("索赔管理一览表.xlsx",request,response);
+            download.download("索赔审核一览表.xlsx",request,response);
         } catch (Exception e) {
-            logger.error("索赔管理一览表模板下载失败！",e);
+            logger.error("索赔审核一览表模板下载失败！",e);
         }
         return "redirect:"+Global.getAdminPath()+"/project/projectDesignChange/?repage";
     }

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectDesignController.java

@@ -118,7 +118,7 @@ public class ProjectDesignController extends BaseController {
         }
         //查询施工合同列表信息
         //Page<ConstructionContract> page = contractService.findPage(new Page<ConstructionContract>(request, response), constructionContract);
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         model.addAttribute("overallProjectTypeId", "43");
         return "modules/projectrecord/implementStage/projectDesignList";
@@ -368,7 +368,7 @@ public class ProjectDesignController extends BaseController {
             workContractInfo.setName(constructionContract.getContractName());
             projectRecords.setWorkContractInfo(workContractInfo);
         }
-        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();
         //新建树形列表集合

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectVisaController.java

@@ -109,7 +109,7 @@ public class ProjectVisaController extends BaseController {
         }
         //查询施工合同列表信息
         //Page<ConstructionContract> page = contractService.findPage(new Page<ConstructionContract>(request, response), constructionContract);
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         model.addAttribute("overallProjectTypeId", "45");
         return "modules/projectrecord/implementStage/projectVisaList";
@@ -365,7 +365,7 @@ public class ProjectVisaController extends BaseController {
             projectRecords.setWorkContractInfo(workContractInfo);
         }
         //获取已审核通过项目集合
-        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();
         //新建树形列表集合

src/main/java/com/jeeplus/modules/projectcontentinfo/dao/ProjectReportDataDao.java

@@ -203,4 +203,10 @@ public interface ProjectReportDataDao extends CrudDao<ProjectReportData> {
      * @param status
      */
     Integer replaceProjectReportStatus(@Param("number")String number, @Param("status") String status);
+
+    /**
+     * 删除中间表信息
+     * @param reportId
+     */
+    public void deleteProjectContentReportById( @Param("reportId") String reportId);
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportDataService.java

@@ -431,6 +431,8 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 	@Transactional(readOnly = false)
 	public void delete(ProjectReportData projectReportData) {
 		dao.deleteReportDataInfo(projectReportData.getId());
+		//删除关联表中数据信息（project_content_report）
+		dao.deleteProjectContentReportById(projectReportData.getId());
 		super.delete(projectReportData);
 	}
 
@@ -463,8 +465,8 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 		}
 		ProjectRecords projectRecords = projectRecordsService.get(projectReportData.getProject());
 		Office recordsOffice =officeService.get(projectRecords.getOffice());
-		String title = "报告名称:"+projectReportData.getName();
-		String str =  "报告名称:"+projectReportData.getName()+",工作内容类型:"+ WorkContentTypeController.getContentTypeName(projectReportData.getType(),"")+",项目所属部门:"+recordsOffice.getName()+",负责人:"+user.getName();
+		String title = "报告号:"+ projectReportData.getNumber() + "。报告名称:"+projectReportData.getName();
+		String str =  "报告号:"+ projectReportData.getNumber() + "。报告名称:"+projectReportData.getName()+",工作内容类型:"+ WorkContentTypeController.getContentTypeName(projectReportData.getType(),"")+",项目所属部门:"+recordsOffice.getName()+",负责人:"+user.getName();
 		// 用来设置启动流程的人员ID，引擎会自动把用户ID保存到activiti:initiator中
 		identityService.setAuthenticatedUserId(user.getId());
 		// 启动流程
@@ -944,8 +946,8 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 		User user= UserUtils.get(projectReportData.getCreateBy().getId());
 		ProjectRecords projectRecords = projectRecordsService.get(projectReportData.getProject());
 		Office recordsOffice =officeService.get(projectRecords.getOffice());
-		String title = "报告名称:"+projectReportData.getName();
-		String str =  "报告名称:"+projectReportData.getName()+",工作内容类型:"+ WorkContentTypeController.getContentTypeName(projectReportData.getType(),"")+",项目所属部门:"+recordsOffice.getName()+",负责人:"+user.getName();
+		String title = "报告号:"+ projectReportData.getNumber() +"。报告名称:"+projectReportData.getName();
+		String str =  "报告号:"+ projectReportData.getNumber() +"。报告名称:"+projectReportData.getName()+",工作内容类型:"+ WorkContentTypeController.getContentTypeName(projectReportData.getType(),"")+",项目所属部门:"+recordsOffice.getName()+",负责人:"+user.getName();
 
 		if (StringUtils.isBlank(act.getComment())){
 			act.setComment(flag.equals("yes")?"同意":"驳回");
@@ -1112,7 +1114,7 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 //            str = "yes".equals(flag)?"您的报销单审核：已通过":"您的报销单审核：未通过";
 			users.add(projectReportData.getCreateBy());
 			if ("yes".equals(flag)) {
-				str =  "报告名称:"+projectReportData.getName()+",工作内容类型:"+ WorkContentTypeController.getContentTypeName(projectReportData.getType(),"")+",项目所属部门:"+recordsOffice.getName();
+				str =  "报告号:"+ projectReportData.getNumber() + "。报告名称:"+projectReportData.getName()+",工作内容类型:"+ WorkContentTypeController.getContentTypeName(projectReportData.getType(),"")+",项目所属部门:"+recordsOffice.getName();
 				projectReportData.setStatus("5");
 				WorkProjectNotify notify = new WorkProjectNotify();
 				notify.setNotifyId(projectReportData.getId());

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectcontentinfoService.java

@@ -538,7 +538,17 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 			}
 			//添加工作内容和报告关系
 			//判断是否为实施前期、实施阶段、竣工阶段信息
-			if ("according".equals(projectcontentinfo.getCondition()) || "completion".equals(projectcontentinfo.getCondition()) || "early".equals(projectcontentinfo.getCondition()) || "claim".equals(projectcontentinfo.getCondition()) || "design".equals(projectcontentinfo.getCondition()) || "visa".equals(projectcontentinfo.getCondition()) || "interim".equals(projectcontentinfo.getCondition()) || "distribution".equals(projectcontentinfo.getCondition())){
+			if ("according".equals(projectcontentinfo.getCondition()) ||
+					"completion".equals(projectcontentinfo.getCondition()) ||
+					"early".equals(projectcontentinfo.getCondition()) ||
+					"claim".equals(projectcontentinfo.getCondition()) ||
+					"design".equals(projectcontentinfo.getCondition()) ||
+					"visa".equals(projectcontentinfo.getCondition()) ||
+					"interim".equals(projectcontentinfo.getCondition()) ||
+					"checkConceal".equals(projectcontentinfo.getCondition()) ||
+					"checkMaterial".equals(projectcontentinfo.getCondition()) ||
+					"checkArmorForMaterials".equals(projectcontentinfo.getCondition()) ||
+					"distribution".equals(projectcontentinfo.getCondition())){
 				if(null != projectReportData.getProjectContentDataList() && null != projectReportData){
 					Integer contentAndReportCount = projectImplementEarlyService.getProjectContrntAndReport(projectReportData.getProjectContentDataList().get(0).getId(), projectReportData.getId());
 					if(contentAndReportCount==0){
@@ -582,7 +592,17 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 			}
 			//保存tree数据
 			//判断是否为实施前期、实施阶段、竣工阶段信息
-			if (!"according".equals(projectcontentinfo.getCondition()) && !"completion".equals(projectcontentinfo.getCondition()) && !"early".equals(projectcontentinfo.getCondition()) && !"claim".equals(projectcontentinfo.getCondition()) && !"design".equals(projectcontentinfo.getCondition()) && !"visa".equals(projectcontentinfo.getCondition()) && !"interim".equals(projectcontentinfo.getCondition()) && !"distribution".equals(projectcontentinfo.getCondition())){
+			if (!"according".equals(projectcontentinfo.getCondition()) &&
+					!"completion".equals(projectcontentinfo.getCondition()) &&
+					!"early".equals(projectcontentinfo.getCondition()) &&
+					!"claim".equals(projectcontentinfo.getCondition()) &&
+					!"design".equals(projectcontentinfo.getCondition()) &&
+					!"visa".equals(projectcontentinfo.getCondition()) &&
+					!"interim".equals(projectcontentinfo.getCondition()) &&
+					!"checkConceal".equals(projectcontentinfo.getCondition()) &&
+					!"checkMaterial".equals(projectcontentinfo.getCondition()) &&
+					!"checkArmorForMaterials".equals(projectcontentinfo.getCondition()) &&
+					!"distribution".equals(projectcontentinfo.getCondition())){
 				saveReportTree(projectcontentinfo,status,company,office,reportDataName,infoId,attachmentList,projectReportData.getReviewStandard(),1);
 			}
 		}

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectImplementEarlyService.java

@@ -150,6 +150,40 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
         return page;
     }
 
+    public Page<ProjectImplementEarly> findOverallProcessProjectPage(Page<ProjectImplementEarly> page, ProjectImplementEarly projectRecords) {
+        //设置数据权限
+        if(!UserUtils.getUser().isAdmin()) {
+            String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
+            //判断是否为空，为空则进行新的权限查询
+            if(org.apache.commons.lang3.StringUtils.isBlank(dataScopeSql)){
+                dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
+            }
+            projectRecords.getSqlMap().put("dsf", dataScopeSql);
+        }
+        projectRecords.setProjectType("3");
+        String lockProjectIds = JedisUtils.get(UserUtils.getUser().getId() + "overAllLockProject");
+        if(StringUtils.isNotBlank(lockProjectIds)){
+            List<String> idList = Arrays.asList(lockProjectIds.split(","));
+            projectRecords.setIdList(idList);
+        }
+        //获取数据条数
+        Integer count = dao.getProjectRecodesCount(projectRecords);
+        page.setCount(count);
+        page.setCountFlag(false);
+        projectRecords.setPage(page);
+        //获取已审核的项目数据信息
+        List<ProjectImplementEarly> recordsList = dao.getProjectRecodesList(projectRecords);
+        //查询负责人信息
+        for (ProjectImplementEarly records : recordsList) {
+            List<User> users = workProjectUserDao.queryProjectUsers(records.getId(), "");
+            records.setProjectLeaders(users);
+            records.setLeaderNameStr(Collections3.extractToString(users, "name", ","));
+            records.setLeaderIds(Collections3.extractToString(users, "id", ","));
+        }
+        page.setList(recordsList);
+        return page;
+    }
+
     /**
      * 查询艮宫咨询报告信息
      * @param page

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -135,6 +135,18 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 		}
 		return projectRecords;
 	}
+
+	public ProjectRecords getOverallProcessQueryProjectUsers(String id) {
+		ProjectRecords projectRecords = super.get(id);
+		List<User> users = workProjectUserDao.queryProjectUsers(projectRecords.getId(), "1");
+		projectRecords.setLeaderNameStr(Collections3.extractToString(users, "name", ","));
+/*		if (StringUtils.isNotBlank(projectRecords.getWorkContractInfo().getId())) {
+			WorkContractInfo workContractInfo = contractInfoService.get(projectRecords.getWorkContractInfo().getId());
+			projectRecords.setWorkContractInfo(workContractInfo);
+		}*/
+		return projectRecords;
+	}
+
 	public ProjectRecords getQueryProjectMasters(ProjectRecords projectRecords) {
 		List<User> users = workProjectUserDao.queryProjectUsers(projectRecords.getId(), "1");
 		projectRecords.setLeaderNameStr(Collections3.extractToString(users, "name", ","));
@@ -253,6 +265,40 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 		return page;
 	}
 
+	public Page<ProjectRecords> findOverallProcessPage(Page<ProjectRecords> page, ProjectRecords projectRecords) {
+		//设置数据权限
+        if(!UserUtils.getUser().isAdmin()) {
+            String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
+            if(StringUtils.isBlank(dataScopeSql)){
+				dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
+			}
+            projectRecords.getSqlMap().put("dsf", dataScopeSql);
+        }
+        //添加全过程项目类型标识
+		projectRecords.setProjectType("3");
+		String lockProjectIds = JedisUtils.get(UserUtils.getUser().getId() + "overAllLockProject");
+		if(com.jeeplus.common.utils.StringUtils.isNotBlank(lockProjectIds)){
+			List<String> idList = Arrays.asList(lockProjectIds.split(","));
+			projectRecords.setIdList(idList);
+		}
+        //查询数据条数
+        int count = dao.queryCount(projectRecords);
+        page.setCount(count);
+        page.setCountFlag(false);
+        projectRecords.setPage(page);
+		List<ProjectRecords> recordsList = findList(projectRecords);
+		//查询负责人信息
+		for (ProjectRecords records : recordsList) {
+			//this.queryContractInfos(records);
+			List<User> users = workProjectUserDao.queryProjectUsers(records.getId(), "1");
+			records.setProjectLeaders(users);
+			records.setLeaderNameStr(Collections3.extractToString(users, "name", ","));
+			records.setLeaderIds(Collections3.extractToString(users, "id", ","));
+		}
+		page.setList(recordsList);
+		return page;
+	}
+
 
 	public String getMoneyAll(ProjectRecords ruralProjectRecords){
 		ruralProjectRecords.setPage(new Page<ProjectRecords>());
@@ -1013,17 +1059,21 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 						vars.put("pass", true);
 						vars.put("passs", true);
 						notifyRole = "审批通过";
-						//审批通过则需要给该项目添加一个报告前缀信息
-						String num = serialNumTplService.genSerialNum(UserUtils.getUser().getCompany(), "92");
-						ReportNum reportNum = new ReportNum();
-						reportNum.preInsert();
-						reportNum.setNum(num);
-						reportNum.setState("0");
-						reportNum.setParentId("0");
-						reportNum.setParentId("0");
-						reportNum.setProjectId(projectRecords.getId());
-						//添加信息
-						projectReportNumDao.insert(reportNum);
+						//首先根据项目id查询是否已经存在报告号，若没有则生成对应报告号，否则不进行生成新的报告号
+						ReportNum reportNumber = projectReportNumDao.getByProjectId(projectRecords.getId());
+						if(null != reportNumber && StringUtils.isNotBlank(reportNumber.getNum())){
+							//审批通过则需要给该项目添加一个报告前缀信息
+							String num = serialNumTplService.genSerialNum(UserUtils.getUser().getCompany(), "92");
+							ReportNum reportNum = new ReportNum();
+							reportNum.preInsert();
+							reportNum.setNum(num);
+							reportNum.setState("0");
+							reportNum.setParentId("0");
+							reportNum.setParentId("0");
+							reportNum.setProjectId(projectRecords.getId());
+							//添加信息
+							projectReportNumDao.insert(reportNum);
+						}
 					} else {
 						workActivityProcess.setIsApproval("2");
 						vars.put("pass", false);

src/main/java/com/jeeplus/modules/projectrecord/service/distributionSettlement/DistributionSettlementService.java

@@ -27,7 +27,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * 分布结算Service
+ * 分部结算Service
  * @author 徐滕
  * @version 2020-07-30
  */
@@ -49,24 +49,24 @@ public class DistributionSettlementService extends CrudService<DistributionSettl
     private WorkattachmentService workattachmentService;
 
     /**
-     * 根据合同id查询分布结算信息
+     * 根据合同id查询分部结算信息
      * @param id
      * @return
      */
     @Transactional(readOnly = true)
     public List<ProjectContentData> getConcealProjectList(String id) {
-        //查询分布结算信息
+        //查询分部结算信息
         List<ProjectContentData> projectVisaList=dao.getConcealProjectList(id);
         return projectVisaList;
     }
 
     /**
-     * 根据id查询分布结算信息
+     * 根据id查询分部结算信息
      * @param id
      * @return
      */
     public ProjectContentData getProjectContentData(String id) {
-        //根据id查询分布结算信息
+        //根据id查询分部结算信息
         ProjectContentData projectContentData = dao.getConcealProjectData(id);
         if(projectContentData!=null){
             Workattachment workattachment = new Workattachment();
@@ -108,7 +108,7 @@ public class DistributionSettlementService extends CrudService<DistributionSettl
         //保存工作内容相关数据
         ProjectContentData projectContentData = concealProjectInfo.getProjectContentData();
         if(StringUtils.isNotBlank(projectContentData.getId())){
-            //查询分布结算信息
+            //查询分部结算信息
             ProjectContentData oldData = dao.getConcealProjectData(projectContentData.getId());
             //数据整合
             MyBeanUtils.copyBeanNotNull2Bean(projectContentData, oldData);
@@ -138,7 +138,7 @@ public class DistributionSettlementService extends CrudService<DistributionSettl
                     List<ProjectBasedData> projectBasedData = new ArrayList<>();
                     if(StringUtils.isNotBlank(data.getName())){
                         projectBasedData.add(data);
-                        //添加分布结算和依据性资料关系表
+                        //添加分部结算和依据性资料关系表
                         projectContentDataService.saveBasedData(projectContentData.getId(),projectBasedData);
                     }
                 }
@@ -177,7 +177,7 @@ public class DistributionSettlementService extends CrudService<DistributionSettl
     }
 
     /**
-     * 删除分布结算信息
+     * 删除分部结算信息
      * @param concealProjectInfo
      */
     @Transactional(readOnly = false)

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectRecordsController.java

@@ -131,7 +131,7 @@ public class ProjectRecordsController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
-		Page<ProjectRecords> page = projectRecordsService.findPage(new Page<ProjectRecords>(request, response), projectRecords);
+		Page<ProjectRecords> page = projectRecordsService.findOverallProcessPage(new Page<ProjectRecords>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
 		List<ProjectRecords> list = page.getList();
 		for (int i = 0; i < list.size(); i++) {

src/main/java/com/jeeplus/modules/projectrecord/web/armorForMaterials/ArmorForMaterialsController.java

@@ -112,7 +112,7 @@ public class ArmorForMaterialsController extends BaseController {
             projectRecords.setWorkContractInfo(workContractInfo);
         }
         //获取项目信息
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         model.addAttribute("overallProjectTypeId", "411");
         return "modules/projectrecord/armorForMaterials/armorForMaterialsList";
@@ -140,7 +140,7 @@ public class ArmorForMaterialsController extends BaseController {
             workContractInfo.setName(constructionContract.getContractName());
             projectRecords.setWorkContractInfo(workContractInfo);
         }
-        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();
         //新建树形列表集合
@@ -226,7 +226,8 @@ public class ArmorForMaterialsController extends BaseController {
                             contentData.setId(data.getId());
                             contentData.setProjectTypeId(data.getProjectTypeId());
                             contentData.setContractName(data.getProjectName());
-                            contentData.setCnumber(contract.getCnumber());
+                            contentData.setCnumber(data.getProjectReportNumber());
+                            contentData.setStatus(data.getStatus());
                             //contentData.setNumber(data.getNumber());
                             contentData.setProjectId(record.getId());
                             contentData.setCreateDate(data.getCreateDate());

src/main/java/com/jeeplus/modules/projectrecord/web/check/ChechDesignController.java

@@ -89,8 +89,17 @@ public class ChechDesignController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
-        //查询合同信息
-        Page<ConstructionContract> page = contractService.findPage(new Page<ConstructionContract>(request, response), constructionContract);
+        ProjectImplementEarly projectRecords = new ProjectImplementEarly();
+        if(StringUtils.isNotBlank(constructionContract.getProjectName())){
+            projectRecords.setProjectName(constructionContract.getProjectName());
+        }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
+        //查询项目信息
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         model.addAttribute("reportType","3");
         model.addAttribute("projectType","43");
@@ -275,7 +284,7 @@ public class ChechDesignController extends BaseController {
             workContractInfo.setName(constructionContract.getContractName());
             projectRecords.setWorkContractInfo(workContractInfo);
         }
-        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();
         //新建树形列表集合
@@ -294,6 +303,24 @@ public class ChechDesignController extends BaseController {
                 recordTreeData.setProjectContentId(record.getProjectContentId());
                 //将项目设置为第一级数据
                 recordTreeData.setCondition(1);
+                //遍历项目负责人信息
+                List<User> masterUserList = record.getProjectLeaders();
+                List<String> masterList = new ArrayList<>();
+                Set masterIdSet = new HashSet();
+                for (User masterUser:masterUserList) {
+                    masterList.add(masterUser.getName());
+                    masterIdSet.add(masterUser.getId());
+                }
+                //Set转List
+                List<String> masterIdList = new ArrayList<>(masterIdSet);
+                for (String masterId : masterIdList) {
+                    if(masterId.equals(UserUtils.getUser().getId())){
+                        recordTreeData.setOperationSign(1);
+                        break;
+                    }else{
+                        recordTreeData.setOperationSign(0);
+                    }
+                }
                 //将项目信息放入
                 treeList.add(recordTreeData);
 
@@ -323,15 +350,11 @@ public class ChechDesignController extends BaseController {
                         //将项目设置为第二级数据
                         visaTreeData.setCondition(2);
                         //遍历项目负责人信息
-                        List<User> masterUserList = record.getProjectLeaders();
-                        List<String> masterList = new ArrayList<>();
-                        Set masterIdSet = new HashSet();
+                        masterIdSet = new HashSet();
                         for (User masterUser:masterUserList) {
                             masterList.add(masterUser.getName());
                             masterIdSet.add(masterUser.getId());
                         }
-                        //Set转List
-                        List<String> masterIdList = new ArrayList<>(masterIdSet);
                         for (String masterId : masterIdList) {
                             if(masterId.equals(UserUtils.getUser().getId())){
                                 visaTreeData.setOperationSign(1);
@@ -363,7 +386,7 @@ public class ChechDesignController extends BaseController {
                             contentData.setPid(visaTreeData.getId());
                             contentData.setId(data.getId());
                             contentData.setContractName(data.getProjectName());
-                            contentData.setCnumber(contract.getCnumber());
+                            contentData.setCnumber(data.getProjectReportNumber());
                             contentData.setStatus(data.getStatus());
                             if(StringUtils.isNotBlank(data.getReportName())){
                                 contentData.setNumber(data.getReportName());

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckArmorForMaterialsController.java

@@ -0,0 +1,386 @@
+package com.jeeplus.modules.projectrecord.web.check;
+
+import com.jeeplus.common.config.Global;
+import com.jeeplus.common.json.AjaxJson;
+import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.projectConstruction.entity.ConstructionContract;
+import com.jeeplus.modules.projectConstruction.service.ContractService;
+import com.jeeplus.modules.projectVisa.entity.ProjectVisa;
+import com.jeeplus.modules.projectVisa.entity.VisaTreeData;
+import com.jeeplus.modules.projectVisa.service.ProjectVisaService;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectContentData;
+import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectContentDataService;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
+import com.jeeplus.modules.projectcontroltable.entity.ProjectControlTable;
+import com.jeeplus.modules.projectcontroltable.service.ProjectControlTableService;
+import com.jeeplus.modules.projectrecord.entity.ConcealProjectInfo;
+import com.jeeplus.modules.projectrecord.entity.ProjectImplementEarly;
+import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
+import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
+import com.jeeplus.modules.projectrecord.service.ProjectImplementEarlyService;
+import com.jeeplus.modules.projectrecord.service.distributionSettlement.DistributionSettlementService;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
+/**
+ * 实施阶段-甲供物资审核controller
+ * @author 徐滕
+ * @version 2020-07-27
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/project/checkArmorForMaterials")
+public class CheckArmorForMaterialsController extends BaseController {
+    @Autowired
+    private ProjectVisaService projectVisaService;
+    @Autowired
+    private ProjectImplementEarlyService projectImplementEarlyService;
+    @Autowired
+    private ContractService contractService;
+    @Autowired
+    private DistributionSettlementService distributionSettlementService;
+    @Autowired
+    private ProjectControlTableService projectControlTableService;
+    @Autowired
+    private ProjectContentDataService projectContentDataService;
+    @Autowired
+    private ProjectcontentinfoService projectcontentinfoService;
+
+    @ModelAttribute
+    public ConstructionContract get(@RequestParam(required=false) String id) {
+        ConstructionContract entity = null;
+        if (StringUtils.isNotBlank(id)){
+            entity = contractService.get(id);
+        }
+        if (entity == null){
+            entity = new ConstructionContract();
+        }
+        return entity;
+    }
+
+    /**
+     * 分部结算信息列表
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = {"list", ""})
+    public String list(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model) {
+        if(UserUtils.isManager()){
+            model.addAttribute("flag","1");
+        }
+        ProjectImplementEarly projectRecords = new ProjectImplementEarly();
+        if(StringUtils.isNotBlank(constructionContract.getProjectName())){
+            projectRecords.setProjectName(constructionContract.getProjectName());
+        }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
+        //查询项目信息
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        model.addAttribute("page", page);
+        model.addAttribute("reportType","3");
+        model.addAttribute("projectType","411");
+        model.addAttribute("contractName",constructionContract.getContractName());
+        return "modules/projectrecord/check/checkArmorForMaterialsList";
+    }
+
+    /**
+     * 查询分部结算信息列表树状图
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = "getProjectList")
+    @ResponseBody
+    public Map<String, List> getTreeList(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model){
+
+        Map<String,List> map = new HashMap<>();
+        ProjectImplementEarly projectRecords = new ProjectImplementEarly();
+        if(StringUtils.isNotBlank(constructionContract.getProjectName())){
+            projectRecords.setProjectName(constructionContract.getProjectName());
+        }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
+        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        //获取项目信息
+        List<ProjectImplementEarly> recordList = recordPage.getList();
+        //新建树形列表集合
+        List<VisaTreeData> treeList=new ArrayList<>();
+        if(recordList.size()>0){
+            for (ProjectImplementEarly record:recordList) {
+                //将项目信息放入树形列表集合中
+                VisaTreeData recordTreeData = new VisaTreeData();
+                //将界面需要展示数据放入类中
+                recordTreeData.setId(record.getId());
+                recordTreeData.setContractName(record.getProjectName());
+                recordTreeData.setCnumber(record.getProjectId());
+                recordTreeData.setNumber("");
+                recordTreeData.setPid("0");
+                //添加工作内容id
+                recordTreeData.setProjectContentId(record.getProjectContentId());
+                //将项目设置为第一级数据
+                recordTreeData.setCondition(1);
+                //遍历项目负责人信息
+                List<User> masterUserList = record.getProjectLeaders();
+                List<String> masterList = new ArrayList<>();
+                Set masterIdSet = new HashSet();
+                for (User masterUser:masterUserList) {
+                    masterList.add(masterUser.getName());
+                    masterIdSet.add(masterUser.getId());
+                }
+                //Set转List
+                List<String> masterIdList = new ArrayList<>(masterIdSet);
+                for (String masterId : masterIdList) {
+                    if(masterId.equals(UserUtils.getUser().getId())){
+                        recordTreeData.setOperationSign(1);
+                        break;
+                    }else{
+                        recordTreeData.setOperationSign(0);
+                    }
+                }
+
+                //将项目信息放入
+                treeList.add(recordTreeData);
+
+                //处理合同信息数据
+                ConstructionContract conditionContract = new ConstructionContract();
+                conditionContract.setProjectId(record.getId());
+
+                if(StringUtils.isNotBlank(constructionContract.getContractName())){
+                    conditionContract.setContractName(constructionContract.getContractName());
+                }
+                //获取合同信息
+                List<ConstructionContract> contractList = contractService.getConstructionContractList(conditionContract);
+                if(contractList.size()>0){
+                    //遍历项目中的合同信息
+                    for (ConstructionContract contract:contractList) {
+                        VisaTreeData visaTreeData=new VisaTreeData();
+                        visaTreeData.setContractId(contract.getId());
+                        visaTreeData.setId(contract.getId());
+                        visaTreeData.setContractName(contract.getContractName());
+                        visaTreeData.setDate(contract.getCreateDate());
+                        visaTreeData.setNumber("");
+                        visaTreeData.setPid(record.getId());
+                        visaTreeData.setCnumber(contract.getCnumber());
+                        //添加工作内容id
+                        visaTreeData.setProjectContentId(record.getProjectContentId());
+
+                        //将项目设置为第二级数据
+                        visaTreeData.setCondition(2);
+                        //遍历项目负责人信息
+                        masterIdSet = new HashSet();
+                        for (User masterUser:masterUserList) {
+                            masterList.add(masterUser.getName());
+                            masterIdSet.add(masterUser.getId());
+                        }
+                        for (String masterId : masterIdList) {
+                            if(masterId.equals(UserUtils.getUser().getId())){
+                                visaTreeData.setOperationSign(1);
+                                break;
+                            }else{
+                                visaTreeData.setOperationSign(0);
+                            }
+                        }
+
+                        //将项目信息放入
+                        treeList.add(visaTreeData);
+
+
+                        //获取阶段Type父节点信息
+                        String projectType = projectImplementEarlyService.getProjectType(record.getProjectTypeId(), "实施阶段");
+                        //根据项目id查询相关的项目阶段内容
+                        List<ProjectRecordTreeData> reportDataList = projectContentDataService.getProjectContentDataListOnImplement(record.getId(),visaTreeData.getId(),projectType,"411");
+
+                        //根据获取的合同的id去查找汇总表获取汇总表信息
+                        //List<ProjectContentData> contentDataList=distributionSettlementService.getConcealProjectList(contract.getId());
+
+                        Projectcontentinfo select = new Projectcontentinfo();
+                        ProjectRecords project = new ProjectRecords();
+                        project.setId(record.getId());
+                        select.setParentIds("0,");
+                        select.setProject(project);
+                        List<Projectcontentinfo> p = projectcontentinfoService.findListByProject(select);
+
+                        for (int j=0;j<reportDataList.size();j++){
+                            VisaTreeData contentData=new VisaTreeData();
+                            ProjectRecordTreeData data=reportDataList.get(j);
+                            contentData.setPid(visaTreeData.getId());
+                            contentData.setId(data.getId());
+                            contentData.setContractName(data.getProjectName());
+                            contentData.setCnumber(data.getProjectReportNumber());
+                            if(StringUtils.isNotBlank(data.getReportName())){
+                                contentData.setNumber(data.getReportName());
+                            }else{
+                                contentData.setNumber("");
+                            }
+                            contentData.setStatus(data.getStatus());
+                            contentData.setProjectId(record.getId());
+                            contentData.setReportId(data.getReportId());
+                            contentData.setCreateDate(data.getCreateDate());
+
+                            if(p.size()>0){
+                                contentData.setContentPId(p.get(0).getId());
+                                contentData.setParentIds("0,");
+                                contentData.setDictType("");
+                            }
+                            //添加工作内容id
+                            contentData.setProjectContentId(record.getProjectContentId());
+
+                            //将项目设置为第二级数据
+                            contentData.setCondition(3);
+                            for (String masterId : masterIdList) {
+                                if(masterId.equals(UserUtils.getUser().getId())){
+                                    contentData.setOperationSign(1);
+                                    break;
+                                }else{
+                                    contentData.setOperationSign(0);
+                                }
+                            }
+                            treeList.add(contentData);
+                        }
+
+                    }
+                }
+            }
+
+        }
+        map.put("data",treeList);
+        return map;
+    }
+
+    /**
+     * 分部结算查方法
+     * @param concealProjectInfo
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = "form")
+    public String form(ConcealProjectInfo concealProjectInfo, Model model) {
+
+        ProjectContentData projectContentData = new ProjectContentData();
+        projectContentData.setType("");
+        //查询分部结算信息
+        if (StringUtils.isNotBlank(concealProjectInfo.getInfoId())){
+            projectContentData = distributionSettlementService.getProjectContentData(concealProjectInfo.getInfoId());
+        }else if (concealProjectInfo.getProjectContentData()!=null && StringUtils.isNotBlank(concealProjectInfo.getProjectContentData().getId())) {
+            projectContentData = distributionSettlementService.getProjectContentData(concealProjectInfo.getProjectContentData().getId());
+        }
+        //添加负责人信息
+        projectContentData.setMaster(UserUtils.getUser());
+        if(StringUtils.isNotBlank(projectContentData.getId())){
+            //查询过程控制明细信息
+            List<ProjectControlTable> controlData = projectControlTableService.getControlData(projectContentData.getId(),"");
+            projectContentData.setProjectControlTableList(controlData);
+            //查询并添加附件信息
+            projectContentDataService.queryBasedData(projectContentData);
+        }
+
+        if(StringUtils.isBlank(concealProjectInfo.getId()) && StringUtils.isNotBlank(concealProjectInfo.getProjectContentId())){
+            concealProjectInfo.setId(concealProjectInfo.getProjectContentId());
+        }
+        concealProjectInfo.setProjectContentData(projectContentData);
+        model.addAttribute("concealProjectInfo", concealProjectInfo);
+        //判断是否为查看页面
+        if("view".equals(concealProjectInfo.getType())){
+            return "modules/projectrecord/concealProject/workContentView";
+        }
+        return "modules/projectrecord/concealProject/workContentForm";
+    }
+
+    /**
+     * 分部结算增改方法
+     * @param concealProjectInfo
+     * @param redirectAttributes
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = {"save"})
+    public String save(ConcealProjectInfo concealProjectInfo, RedirectAttributes redirectAttributes) throws Exception {
+        //调用新增方法
+        String str = distributionSettlementService.saveData(concealProjectInfo);
+        addMessage(redirectAttributes, "保存分部结算内容信息"+(str.equals("true")?"成功":"失败"));
+        return "redirect:"+Global.getAdminPath()+"/project/checkArmorForMaterials/?repage";
+    }
+
+    /**
+     * 删除分部结算和宜居性资料关系
+     * @param contentId
+     * @param basedId
+     * @return
+     */
+    @RequestMapping("ajaxdelete")
+    @ResponseBody
+    public AjaxJson deleteBased(String contentId, String basedId){
+        AjaxJson ajaxJson = new AjaxJson();
+        try {
+            if (StringUtils.isNotBlank(contentId)) {
+                //调用删除方法
+                distributionSettlementService.deleteBased(contentId, basedId);
+            }
+            Integer count = projectContentDataService.countBased(basedId);
+            ajaxJson.getBody().put("inuse", count == null ? true : count > 0);
+        }catch (Exception e){
+            logger.error("删除依据资料异常!",e);
+            ajaxJson.setSuccess(false);
+            ajaxJson.setMsg("删除依据资料失败");
+        }
+        return  ajaxJson;
+    }
+
+
+    /**
+     * 分部结算删除方法
+     * @param concealProjectInfo
+     * @return
+     */
+    @RequestMapping(value = {"deleteConcealProject"})
+    public String deleteConcealProject(ConcealProjectInfo concealProjectInfo) {
+        distributionSettlementService.deleteConcealProject(concealProjectInfo);
+        return "redirect:"+ Global.getAdminPath()+"/project/checkArmorForMaterials/?repage";
+    }
+    /**
+     * 删除依据性资料
+     */
+    @RequestMapping(value = "delete")
+    @ResponseBody
+    public Map<String,Object> delete(ProjectVisa projectVisa, RedirectAttributes redirectAttributes) {
+        Map<String,Object> j= new HashMap<>();
+        try {
+            projectVisaService.deleteByLogic(projectVisa.getId(),projectVisa.getType());
+            j.put("status",true);
+            j.put("msg","删除成功");
+            addMessage(redirectAttributes, "删除成功");
+        }catch (Exception e){
+            j.put("status",false);
+            j.put("msg","删除失败");
+            addMessage(redirectAttributes, "删除失败");
+        }
+        return j;
+    }
+
+}

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckClaimController.java

@@ -39,7 +39,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
-//实施阶段-索赔管理
+//实施阶段-索赔审核
 @Controller
 @RequestMapping(value = "${adminPath}/project/checkClaim")
 public class CheckClaimController extends BaseController {
@@ -70,7 +70,7 @@ public class CheckClaimController extends BaseController {
     }
 
     /**
-     * 索赔管理表列表页面
+     * 索赔审核表列表页面
      * @param constructionContract
      * @param request
      * @param response
@@ -82,8 +82,17 @@ public class CheckClaimController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
-        //查询合同信息
-        Page<ConstructionContract> page = contractService.findPage(new Page<ConstructionContract>(request, response), constructionContract);
+        ProjectImplementEarly projectRecords = new ProjectImplementEarly();
+        if(StringUtils.isNotBlank(constructionContract.getProjectName())){
+            projectRecords.setProjectName(constructionContract.getProjectName());
+        }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
+        //查询项目信息
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         model.addAttribute("reportType","3");
         model.addAttribute("projectType","46");
@@ -92,7 +101,7 @@ public class CheckClaimController extends BaseController {
     }
 
     /**
-     * 查询索赔管理列表树状图信息
+     * 查询索赔审核列表树状图信息
      * @param constructionContract
      * @param request
      * @param response
@@ -113,7 +122,7 @@ public class CheckClaimController extends BaseController {
             workContractInfo.setName(constructionContract.getContractName());
             projectRecords.setWorkContractInfo(workContractInfo);
         }
-        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();
         //新建树形列表集合
@@ -132,6 +141,24 @@ public class CheckClaimController extends BaseController {
                 recordTreeData.setProjectContentId(record.getProjectContentId());
                 //将项目设置为第一级数据
                 recordTreeData.setCondition(1);
+                //遍历项目负责人信息
+                List<User> masterUserList = record.getProjectLeaders();
+                List<String> masterList = new ArrayList<>();
+                Set masterIdSet = new HashSet();
+                for (User masterUser:masterUserList) {
+                    masterList.add(masterUser.getName());
+                    masterIdSet.add(masterUser.getId());
+                }
+                //Set转List
+                List<String> masterIdList = new ArrayList<>(masterIdSet);
+                for (String masterId : masterIdList) {
+                    if(masterId.equals(UserUtils.getUser().getId())){
+                        recordTreeData.setOperationSign(1);
+                        break;
+                    }else{
+                        recordTreeData.setOperationSign(0);
+                    }
+                }
                 //将项目信息放入
                 treeList.add(recordTreeData);
 
@@ -161,15 +188,11 @@ public class CheckClaimController extends BaseController {
                         //将项目设置为第二级数据
                         visaTreeData.setCondition(2);
                         //遍历项目负责人信息
-                        List<User> masterUserList = record.getProjectLeaders();
-                        List<String> masterList = new ArrayList<>();
-                        Set masterIdSet = new HashSet();
+                        masterIdSet = new HashSet();
                         for (User masterUser:masterUserList) {
                             masterList.add(masterUser.getName());
                             masterIdSet.add(masterUser.getId());
                         }
-                        //Set转List
-                        List<String> masterIdList = new ArrayList<>(masterIdSet);
                         for (String masterId : masterIdList) {
                             if(masterId.equals(UserUtils.getUser().getId())){
                                 visaTreeData.setOperationSign(1);
@@ -202,7 +225,7 @@ public class CheckClaimController extends BaseController {
                             contentData.setPid(visaTreeData.getId());
                             contentData.setId(data.getId());
                             contentData.setContractName(data.getProjectName());
-                            contentData.setCnumber(contract.getCnumber());
+                            contentData.setCnumber(data.getProjectReportNumber());
                             contentData.setStatus(data.getStatus());
                             if(StringUtils.isNotBlank(data.getReportName())){
                                 contentData.setNumber(data.getReportName());
@@ -244,7 +267,7 @@ public class CheckClaimController extends BaseController {
     }
 
     /**
-     * 添加索赔管理页面
+     * 添加索赔审核页面
      * @param concealProjectInfo
      * @param model
      * @return
@@ -254,7 +277,7 @@ public class CheckClaimController extends BaseController {
 
         ProjectContentData projectContentData = new ProjectContentData();
         projectContentData.setType("");
-        //查询索赔管理信息
+        //查询索赔审核信息
         if (StringUtils.isNotBlank(concealProjectInfo.getInfoId())){
             projectContentData = projectVisaService.getProjectContentData(concealProjectInfo.getInfoId());
         }else if (concealProjectInfo.getProjectContentData()!=null && StringUtils.isNotBlank(concealProjectInfo.getProjectContentData().getId())) {
@@ -280,7 +303,7 @@ public class CheckClaimController extends BaseController {
     }
 
     /**
-     * 索赔管理页面
+     * 索赔审核页面
      * @param projectVisa
      * @param view
      * @param request
@@ -298,7 +321,7 @@ public class CheckClaimController extends BaseController {
         }
         List<ProjectVisa> list = new ArrayList<>();
         if(StringUtils.isNotBlank(projectVisa.getContentId())){
-            //查询索赔管理信息list
+            //查询索赔审核信息list
             list = projectVisaService.findList(projectVisa);
         }
         if(null != list){

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckConcealProjectController.java

@@ -0,0 +1,394 @@
+package com.jeeplus.modules.projectrecord.web.check;
+
+import com.jeeplus.common.config.Global;
+import com.jeeplus.common.json.AjaxJson;
+import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.utils.MyBeanUtils;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.projectConstruction.entity.ConstructionContract;
+import com.jeeplus.modules.projectConstruction.service.ContractService;
+import com.jeeplus.modules.projectType.service.ProjectTypeService;
+import com.jeeplus.modules.projectVisa.entity.ProjectVisa;
+import com.jeeplus.modules.projectVisa.entity.VisaTreeData;
+import com.jeeplus.modules.projectVisa.service.ProjectVisaService;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectBasedData;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectContentData;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
+import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectContentDataService;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectReportChangeService;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
+import com.jeeplus.modules.projectcontroltable.entity.ProjectControlTable;
+import com.jeeplus.modules.projectcontroltable.service.ProjectControlTableService;
+import com.jeeplus.modules.projectrecord.entity.*;
+import com.jeeplus.modules.projectrecord.service.ProjectImplementEarlyService;
+import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
+import com.jeeplus.modules.projectrecord.service.distributionSettlement.DistributionSettlementService;
+import com.jeeplus.modules.projectrecord.service.early.ProjectEarlyReviewService;
+import com.jeeplus.modules.projectrecord.service.implementStage.ProjectInterimPaymentService;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.service.DictService;
+import com.jeeplus.modules.sys.service.WorkattachmentService;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
+/**
+ * 实施阶段-隐蔽工程量管理controller
+ * @author 徐滕
+ * @version 2020-07-27
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/project/checkConcealProject")
+public class CheckConcealProjectController extends BaseController {
+    @Autowired
+    private ProjectVisaService projectVisaService;
+    @Autowired
+    private ProjectImplementEarlyService projectImplementEarlyService;
+    @Autowired
+    private ContractService contractService;
+    @Autowired
+    private DistributionSettlementService distributionSettlementService;
+    @Autowired
+    private ProjectControlTableService projectControlTableService;
+    @Autowired
+    private ProjectContentDataService projectContentDataService;
+    @Autowired
+    private ProjectcontentinfoService projectcontentinfoService;
+
+    @ModelAttribute
+    public ConstructionContract get(@RequestParam(required=false) String id) {
+        ConstructionContract entity = null;
+        if (StringUtils.isNotBlank(id)){
+            entity = contractService.get(id);
+        }
+        if (entity == null){
+            entity = new ConstructionContract();
+        }
+        return entity;
+    }
+
+    /**
+     * 分部结算信息列表
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = {"list", ""})
+    public String list(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model) {
+        if(UserUtils.isManager()){
+            model.addAttribute("flag","1");
+        }
+        ProjectImplementEarly projectRecords = new ProjectImplementEarly();
+        if(StringUtils.isNotBlank(constructionContract.getProjectName())){
+            projectRecords.setProjectName(constructionContract.getProjectName());
+        }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
+        //查询项目信息
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        model.addAttribute("page", page);
+        model.addAttribute("reportType","3");
+        model.addAttribute("projectType","410");
+        model.addAttribute("contractName",constructionContract.getContractName());
+        return "modules/projectrecord/check/checkConcealProjectList";
+    }
+
+    /**
+     * 查询分部结算信息列表树状图
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = "getProjectList")
+    @ResponseBody
+    public Map<String, List> getTreeList(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model){
+
+        Map<String,List> map = new HashMap<>();
+        ProjectImplementEarly projectRecords = new ProjectImplementEarly();
+        if(StringUtils.isNotBlank(constructionContract.getProjectName())){
+            projectRecords.setProjectName(constructionContract.getProjectName());
+        }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
+        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        //获取项目信息
+        List<ProjectImplementEarly> recordList = recordPage.getList();
+        //新建树形列表集合
+        List<VisaTreeData> treeList=new ArrayList<>();
+        if(recordList.size()>0){
+            for (ProjectImplementEarly record:recordList) {
+                //将项目信息放入树形列表集合中
+                VisaTreeData recordTreeData = new VisaTreeData();
+                //将界面需要展示数据放入类中
+                recordTreeData.setId(record.getId());
+                recordTreeData.setContractName(record.getProjectName());
+                recordTreeData.setCnumber(record.getProjectId());
+                recordTreeData.setNumber("");
+                recordTreeData.setPid("0");
+                //添加工作内容id
+                recordTreeData.setProjectContentId(record.getProjectContentId());
+                //将项目设置为第一级数据
+                recordTreeData.setCondition(1);
+                //遍历项目负责人信息
+                List<User> masterUserList = record.getProjectLeaders();
+                List<String> masterList = new ArrayList<>();
+                Set masterIdSet = new HashSet();
+                for (User masterUser:masterUserList) {
+                    masterList.add(masterUser.getName());
+                    masterIdSet.add(masterUser.getId());
+                }
+                //Set转List
+                List<String> masterIdList = new ArrayList<>(masterIdSet);
+                for (String masterId : masterIdList) {
+                    if(masterId.equals(UserUtils.getUser().getId())){
+                        recordTreeData.setOperationSign(1);
+                        break;
+                    }else{
+                        recordTreeData.setOperationSign(0);
+                    }
+                }
+
+                //将项目信息放入
+                treeList.add(recordTreeData);
+
+                //处理合同信息数据
+                ConstructionContract conditionContract = new ConstructionContract();
+                conditionContract.setProjectId(record.getId());
+
+                if(StringUtils.isNotBlank(constructionContract.getContractName())){
+                    conditionContract.setContractName(constructionContract.getContractName());
+                }
+                //获取合同信息
+                List<ConstructionContract> contractList = contractService.getConstructionContractList(conditionContract);
+                if(contractList.size()>0){
+                    //遍历项目中的合同信息
+                    for (ConstructionContract contract:contractList) {
+                        VisaTreeData visaTreeData=new VisaTreeData();
+                        visaTreeData.setContractId(contract.getId());
+                        visaTreeData.setId(contract.getId());
+                        visaTreeData.setContractName(contract.getContractName());
+                        visaTreeData.setDate(contract.getCreateDate());
+                        visaTreeData.setNumber("");
+                        visaTreeData.setPid(record.getId());
+                        visaTreeData.setCnumber(contract.getCnumber());
+                        //添加工作内容id
+                        visaTreeData.setProjectContentId(record.getProjectContentId());
+
+                        //将项目设置为第二级数据
+                        visaTreeData.setCondition(2);
+                        //遍历项目负责人信息
+                        masterIdSet = new HashSet();
+                        for (User masterUser:masterUserList) {
+                            masterList.add(masterUser.getName());
+                            masterIdSet.add(masterUser.getId());
+                        }
+                        for (String masterId : masterIdList) {
+                            if(masterId.equals(UserUtils.getUser().getId())){
+                                visaTreeData.setOperationSign(1);
+                                break;
+                            }else{
+                                visaTreeData.setOperationSign(0);
+                            }
+                        }
+
+                        //将项目信息放入
+                        treeList.add(visaTreeData);
+
+
+                        //获取阶段Type父节点信息
+                        String projectType = projectImplementEarlyService.getProjectType(record.getProjectTypeId(), "实施阶段");
+                        //根据项目id查询相关的项目阶段内容
+                        List<ProjectRecordTreeData> reportDataList = projectContentDataService.getProjectContentDataListOnImplement(record.getId(),visaTreeData.getId(),projectType,"410");
+
+                        //根据获取的合同的id去查找汇总表获取汇总表信息
+                        //List<ProjectContentData> contentDataList=distributionSettlementService.getConcealProjectList(contract.getId());
+
+                        Projectcontentinfo select = new Projectcontentinfo();
+                        ProjectRecords project = new ProjectRecords();
+                        project.setId(record.getId());
+                        select.setParentIds("0,");
+                        select.setProject(project);
+                        List<Projectcontentinfo> p = projectcontentinfoService.findListByProject(select);
+
+                        for (int j=0;j<reportDataList.size();j++){
+                            VisaTreeData contentData=new VisaTreeData();
+                            ProjectRecordTreeData data=reportDataList.get(j);
+                            contentData.setPid(visaTreeData.getId());
+                            contentData.setId(data.getId());
+                            contentData.setContractName(data.getProjectName());
+                            contentData.setCnumber(data.getProjectReportNumber());
+                            if(StringUtils.isNotBlank(data.getReportName())){
+                                contentData.setNumber(data.getReportName());
+                            }else{
+                                contentData.setNumber("");
+                            }
+                            contentData.setStatus(data.getStatus());
+                            contentData.setProjectId(record.getId());
+                            contentData.setReportId(data.getReportId());
+                            contentData.setCreateDate(data.getCreateDate());
+
+                            if(p.size()>0){
+                                contentData.setContentPId(p.get(0).getId());
+                                contentData.setParentIds("0,");
+                                contentData.setDictType("");
+                            }
+                            //添加工作内容id
+                            contentData.setProjectContentId(record.getProjectContentId());
+
+                            //将项目设置为第二级数据
+                            contentData.setCondition(3);
+                            for (String masterId : masterIdList) {
+                                if(masterId.equals(UserUtils.getUser().getId())){
+                                    contentData.setOperationSign(1);
+                                    break;
+                                }else{
+                                    contentData.setOperationSign(0);
+                                }
+                            }
+                            treeList.add(contentData);
+                        }
+
+                    }
+                }
+            }
+
+        }
+        map.put("data",treeList);
+        return map;
+    }
+
+    /**
+     * 分部结算查方法
+     * @param concealProjectInfo
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = "form")
+    public String form(ConcealProjectInfo concealProjectInfo, Model model) {
+
+        ProjectContentData projectContentData = new ProjectContentData();
+        projectContentData.setType("");
+        //查询分部结算信息
+        if (StringUtils.isNotBlank(concealProjectInfo.getInfoId())){
+            projectContentData = distributionSettlementService.getProjectContentData(concealProjectInfo.getInfoId());
+        }else if (concealProjectInfo.getProjectContentData()!=null && StringUtils.isNotBlank(concealProjectInfo.getProjectContentData().getId())) {
+            projectContentData = distributionSettlementService.getProjectContentData(concealProjectInfo.getProjectContentData().getId());
+        }
+        //添加负责人信息
+        projectContentData.setMaster(UserUtils.getUser());
+        if(StringUtils.isNotBlank(projectContentData.getId())){
+            //查询过程控制明细信息
+            List<ProjectControlTable> controlData = projectControlTableService.getControlData(projectContentData.getId(),"");
+            projectContentData.setProjectControlTableList(controlData);
+            //查询并添加附件信息
+            projectContentDataService.queryBasedData(projectContentData);
+        }
+
+        if(StringUtils.isBlank(concealProjectInfo.getId()) && StringUtils.isNotBlank(concealProjectInfo.getProjectContentId())){
+            concealProjectInfo.setId(concealProjectInfo.getProjectContentId());
+        }
+        concealProjectInfo.setProjectContentData(projectContentData);
+        model.addAttribute("concealProjectInfo", concealProjectInfo);
+        //判断是否为查看页面
+        if("view".equals(concealProjectInfo.getType())){
+            return "modules/projectrecord/concealProject/workContentView";
+        }
+        return "modules/projectrecord/concealProject/workContentForm";
+    }
+
+    /**
+     * 分部结算增改方法
+     * @param concealProjectInfo
+     * @param redirectAttributes
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = {"save"})
+    public String save(ConcealProjectInfo concealProjectInfo, RedirectAttributes redirectAttributes) throws Exception {
+        //调用新增方法
+        String str = distributionSettlementService.saveData(concealProjectInfo);
+        addMessage(redirectAttributes, "保存分部结算内容信息"+(str.equals("true")?"成功":"失败"));
+        return "redirect:"+Global.getAdminPath()+"/project/checkConcealProject/?repage";
+    }
+
+    /**
+     * 删除分部结算和宜居性资料关系
+     * @param contentId
+     * @param basedId
+     * @return
+     */
+    @RequestMapping("ajaxdelete")
+    @ResponseBody
+    public AjaxJson deleteBased(String contentId, String basedId){
+        AjaxJson ajaxJson = new AjaxJson();
+        try {
+            if (StringUtils.isNotBlank(contentId)) {
+                //调用删除方法
+                distributionSettlementService.deleteBased(contentId, basedId);
+            }
+            Integer count = projectContentDataService.countBased(basedId);
+            ajaxJson.getBody().put("inuse", count == null ? true : count > 0);
+        }catch (Exception e){
+            logger.error("删除依据资料异常!",e);
+            ajaxJson.setSuccess(false);
+            ajaxJson.setMsg("删除依据资料失败");
+        }
+        return  ajaxJson;
+    }
+
+
+    /**
+     * 分部结算删除方法
+     * @param concealProjectInfo
+     * @return
+     */
+    @RequestMapping(value = {"deleteConcealProject"})
+    public String deleteConcealProject(ConcealProjectInfo concealProjectInfo) {
+        distributionSettlementService.deleteConcealProject(concealProjectInfo);
+        return "redirect:"+ Global.getAdminPath()+"/project/checkConcealProject/?repage";
+    }
+    /**
+     * 删除依据性资料
+     */
+    @RequestMapping(value = "delete")
+    @ResponseBody
+    public Map<String,Object> delete(ProjectVisa projectVisa, RedirectAttributes redirectAttributes) {
+        Map<String,Object> j= new HashMap<>();
+        try {
+            projectVisaService.deleteByLogic(projectVisa.getId(),projectVisa.getType());
+            j.put("status",true);
+            j.put("msg","删除成功");
+            addMessage(redirectAttributes, "删除成功");
+        }catch (Exception e){
+            j.put("status",false);
+            j.put("msg","删除失败");
+            addMessage(redirectAttributes, "删除失败");
+        }
+        return j;
+    }
+
+}

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckDistributionSettlementController.java

@@ -41,7 +41,7 @@ import java.util.*;
 
 
 /**
- * 分布结算Controller
+ * 分部结算Controller
  * @author 徐滕
  * @version 2020-07-30
  */
@@ -76,7 +76,7 @@ public class CheckDistributionSettlementController extends BaseController {
     }
 
     /**
-     * 分布结算信息列表
+     * 分部结算信息列表
      * @param constructionContract
      * @param request
      * @param response
@@ -98,7 +98,7 @@ public class CheckDistributionSettlementController extends BaseController {
             projectRecords.setWorkContractInfo(workContractInfo);
         }
         //查询项目信息
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         model.addAttribute("reportType","3");
         model.addAttribute("projectType","412");
@@ -107,7 +107,7 @@ public class CheckDistributionSettlementController extends BaseController {
     }
 
     /**
-     * 查询分布结算信息列表树状图
+     * 查询分部结算信息列表树状图
      * @param constructionContract
      * @param request
      * @param response
@@ -128,7 +128,7 @@ public class CheckDistributionSettlementController extends BaseController {
             workContractInfo.setName(constructionContract.getContractName());
             projectRecords.setWorkContractInfo(workContractInfo);
         }
-        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();
         //新建树形列表集合
@@ -147,6 +147,25 @@ public class CheckDistributionSettlementController extends BaseController {
                 recordTreeData.setProjectContentId(record.getProjectContentId());
                 //将项目设置为第一级数据
                 recordTreeData.setCondition(1);
+                //遍历项目负责人信息
+                List<User> masterUserList = record.getProjectLeaders();
+                List<String> masterList = new ArrayList<>();
+                Set masterIdSet = new HashSet();
+                for (User masterUser:masterUserList) {
+                    masterList.add(masterUser.getName());
+                    masterIdSet.add(masterUser.getId());
+                }
+                //Set转List
+                List<String> masterIdList = new ArrayList<>(masterIdSet);
+                for (String masterId : masterIdList) {
+                    if(masterId.equals(UserUtils.getUser().getId())){
+                        recordTreeData.setOperationSign(1);
+                        break;
+                    }else{
+                        recordTreeData.setOperationSign(0);
+                    }
+                }
+
                 //将项目信息放入
                 treeList.add(recordTreeData);
 
@@ -176,15 +195,11 @@ public class CheckDistributionSettlementController extends BaseController {
                         //将项目设置为第二级数据
                         visaTreeData.setCondition(2);
                         //遍历项目负责人信息
-                        List<User> masterUserList = record.getProjectLeaders();
-                        List<String> masterList = new ArrayList<>();
-                        Set masterIdSet = new HashSet();
+                        masterIdSet = new HashSet();
                         for (User masterUser:masterUserList) {
                             masterList.add(masterUser.getName());
                             masterIdSet.add(masterUser.getId());
                         }
-                        //Set转List
-                        List<String> masterIdList = new ArrayList<>(masterIdSet);
                         for (String masterId : masterIdList) {
                             if(masterId.equals(UserUtils.getUser().getId())){
                                 visaTreeData.setOperationSign(1);
@@ -219,7 +234,7 @@ public class CheckDistributionSettlementController extends BaseController {
                             contentData.setPid(visaTreeData.getId());
                             contentData.setId(data.getId());
                             contentData.setContractName(data.getProjectName());
-                            contentData.setCnumber(contract.getCnumber());
+                            contentData.setCnumber(data.getProjectReportNumber());
                             if(StringUtils.isNotBlank(data.getReportName())){
                                 contentData.setNumber(data.getReportName());
                             }else{
@@ -261,7 +276,7 @@ public class CheckDistributionSettlementController extends BaseController {
     }
 
     /**
-     * 分布结算查方法
+     * 分部结算查方法
      * @param concealProjectInfo
      * @param model
      * @return
@@ -271,7 +286,7 @@ public class CheckDistributionSettlementController extends BaseController {
 
         ProjectContentData projectContentData = new ProjectContentData();
         projectContentData.setType("");
-        //查询分布结算信息
+        //查询分部结算信息
         if (StringUtils.isNotBlank(concealProjectInfo.getInfoId())){
             projectContentData = distributionSettlementService.getProjectContentData(concealProjectInfo.getInfoId());
         }else if (concealProjectInfo.getProjectContentData()!=null && StringUtils.isNotBlank(concealProjectInfo.getProjectContentData().getId())) {
@@ -300,7 +315,7 @@ public class CheckDistributionSettlementController extends BaseController {
     }
 
     /**
-     * 分布结算增改方法
+     * 分部结算增改方法
      * @param concealProjectInfo
      * @param redirectAttributes
      * @return
@@ -310,12 +325,12 @@ public class CheckDistributionSettlementController extends BaseController {
     public String save(ConcealProjectInfo concealProjectInfo, RedirectAttributes redirectAttributes) throws Exception {
         //调用新增方法
         String str = distributionSettlementService.saveData(concealProjectInfo);
-        addMessage(redirectAttributes, "保存分布结算内容信息"+(str.equals("true")?"成功":"失败"));
+        addMessage(redirectAttributes, "保存分部结算内容信息"+(str.equals("true")?"成功":"失败"));
         return "redirect:"+Global.getAdminPath()+"/project/distributionSettlement/?repage";
     }
 
     /**
-     * 删除分布结算和宜居性资料关系
+     * 删除分部结算和宜居性资料关系
      * @param contentId
      * @param basedId
      * @return
@@ -341,7 +356,7 @@ public class CheckDistributionSettlementController extends BaseController {
 
 
     /**
-     * 分布结算删除方法
+     * 分部结算删除方法
      * @param concealProjectInfo
      * @return
      */

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckInterimPaymentController.java

@@ -88,10 +88,17 @@ public class CheckInterimPaymentController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
-        //查询合同信息
-        Page<ConstructionContract> page = contractService.findPage(new Page<ConstructionContract>(request, response), constructionContract);
-        //无合同状态下，获取委托方的名称
-        List<ConstructionContract> list = page.getList();
+        ProjectImplementEarly projectRecords = new ProjectImplementEarly();
+        if(StringUtils.isNotBlank(constructionContract.getProjectName())){
+            projectRecords.setProjectName(constructionContract.getProjectName());
+        }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
+        //查询项目信息
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         model.addAttribute("reportType","3");
         model.addAttribute("projectType","420");
@@ -121,7 +128,7 @@ public class CheckInterimPaymentController extends BaseController {
             workContractInfo.setName(constructionContract.getContractName());
             projectRecords.setWorkContractInfo(workContractInfo);
         }
-        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();
         //新建树形列表集合
@@ -140,6 +147,24 @@ public class CheckInterimPaymentController extends BaseController {
                 recordTreeData.setProjectContentId(record.getProjectContentId());
                 //将项目设置为第一级数据
                 recordTreeData.setCondition(1);
+                //遍历项目负责人信息
+                List<User> masterUserList = record.getProjectLeaders();
+                List<String> masterList = new ArrayList<>();
+                Set masterIdSet = new HashSet();
+                for (User masterUser:masterUserList) {
+                    masterList.add(masterUser.getName());
+                    masterIdSet.add(masterUser.getId());
+                }
+                //Set转List
+                List<String> masterIdList = new ArrayList<>(masterIdSet);
+                for (String masterId : masterIdList) {
+                    if(masterId.equals(UserUtils.getUser().getId())){
+                        recordTreeData.setOperationSign(1);
+                        break;
+                    }else{
+                        recordTreeData.setOperationSign(0);
+                    }
+                }
                 //将项目信息放入
                 treeList.add(recordTreeData);
 
@@ -169,15 +194,11 @@ public class CheckInterimPaymentController extends BaseController {
                         //将项目设置为第二级数据
                         visaTreeData.setCondition(2);
                         //遍历项目负责人信息
-                        List<User> masterUserList = record.getProjectLeaders();
-                        List<String> masterList = new ArrayList<>();
-                        Set masterIdSet = new HashSet();
+                        masterIdSet = new HashSet();
                         for (User masterUser:masterUserList) {
                             masterList.add(masterUser.getName());
                             masterIdSet.add(masterUser.getId());
                         }
-                        //Set转List
-                        List<String> masterIdList = new ArrayList<>(masterIdSet);
                         for (String masterId : masterIdList) {
                             if(masterId.equals(UserUtils.getUser().getId())){
                                 visaTreeData.setOperationSign(1);
@@ -210,7 +231,7 @@ public class CheckInterimPaymentController extends BaseController {
                             contentData.setPid(visaTreeData.getId());
                             contentData.setId(data.getId());
                             contentData.setContractName(data.getProjectName());
-                            contentData.setCnumber(contract.getCnumber());
+                            contentData.setCnumber(data.getProjectReportNumber());
                             contentData.setStatus(data.getStatus());
                             if(StringUtils.isNotBlank(data.getReportName())){
                                 contentData.setNumber(data.getReportName());

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckMaterialController.java

@@ -0,0 +1,330 @@
+package com.jeeplus.modules.projectrecord.web.check;
+
+import com.jeeplus.common.config.Global;
+import com.jeeplus.common.json.AjaxJson;
+import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.projectConstruction.entity.ConstructionContract;
+import com.jeeplus.modules.projectConstruction.service.ContractService;
+import com.jeeplus.modules.projectVisa.entity.ProjectVisa;
+import com.jeeplus.modules.projectVisa.entity.VisaTreeData;
+import com.jeeplus.modules.projectVisa.service.ProjectVisaService;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectContentData;
+import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectContentDataService;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
+import com.jeeplus.modules.projectcontroltable.entity.ProjectControlTable;
+import com.jeeplus.modules.projectcontroltable.service.ProjectControlTableService;
+import com.jeeplus.modules.projectrecord.entity.ConcealProjectInfo;
+import com.jeeplus.modules.projectrecord.entity.ProjectImplementEarly;
+import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
+import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
+import com.jeeplus.modules.projectrecord.service.ProjectImplementEarlyService;
+import com.jeeplus.modules.projectrecord.service.distributionSettlement.DistributionSettlementService;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
+/**
+ * 实施阶段-隐蔽工程量管理controller
+ * @author 徐滕
+ * @version 2020-07-27
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/project/checkMaterial")
+public class CheckMaterialController extends BaseController {
+    @Autowired
+    private ProjectVisaService projectVisaService;
+    @Autowired
+    private ProjectImplementEarlyService projectImplementEarlyService;
+    @Autowired
+    private ContractService contractService;
+    @Autowired
+    private DistributionSettlementService distributionSettlementService;
+    @Autowired
+    private ProjectContentDataService projectContentDataService;
+    @Autowired
+    private ProjectcontentinfoService projectcontentinfoService;
+
+    @ModelAttribute
+    public ConstructionContract get(@RequestParam(required=false) String id) {
+        ConstructionContract entity = null;
+        if (StringUtils.isNotBlank(id)){
+            entity = contractService.get(id);
+        }
+        if (entity == null){
+            entity = new ConstructionContract();
+        }
+        return entity;
+    }
+
+    /**
+     * 分部结算信息列表
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = {"list", ""})
+    public String list(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model) {
+        if(UserUtils.isManager()){
+            model.addAttribute("flag","1");
+        }
+        ProjectImplementEarly projectRecords = new ProjectImplementEarly();
+        if(StringUtils.isNotBlank(constructionContract.getProjectName())){
+            projectRecords.setProjectName(constructionContract.getProjectName());
+        }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
+        //查询项目信息
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        model.addAttribute("page", page);
+        model.addAttribute("reportType","3");
+        model.addAttribute("projectType","421");
+        model.addAttribute("contractName",constructionContract.getContractName());
+        return "modules/projectrecord/check/checkMaterialList";
+    }
+
+    /**
+     * 查询分部结算信息列表树状图
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = "getProjectList")
+    @ResponseBody
+    public Map<String, List> getTreeList(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model){
+
+        Map<String,List> map = new HashMap<>();
+        ProjectImplementEarly projectRecords = new ProjectImplementEarly();
+        if(StringUtils.isNotBlank(constructionContract.getProjectName())){
+            projectRecords.setProjectName(constructionContract.getProjectName());
+        }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
+        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        //获取项目信息
+        List<ProjectImplementEarly> recordList = recordPage.getList();
+        //新建树形列表集合
+        List<VisaTreeData> treeList=new ArrayList<>();
+        if(recordList.size()>0){
+            for (ProjectImplementEarly record:recordList) {
+                //将项目信息放入树形列表集合中
+                VisaTreeData recordTreeData = new VisaTreeData();
+                //将界面需要展示数据放入类中
+                recordTreeData.setId(record.getId());
+                recordTreeData.setContractName(record.getProjectName());
+                recordTreeData.setCnumber(record.getProjectId());
+                recordTreeData.setNumber("");
+                recordTreeData.setPid("0");
+                //添加工作内容id
+                recordTreeData.setProjectContentId(record.getProjectContentId());
+                //将项目设置为第一级数据
+                recordTreeData.setCondition(1);
+                //遍历项目负责人信息
+                List<User> masterUserList = record.getProjectLeaders();
+                List<String> masterList = new ArrayList<>();
+                Set masterIdSet = new HashSet();
+                for (User masterUser:masterUserList) {
+                    masterList.add(masterUser.getName());
+                    masterIdSet.add(masterUser.getId());
+                }
+                //Set转List
+                List<String> masterIdList = new ArrayList<>(masterIdSet);
+                for (String masterId : masterIdList) {
+                    if(masterId.equals(UserUtils.getUser().getId())){
+                        recordTreeData.setOperationSign(1);
+                        break;
+                    }else{
+                        recordTreeData.setOperationSign(0);
+                    }
+                }
+
+                //将项目信息放入
+                treeList.add(recordTreeData);
+
+                //处理合同信息数据
+                ConstructionContract conditionContract = new ConstructionContract();
+                conditionContract.setProjectId(record.getId());
+
+                if(StringUtils.isNotBlank(constructionContract.getContractName())){
+                    conditionContract.setContractName(constructionContract.getContractName());
+                }
+                //获取合同信息
+                List<ConstructionContract> contractList = contractService.getConstructionContractList(conditionContract);
+                if(contractList.size()>0){
+                    //遍历项目中的合同信息
+                    for (ConstructionContract contract:contractList) {
+                        VisaTreeData visaTreeData=new VisaTreeData();
+                        visaTreeData.setContractId(contract.getId());
+                        visaTreeData.setId(contract.getId());
+                        visaTreeData.setContractName(contract.getContractName());
+                        visaTreeData.setDate(contract.getCreateDate());
+                        visaTreeData.setNumber("");
+                        visaTreeData.setPid(record.getId());
+                        visaTreeData.setCnumber(contract.getCnumber());
+                        //添加工作内容id
+                        visaTreeData.setProjectContentId(record.getProjectContentId());
+
+                        //将项目设置为第二级数据
+                        visaTreeData.setCondition(2);
+                        //遍历项目负责人信息
+                        masterIdSet = new HashSet();
+                        for (User masterUser:masterUserList) {
+                            masterList.add(masterUser.getName());
+                            masterIdSet.add(masterUser.getId());
+                        }
+                        for (String masterId : masterIdList) {
+                            if(masterId.equals(UserUtils.getUser().getId())){
+                                visaTreeData.setOperationSign(1);
+                                break;
+                            }else{
+                                visaTreeData.setOperationSign(0);
+                            }
+                        }
+
+                        //将项目信息放入
+                        treeList.add(visaTreeData);
+
+
+                        //获取阶段Type父节点信息
+                        String projectType = projectImplementEarlyService.getProjectType(record.getProjectTypeId(), "实施阶段");
+                        //根据项目id查询相关的项目阶段内容
+                        List<ProjectRecordTreeData> reportDataList = projectContentDataService.getProjectContentDataListOnImplement(record.getId(),visaTreeData.getId(),projectType,"421");
+
+                        //根据获取的合同的id去查找汇总表获取汇总表信息
+                        //List<ProjectContentData> contentDataList=distributionSettlementService.getConcealProjectList(contract.getId());
+
+                        Projectcontentinfo select = new Projectcontentinfo();
+                        ProjectRecords project = new ProjectRecords();
+                        project.setId(record.getId());
+                        select.setParentIds("0,");
+                        select.setProject(project);
+                        List<Projectcontentinfo> p = projectcontentinfoService.findListByProject(select);
+
+                        for (int j=0;j<reportDataList.size();j++){
+                            VisaTreeData contentData=new VisaTreeData();
+                            ProjectRecordTreeData data=reportDataList.get(j);
+                            contentData.setPid(visaTreeData.getId());
+                            contentData.setId(data.getId());
+                            contentData.setContractName(data.getProjectName());
+                            contentData.setCnumber(data.getProjectReportNumber());
+                            if(StringUtils.isNotBlank(data.getReportName())){
+                                contentData.setNumber(data.getReportName());
+                            }else{
+                                contentData.setNumber("");
+                            }
+                            contentData.setStatus(data.getStatus());
+                            contentData.setProjectId(record.getId());
+                            contentData.setReportId(data.getReportId());
+                            contentData.setCreateDate(data.getCreateDate());
+
+                            if(p.size()>0){
+                                contentData.setContentPId(p.get(0).getId());
+                                contentData.setParentIds("0,");
+                                contentData.setDictType("");
+                            }
+                            //添加工作内容id
+                            contentData.setProjectContentId(record.getProjectContentId());
+
+                            //将项目设置为第二级数据
+                            contentData.setCondition(3);
+                            for (String masterId : masterIdList) {
+                                if(masterId.equals(UserUtils.getUser().getId())){
+                                    contentData.setOperationSign(1);
+                                    break;
+                                }else{
+                                    contentData.setOperationSign(0);
+                                }
+                            }
+                            treeList.add(contentData);
+                        }
+
+                    }
+                }
+            }
+
+        }
+        map.put("data",treeList);
+        return map;
+    }
+
+    /**
+     * 删除分部结算和宜居性资料关系
+     * @param contentId
+     * @param basedId
+     * @return
+     */
+    @RequestMapping("ajaxdelete")
+    @ResponseBody
+    public AjaxJson deleteBased(String contentId, String basedId){
+        AjaxJson ajaxJson = new AjaxJson();
+        try {
+            if (StringUtils.isNotBlank(contentId)) {
+                //调用删除方法
+                distributionSettlementService.deleteBased(contentId, basedId);
+            }
+            Integer count = projectContentDataService.countBased(basedId);
+            ajaxJson.getBody().put("inuse", count == null ? true : count > 0);
+        }catch (Exception e){
+            logger.error("删除依据资料异常!",e);
+            ajaxJson.setSuccess(false);
+            ajaxJson.setMsg("删除依据资料失败");
+        }
+        return  ajaxJson;
+    }
+
+
+    /**
+     * 分部结算删除方法
+     * @param concealProjectInfo
+     * @return
+     */
+    @RequestMapping(value = {"deleteConcealProject"})
+    public String deleteConcealProject(ConcealProjectInfo concealProjectInfo) {
+        distributionSettlementService.deleteConcealProject(concealProjectInfo);
+        return "redirect:"+ Global.getAdminPath()+"/project/checkMaterial/?repage";
+    }
+    /**
+     * 删除依据性资料
+     */
+    @RequestMapping(value = "delete")
+    @ResponseBody
+    public Map<String,Object> delete(ProjectVisa projectVisa, RedirectAttributes redirectAttributes) {
+        Map<String,Object> j= new HashMap<>();
+        try {
+            projectVisaService.deleteByLogic(projectVisa.getId(),projectVisa.getType());
+            j.put("status",true);
+            j.put("msg","删除成功");
+            addMessage(redirectAttributes, "删除成功");
+        }catch (Exception e){
+            j.put("status",false);
+            j.put("msg","删除失败");
+            addMessage(redirectAttributes, "删除失败");
+        }
+        return j;
+    }
+
+}

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckVisaController.java

@@ -290,7 +290,7 @@ public class CheckVisaController extends BaseController {
             workContractInfo.setName(constructionContract.getContractName());
             projectRecords.setWorkContractInfo(workContractInfo);
         }
-        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();
         //新建树形列表集合
@@ -309,6 +309,24 @@ public class CheckVisaController extends BaseController {
                 recordTreeData.setProjectContentId(record.getProjectContentId());
                 //将项目设置为第一级数据
                 recordTreeData.setCondition(1);
+                //遍历项目负责人信息
+                List<User> masterUserList = record.getProjectLeaders();
+                List<String> masterList = new ArrayList<>();
+                Set masterIdSet = new HashSet();
+                for (User masterUser:masterUserList) {
+                    masterList.add(masterUser.getName());
+                    masterIdSet.add(masterUser.getId());
+                }
+                //Set转List
+                List<String> masterIdList = new ArrayList<>(masterIdSet);
+                for (String masterId : masterIdList) {
+                    if(masterId.equals(UserUtils.getUser().getId())){
+                        recordTreeData.setOperationSign(1);
+                        break;
+                    }else{
+                        recordTreeData.setOperationSign(0);
+                    }
+                }
                 //将项目信息放入
                 treeList.add(recordTreeData);
 
@@ -338,15 +356,11 @@ public class CheckVisaController extends BaseController {
                         //将项目设置为第二级数据
                         visaTreeData.setCondition(2);
                         //遍历项目负责人信息
-                        List<User> masterUserList = record.getProjectLeaders();
-                        List<String> masterList = new ArrayList<>();
-                        Set masterIdSet = new HashSet();
+                        masterIdSet = new HashSet();
                         for (User masterUser:masterUserList) {
                             masterList.add(masterUser.getName());
                             masterIdSet.add(masterUser.getId());
                         }
-                        //Set转List
-                        List<String> masterIdList = new ArrayList<>(masterIdSet);
                         for (String masterId : masterIdList) {
                             if(masterId.equals(UserUtils.getUser().getId())){
                                 visaTreeData.setOperationSign(1);
@@ -381,7 +395,7 @@ public class CheckVisaController extends BaseController {
                             contentData.setPid(visaTreeData.getId());
                             contentData.setId(data.getId());
                             contentData.setContractName(data.getProjectName());
-                            contentData.setCnumber(contract.getCnumber());
+                            contentData.setCnumber(data.getProjectReportNumber());
                             contentData.setStatus(data.getStatus());
                             if(StringUtils.isNotBlank(data.getReportName())){
                                 contentData.setNumber(data.getReportName());

src/main/java/com/jeeplus/modules/projectrecord/web/concealProject/ConcealProjectController.java

@@ -109,7 +109,7 @@ public class ConcealProjectController extends BaseController {
             projectRecords.setWorkContractInfo(workContractInfo);
         }
         //查询已审核通过的项目信息
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         model.addAttribute("overallProjectTypeId", "410");
         return "modules/projectrecord/concealProject/concealProjectList";
@@ -138,7 +138,7 @@ public class ConcealProjectController extends BaseController {
             projectRecords.setWorkContractInfo(workContractInfo);
         }
         //查询已审核通过的项目信息
-        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();
         //新建树形列表集合
@@ -226,7 +226,8 @@ public class ConcealProjectController extends BaseController {
                             contentData.setId(data.getId());
                             contentData.setProjectTypeId(data.getProjectTypeId());
                             contentData.setContractName(data.getProjectName());
-                            contentData.setCnumber(contract.getCnumber());
+                            contentData.setCnumber(data.getProjectReportNumber());
+                            contentData.setStatus(data.getStatus());
                             //contentData.setNumber(data.getNumber());
                             contentData.setProjectId(record.getId());
                             contentData.setCreateDate(data.getCreateDate());

src/main/java/com/jeeplus/modules/projectrecord/web/contractMaterial/MaterialController.java

@@ -109,7 +109,7 @@ public class MaterialController extends BaseController {
             projectRecords.setWorkContractInfo(workContractInfo);
         }
         //查询已审核通过 的项目信息
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         model.addAttribute("overallProjectTypeId", "421");
         return "modules/projectrecord/contractMaterial/materialList";
@@ -137,7 +137,7 @@ public class MaterialController extends BaseController {
             workContractInfo.setName(constructionContract.getContractName());
             projectRecords.setWorkContractInfo(workContractInfo);
         }
-        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();
         //新建树形列表集合
@@ -223,7 +223,8 @@ public class MaterialController extends BaseController {
                             contentData.setId(data.getId());
                             contentData.setProjectTypeId(data.getProjectTypeId());
                             contentData.setContractName(data.getProjectName());
-                            contentData.setCnumber(contract.getCnumber());
+                            contentData.setCnumber(data.getProjectReportNumber());
+                            contentData.setStatus(data.getStatus());
                             //contentData.setNumber(data.getNumber());
                             contentData.setProjectId(record.getId());
                             contentData.setCreateDate(data.getCreateDate());

src/main/java/com/jeeplus/modules/projectrecord/web/distributionSettlement/DistributionSettlementController.java

@@ -49,7 +49,7 @@ import java.util.*;
 
 
 /**
- * 分布结算Controller
+ * 分部结算Controller
  * @author 徐滕
  * @version 2020-07-30
  */
@@ -90,7 +90,7 @@ public class DistributionSettlementController extends BaseController {
     }
 
     /**
-     * 分布结算list页面查询
+     * 分部结算list页面查询
      * @param constructionContract
      * @param request
      * @param response
@@ -113,14 +113,14 @@ public class DistributionSettlementController extends BaseController {
             projectRecords.setWorkContractInfo(workContractInfo);
         }
         //获取已审核通过项目信息
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         model.addAttribute("overallProjectTypeId", "412");
         return "modules/projectrecord/distributionSettlement/distributionSettlementList";
     }
 
     /**
-     * 分布结算页面树形图数据查询
+     * 分部结算页面树形图数据查询
      * @param constructionContract
      * @param request
      * @param response
@@ -141,7 +141,7 @@ public class DistributionSettlementController extends BaseController {
             workContractInfo.setName(constructionContract.getContractName());
             projectRecords.setWorkContractInfo(workContractInfo);
         }
-        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();
         //新建树形列表集合
@@ -269,7 +269,7 @@ public class DistributionSettlementController extends BaseController {
     }
 
     /**
-     * 分布结算查看方法
+     * 分部结算查看方法
      * @param concealProjectInfo
      * @param model
      * @return
@@ -281,7 +281,7 @@ public class DistributionSettlementController extends BaseController {
         projectContentData.setType("");
         //获取项目信息
         ProjectRecords records = projectRecordsService.getQueryProjectUsers(concealProjectInfo.getProject().getId());
-        //根据infoId查询分布结算信息
+        //根据infoId查询分部结算信息
         if (StringUtils.isNotBlank(concealProjectInfo.getInfoId())){
             projectContentData = distributionSettlementService.getProjectContentData(concealProjectInfo.getInfoId());
         }else if (concealProjectInfo.getProjectContentData()!=null && StringUtils.isNotBlank(concealProjectInfo.getProjectContentData().getId())) {
@@ -354,7 +354,7 @@ public class DistributionSettlementController extends BaseController {
     }
 
     /**
-     * 分布结算增改方法
+     * 分部结算增改方法
      * @param concealProjectInfo
      * @param redirectAttributes
      * @return
@@ -364,7 +364,7 @@ public class DistributionSettlementController extends BaseController {
     public String save(ConcealProjectInfo concealProjectInfo, RedirectAttributes redirectAttributes) throws Exception {
         //调用新增方法
         String str = distributionSettlementService.saveData(concealProjectInfo);
-        addMessage(redirectAttributes, "保存分布结算内容信息"+(str.equals("true")?"成功":"失败"));
+        addMessage(redirectAttributes, "保存分部结算内容信息"+(str.equals("true")?"成功":"失败"));
         return "redirect:"+Global.getAdminPath()+"/project/distributionSettlement/?repage";
     }
 
@@ -396,7 +396,7 @@ public class DistributionSettlementController extends BaseController {
 
 
     /**
-     * 分布结算删除方法
+     * 分部结算删除方法
      * @param concealProjectInfo
      * @return
      */

src/main/java/com/jeeplus/modules/projectrecord/web/implementStage/ProjectInterimPaymentController.java

@@ -79,10 +79,17 @@ public class ProjectInterimPaymentController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
-        //获取审核通过的项目信息
-        Page<ConstructionContract> page = contractService.findPage(new Page<ConstructionContract>(request, response), constructionContract);
-        //无合同状态下，获取委托方的名称
-        List<ConstructionContract> list = page.getList();
+        ProjectImplementEarly projectRecords = new ProjectImplementEarly();
+        if(StringUtils.isNotBlank(constructionContract.getProjectName())){
+            projectRecords.setProjectName(constructionContract.getProjectName());
+        }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
+        //查询项目信息
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         model.addAttribute("reportType","2");
         model.addAttribute("contractName",constructionContract.getContractName());
@@ -105,8 +112,8 @@ public class ProjectInterimPaymentController extends BaseController {
             workContractInfo.setName(constructionContract.getContractName());
             projectRecords.setWorkContractInfo(workContractInfo);
         }
-        //获取审核通过的项目信息
-        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        //查询项目信息
+        Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();
         //新建树形列表集合

src/main/java/com/jeeplus/modules/projectrecord/web/summarizing/ContentDistributionSummarizingController.java

@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
 /**
- * 分布结算汇总表Controller
+ * 分部结算汇总表Controller
  * @author 徐滕
  * @version 2020-07-10
  */

src/main/java/com/jeeplus/modules/projectreportnum/dao/ProjectReportNumDao.java

@@ -6,10 +6,8 @@ package com.jeeplus.modules.projectreportnum.dao;
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectContentTreeData;
-import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectreportnum.entity.ReportNum;
 import com.jeeplus.modules.workcontent.entity.WorkContentType;
-import com.jeeplus.modules.worklog.entity.WorkLog;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -42,4 +40,6 @@ public interface ProjectReportNumDao extends CrudDao<ReportNum> {
     WorkContentType getWorkContentTypeByReportNum(String reportNum);
     //通过id获取阶段名称project_type
     String getStageName(String reportType);
+
+    ReportNum getByProjectId(String projectId);
 }

src/main/java/com/jeeplus/modules/projectreportnum/web/ProjectReportNumController.java

@@ -220,6 +220,121 @@ public class ProjectReportNumController extends BaseController {
 		return map;
 	}
 
+	/**
+	 * 报告号数据查询
+	 * @param reportNum
+	 * @param projectTypeId
+	 * @param reportType
+	 * @return
+	 */
+	@RequestMapping(value = "getReviewReportNumList")
+	@ResponseBody
+	public Map<String,List> getReviewReportNumList(ReportNum reportNum,String projectTypeId,String reportType) {
+		String userId = UserUtils.getUser().getId();
+		reportNum.setUserId(userId);
+		List<ProjectContentTreeData> listNum=new LinkedList();
+		Map<String,List> map = new HashMap<>();
+
+		String stageName=null;
+		//根据项目对应编码查询报告号
+		List<ProjectContentTreeData> projectContentTreeDataList = projectReportNumService.getReportNumList(reportNum);
+		if(StringUtils.isNotEmpty(reportType)&&projectContentTreeDataList.size()>0){
+			//通过id获取阶段名称
+			stageName=projectReportNumService.getStageName(reportType);
+
+			for(ProjectContentTreeData pct:projectContentTreeDataList){
+				pct.setStageName(stageName);
+				//判定如果不是父节点 则查询工作内容名称并展示
+				if (!"0".equals(pct.getPid())){
+					String typeId = "";
+					if(pct.getNum().contains("(")){
+						typeId = pct.getNum().substring(pct.getNum().indexOf("("),pct.getNum().indexOf(")")+1);
+					}else{
+						typeId = pct.getNum().split("-")[1];
+					}
+					ProjectType dataByType = projectTypeService.getDataByTypeId(typeId);
+					pct.setTypeName(dataByType.getTypeName());
+				}else{
+					pct.setTypeName("");
+				}
+			}
+		}
+
+		//判断项目类型是否为空
+		if(StringUtils.isNotEmpty(projectTypeId)){
+			for(ProjectContentTreeData treeData:projectContentTreeDataList){
+				//判断是否为父节点
+				if(treeData.getPid().equals("0")){
+					listNum.add(treeData);
+				}else{
+					//截取字符串
+					String typeId = "";
+					if(treeData.getNum().contains("(")){
+						typeId = treeData.getNum().substring(treeData.getNum().indexOf("("),treeData.getNum().indexOf(")")+1);
+					}else{
+						typeId = treeData.getNum().split("-")[1];
+					}
+					if(typeId.equals(projectTypeId)){
+						//根据父节点查询对应的附件信息
+						List<WorkClientAttachment> workClientAttachmentList = projectResultsFileTemplateService.getWorkClientAttachmentList(typeId);
+						if(null != workClientAttachmentList){
+							for (WorkClientAttachment workClientAttachment: workClientAttachmentList) {
+								//获取对应附件的路径
+								treeData.setUrl(workClientAttachment.getUrl());
+							}
+							treeData.setCount(workClientAttachmentList.size());
+							treeData.setType(typeId);
+						}
+						listNum.add(treeData);
+					}
+				}
+			}
+
+		}else{
+			if(null != projectContentTreeDataList){
+				//根据前台是否传递具体复核文件信息来进行展示报告号文件
+				List<String> typeIdList = new ArrayList<>();
+				if(StringUtils.isNotBlank(reportNum.getProjectType())){
+					typeIdList.add(reportNum.getProjectType());
+				}else{
+					//根据父节点id查询对应的project_type表中的typeId数据
+					typeIdList = projectReportNumService.getTypeIdList(reportType);
+				}
+
+				for(ProjectContentTreeData treeData:projectContentTreeDataList){
+					if(treeData.getPid().equals("0")){
+						listNum.add(treeData);
+					}else{
+						String typeId = "";
+						if(treeData.getNum().contains("(")){
+							typeId = treeData.getNum().substring(treeData.getNum().indexOf("("),treeData.getNum().indexOf(")")+1);
+						}else{
+							typeId = treeData.getNum().split("-")[1];
+						}
+						String stageId = projectTypeService.getStageId(typeId);
+						//截取获取
+						//String typeStage=typeId.split("")[0];
+						//判断是否包含数据
+						List<WorkClientAttachment> workClientAttachmentList = projectResultsFileTemplateService.getWorkClientAttachmentList(stageId);
+						if(null != workClientAttachmentList){
+							for (WorkClientAttachment workClientAttachment: workClientAttachmentList) {
+								treeData.setUrl(workClientAttachment.getUrl());
+							}
+							treeData.setCount(workClientAttachmentList.size());
+							treeData.setType(stageId);
+						}
+						listNum.add(treeData);
+					}
+				}
+			}
+		}
+		for (int i=0 ; i<listNum.size(); i++){
+			listNum.get(i).setIndex(i+1+"");
+		}
+		map.put("data",listNum);
+		return map;
+	}
+
 
 	@RequestMapping(value = "select")
 	public String select(ReportNum reportNum, HttpServletRequest request, HttpServletResponse response, Model model,String projectTypeId) {

src/main/java/com/jeeplus/modules/workcontent/common/WorkContentDetailFactory.java

@@ -38,13 +38,13 @@ public class WorkContentDetailFactory {
     private static WorkContentPriceadjustService priceadjustService = SpringContextHolder.getBean(WorkContentPriceadjustService.class);
     //合同管理Service
     private static WorkContentContractinfoService contractinfoService = SpringContextHolder.getBean(WorkContentContractinfoService.class);
-    //索赔管理Service
+    //索赔审核Service
     private static WorkContentClaimService contentClaimService = SpringContextHolder.getBean(WorkContentClaimService.class);
     //工程价款管理Service
     private static WorkContentProjectpriceService projectpriceService = SpringContextHolder.getBean(WorkContentProjectpriceService.class);
     //合约动态生成
     private static WorkContentContractSumService contractsumService = SpringContextHolder.getBean(WorkContentContractSumService.class);
-    //输变电功能分布结算
+    //输变电功能分部结算
     private static WorkContentBranchAccountService workContentBranchAccountService=SpringContextHolder.getBean(WorkContentBranchAccountService.class);
     //输变电工程竣工结算
     private static WorkContentCompleteAccountService workContentCompleteAccountService=SpringContextHolder.getBean(WorkContentCompleteAccountService.class);

src/main/java/com/jeeplus/modules/workcontent/dao/WorkConcealProjectDao.java

@@ -36,7 +36,7 @@ public interface WorkConcealProjectDao extends CrudDao<WorkConcealProject> {
     List<String> getTableType(String contentId);
 
     /**
-     * 根据id删除设计变更、现场签证、索赔管理模块内容详情
+     * 根据id删除设计变更、现场签证、索赔审核模块内容详情
      * @param id
      */
     void deleteContractById(String id);

src/main/java/com/jeeplus/modules/workcontent/dao/WorkContentClaimDao.java

@@ -10,7 +10,7 @@ import com.jeeplus.modules.workcontent.entity.WorkContentClaim;
 import java.util.List;
 
 /**
- * 索赔管理DAO接口
+ * 索赔审核DAO接口
  * @author ssrh
  * @version 2018-06-12
  */

src/main/java/com/jeeplus/modules/workcontent/entity/WorkContentClaim.java

@@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
- * 索赔管理Entity
+ * 索赔审核Entity
  * @author ssrh
  * @version 2018-06-12
  */

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentBranchAccountService.java

@@ -32,7 +32,7 @@ public class WorkContentBranchAccountService extends CrudService<WorkContentBran
 	}
 
 	/**
-	 * 查询分布结算信息
+	 * 查询分部结算信息
 	 * @param workContentBranchAccount
 	 * @return
 	 */

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentClaimService.java

@@ -17,7 +17,7 @@ import com.jeeplus.modules.workcontent.entity.WorkContentClaim;
 import com.jeeplus.modules.workcontent.dao.WorkContentClaimDao;
 
 /**
- * 索赔管理Service
+ * 索赔审核Service
  * @author ssrh
  * @version 2018-06-12
  */

src/main/java/com/jeeplus/modules/workcontent/web/WorkContentBranchAccountController.java

@@ -140,9 +140,9 @@ public class WorkContentBranchAccountController extends BaseController {
 			}
             responseEntity.setData(listAll);
 		} catch (Exception e) {
-		    logger.error("导入分布结算审核表失败！",e);
+		    logger.error("导入分部结算审核表失败！",e);
 		    responseEntity.setCode(400);
-		    responseEntity.setMessage("导入分布结算审核表失败！"+e.getMessage());
+		    responseEntity.setMessage("导入分部结算审核表失败！"+e.getMessage());
 		}
 		return responseEntity;
     }
@@ -154,9 +154,9 @@ public class WorkContentBranchAccountController extends BaseController {
 	public String importFileTemplate(HttpServletResponse response, HttpServletRequest request, RedirectAttributes redirectAttributes) {
 		try {
 			ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
-			download.download("分布结算审核表.xlsx",request,response);
+			download.download("分部结算审核表.xlsx",request,response);
 		} catch (Exception e) {
-			logger.error("分布结算审核表模板下载失败！",e);
+			logger.error("分部结算审核表模板下载失败！",e);
 		}
     	/*try {
             String fileName = "工程分部结算数据导入模板.xlsx";

src/main/java/com/jeeplus/modules/workcontent/web/WorkContentClaimController.java

@@ -36,7 +36,7 @@ import com.jeeplus.modules.workcontent.entity.WorkContentClaim;
 import com.jeeplus.modules.workcontent.service.WorkContentClaimService;
 
 /**
- * 索赔管理Controller
+ * 索赔审核Controller
  * @author ssrh
  * @version 2018-06-12
  */
@@ -60,7 +60,7 @@ public class WorkContentClaimController extends BaseController {
 	}
 	
 	/**
-	 * 索赔管理列表页面
+	 * 索赔审核列表页面
 	 */
 	@RequiresPermissions("workcontent:workContentClaim:list")
 	@RequestMapping(value = {"list", ""})
@@ -71,7 +71,7 @@ public class WorkContentClaimController extends BaseController {
 	}
 
 	/**
-	 * 查看，增加，编辑索赔管理表单页面
+	 * 查看，增加，编辑索赔审核表单页面
 	 */
 	@RequestMapping(value = "form")
 	public String form(WorkContentClaim workContentClaim,String view, Model model) {
@@ -97,7 +97,7 @@ public class WorkContentClaimController extends BaseController {
 	}
 
 	/**
-	 * 保存索赔管理
+	 * 保存索赔审核
 	 */
 	@RequiresPermissions(value={"workcontent:workContentClaim:add","workcontent:workContentClaim:edit"},logical=Logical.OR)
 	@RequestMapping(value = "save")
@@ -112,23 +112,23 @@ public class WorkContentClaimController extends BaseController {
 		}else{//新增表单保存
 			workContentClaimService.save(workContentClaim);//保存
 		}
-		addMessage(redirectAttributes, "保存索赔管理成功");
+		addMessage(redirectAttributes, "保存索赔审核成功");
 		return "redirect:"+Global.getAdminPath()+"/workcontent/workContentClaim/?repage";
 	}
 	
 	/**
-	 * 删除索赔管理
+	 * 删除索赔审核
 	 */
 	@RequiresPermissions("workcontent:workContentClaim:del")
 	@RequestMapping(value = "delete")
 	public String delete(WorkContentClaim workContentClaim, RedirectAttributes redirectAttributes) {
 		workContentClaimService.delete(workContentClaim);
-		addMessage(redirectAttributes, "删除索赔管理成功");
+		addMessage(redirectAttributes, "删除索赔审核成功");
 		return "redirect:"+Global.getAdminPath()+"/workcontent/workContentClaim/?repage";
 	}
 	
 	/**
-	 * 批量删除索赔管理
+	 * 批量删除索赔审核
 	 */
 	@RequiresPermissions("workcontent:workContentClaim:del")
 	@RequestMapping(value = "deleteAll")
@@ -137,7 +137,7 @@ public class WorkContentClaimController extends BaseController {
 		for(String id : idArray){
 			workContentClaimService.delete(workContentClaimService.get(id));
 		}
-		addMessage(redirectAttributes, "删除索赔管理成功");
+		addMessage(redirectAttributes, "删除索赔审核成功");
 		return "redirect:"+Global.getAdminPath()+"/workcontent/workContentClaim/?repage";
 	}
 	
@@ -148,12 +148,12 @@ public class WorkContentClaimController extends BaseController {
     @RequestMapping(value = "export", method=RequestMethod.POST)
     public String exportFile(WorkContentClaim workContentClaim, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
 		try {
-            String fileName = "索赔管理"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
+            String fileName = "索赔审核"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
             Page<WorkContentClaim> page = workContentClaimService.findPage(new Page<WorkContentClaim>(request, response, -1), workContentClaim);
-    		new ExportExcel("索赔管理", WorkContentClaim.class).setDataList(page.getList()).write(response, fileName).dispose();
+    		new ExportExcel("索赔审核", WorkContentClaim.class).setDataList(page.getList()).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
-			addMessage(redirectAttributes, "导出索赔管理记录失败！失败信息："+e.getMessage());
+			addMessage(redirectAttributes, "导出索赔审核记录失败！失败信息："+e.getMessage());
 		}
 		return "redirect:"+Global.getAdminPath()+"/workcontent/workContentClaim/?repage";
     }
@@ -182,25 +182,25 @@ public class WorkContentClaimController extends BaseController {
 				}
 			}
 			if (failureNum>0){
-				failureMsg.insert(0, "，失败 "+failureNum+" 条索赔管理记录。");
+				failureMsg.insert(0, "，失败 "+failureNum+" 条索赔审核记录。");
 			}
-			addMessage(redirectAttributes, "已成功导入 "+successNum+" 条索赔管理记录"+failureMsg);
+			addMessage(redirectAttributes, "已成功导入 "+successNum+" 条索赔审核记录"+failureMsg);
 		} catch (Exception e) {
-			addMessage(redirectAttributes, "导入索赔管理失败！失败信息："+e.getMessage());
+			addMessage(redirectAttributes, "导入索赔审核失败！失败信息："+e.getMessage());
 		}
 		return "redirect:"+Global.getAdminPath()+"/workcontent/workContentClaim/?repage";
     }
 	
 	/**
-	 * 下载导入索赔管理数据模板
+	 * 下载导入索赔审核数据模板
 	 */
 	@RequiresPermissions("workcontent:workContentClaim:import")
     @RequestMapping(value = "import/template")
     public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
 		try {
-            String fileName = "索赔管理数据导入模板.xlsx";
+            String fileName = "索赔审核数据导入模板.xlsx";
     		List<WorkContentClaim> list = Lists.newArrayList(); 
-    		new ExportExcel("索赔管理数据", WorkContentClaim.class, 1).setDataList(list).write(response, fileName).dispose();
+    		new ExportExcel("索赔审核数据", WorkContentClaim.class, 1).setDataList(list).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());

src/main/resources/mappings/modules/projectcontentinfo/ProjectContentDataDao.xml

@@ -329,7 +329,8 @@
 		a.project_id as "pid", a.name as "projectName", "" as projectId,
 		"0" as projectStatus,su.name as "projectRegistrant" ,prd.id as "reportId",
 		pt.type_name as projectLeader,pt.id as projectTypeId,
-		ppt.type_name as clientName,ifnull(prd.status,'10') as status,ifnull(prd.name,'') as reportName
+		ppt.type_name as clientName,ifnull(prd.status,'10') as status,ifnull(prd.name,'') as reportName,
+		ifnull( prd.number, '' ) as "projectReportNumber"
 		from project_content_data a
 		left join sys_user su on su.id = a.create_by
 		left join project_type pt on a.type = pt.type_id

src/main/resources/mappings/modules/projectcontentinfo/ProjectReportDataDao.xml

@@ -1280,4 +1280,8 @@
 		status = #{status}
 		WHERE `number` = #{number}
 	</update>
+
+	<update id="deleteProjectContentReportById">
+		DELETE FROM project_content_report WHERE report_id = #{reportId}
+	</update>
 </mapper>

src/main/resources/mappings/modules/projectreportnum/ProjectReportNumDao.xml

@@ -131,15 +131,16 @@
 		a.del_flag as "delFlag",
 		a.num as "num",
 		a.parent_id as "pid",
-		su.name as createId ,
+		(case when a.parent_id = '0' then sur.NAME when a.parent_id != '0' then su.NAME else su.NAME end) as createId,
 		a.create_date as "createDate"
 		from report_num a
 		left join rural_project_records rpr on a.project_id = rpr.id
-		left join sys_user su on su.id = rpr.create_by
+		LEFT JOIN sys_user su ON su.id = a.create_by
+		LEFT JOIN sys_user sur ON sur.id = rpr.create_by
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL} and a.state = '0' and a.project_id = #{projectId}
 		</where>
-		ORDER BY a.parent_id,a.create_date
+		ORDER BY a.parent_id,a.num,a.create_date
 	</select>
 
 	<select id="getTypeIdList" resultType="java.lang.String">
@@ -165,5 +166,15 @@
 		select type_name as stageName from project_type where id=#{reportType}
 	</select>
 
+	<select id="getByProjectId" resultType="com.jeeplus.modules.projectreportnum.entity.ReportNum">
+		SELECT
+		<include refid="infoColums"/>
+		FROM report_num a
+		<where>
+			a.project_id = #{projectId}
+		</where>
+		limit 1
+	</select>
+
 
 </mapper>

src/main/resources/mappings/modules/workProjectUser/WorkProjectUserDao.xml

@@ -64,7 +64,14 @@
     </insert>
 
     <select id="queryProjectUsers" resultType="com.jeeplus.modules.sys.entity.User">
-        SELECT u.id,u.name,u.photo from work_project_user a, sys_user u WHERE a.user_id = u.id and a.project_id = #{projectId} and a.is_master = #{isMaster}
+        SELECT u.id,u.name,u.photo from work_project_user a, sys_user u
+        <where>
+            a.user_id = u.id
+            and a.project_id = #{projectId}
+            <if test="null != isMaster and '' != isMaster">
+                and a.is_master = #{isMaster}
+            </if>
+        </where>
     </select>
     <select id="projectUsers" resultType="com.jeeplus.modules.sys.entity.User">
         SELECT u.id,u.name,u.photo from work_project_user a, sys_user u WHERE a.user_id = u.id and a.project_id = #{projectId} and a.del_flag = '0'

src/main/webapp/static/common/jeeplus.js

@@ -761,3 +761,48 @@ function checkContentKeyUp(id,maxLength) {
     contentMsg.innerHTML = "您已输入<font >" + length
         + "</font>字符，还可输入<font color='red'>" + (maxLength - length) + "</font>字符";
 }
+
+
+function confirmDelete(mess, href){
+    top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
+        //do something
+        if (typeof href == 'function') {
+            href();
+        }else{
+            $.ajax({
+                url:href,
+                type:"post",
+                success:function(data){
+                    if(data.success){
+                        top.layer.msg("删除成功！", {icon: 1});
+                        sortOrRefresh()
+                    }
+                }
+            });
+        }
+        top.layer.close(index);
+    });
+    return false;
+}
+
+function confirmDelete(mess, href){
+    top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
+        //do something
+        if (typeof href == 'function') {
+            href();
+        }else{
+            $.ajax({
+                url:href,
+                type:"post",
+                success:function(data){
+                    if(data.success){
+                        top.layer.msg("删除成功！", {icon: 1});
+                        sortOrRefresh()
+                    }
+                }
+            });
+        }
+        top.layer.close(index);
+    });
+    return false;
+}

src/main/webapp/webpage/include/head.jsp

@@ -36,7 +36,7 @@
 
 <!-- jeeplus -->
 <link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-<script src="${ctxStatic}/common/jeeplus.js?9" type="text/javascript"></script>
+<script src="${ctxStatic}/common/jeeplus.js?10" type="text/javascript"></script>
 <script type="text/javascript" src="${ctxStatic}/common/openShow.js"></script>
 
 <!-- jquery ui -->

src/main/webapp/webpage/modules/project/type/projectTypeList.jsp

@@ -19,6 +19,10 @@
 			background-color:rgba(255,255,255,0);
 			height:100%;
 		}
+		.projectType{
+			margin-left: 1px;
+			margin-right: 0px;
+		}
 	</style>
 </head>
 <body>
@@ -40,9 +44,9 @@
 							</div>
 						</div>
 						<div class="layui-item athird">
-							<div class="input-group">
-								<button id="searchReset" style="margin-right: 0px;" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							<div class="layui-btn-group search-spacing">
+								<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn layui-btn-sm" onclick="resetSearch()">重置</button>
 							</div>
 						</div>
 						<div style="    clear:both;"></div>
@@ -63,8 +67,7 @@
 					<shiro:hasPermission name="project:projectType:export">
 						<table:exportExcel url="${ctx}/projectType/projectType/export"></table:exportExcel><!-- 导出按钮 -->
 					</shiro:hasPermission>
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</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>
+					<button class="layui-btn layui-btn-sm layui-bg-green" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					<div style="clear: both;"></div>
 				</div>
 
@@ -201,19 +204,19 @@
 			].join('');*/
 			if('0'==d.forbidden){
 				return [
-					"<a href=\"javascript:void(0)\" onclick=\"openProjectTypeView('查看项目类型信息','${ctx}/projectType/projectType/form?view=view&id="+d.id+"','95%', '95%');\" class=\"op-btn op-btn-view\"><i class=\"fa fa-search-plus\"></i> 查看</a>",
-					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('新增项目类型信息','${ctx}/projectType/projectType/form?view=saveSubordinateInfo&id="+d.id+"','95%', '95%');\" class=\"op-btn nav-btn-add layui-bg-green\"><i class=\"fa fa-plus layui-bg-green\"></i> 新增下级项目类型</a>",
-					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('修改项目类型信息','${ctx}/projectType/projectType/form?view=updateSubordinateInfo&id="+d.id+"','95%', '95%');\" class=\"btn btn-success btn-xs\"><i class=\"fa fa-edit\"></i> 修改</a>",
-					'<a href="${ctx}/projectType/projectType/delete?id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该项目类型信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
-					'<a href="${ctx}/projectType/projectType/change?id='+d.id+'&forbidden='+d.forbidden+'" onclick="return confirmx(\'确认要禁用该项目类型吗？\', this.href)"   class="op-btn layui-btn-danger"><i class="layui-icon-close-fill"></i> 禁用</a>',
+					"<a href=\"javascript:void(0)\" onclick=\"openProjectTypeView('查看项目类型信息','${ctx}/projectType/projectType/form?view=view&id="+d.id+"','95%', '95%');\" class=\"op-btn op-btn-view projectType\">查看</a>",
+					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('新增项目类型信息','${ctx}/projectType/projectType/form?view=saveSubordinateInfo&id="+d.id+"','95%', '95%');\" class=\"op-btn nav-btn-add layui-bg-green projectType\">新增下级项目类型</a>",
+					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('修改项目类型信息','${ctx}/projectType/projectType/form?view=updateSubordinateInfo&id="+d.id+"','95%', '95%');\" class=\"op-btn btn-success projectType\">修改</a>",
+					'<a href="${ctx}/projectType/projectType/delete?id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该项目类型信息吗？\', this.href)"   class="op-btn op-btn-delete projectType">删除</a>',
+					'<a href="${ctx}/projectType/projectType/change?id='+d.id+'&forbidden='+d.forbidden+'" onclick="return confirmx(\'确认要禁用该项目类型吗？\', this.href)"   class="op-btn layui-btn-danger projectType">禁用</a>',
 				].join('');
 			}else if('1'==d.forbidden){
 				return [
-					"<a href=\"javascript:void(0)\" onclick=\"openProjectTypeView('查看项目类型信息','${ctx}/projectType/projectType/form?view=view&id="+d.id+"','95%', '95%');\" class=\"op-btn op-btn-view\"><i class=\"fa fa-search-plus\"></i> 查看</a>",
-					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('新增项目类型信息','${ctx}/projectType/projectType/form?view=saveSubordinateInfo&id="+d.id+"','95%', '95%');\" class=\"op-btn nav-btn-add layui-bg-green\"><i class=\"fa fa-plus layui-bg-green\"></i> 新增下级项目类型</a>",
-					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('修改项目类型信息','${ctx}/projectType/projectType/form?view=updateSubordinateInfo&id="+d.id+"','95%', '95%');\" class=\"btn btn-success btn-xs\"><i class=\"fa fa-edit\"></i> 修改</a>",
-					'<a href="${ctx}/projectType/projectType/delete?id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该项目类型信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
-					'<a href="${ctx}/projectType/projectType/change?id='+d.id+'&forbidden='+d.forbidden+'" onclick="return confirmx(\'确认要启用该项目类型吗？\', this.href)"   class="op-btn op-btn-submit"><i class="fa fa-undo"></i> 启用</a>',
+					"<a href=\"javascript:void(0)\" onclick=\"openProjectTypeView('查看项目类型信息','${ctx}/projectType/projectType/form?view=view&id="+d.id+"','95%', '95%');\" class=\"op-btn op-btn-view projectType\">查看</a>",
+					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('新增项目类型信息','${ctx}/projectType/projectType/form?view=saveSubordinateInfo&id="+d.id+"','95%', '95%');\" class=\"op-btn nav-btn-add layui-bg-green projectType\">新增下级项目类型</a>",
+					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('修改项目类型信息','${ctx}/projectType/projectType/form?view=updateSubordinateInfo&id="+d.id+"','95%', '95%');\" class=\"op-btn btn-success projectType\">修改</a>",
+					'<a href="${ctx}/projectType/projectType/delete?id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该项目类型信息吗？\', this.href)"   class="op-btn op-btn-delete projectType">删除</a>',
+					'<a href="${ctx}/projectType/projectType/change?id='+d.id+'&forbidden='+d.forbidden+'" onclick="return confirmx(\'确认要启用该项目类型吗？\', this.href)"   class="op-btn op-btn-submit projectType">启用</a>',
 				].join('');
 			}
 

src/main/webapp/webpage/modules/projectMaterialStorage/projectMaterialStorageAddForm.jsp

@@ -0,0 +1,335 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>材料库</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+	<script src="${ctxStatic}/common/html/js/script.js"></script>
+	<style>
+		#contractTypeDoc-error{
+			top:80px;
+			left:0;
+		}
+		 /*超过5个汉字，调整label的长度，以下是配套的*/
+		 .layui-item .layui-form-label{
+			 width:90px;
+		 }
+		.form-group .layui-item .layui-input-block,
+		.query .layui-input-block {
+			margin-left: 116px;
+		}
+		#workInvoiceProjectRelationList td{
+			padding-left: 0px;
+			padding-right: 0px;
+		}
+		#projectMaterialStorageList td{
+			padding-left: 0px;
+			padding-right: 0px;
+		}
+	</style>
+	<script type="text/javascript">
+        var validateForm;
+        function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+            //debugger
+            if(validateForm.form()){
+				if($("#projectMaterialStorageList tr").length==0){
+					top.layer.alert('请至少填写一条材料信息！', {icon: 0});
+					return;
+				}
+				$("#inputForm").submit();
+                return true;
+            }else {
+				parent.layer.msg("信息未填写完整!", {icon: 5});
+			}
+            return false;
+        }
+
+        $(document).ready(function() {
+
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+			});
+            validateForm = $("#inputForm").validate({
+                submitHandler: function(form){
+                    loading('正在提交，请稍等...');
+                    form.submit();
+                },
+                errorContainer: "#messageBox",
+                errorPlacement: function(error, element) {
+
+                    $("#messageBox").text("输入有误，请先更正。");
+                    if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+                        error.appendTo(element.parent().parent());
+                    } else {
+                        error.insertAfter(element);
+                    }
+                }
+            });
+
+
+            /*--------------*/
+			$("#attachment_btn").click(function () {
+				$("#attachment_file").click();
+			});
+			laydate.render({
+				elem: '#quotedPriceDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+				type : 'date'
+				, trigger: 'click'
+			});
+        });
+		function addRow1(list, idx, tpl, row){
+			var idx1 = $("#projectMaterialStorageList tr").length;
+			console.log(idx1)
+			if(list == '#projectMaterialStorageList'){
+				bornTemplete1(list, idx, tpl, row, idx1);
+				projectMaterialStorageListRowIdx+=1;
+			}
+		}
+
+		function bornTemplete1(list, idx, tpl, row, idx1){
+			$(list).append(Mustache.render(tpl, {
+				idx: idx, delBtn: true, row: row,
+				order:idx1 + 1
+			}));
+			$(list+idx).find("select").each(function(){
+				$(this).val($(this).attr("data-value"));
+			});
+			$(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
+				var ss = $(this).attr("data-value").split(',');
+				for (var i=0; i<ss.length; i++){
+					if($(this).val() == ss[i]){
+						$(this).attr("checked","checked");
+					}
+				}
+			});
+
+			laydate.render({
+				elem : (list+idx+"_quotedPriceDate"),
+				event: 'focus',
+				type : 'date'
+				, trigger: 'click',
+				trigger: 'click'
+			});
+		}
+
+		function newSetPNumber(obj,label,ids,isProject,details){
+			$("#projectId").val(obj)
+			// 根据项目id查询项目信息
+			$.ajax({
+				type:'post',
+				url:'${ctx}/ruralProject/ruralProjectRecords/get?id=' + obj,
+				success:function(data){
+					console.log(data)
+					if(data.projectReportNumber){
+						$("#projectReportNumber").val(data.projectReportNumber)
+						$("#leaderName").val(data.leaderNameStr)
+						$("#projectNoId").val(data.projectId)
+					}
+				}
+			})
+			$("#projectName").val(label)
+		}
+
+		function num(obj){
+
+			obj.value = obj.value.replace(/[^\d.]/g,""); //清除"数字"和"."以外的字符
+			obj.value = obj.value.replace(/^\./g,""); //验证第一个字符是数字
+			obj.value = obj.value.replace(/\.{2,}/g,"."); //只保留第一个, 清除多余的
+			obj.value = obj.value.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
+			obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3'); //只能输入两个小数
+		}
+
+		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){
+					top.layer.close(index)
+					document.getElementById('iframe').contentWindow.location.reload();
+				}
+			});
+		}
+
+		function delRow(obj, prefix) {
+			var id = $(prefix + "_invoiceId");
+			var delFlag = $(prefix + "_delFlag");
+			if (id.val() == "") {
+				$(obj).parent().parent().remove();
+			} else if (delFlag.val() == "0") {
+				delFlag.val("1");
+				$(obj).html("&divide;").attr("title", "撤回删除");
+				$(obj).parent().parent().addClass("error");
+				$(obj).parent().parent().addClass("hide");
+			} else if (delFlag.val() == "1") {
+				delFlag.val("0");
+				$(obj).html("&times;").attr("title", "删除");
+				$(obj).parent().parent().removeClass("error");
+			}
+			var length=$("#projectMaterialStorageList tr").length;
+			var count=length;
+			for (var i=1;i<=length;i++) {
+				var delFlag = $("#projectMaterialStorageList").find("tr").eq(i-1).find("input").eq(1).val();
+				if (delFlag == "1") {
+					count =count-1;
+				}
+			}
+			if(count==1){
+				$("#chargeType").val("2")
+				layui.form.render();
+			}else if (count>1){
+				$("#chargeType").val("1")
+				layui.form.render();
+			}else if(count == 0){
+				$("#projectFlag").val("");
+			}
+		}
+
+		function genRow(data) {
+			for (var i = 0; i < data.length; i++) {
+				addRow1('#projectMaterialStorageList', projectMaterialStorageListRowIdx, projectMaterialStorageListTpl, data[i])
+			}
+		}
+	</script>
+</head>
+<body>
+<div class="single-form">
+	<div class="container">
+		<form:form id="inputForm" modelAttribute="projectMaterialStorage" action="${ctx}/project/projectMaterialStorage/storageSave" method="post" class="layui-form">
+			<form:hidden path="id"/>
+			<form:hidden path="projectId"/>
+			<div class="form-group layui-row first">
+				<div class="form-group-label"><h2>项目信息</h2></div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">项目名称</label>
+					<div class="layui-input-block">
+						<sys:gridselectprojectmaterial disabled="true" url="${ctx}/project/projectMaterialStorage/selectproject" id="project" name="projectNumber"  value="${projectMaterialStorage.projectName}"  title="选择所属项目" labelName="projectName" cssStyle="background-color: #fff"
+													  labelValue="${projectMaterialStorage.projectName}" cssClass="form-control layui-input" fieldLabels="项目名称" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName"  ></sys:gridselectprojectmaterial>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">报告号</label>
+					<div class="layui-input-block">
+						<input id="projectReportNumber" htmlEscape="false"  value=""  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">项目编号</label>
+					<div class="layui-input-block">
+						<input id="projectNoId" htmlEscape="false"  value=""  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">项目责任人</label>
+					<div class="layui-input-block">
+						<input id="leaderName" htmlEscape="false"  value=""  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+			</div>
+			<div class="form-group layui-row first lw14">
+				<div class="form-group-label"><h2>材料详情</h2></div>
+				<div class="layui-item nav-btns">
+					<a class="nav-btn nav-btn-add" onclick="addRow1('#projectMaterialStorageList', projectMaterialStorageListRowIdx, projectMaterialStorageListTpl);projectMaterialStorageListRowIdx = projectMaterialStorageListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增</a>
+					<table:importExcelA url="${ctx}/project/projectMaterialStorage/import"></table:importExcelA><!-- 导入按钮 -->
+				</div>
+				<div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
+					<table id="contentTables" class="table table-bordered table-condensed can-edit no-bottom-margin details">
+						<thead>
+						<tr>
+							<th width="200px"><font color="red">*</font>材料名称</th>
+							<th width="150px">品牌</th>
+							<th width="200px"><font color="red">*</font>规格型号</th>
+							<th width="100px">含税工程价(元)</th>
+							<th width="100px">含税市场价(元)</th>
+							<th width="100px">税率</th>
+							<th width="100px"><font color="red">*</font>单位</th>
+							<th width="200px">产品说明</th>
+							<th width="100px">供应商</th>
+							<th width="200px">备注</th>
+								<%--						<th width="200px">单位</th>--%>
+							<th width="100px">报价时间</th>
+							<th width="100px">操作</th>
+						</tr>
+						</thead>
+						<tbody id="projectMaterialStorageList">
+						</tbody>
+					</table>
+					<script type="text/template" id="projectMaterialStorageListTpl">//<!--
+                    <tr id="projectMaterialStorageList{{idx}}">
+                        <td class="hide">
+							<input id="projectMaterialStorageList{{idx}}_projectId" name="projectMaterialStorageList[{{idx}}].projectId" type="hidden" value="{{row.projectId}}"/>
+							<input id="projectMaterialStorageList{{idx}}_delFlag" name="projectMaterialStorageList[{{idx}}].delFlag" type="hidden" value="0"/>
+                        </td>
+                        <td>
+							<input id="projectMaterialStorageList{{idx}}_materialName" name = "projectMaterialStorageList[{{idx}}].materialName"  type="text" value="{{row.materialName}}"  class="form-control"/>
+                        </td>
+                        <td>
+							<input id="projectMaterialStorageList{{idx}}_brand" name = "projectMaterialStorageList[{{idx}}].brand"  type="text" value="{{row.brand}}"  class="form-control"/>
+                        </td>
+                        <td>
+							<input id="projectMaterialStorageList{{idx}}_specifications" name = "projectMaterialStorageList[{{idx}}].specifications"  type="text" value="{{row.specifications}}"  class="form-control"/>
+                        </td>
+                        <td>
+							<input id="projectMaterialStorageList{{idx}}_projectPriceIncludingTax" name = "projectMaterialStorageList[{{idx}}].projectPriceIncludingTax"  type="text" value="{{row.projectPriceIncludingTax}}" onkeyup="num(this)"  class="form-control"/>
+                        </td>
+                        <td>
+							<input id="projectMaterialStorageList{{idx}}_marketPriceIncludingTax" name = "projectMaterialStorageList[{{idx}}].marketPriceIncludingTax"  type="text" value="{{row.marketPriceIncludingTax}}" onkeyup="num(this)"  class="form-control"/>
+                        </td>
+                        <td>
+							<input id="projectMaterialStorageList{{idx}}_taxRate" name = "projectMaterialStorageList[{{idx}}].taxRate"  type="text" value="{{row.taxRate}}" onkeyup="num(this)"  class="form-control"/>
+                        </td>
+                        <td>
+							<input id="projectMaterialStorageList{{idx}}_unit" name = "projectMaterialStorageList[{{idx}}].unit"  type="text" value="{{row.unit}}"  class="form-control"/>
+                        </td>
+                        <td>
+							<input id="projectMaterialStorageList{{idx}}_explain" name = "projectMaterialStorageList[{{idx}}].explain"  type="text" value="{{row.explain}}"  class="form-control"/>
+                        </td>
+                        <td>
+							<input id="projectMaterialStorageList{{idx}}_supplier" name = "projectMaterialStorageList[{{idx}}].supplier"  type="text" value="{{row.supplier}}"  class="form-control"/>
+                        </td>
+                        <td>
+							<input id="projectMaterialStorageList{{idx}}_remarks" name = "projectMaterialStorageList[{{idx}}].remarks"  type="text" value="{{row.remarks}}"  class="form-control"/>
+                        </td>
+						<td>
+							<input lay-verify="date" readonly="true" placeholder="yyyy-MM-dd" autocomplete="off" id="projectMaterialStorageList{{idx}}_quotedPriceDate" name="projectMaterialStorageList[{{idx}}].quotedPriceDate" type="text" value="{{row.quotedPriceDate}}" style="text-align: center" class="form-control datetime"/>
+						</td>
+                        <td class="text-center op-td" >
+                            {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#projectMaterialStorageList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}
+                        </td>
+                    </tr>//-->
+					</script>
+					<script type="text/javascript">
+						var projectMaterialStorageListRowIdx = 0, projectMaterialStorageListTpl = $("#projectMaterialStorageListTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+						/*if($("#id").val()){
+                            workInvoiceProjectRelationListRowIdx = ${fn:length(workInvoice.workInvoiceProjectRelationList)};
+						}*/
+						$(document).ready(function() {
+							<%--var data = ${fns:toJson(projectMaterialStorage.projectMaterialStorageList)};--%>
+							for (var i=0; i<data.length; i++){
+								addRow1('#projectMaterialStorageList', projectMaterialStorageListRowIdx, projectMaterialStorageListTpl, data[i])
+								projectMaterialStorageListRowIdx = projectMaterialStorageListRowIdx + 1;
+							}
+						});
+					</script>
+				</div>
+			</div>
+			<div class="form-group layui-row page-end"></div>
+		</form:form>
+	</div>
+</div>
+
+</body>
+</html>

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

@@ -216,13 +216,13 @@
 					}
 				}
 			});
-			changeContentDetail("${projectContentDataType}");
 			var tp = "${projectcontentinfo.dictType}";
 			var tp2 = "${projectcontentinfo.projectContentData.id}"
 			if((tp!=null && tp!='')||(tp2!=null && tp2!='')){
 				$(document.getElementById("projectContentData.type")).attr("disabled","disabled");
 			}
 			initControlData("1");
+			window.setTimeout("changeContentDetail(\"${projectContentDataType}\")",100);
 		});
 		function getNowFormatDate() {
 			var date = new Date();
@@ -897,7 +897,7 @@
 					<label class="layui-form-label"><span class="require-item">*</span>报告编号：</label>
 					<div class="layui-input-block">
 						<div class="input-group">
-							<form:input  path="projectReportData.number" onclick="selectNum()" id="number" htmlEscape="false" readonly="true" class="form-control layui-input required"/>
+							<form:input  path="projectReportData.number" onclick="selectNum()"  style="background-color:#ffffff" id="number" htmlEscape="false" readonly="true" class="form-control layui-input required"/>
 							<span class="input-group-btn" onclick="selectNum()">
 								<label class="form-status">
 									<c:choose>
@@ -958,7 +958,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>报告日期：</label>
 					<div class="layui-input-block">
-						<input id="reportDate" name="projectReportData.reportDate" type="text" htmlEscape="false" readonly="true" class="laydate-icondate form-control layer-date required layui-input laydate-icon"
+						<input id="reportDate" name="projectReportData.reportDate" type="text"  style="background-color:#ffffff" htmlEscape="false" readonly="true" class="laydate-icondate form-control layer-date required layui-input laydate-icon"
 							   value="<fmt:formatDate value="${projectcontentinfo.projectReportData.reportDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>

src/main/webapp/webpage/modules/projectrecord/armorForMaterials/armorForMaterialsList.jsp

@@ -284,7 +284,7 @@
                             }else if(d.condition ==2){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看隐蔽工程量信息', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=armor&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&project.overallProjectTypeId=${overallProjectTypeId}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看甲供物资信息', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=armor&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&project.overallProjectTypeId=${overallProjectTypeId}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
                             }
                         }},
                     {field: 'date', align:'center', title: '创建日期',width:100,templet: function(d){
@@ -338,12 +338,17 @@
                 }
             } else if (d.condition ==3){
                 if(1 == d.operationSign) {
-                    return [
-                        '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改隐蔽工程量信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=armor&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'&project.overallProjectTypeId='+$("#overallProjectTypeId").val()+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
-                        '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
-                        +'</div>'
-                    ].join('');
+                    if(d.status =="10"){
+                        return [
+                            '<div class=\"layui-btn-group\">'+
+                            '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改甲供物资信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=armor&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'&project.overallProjectTypeId='+$("#overallProjectTypeId").val()+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
+                            '<a href="javascript:void(0)" onclick="confirmDelete(\'确认要删除该甲供物资信息吗\', \'${ctx}/projectcontentinfo/projectcontentinfo/deleteOverallProcessContentById?infoId='+d.id+'\')" class="layui-btn layui-btn-xs layui-bg-red" > 删除</a>',
+                            '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
+                            +'</div>'
+                        ].join('');
+                    }else{
+                        return[''].join('');
+                    }
                 }else{
                     return[''].join('');
                 }

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

@@ -0,0 +1,596 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>隐蔽工程量信息</title>
+	<meta name="decorator" content="default"/>
+    <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%--<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) {
+                }
+            });
+        }
+	</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="list-form-tab contentShadow shadowLTR" id="tabDiv">
+				<ul class="list-tabs" >
+					<li><a href="${ctx}/project/checkInterimPayment/list">工程进度款复核</a></li>
+					<li><a href="${ctx}/project/checkDesign/list">设计变更复核</a></li>
+					<li><a href="${ctx}/project/checkVisa/list">现场签证复核</a></li>
+					<li><a href="${ctx}/project/checkClaim/list">索赔复核</a></li>
+					<li><a href="${ctx}/project/checkDistributionSettlement/list">分部结算复核</a></li>
+					<li><a href="${ctx}/project/checkConcealProject/list">隐蔽工程量</a></li>
+					<li><a href="${ctx}/project/checkMaterial/list">暂定材料价</a></li>
+					<li class="active"><a href="${ctx}/project/checkArmorForMaterials/list">甲供物资审核</a></li>
+				</ul>
+			</div>
+			<div class="layui-row contentShadow shadowLR" id="queryDiv">
+				<form:form id="searchForm" modelAttribute="constructionContract" action="${ctx}/project/checkArmorForMaterials/" 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">
+								<form:input path="projectName" 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">
+								<form:input path="contractName" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item athird">
+							<div class="input-group">
+<%--								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn  layui-btn-sm" onclick="resetSearch()">重置</button>
+								</div>
+<%--								<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 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">
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<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 contractName = $("#contractName").val();
+        	if(undefined == contractName){
+				contractName = "";
+			}
+        	var projectName = $("#projectName").val();
+        	if(undefined == projectName){
+				projectName = "";
+			}
+            layer.load(2);
+            treetable.render({
+                treeColIndex: 1,//树形图标显示在第几列
+                treeSpid: 0,//最上级的父级id
+                treeIdName: 'permissionId',//id字段的名称
+                treePidName: 'pid',//pid字段的名称
+                treeDefaultClose: true,//是否默认折叠
+                treeLinkage: true,//父级展开时是否自动展开所有子级
+                elem: '#permissionTable',
+                url: '${ctx}/project/checkArmorForMaterials/getProjectList?pageNo=${page.pageNo}&pageSize=${page.pageSize}&contractName='+contractName+'&projectName='+projectName,
+                page: false,
+				cols: [[
+					{type: 'numbers', align:'center', title: '序号' ,width:80},
+					{field: 'cnumber', title: '项目编号/合同编号/甲供物资审核报告号',templet:function(d){
+							if(d.condition ==1){
+								return "<font>"+d.cnumber+"</font>";
+							}else if(d.condition ==2){
+								return "<font>"+d.cnumber+"</font>";
+							}else{
+								return "<font>"+d.cnumber+"</font>";
+							}
+						}},
+					{field: 'contractName',align:'center', title: '项目名称/实施合同名称/甲供物资审核名称',templet:function(d){
+							if(d.condition ==1){
+								return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/project/projectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.contractName + "</a>";
+							}else if(d.condition ==2){
+								return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
+							}else{
+								return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=checkArmorForMaterials&flag=view&reportType=${reportType}&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&projectReportData.id="+d.reportId+"','95%', '95%')\">" + d.contractName + "</a>";
+							}
+						}},
+					{field: 'reportName', align:'center', title: '成果文件名称',templet:function(d){
+							if(d.condition ==1){
+								return  "";
+							}else if(d.condition ==2){
+								return  "";
+							}else if(d.condition ==3){
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=checkArmorForMaterials&flag=view&reportType=${reportType}&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&projectReportData.id="+d.reportId+"','95%', '95%')\">" + d.number + "</a>";
+							}else{
+								return "";
+							}
+						}},
+					{field: 'date', align:'center', title: '创建日期',width:100,templet: function(d){
+							var date=d.createDate;
+							if(d.condition ==1){
+								return "";
+							}else if(d.condition ==2){
+								return "";
+							}else{
+								return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
+							}
+						}},
+					{align:'center', title: '状态',  width:70,templet:function(d){
+							var st = getAuditState(""+d.projectStatus);
+							if(d.condition ==1){
+								return "";
+							}else if(d.condition ==2){
+								return "";
+							}else if(d.condition ==3){
+								st = getAuditState(""+d.status);
+								if(st.action)
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + d.id + "&projectReportData.id="+ d.reportId + "&type="+d.status+"','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 '';
+							}
+						}},
+					{templet: complain, align:'center', title: '操作',width:130}
+				]],
+                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){//操作中显示的内容
+			if(d.condition ==1) {
+				if(1 == d.operationSign) {
+					return [
+						'<div class=\"layui-btn-group\">'+
+						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.id+'\',\'60%\',\'95%\',false,\'inputForm\')" class="layui-btn layui-btn-xs  layui-bg-orange" > 领取报告号</a>',
+						+'</div>'
+					].join('');
+				}else{
+					return[''].join('');
+				}
+			} else if (d.condition ==2){
+				return [
+					'',
+				].join('');
+			} else if (d.condition ==3){
+				if(1 == d.operationSign) {
+					if(d.status == 1){
+						return [
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=checkArmorForMaterials&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=checkArmorForMaterials&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+							+'</div>'
+						].join('');
+					}else if(d.status == 2){
+						return [
+							'<div class=\"layui-btn-group\">'+
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 撤回</a>',
+
+							+'</div>'
+						].join('');
+					}else if(d.status == 3){
+						return [
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=checkArmorForMaterials&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=checkArmorForMaterials&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+							+'</div>'
+						].join('');
+					}else if(d.status == 4){
+						return [
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=checkArmorForMaterials&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=checkArmorForMaterials&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+							+'</div>'
+
+						].join('');
+					}else if(d.status == 5){
+						return [''].join('');
+					}else if(d.status == null || d.status == '' || d.status == 10){
+						return [
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=checkArmorForMaterials&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-orange" > 复核</a>',
+							+'</div>'
+						].join('');
+					}else{
+						return[''].join('');
+					}
+				}else{
+					return[''].join('');
+				}
+			}else{
+				return[''].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/checkArmorForMaterials/list';
+					}
+				});
+			}
+			top.layer.close(index);
+		});
+		return false;
+	}
+
+	function openDialogWork1(title,url,width,height,target){
+		top.layer.open({
+			type: 2,
+			area: [width, height],
+			title: title,
+			maxmin: true, //开启最大化最小化按钮
+			content: url ,
+			btn: ['关闭'],
+			end:function(index){
+				top.layer.close(index)
+			}
+		});
+	}
+</script>
+</body>
+</html>

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

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-    <title>索赔管理</title>
+    <title>索赔审核</title>
     <meta name="decorator" content="default"/>
     <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
     <style>
@@ -166,7 +166,10 @@
                     <li><a href="${ctx}/project/checkDesign/list">设计变更复核</a></li>
                     <li><a href="${ctx}/project/checkVisa/list">现场签证复核</a></li>
                     <li class="active"><a href="${ctx}/project/checkClaim/list">索赔复核</a></li>
-                    <li><a href="${ctx}/project/checkDistributionSettlement/list">分布结算复核</a></li>
+                    <li><a href="${ctx}/project/checkDistributionSettlement/list">分部结算复核</a></li>
+                    <li><a href="${ctx}/project/checkConcealProject/list">隐蔽工程量</a></li>
+                    <li><a href="${ctx}/project/checkMaterial/list">暂定材料价</a></li>
+                    <li><a href="${ctx}/project/checkArmorForMaterials/list">甲供物资审核</a></li>
                 </ul>
             </div>
             <div class="layui-row contentShadow shadowLR" id="queryDiv">
@@ -277,7 +280,7 @@
                 page: false,
                 cols: [[
                     {type: 'numbers', align:'center', title: '序号' ,width:80},
-                    {field: 'cnumber', title: '项目编号/合同编号',templet:function(d){
+                    {field: 'cnumber', title: '项目编号/合同编号/索赔复核报告号',templet:function(d){
                             if(d.condition ==1){
                                 return "<font>"+d.cnumber+"</font>";
                             }else if(d.condition ==2){
@@ -292,7 +295,7 @@
                             }else if(d.condition ==2){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=claim&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"&reportId="+d.reportId+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=claim&flag=view&reportType=${reportType}&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&projectReportData.id="+d.reportId+"','95%', '95%')\">" + d.contractName + "</a>";
                             }
                         }},
                     {field: 'reportName', align:'center', title: '成果文件名称',templet:function(d){
@@ -301,7 +304,7 @@
                             }else if(d.condition ==2){
                                 return  "";
                             }else if(d.condition ==3){
-                                return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=according&dictType=&id="+d.contentPId+"&parentIds="+d.parentIds+"&infoId="+d.id+"&reportId="+d.reportId+"','95%', '95%')\">" + d.number + "</a>";
+                                return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=claim&flag=view&reportType=${reportType}&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&projectReportData.id="+d.reportId+"','95%', '95%')\">" + d.number + "</a>";
                             }else{
                                 return "";
                             }
@@ -361,26 +364,26 @@
 
         function complain(d){//操作中显示的内容
             if(d.condition ==1) {
-                return [
-                    '',
-                ].join('');
-            } else if(d.condition ==2) {
                 if(1 == d.operationSign) {
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs  layui-bg-orange" >  领取报告号</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.id+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs  layui-bg-orange" >  领取报告号</a>',
 
                         +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');
                 }
+            } else if(d.condition ==2) {
+                return [
+                    '',
+                ].join('');
             } else if (d.condition ==3){
                 if(d.status == 1){
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=claim&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=claim&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
 
                         +'</div>'
                     ].join('');
@@ -394,16 +397,16 @@
                 }else if(d.status == 3){
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" >修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red">删除</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=claim&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" >修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=claim&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red">删除</a>',
 
                         +'</div>'
                     ].join('');
                 }else if(d.status == 4){
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=according&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs " > 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=claim&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs " > 修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=claim&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
 
                         +'</div>'
                     ].join('');
@@ -458,7 +461,7 @@
             skin: 'three-btns',
             maxmin: true, //开启最大化最小化按钮
             content: url ,
-            btn: ['提交','暂存','关闭'],
+            btn: ['送审','暂存','关闭'],
             btn1: function(index, layero){
                 var body = top.layer.getChildFrame('body', index);
                 var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
@@ -552,7 +555,7 @@
                             parent.layer.msg(data.msg,{icon:2});
                         }
                         //parent.refreshTrees();
-                        location = '${ctx}/project/projectClaim/list';
+                        location = '${ctx}/project/checkClaim/list';
                     }
                 });
             }

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

@@ -0,0 +1,596 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>隐蔽工程量信息</title>
+	<meta name="decorator" content="default"/>
+    <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%--<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) {
+                }
+            });
+        }
+	</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="list-form-tab contentShadow shadowLTR" id="tabDiv">
+				<ul class="list-tabs" >
+					<li><a href="${ctx}/project/checkInterimPayment/list">工程进度款复核</a></li>
+					<li><a href="${ctx}/project/checkDesign/list">设计变更复核</a></li>
+					<li><a href="${ctx}/project/checkVisa/list">现场签证复核</a></li>
+					<li><a href="${ctx}/project/checkClaim/list">索赔复核</a></li>
+					<li><a href="${ctx}/project/checkDistributionSettlement/list">分部结算复核</a></li>
+					<li class="active"><a href="${ctx}/project/checkConcealProject/list">隐蔽工程量</a></li>
+					<li><a href="${ctx}/project/checkMaterial/list">暂定材料价</a></li>
+					<li><a href="${ctx}/project/checkArmorForMaterials/list">甲供物资审核</a></li>
+				</ul>
+			</div>
+			<div class="layui-row contentShadow shadowLR" id="queryDiv">
+				<form:form id="searchForm" modelAttribute="constructionContract" action="${ctx}/project/checkConcealProject/" 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">
+								<form:input path="projectName" 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">
+								<form:input path="contractName" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item athird">
+							<div class="input-group">
+<%--								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn  layui-btn-sm" onclick="resetSearch()">重置</button>
+								</div>
+<%--								<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 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">
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<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 contractName = $("#contractName").val();
+        	if(undefined == contractName){
+				contractName = "";
+			}
+        	var projectName = $("#projectName").val();
+        	if(undefined == projectName){
+				projectName = "";
+			}
+            layer.load(2);
+            treetable.render({
+                treeColIndex: 1,//树形图标显示在第几列
+                treeSpid: 0,//最上级的父级id
+                treeIdName: 'permissionId',//id字段的名称
+                treePidName: 'pid',//pid字段的名称
+                treeDefaultClose: true,//是否默认折叠
+                treeLinkage: true,//父级展开时是否自动展开所有子级
+                elem: '#permissionTable',
+                url: '${ctx}/project/checkConcealProject/getProjectList?pageNo=${page.pageNo}&pageSize=${page.pageSize}&contractName='+contractName+'&projectName='+projectName,
+                page: false,
+				cols: [[
+					{type: 'numbers', align:'center', title: '序号' ,width:80},
+					{field: 'cnumber', title: '项目编号/合同编号/隐蔽工程量报告号',templet:function(d){
+							if(d.condition ==1){
+								return "<font>"+d.cnumber+"</font>";
+							}else if(d.condition ==2){
+								return "<font>"+d.cnumber+"</font>";
+							}else{
+								return "<font>"+d.cnumber+"</font>";
+							}
+						}},
+					{field: 'contractName',align:'center', title: '项目名称/实施合同名称/隐蔽工程量名称',templet:function(d){
+							if(d.condition ==1){
+								return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/project/projectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.contractName + "</a>";
+							}else if(d.condition ==2){
+								return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
+							}else{
+								return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=checkConceal&flag=view&reportType=${reportType}&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&projectReportData.id="+d.reportId+"','95%', '95%')\">" + d.contractName + "</a>";
+							}
+						}},
+					{field: 'reportName', align:'center', title: '成果文件名称',templet:function(d){
+							if(d.condition ==1){
+								return  "";
+							}else if(d.condition ==2){
+								return  "";
+							}else if(d.condition ==3){
+								return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=checkConceal&flag=view&reportType=${reportType}&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&projectReportData.id="+d.reportId+"','95%', '95%')\">" + d.number + "</a>";
+							}else{
+								return "";
+							}
+						}},
+					{field: 'date', align:'center', title: '创建日期',width:100,templet: function(d){
+							var date=d.createDate;
+							if(d.condition ==1){
+								return "";
+							}else if(d.condition ==2){
+								return "";
+							}else{
+								return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
+							}
+						}},
+					{align:'center', title: '状态',  width:70,templet:function(d){
+							var st = getAuditState(""+d.projectStatus);
+							if(d.condition ==1){
+								return "";
+							}else if(d.condition ==2){
+								return "";
+							}else if(d.condition ==3){
+								st = getAuditState(""+d.status);
+								if(st.action)
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + d.id + "&projectReportData.id="+ d.reportId + "&type="+d.status+"','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 '';
+							}
+						}},
+					{templet: complain, align:'center', title: '操作',width:130}
+				]],
+                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){//操作中显示的内容
+			if(d.condition ==1) {
+				if(1 == d.operationSign) {
+					return [
+						'<div class=\"layui-btn-group\">'+
+						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.id+'\',\'60%\',\'95%\',false,\'inputForm\')" class="layui-btn layui-btn-xs  layui-bg-orange" > 领取报告号</a>',
+						+'</div>'
+					].join('');
+				}else{
+					return[''].join('');
+				}
+			} else if (d.condition ==2){
+				return [
+					'',
+				].join('');
+			} else if (d.condition ==3){
+				if(1 == d.operationSign) {
+					if(d.status == 1){
+						return [
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=checkConceal&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=checkConceal&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+							+'</div>'
+						].join('');
+					}else if(d.status == 2){
+						return [
+							'<div class=\"layui-btn-group\">'+
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 撤回</a>',
+
+							+'</div>'
+						].join('');
+					}else if(d.status == 3){
+						return [
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=checkConceal&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=checkConceal&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+							+'</div>'
+						].join('');
+					}else if(d.status == 4){
+						return [
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=checkConceal&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=checkConceal&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+							+'</div>'
+
+						].join('');
+					}else if(d.status == 5){
+						return [''].join('');
+					}else if(d.status == null || d.status == '' || d.status == 10){
+						return [
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=checkConceal&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-orange" > 复核</a>',
+							+'</div>'
+						].join('');
+					}else{
+						return[''].join('');
+					}
+				}else{
+					return[''].join('');
+				}
+			}else{
+				return[''].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/checkConcealProject/list';
+					}
+				});
+			}
+			top.layer.close(index);
+		});
+		return false;
+	}
+
+	function openDialogWork1(title,url,width,height,target){
+		top.layer.open({
+			type: 2,
+			area: [width, height],
+			title: title,
+			maxmin: true, //开启最大化最小化按钮
+			content: url ,
+			btn: ['关闭'],
+			end:function(index){
+				top.layer.close(index)
+			}
+		});
+	}
+</script>
+</body>
+</html>

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

@@ -167,7 +167,10 @@
                     <li class="active"><a href="${ctx}/project/checkDesign/list">设计变更复核</a></li>
                     <li><a href="${ctx}/project/checkVisa/list">现场签证复核</a></li>
                     <li><a href="${ctx}/project/checkClaim/list">索赔复核</a></li>
-                    <li><a href="${ctx}/project/checkDistributionSettlement/list">分布结算复核</a></li>
+                    <li><a href="${ctx}/project/checkDistributionSettlement/list">分部结算复核</a></li>
+                    <li><a href="${ctx}/project/checkConcealProject/list">隐蔽工程量</a></li>
+                    <li><a href="${ctx}/project/checkMaterial/list">暂定材料价</a></li>
+                    <li><a href="${ctx}/project/checkArmorForMaterials/list">甲供物资审核</a></li>
                 </ul>
             </div>
             <div class="layui-row contentShadow shadowLR" id="queryDiv">
@@ -279,7 +282,7 @@
                 page: false,
                 cols: [[
                     {type: 'numbers', align:'center', title: '序号' ,width:80},
-                    {field: 'cnumber', title: '项目编号/合同编号',templet:function(d){
+                    {field: 'cnumber', title: '项目编号/合同编号/设计变更报告号',templet:function(d){
                             if(d.condition ==1){
                                 return "<font>"+d.cnumber+"</font>";
                             }else if(d.condition ==2){
@@ -294,7 +297,7 @@
                             }else if(d.condition ==2){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=design&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"&reportId="+d.reportId+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=design&flag=view&reportType=${reportType}&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&projectReportData.id="+d.reportId+"','95%', '95%')\">" + d.contractName + "</a>";
                             }
                         }},
                     {field: 'reportName', align:'center', title: '成果文件名称',templet:function(d){
@@ -303,7 +306,7 @@
                             }else if(d.condition ==2){
                                 return  "";
                             }else if(d.condition ==3){
-                                return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=according&dictType=&id="+d.contentPId+"&parentIds="+d.parentIds+"&infoId="+d.id+"&reportId="+d.reportId+"','95%', '95%')\">" + d.number + "</a>";
+                                return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=design&flag=view&reportType=${reportType}&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&projectReportData.id="+d.reportId+"','95%', '95%')\">" + d.number + "</a>";
                             }else{
                                 return "";
                             }
@@ -363,25 +366,25 @@
 
         function complain(d){//操作中显示的内容
             if(d.condition ==1) {
-                return [
-                    '',
-                ].join('');
-            } else if(d.condition ==2) {
                 if(1 == d.operationSign) {
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs layui-bg-orange" > 领取报告号</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.id+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs layui-bg-orange" > 领取报告号</a>',
                         +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');
                 }
+            } else if(d.condition ==2) {
+                return [
+                    '',
+                ].join('');
             } else if (d.condition ==3){
                 if(d.status == 1){
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=design&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=design&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
                         +'</div>'
                     ].join('');
                 }else if(d.status == 2){
@@ -394,15 +397,15 @@
                 }else if(d.status == 3){
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=design&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=design&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
                         +'</div>'
                     ].join('');
                 }else if(d.status == 4){
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=according&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=design&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=design&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
 
                         +'</div>'
                     ].join('');
@@ -455,7 +458,7 @@
             skin: 'three-btns',
             maxmin: true, //开启最大化最小化按钮
             content: url ,
-            btn: ['提交','暂存','关闭'],
+            btn: ['送审','暂存','关闭'],
             btn1: function(index, layero){
                 var body = top.layer.getChildFrame('body', index);
                 var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
@@ -549,7 +552,7 @@
                             parent.layer.msg(data.msg,{icon:2});
                         }
                         //parent.refreshTrees();
-                        location = '${ctx}/project/projectDesignChange/list';
+                        location = '${ctx}/project/checkDesign/list';
                     }
                 });
             }

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

@@ -166,7 +166,10 @@
                     <li><a href="${ctx}/project/checkDesign/list">设计变更复核</a></li>
                     <li><a href="${ctx}/project/checkVisa/list">现场签证复核</a></li>
                     <li><a href="${ctx}/project/checkClaim/list">索赔复核</a></li>
-                    <li class="active"><a href="${ctx}/project/checkDistributionSettlement/list">分布结算复核</a></li>
+                    <li class="active"><a href="${ctx}/project/checkDistributionSettlement/list">分部结算复核</a></li>
+                    <li><a href="${ctx}/project/checkConcealProject/list">隐蔽工程量</a></li>
+                    <li><a href="${ctx}/project/checkMaterial/list">暂定材料价</a></li>
+                    <li><a href="${ctx}/project/checkArmorForMaterials/list">甲供物资审核</a></li>
                 </ul>
             </div>
             <div class="layui-row contentShadow shadowLR" id="queryDiv">
@@ -277,7 +280,7 @@
                 page: false,
                 cols: [[
                     {type: 'numbers', align:'center', title: '序号' ,width:80},
-                    {field: 'cnumber', title: '项目编号/合同编号',templet:function(d){
+                    {field: 'cnumber', title: '项目编号/合同编号/分部结算报告号',templet:function(d){
                             if(d.condition ==1){
                                 return "<font>"+d.cnumber+"</font>";
                             }else if(d.condition ==2){
@@ -286,13 +289,13 @@
                                 return "<font>"+d.cnumber+"</font>";
                             }
                         }},
-                    {field: 'contractName',align:'center', title: '项目名称/合同名称/分布结算信息名称',templet:function(d){
+                    {field: 'contractName',align:'center', title: '项目名称/合同名称/分部结算信息名称',templet:function(d){
                             if(d.condition ==1){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/project/projectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else if(d.condition ==2){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=distribution&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"&reportId="+d.reportId+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=distribution&flag=view&reportType=${reportType}&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&projectReportData.id="+d.reportId+"','95%', '95%')\">" + d.contractName + "</a>";
                             }
                         }},
                     {field: 'reportName', align:'center', title: '成果文件名称',templet:function(d){
@@ -301,7 +304,7 @@
                             }else if(d.condition ==2){
                                 return  "";
                             }else if(d.condition ==3){
-                                return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看成果文件', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=according&dictType=&id="+d.contentPId+"&parentIds="+d.parentIds+"&infoId="+d.id+"&reportId="+d.reportId+"','95%', '95%')\">" + d.number + "</a>";
+                                return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=distribution&flag=view&reportType=${reportType}&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&projectReportData.id="+d.reportId+"','95%', '95%')\">" + d.number + "</a>";
                             }else{
                                 return "";
                             }
@@ -359,26 +362,26 @@
 
         function complain(d){//操作中显示的内容
             if(d.condition ==1) {
-                return [
-                    '',
-                ].join('');
-            } else if(d.condition ==2) {
                 if(1 == d.operationSign) {
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs  layui-bg-orange" > 领取报告号</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.id+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs  layui-bg-orange" > 领取报告号</a>',
 
                         +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');
                 }
+            } else if(d.condition ==2) {
+                return [
+                    '',
+                ].join('');
             } else if (d.condition ==3){
                 if(d.status == 1){
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" >  修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red">  删除</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=distribution&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" >  修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=distribution&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red">  删除</a>',
 
                         +'</div>'
                     ].join('');
@@ -392,16 +395,16 @@
                 }else if(d.status == 3){
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs " > 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=distribution&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs " > 修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=distribution&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
 
                         +'</div>'
                     ].join('');
                 }else if(d.status == 4){
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=according&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class=" layui-btn layui-btn-xs " >  修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=distribution&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class=" layui-btn layui-btn-xs " >  修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=distribution&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
 
                         +'</div>'
                     ].join('');
@@ -455,7 +458,7 @@
             skin: 'three-btns',
             maxmin: true, //开启最大化最小化按钮
             content: url ,
-            btn: ['提交','暂存','关闭'],
+            btn: ['送审','暂存','关闭'],
             btn1: function(index, layero){
                 var body = top.layer.getChildFrame('body', index);
                 var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();

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

@@ -203,7 +203,10 @@
 					<li><a href="${ctx}/project/checkDesign/list">设计变更复核</a></li>
 					<li><a href="${ctx}/project/checkVisa/list">现场签证复核</a></li>
 					<li><a href="${ctx}/project/checkClaim/list">索赔复核</a></li>
-					<li><a href="${ctx}/project/checkDistributionSettlement/list">分布结算复核</a></li>
+					<li><a href="${ctx}/project/checkDistributionSettlement/list">分部结算复核</a></li>
+					<li><a href="${ctx}/project/checkConcealProject/list">隐蔽工程量</a></li>
+					<li><a href="${ctx}/project/checkMaterial/list">暂定材料价</a></li>
+					<li><a href="${ctx}/project/checkArmorForMaterials/list">甲供物资审核</a></li>
 				</ul>
 			</div>
 			<div class="layui-row contentShadow shadowLR" id="queryDiv">
@@ -316,7 +319,7 @@
                 page: false,
 				cols: [[
 					{type: 'numbers', align:'center', title: '序号' ,width:80},
-					{field: 'cnumber', title: '项目编号/实施合同编号',templet:function(d){
+					{field: 'cnumber', title: '项目编号/合同编号/工程进度款报告号',templet:function(d){
 							if(d.condition ==1){
 								return "<font>"+d.cnumber+"</font>";
 							}else if(d.condition ==2){
@@ -331,7 +334,7 @@
 							}else if(d.condition ==2){
 								return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
 							}else{
-								return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"&reportId="+d.reportId+"','95%', '95%')\">" + d.contractName + "</a>";
+								return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=interim&flag=view&reportType=${reportType}&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&projectReportData.id="+d.reportId+"','95%', '95%')\">" + d.contractName + "</a>";
 							}
 						}},
 					{field: 'reportName', align:'center', title: '成果文件名称',templet:function(d){
@@ -340,7 +343,7 @@
 							}else if(d.condition ==2){
 								return  "";
 							}else if(d.condition ==3){
-								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=according&dictType=&id="+d.contentPId+"&parentIds="+d.parentIds+"&infoId="+d.id+"&reportId="+d.reportId+"','95%', '95%')\">" + d.number + "</a>";
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=interim&flag=view&reportType=${reportType}&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&projectReportData.id="+d.reportId+"','95%', '95%')\">" + d.number + "</a>";
 							}else{
 								return "";
 							}
@@ -398,27 +401,26 @@
 
         function complain(d){//操作中显示的内容
 			if(d.condition ==1) {
-					return [
-						'',
-					].join('');
-			} else if (d.condition ==2){
-
 				if(1 == d.operationSign) {
 					return [
 						'<div class=\"layui-btn-group\">'+
-						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" class="layui-btn layui-btn-xs  layui-bg-orange" > 领取报告号</a>',
+						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.id+'\',\'60%\',\'95%\',false,\'inputForm\')" class="layui-btn layui-btn-xs  layui-bg-orange" > 领取报告号</a>',
 						+'</div>'
 					].join('');
 				}else{
 					return[''].join('');
 				}
+			} else if (d.condition ==2){
+				return [
+					'',
+				].join('');
 			} else if (d.condition ==3){
 				if(1 == d.operationSign) {
 					if(d.status == 1){
 						return [
 							'<div class=\"layui-btn-group\">'+
-							'<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>',
-							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+							'<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=interim&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=interim&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
 
 							+'</div>'
 						].join('');
@@ -432,16 +434,16 @@
 					}else if(d.status == 3){
 						return [
 							'<div class=\"layui-btn-group\">'+
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>',
-							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=interim&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=interim&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
 
 							+'</div>'
 						].join('');
 					}else if(d.status == 4){
 						return [
 							'<div class=\"layui-btn-group\">'+
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=according&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>',
-							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=interim&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=interim&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
 							+'</div>'
 
 						].join('');
@@ -494,7 +496,7 @@
 			skin: 'three-btns',
 			maxmin: true, //开启最大化最小化按钮
 			content: url ,
-			btn: ['提交','暂存','关闭'],
+			btn: ['送审','暂存','关闭'],
 			btn1: function(index, layero){
 				var body = top.layer.getChildFrame('body', index);
 				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
@@ -587,7 +589,7 @@
 							parent.layer.msg(data.msg,{icon:2});
 						}
 						//parent.refreshTrees();
-						location = '${ctx}/project/projectEarlyReview/list';
+						location = '${ctx}/project/checkInterimPayment/list';
 					}
 				});
 			}

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

@@ -0,0 +1,596 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>隐蔽工程量信息</title>
+	<meta name="decorator" content="default"/>
+    <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%--<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) {
+                }
+            });
+        }
+	</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="list-form-tab contentShadow shadowLTR" id="tabDiv">
+				<ul class="list-tabs" >
+					<li><a href="${ctx}/project/checkInterimPayment/list">工程进度款复核</a></li>
+					<li><a href="${ctx}/project/checkDesign/list">设计变更复核</a></li>
+					<li><a href="${ctx}/project/checkVisa/list">现场签证复核</a></li>
+					<li><a href="${ctx}/project/checkClaim/list">索赔复核</a></li>
+					<li><a href="${ctx}/project/checkDistributionSettlement/list">分部结算复核</a></li>
+					<li><a href="${ctx}/project/checkConcealProject/list">隐蔽工程量</a></li>
+					<li class="active"><a href="${ctx}/project/checkMaterial/list">暂定材料价</a></li>
+					<li><a href="${ctx}/project/checkArmorForMaterials/list">甲供物资审核</a></li>
+				</ul>
+			</div>
+			<div class="layui-row contentShadow shadowLR" id="queryDiv">
+				<form:form id="searchForm" modelAttribute="constructionContract" action="${ctx}/project/checkMaterial/" 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">
+								<form:input path="projectName" 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">
+								<form:input path="contractName" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item athird">
+							<div class="input-group">
+<%--								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn  layui-btn-sm" onclick="resetSearch()">重置</button>
+								</div>
+<%--								<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 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">
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<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 contractName = $("#contractName").val();
+        	if(undefined == contractName){
+				contractName = "";
+			}
+        	var projectName = $("#projectName").val();
+        	if(undefined == projectName){
+				projectName = "";
+			}
+            layer.load(2);
+            treetable.render({
+                treeColIndex: 1,//树形图标显示在第几列
+                treeSpid: 0,//最上级的父级id
+                treeIdName: 'permissionId',//id字段的名称
+                treePidName: 'pid',//pid字段的名称
+                treeDefaultClose: true,//是否默认折叠
+                treeLinkage: true,//父级展开时是否自动展开所有子级
+                elem: '#permissionTable',
+                url: '${ctx}/project/checkMaterial/getProjectList?pageNo=${page.pageNo}&pageSize=${page.pageSize}&contractName='+contractName+'&projectName='+projectName,
+                page: false,
+				cols: [[
+					{type: 'numbers', align:'center', title: '序号' ,width:80},
+					{field: 'cnumber', title: '项目编号/合同编号/暂定材料价报告号',templet:function(d){
+							if(d.condition ==1){
+								return "<font>"+d.cnumber+"</font>";
+							}else if(d.condition ==2){
+								return "<font>"+d.cnumber+"</font>";
+							}else{
+								return "<font>"+d.cnumber+"</font>";
+							}
+						}},
+					{field: 'contractName',align:'center', title: '项目名称/实施合同名称/暂定材料价名称',templet:function(d){
+							if(d.condition ==1){
+								return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/project/projectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.contractName + "</a>";
+							}else if(d.condition ==2){
+								return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
+							}else{
+								return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=checkMaterial&flag=view&reportType=${reportType}&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&projectReportData.id="+d.reportId+"','95%', '95%')\">" + d.contractName + "</a>";
+							}
+						}},
+					{field: 'reportName', align:'center', title: '成果文件名称',templet:function(d){
+							if(d.condition ==1){
+								return  "";
+							}else if(d.condition ==2){
+								return  "";
+							}else if(d.condition ==3){
+								return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=checkMaterial&flag=view&reportType=${reportType}&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&projectReportData.id="+d.reportId+"','95%', '95%')\">" + d.number + "</a>";
+							}else{
+								return "";
+							}
+						}},
+					{field: 'date', align:'center', title: '创建日期',width:100,templet: function(d){
+							var date=d.createDate;
+							if(d.condition ==1){
+								return "";
+							}else if(d.condition ==2){
+								return "";
+							}else{
+								return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
+							}
+						}},
+					{align:'center', title: '状态',  width:70,templet:function(d){
+							var st = getAuditState(""+d.projectStatus);
+							if(d.condition ==1){
+								return "";
+							}else if(d.condition ==2){
+								return "";
+							}else if(d.condition ==3){
+								st = getAuditState(""+d.status);
+								if(st.action)
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + d.id + "&projectReportData.id="+ d.reportId + "&type="+d.status+"','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 '';
+							}
+						}},
+					{templet: complain, align:'center', title: '操作',width:130}
+				]],
+                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){//操作中显示的内容
+			if(d.condition ==1) {
+				if(1 == d.operationSign) {
+					return [
+						'<div class=\"layui-btn-group\">'+
+						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.id+'\',\'60%\',\'95%\',false,\'inputForm\')" class="layui-btn layui-btn-xs  layui-bg-orange" > 领取报告号</a>',
+						+'</div>'
+					].join('');
+				}else{
+					return[''].join('');
+				}
+			} else if (d.condition ==2){
+				return [
+					'',
+				].join('');
+			} else if (d.condition ==3){
+				if(1 == d.operationSign) {
+					if(d.status == 1){
+						return [
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=checkMaterial&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=checkMaterial&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+							+'</div>'
+						].join('');
+					}else if(d.status == 2){
+						return [
+							'<div class=\"layui-btn-group\">'+
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 撤回</a>',
+
+							+'</div>'
+						].join('');
+					}else if(d.status == 3){
+						return [
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=checkMaterial&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=checkMaterial&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+							+'</div>'
+						].join('');
+					}else if(d.status == 4){
+						return [
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=checkMaterial&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=checkMaterial&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+							+'</div>'
+
+						].join('');
+					}else if(d.status == 5){
+						return [''].join('');
+					}else if(d.status == null || d.status == '' || d.status == 10){
+						return [
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=checkMaterial&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-orange" > 复核</a>',
+							+'</div>'
+						].join('');
+					}else{
+						return[''].join('');
+					}
+				}else{
+					return[''].join('');
+				}
+			}else{
+				return[''].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/checkMaterial/list';
+					}
+				});
+			}
+			top.layer.close(index);
+		});
+		return false;
+	}
+
+	function openDialogWork1(title,url,width,height,target){
+		top.layer.open({
+			type: 2,
+			area: [width, height],
+			title: title,
+			maxmin: true, //开启最大化最小化按钮
+			content: url ,
+			btn: ['关闭'],
+			end:function(index){
+				top.layer.close(index)
+			}
+		});
+	}
+</script>
+</body>
+</html>

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

@@ -167,7 +167,10 @@
                     <li><a href="${ctx}/project/checkDesign/list">设计变更复核</a></li>
                     <li class="active"><a href="${ctx}/project/checkVisa/list">现场签证复核</a></li>
                     <li><a href="${ctx}/project/checkClaim/list">索赔复核</a></li>
-                    <li><a href="${ctx}/project/checkDistributionSettlement/list">分布结算复核</a></li>
+                    <li><a href="${ctx}/project/checkDistributionSettlement/list">分部结算复核</a></li>
+                    <li><a href="${ctx}/project/checkConcealProject/list">隐蔽工程量</a></li>
+                    <li><a href="${ctx}/project/checkMaterial/list">暂定材料价</a></li>
+                    <li><a href="${ctx}/project/checkArmorForMaterials/list">甲供物资审核</a></li>
                 </ul>
             </div>
             <div class="layui-row contentShadow shadowLR" id="queryDiv">
@@ -279,7 +282,7 @@
                 page: false,
                 cols: [[
                     {type: 'numbers', align:'center', title: '序号' ,width:80},
-                    {field: 'cnumber', title: '项目编号/合同编号',templet:function(d){
+                    {field: 'cnumber', title: '项目编号/合同编号/现场签证报告号',templet:function(d){
                             if(d.condition ==1){
                                 return "<font>"+d.cnumber+"</font>";
                             }else if(d.condition ==2){
@@ -294,7 +297,7 @@
                             }else if(d.condition ==2){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=visa&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"&reportId="+d.reportId+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=visa&flag=view&reportType=${reportType}&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&projectReportData.id="+d.reportId+"','95%', '95%')\">" + d.contractName + "</a>";
                             }
                         }},
                     {field: 'reportName', align:'center', title: '成果文件名称',templet:function(d){
@@ -303,7 +306,7 @@
                             }else if(d.condition ==2){
                                 return  "";
                             }else if(d.condition ==3){
-                                return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=according&dictType=&id="+d.contentPId+"&parentIds="+d.parentIds+"&infoId="+d.id+"&reportId="+d.reportId+"','95%', '95%')\">" + d.number + "</a>";
+                                return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=visa&flag=view&reportType=${reportType}&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&projectReportData.id="+d.reportId+"','95%', '95%')\">" + d.number + "</a>";
                             }else{
                                 return "";
                             }
@@ -362,26 +365,26 @@
 
         function complain(d){//操作中显示的内容
             if(d.condition ==1) {
-                return [
-                    '',
-                ].join('');
-            } else if(d.condition ==2) {
                 if(1 == d.operationSign) {
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs layui-bg-orange" > 领取报告号</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.id+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs layui-bg-orange" > 领取报告号</a>',
 
                         +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');
                 }
+            } else if(d.condition ==2) {
+                return [
+                    '',
+                ].join('');
             } else if (d.condition ==3){
                 if(d.status == 1){
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=visa&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=visa&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
 
                         +'</div>'
                     ].join('');
@@ -395,16 +398,16 @@
                 }else if(d.status == 3){
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=visa&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=visa&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
 
                         +'</div>'
                     ].join('');
                 }else if(d.status == 4){
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=according&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=visa&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=visa&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
 
                         +'</div>'
                     ].join('');
@@ -458,7 +461,7 @@
             skin: 'three-btns',
             maxmin: true, //开启最大化最小化按钮
             content: url ,
-            btn: ['提交','暂存','关闭'],
+            btn: ['送审','暂存','关闭'],
             btn1: function(index, layero){
                 var body = top.layer.getChildFrame('body', index);
                 var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();

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

@@ -214,13 +214,14 @@
 					}
 				}
 			});
-			changeContentDetail("${projectContentDataType}");
 			var tp = "${projectcontentinfo.dictType}";
 			var tp2 = "${projectContentDataId}"
 			if((tp!=null && tp!='')||(tp2!=null && tp2!='')){
 				$(document.getElementById("projectContentData.type")).attr("disabled","disabled");
 			}
 			initControlData("1");
+			window.setTimeout("changeContentDetail(\"${projectContentDataType}\")",100);
+
 		});
 		function getNowFormatDate() {
 			var date = new Date();
@@ -506,6 +507,7 @@
             })
         }
 		function changeContentDetail(obj) {
+			console.log(123123)
 			contentDetailTypeShow(obj);
 			$("#contentDetailTypeDiv").show();
 			$("#projectContentDataSign").val(obj);
@@ -1241,7 +1243,6 @@
                         });
                     }
                     function delRowBaseData(obj, prefix,userId){
-						console.log(${projectcontentinfo});
                         var id = $(prefix+"_id").val();
                         /* var createBy = $(prefix+"_userId").val();*/
                         var currentUser = '${fns:getUser().id}';

src/main/webapp/webpage/modules/projectrecord/claim/projectClaimList.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-    <title>索赔管理</title>
+    <title>索赔审核</title>
     <meta name="decorator" content="default"/>
     <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
     <style>
@@ -362,6 +362,7 @@
                         return [
                             '<div class=\"layui-btn-group\">'+
                             '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改索赔信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=claim&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'&project.overallProjectTypeId='+$("#overallProjectTypeId").val()+'\',\'95%\',\'95%\')" class=" layui-btn layui-btn-xs" > 编辑</a>',
+                            '<a href="javascript:void(0)" onclick="confirmDelete(\'确认要删除该索赔审核信息吗\', \'${ctx}/projectcontentinfo/projectcontentinfo/deleteOverallProcessContentById?infoId='+d.id+'\')" class="layui-btn layui-btn-xs layui-bg-red" > 删除</a>',
                             '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
                             +'</div>'
                         ].join('');

src/main/webapp/webpage/modules/projectrecord/concealProject/concealProjectList.jsp

@@ -339,12 +339,17 @@
                 }
             } else if (d.condition ==3){
                 if(1 == d.operationSign) {
-                    return [
-                        '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改隐蔽工程量信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=conceal&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'&project.overallProjectTypeId='+$("#overallProjectTypeId").val()+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
-                        '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
-                        +'</div>'
-                    ].join('');
+                    if(d.status =="10"){
+                        return [
+                            '<div class=\"layui-btn-group\">'+
+                            '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改隐蔽工程量信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=conceal&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'&project.overallProjectTypeId='+$("#overallProjectTypeId").val()+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
+                            '<a href="javascript:void(0)" onclick="confirmDelete(\'确认要删除该隐蔽工程量信息吗\', \'${ctx}/projectcontentinfo/projectcontentinfo/deleteOverallProcessContentById?infoId='+d.id+'\')" class="layui-btn layui-btn-xs layui-bg-red" > 删除</a>',
+                            '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
+                            +'</div>'
+                        ].join('');
+                    }else{
+                        return[''].join('');
+                    }
                 }else{
                     return[''].join('');
                 }

src/main/webapp/webpage/modules/projectrecord/contractMaterial/materialList.jsp

@@ -285,7 +285,7 @@
                             }else if(d.condition ==2){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看隐蔽工程量信息', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=material&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&project.overallProjectTypeId=${overallProjectTypeId}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看暂定材料价信息', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=material&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&project.overallProjectTypeId=${overallProjectTypeId}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
                             }
                         }},
                     {field: 'date', align:'center', title: '创建日期',width:100,templet: function(d){
@@ -339,12 +339,17 @@
                 }
             } else if (d.condition ==3){
                 if(1 == d.operationSign) {
-                    return [
-                        '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改隐蔽工程量信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=material&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'&project.overallProjectTypeId='+$("#overallProjectTypeId").val()+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
-                        '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
-                        +'</div>'
-                    ].join('');
+                    if(d.status =="10"){
+                        return [
+                            '<div class=\"layui-btn-group\">'+
+                            '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改暂定材料价信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=material&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'&project.overallProjectTypeId='+$("#overallProjectTypeId").val()+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
+                            '<a href="javascript:void(0)" onclick="confirmDelete(\'确认要删除该暂定材料价信息吗\', \'${ctx}/projectcontentinfo/projectcontentinfo/deleteOverallProcessContentById?infoId='+d.id+'\')" class="layui-btn layui-btn-xs layui-bg-red" > 删除</a>',
+                            '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
+                            +'</div>'
+                        ].join('');
+                    }else{
+                        return[''].join('');
+                    }
                 }else{
                     return[''].join('');
                 }

src/main/webapp/webpage/modules/projectrecord/distributionSettlement/distributionSettlementForm.jsp

@@ -53,7 +53,7 @@
                         var businessReduce = $("#investmentCostList"+i+"_businessReduce").val();
                         var businessRate = $("#investmentCostList"+i+"_businessRate").val();
                         if('' == accountName || ''==contractAccount || '' == submitAccount || '' == setAccount || '' == businessAdd || '' == businessReduce || '' == businessRate){
-                            layer.msg('请填写完分布结算审核单', {icon: 5});
+                            layer.msg('请填写完分部结算审核单', {icon: 5});
                             return false;
                         }
                     }
@@ -761,7 +761,7 @@
                     </div>
                 </div>--%>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>分布结算审核名称：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>分部结算审核名称：</label>
                     <div class="layui-input-block">
                         <form:input path="projectContentData.name" value="${concealProjectInfo.contract.contractName}" htmlEscape="false" class="form-control required layui-input"/>
                     </div>

src/main/webapp/webpage/modules/projectrecord/distributionSettlement/distributionSettlementList.jsp

@@ -278,7 +278,7 @@
                                 return "<font>"+d.cnumber+"</font>";
                             }
                         }},
-                    {field: 'contractName',align:'center', title: '项目名称/合同名称/分布结算信息名称',templet:function(d){
+                    {field: 'contractName',align:'center', title: '项目名称/合同名称/分部结算信息名称',templet:function(d){
                             if(d.condition ==1){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/project/projectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else if(d.condition ==2){
@@ -330,7 +330,7 @@
                 if(1 == d.operationSign) {
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增分布结算信息\', \'${ctx}/project/distributionSettlement/form?project.id='+d.pid+'&contract.id='+d.id+'&projectContentId='+d.projectContentId+'&contract.contractName='+d.contractName+'&project.overallProjectTypeId='+$("#overallProjectTypeId").val()+' \',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-blue" > 新增</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增分部结算信息\', \'${ctx}/project/distributionSettlement/form?project.id='+d.pid+'&contract.id='+d.id+'&projectContentId='+d.projectContentId+'&contract.contractName='+d.contractName+'&project.overallProjectTypeId='+$("#overallProjectTypeId").val()+' \',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-blue" > 新增</a>',
                         +'</div>'
                     ].join('');
                 }else{
@@ -341,8 +341,8 @@
                     if(d.status =="10"){
                         return [
                             '<div class=\"layui-btn-group\">'+
-                            '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改分布结算信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=distribution&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'&project.overallProjectTypeId='+$("#overallProjectTypeId").val()+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs"" > 编辑</a>',
-                            '<a href="javascript:void(0)" onclick="confirmDelete(\'确认要删除该分布结算信息吗\', \'${ctx}/projectcontentinfo/projectcontentinfo/deleteOverallProcessContentById?infoId='+d.id+'\')" class="layui-btn layui-btn-xs layui-bg-red" > 删除</a>',
+                            '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改分部结算信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=distribution&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'&project.overallProjectTypeId='+$("#overallProjectTypeId").val()+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs"" > 编辑</a>',
+                            '<a href="javascript:void(0)" onclick="confirmDelete(\'确认要删除该分部结算信息吗\', \'${ctx}/projectcontentinfo/projectcontentinfo/deleteOverallProcessContentById?infoId='+d.id+'\')" class="layui-btn layui-btn-xs layui-bg-red" > 删除</a>',
                             '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
                             +'</div>'
                         ].join('');
@@ -466,27 +466,6 @@
         });
     }
 
-    function confirmDelete(mess, href){
-        top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
-            //do something
-            if (typeof href == 'function') {
-                href();
-            }else{
-                $.ajax({
-                    url:href,
-                    type:"post",
-                    success:function(data){
-                        if(data.success){
-                            top.layer.msg("删除成功！", {icon: 1});
-                            sortOrRefresh()
-                        }
-                    }
-                });
-            }
-            top.layer.close(index);
-        });
-        return false;
-    }
     // 确认对话框
     function confirmxRefresh(mess, href){
         top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){

src/main/webapp/webpage/modules/projectrecord/distributionSettlement/distributionSettlementView.jsp

@@ -418,7 +418,7 @@
                     </div>
                 </div>--%>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>分布结算审核名称：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>分部结算审核名称：</label>
                     <div class="layui-input-block">
                         <form:input path="projectContentData.name" readonly="true" value="${concealProjectInfo.contract.contractName}" htmlEscape="false" class="form-control required layui-input"/>
                     </div>

src/main/webapp/webpage/modules/projectrecord/implementStage/projectDesignList.jsp

@@ -364,6 +364,7 @@
                         return [
                             '<div class=\"layui-btn-group\">'+
                             '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改设计变更信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=design&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'&project.overallProjectTypeId='+$("#overallProjectTypeId").val()+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green" > 编辑</a>',
+                            '<a href="javascript:void(0)" onclick="confirmDelete(\'确认要删除该设计变更信息吗\', \'${ctx}/projectcontentinfo/projectcontentinfo/deleteOverallProcessContentById?infoId='+d.id+'\')" class="layui-btn layui-btn-xs layui-bg-red" > 删除</a>',
                             '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
                             +'</div>'
                         ].join('');

src/main/webapp/webpage/modules/projectrecord/implementStage/projectInterimPaymentList.jsp

@@ -435,6 +435,7 @@
 						return [
 							'<div class=\"layui-btn-group\">'+
 							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工程进度款信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=interim&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'&project.overallProjectTypeId='+$("#overallProjectTypeId").val()+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green" > 编辑</a>',
+							'<a href="javascript:void(0)" onclick="confirmDelete(\'确认要删除该工程进度款信息吗\', \'${ctx}/projectcontentinfo/projectcontentinfo/deleteOverallProcessContentById?infoId='+d.id+'\')" class="layui-btn layui-btn-xs layui-bg-red" > 删除</a>',
 							'<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
 							/*'<a href="${ctx}/project/projectInterimPayment/deleteInterimPayment?id='+d.id+'" onclick="return confirmx(\'确认要删除该甲供物资信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',*/
 							+'</div>'

src/main/webapp/webpage/modules/projectrecord/implementStage/projectVisaList.jsp

@@ -359,6 +359,7 @@
                     return [
                         '<div class=\"layui-btn-group\">'+
                         '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改签证信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=visa&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'&project.overallProjectTypeId='+$("#overallProjectTypeId").val()+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green" > 编辑</a>',
+                        '<a href="javascript:void(0)" onclick="confirmDelete(\'确认要删除该签证信息吗\', \'${ctx}/projectcontentinfo/projectcontentinfo/deleteOverallProcessContentById?infoId='+d.id+'\')" class="layui-btn layui-btn-xs layui-bg-red" > 删除</a>',
                         '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
                         +'</div>'
                     ].join('');

src/main/webapp/webpage/modules/projectrecord/projectRecordsList.jsp

@@ -434,7 +434,7 @@
 						return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 					}
 					}}
-                ,{field:'projMaster', align:'center',title: '负责人', width:65,templet:function(d){
+                ,{field:'projMaster', align:'center',title: '负责人', width:85,templet:function(d){
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
                     }}
                 ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){

src/main/webapp/webpage/modules/projectrecord/summarizing/armorProjectRecordsList.jsp

@@ -203,7 +203,7 @@
 					<li><a href="${ctx}/project/designSummarizing/list">设计变更汇总表</a></li>
 					<li><a href="${ctx}/project/visaSummarizing/list">现场签证汇总表</a></li>
 					<li><a href="${ctx}/project/claimSummarizing/list">索赔汇总表</a></li>
-					<li><a href="${ctx}/project/distributionSummarizing/list">分布结算汇总表</a></li>
+					<li><a href="${ctx}/project/distributionSummarizing/list">分部结算汇总表</a></li>
 					<li><a href="${ctx}/project/materialSummarizing/list">暂定材料价汇总表</a></li>
 					<li class="active"><a href="${ctx}/project/armorSummarizing/list">甲供物资汇总表</a></li>
 					<li><a href="${ctx}/project/concealSummarizing/list">隐蔽工程量汇总表</a></li>

src/main/webapp/webpage/modules/projectrecord/summarizing/claimSumamarizingProjectRecordsList.jsp

@@ -203,7 +203,7 @@
 					<li><a href="${ctx}/project/designSummarizing/list">设计变更汇总表</a></li>
 					<li><a href="${ctx}/project/visaSummarizing/list">现场签证汇总表</a></li>
 					<li class="active"><a href="${ctx}/project/claimSummarizing/list">索赔汇总表</a></li>
-					<li><a href="${ctx}/project/distributionSummarizing/list">分布结算汇总表</a></li>
+					<li><a href="${ctx}/project/distributionSummarizing/list">分部结算汇总表</a></li>
 					<li><a href="${ctx}/project/materialSummarizing/list">暂定材料价汇总表</a></li>
 					<li><a href="${ctx}/project/armorSummarizing/list">甲供物资汇总表</a></li>
 					<li><a href="${ctx}/project/concealSummarizing/list">隐蔽工程量汇总表</a></li>

src/main/webapp/webpage/modules/projectrecord/summarizing/concealProjectRecordsList.jsp

@@ -203,7 +203,7 @@
 					<li><a href="${ctx}/project/designSummarizing/list">设计变更汇总表</a></li>
 					<li><a href="${ctx}/project/visaSummarizing/list">现场签证汇总表</a></li>
 					<li><a href="${ctx}/project/claimSummarizing/list">索赔汇总表</a></li>
-					<li><a href="${ctx}/project/distributionSummarizing/list">分布结算汇总表</a></li>
+					<li><a href="${ctx}/project/distributionSummarizing/list">分部结算汇总表</a></li>
 					<li><a href="${ctx}/project/materialSummarizing/list">暂定材料价汇总表</a></li>
 					<li><a href="${ctx}/project/armorSummarizing/list">甲供物资汇总表</a></li>
 					<li class="active"><a href="${ctx}/project/concealSummarizing/list">隐蔽工程量汇总表</a></li>

src/main/webapp/webpage/modules/projectrecord/summarizing/designSumamarizingProjectRecordsList.jsp

@@ -203,7 +203,7 @@
 					<li class="active"><a href="${ctx}/project/designSummarizing/list">设计变更汇总表</a></li>
 					<li><a href="${ctx}/project/visaSummarizing/list">现场签证汇总表</a></li>
 					<li><a href="${ctx}/project/claimSummarizing/list">索赔汇总表</a></li>
-					<li><a href="${ctx}/project/distributionSummarizing/list">分布结算汇总表</a></li>
+					<li><a href="${ctx}/project/distributionSummarizing/list">分部结算汇总表</a></li>
 					<li><a href="${ctx}/project/materialSummarizing/list">暂定材料价汇总表</a></li>
 					<li><a href="${ctx}/project/armorSummarizing/list">甲供物资汇总表</a></li>
 					<li><a href="${ctx}/project/concealSummarizing/list">隐蔽工程量汇总表</a></li>

src/main/webapp/webpage/modules/projectrecord/summarizing/distributionSumamarizingProjectRecordsList.jsp

@@ -203,7 +203,7 @@
 					<li><a href="${ctx}/project/designSummarizing/list">设计变更汇总表</a></li>
 					<li><a href="${ctx}/project/visaSummarizing/list">现场签证汇总表</a></li>
 					<li><a href="${ctx}/project/claimSummarizing/list">索赔汇总表</a></li>
-					<li class="active"><a href="${ctx}/project/distributionSummarizing/list">分布结算汇总表</a></li>
+					<li class="active"><a href="${ctx}/project/distributionSummarizing/list">分部结算汇总表</a></li>
 					<li><a href="${ctx}/project/materialSummarizing/list">暂定材料价汇总表</a></li>
 					<li><a href="${ctx}/project/armorSummarizing/list">甲供物资汇总表</a></li>
 					<li><a href="${ctx}/project/concealSummarizing/list">隐蔽工程量汇总表</a></li>

src/main/webapp/webpage/modules/projectrecord/summarizing/materialProjectRecordsList.jsp

@@ -203,7 +203,7 @@
 					<li><a href="${ctx}/project/designSummarizing/list">设计变更汇总表</a></li>
 					<li><a href="${ctx}/project/visaSummarizing/list">现场签证汇总表</a></li>
 					<li><a href="${ctx}/project/claimSummarizing/list">索赔汇总表</a></li>
-					<li><a href="${ctx}/project/distributionSummarizing/list">分布结算汇总表</a></li>
+					<li><a href="${ctx}/project/distributionSummarizing/list">分部结算汇总表</a></li>
 					<li class="active"><a href="${ctx}/project/materialSummarizing/list">暂定材料价汇总表</a></li>
 					<li><a href="${ctx}/project/armorSummarizing/list">甲供物资汇总表</a></li>
 					<li><a href="${ctx}/project/concealSummarizing/list">隐蔽工程量汇总表</a></li>

src/main/webapp/webpage/modules/projectrecord/summarizing/sumamarizingProjectRecordsList.jsp

@@ -203,7 +203,7 @@
 					<li><a href="${ctx}/project/designSummarizing/list">设计变更汇总表</a></li>
 					<li><a href="${ctx}/project/visaSummarizing/list">现场签证汇总表</a></li>
 					<li><a href="${ctx}/project/claimSummarizing/list">索赔汇总表</a></li>
-					<li><a href="${ctx}/project/distributionSummarizing/list">分布结算汇总表</a></li>
+					<li><a href="${ctx}/project/distributionSummarizing/list">分部结算汇总表</a></li>
 					<li><a href="${ctx}/project/materialSummarizing/list">暂定材料价汇总表</a></li>
 					<li><a href="${ctx}/project/armorSummarizing/list">甲供物资汇总表</a></li>
 					<li><a href="${ctx}/project/concealSummarizing/list">隐蔽工程量汇总表</a></li>

src/main/webapp/webpage/modules/projectrecord/summarizing/visaSumamarizingProjectRecordsList.jsp

@@ -203,7 +203,7 @@
 					<li><a href="${ctx}/project/designSummarizing/list">设计变更汇总表</a></li>
 					<li class="active"><a href="${ctx}/project/visaSummarizing/list">现场签证汇总表</a></li>
 					<li><a href="${ctx}/project/claimSummarizing/list">索赔汇总表</a></li>
-					<li><a href="${ctx}/project/distributionSummarizing/list">分布结算汇总表</a></li>
+					<li><a href="${ctx}/project/distributionSummarizing/list">分部结算汇总表</a></li>
 					<li><a href="${ctx}/project/materialSummarizing/list">暂定材料价汇总表</a></li>
 					<li><a href="${ctx}/project/armorSummarizing/list">甲供物资汇总表</a></li>
 					<li><a href="${ctx}/project/concealSummarizing/list">隐蔽工程量汇总表</a></li>

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

@@ -219,13 +219,13 @@
 					}
 				}
 			});
-			changeContentDetail("${projectContentDataType}");
 			var tp = "${projectcontentinfo.dictType}";
 			var tp2 = "${projectcontentinfo.projectContentData.id}"
 			if((tp!=null && tp!='')||(tp2!=null && tp2!='')){
 				$(document.getElementById("projectContentData.type")).attr("disabled","disabled");
 			}
 			initControlData("1");
+			window.setTimeout("changeContentDetail(\"${projectContentDataType}\")",100);
 		});
 		function getNowFormatDate() {
 			var date = new Date();
@@ -893,7 +893,7 @@
 				<label class="layui-form-label"><span class="require-item">*</span>报告编号：</label>
 				<div class="layui-input-block">
 					<div class="input-group">
-						<form:input  path="projectReportData.number" onclick="selectNum()" id="number" htmlEscape="false" readonly="true" class="form-control layui-input required"/>
+						<form:input  path="projectReportData.number" onclick="selectNum()" id="number" htmlEscape="false" style="background-color:#ffffff" readonly="true" class="form-control layui-input required"/>
 						<span class="input-group-btn" onclick="selectNum()">
 								<label class="form-status">
 									<c:choose>
@@ -908,7 +908,7 @@
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>工作内容类型：</label>
 				<div class="layui-input-block with-icon">
-					<input id="projectReportDataType" name="projectReportDataType" htmlEscape="false"  value="${fns:getContentTypeName(projectcontentinfo.projectReportData.type,"")}"  readonly="readonly" class="form-control layui-input required" value="">
+					<input id="projectReportDataType" name="projectReportDataType" htmlEscape="false" value="${fns:getContentTypeName(projectcontentinfo.projectReportData.type,"")}"  readonly="readonly" class="form-control layui-input required" value="">
 				</div>
 			</div>
 			<%--<div class="layui-item layui-col-sm6">
@@ -954,7 +954,7 @@
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>报告日期：</label>
 				<div class="layui-input-block">
-					<input id="reportDate" name="projectReportData.reportDate" type="text" htmlEscape="false" readonly="true" class="laydate-icondate form-control layer-date required layui-input laydate-icon"
+					<input id="reportDate" name="projectReportData.reportDate" type="text" style="background-color:#ffffff" htmlEscape="false" readonly="true" class="laydate-icondate form-control layer-date required layui-input laydate-icon"
 						   value="<fmt:formatDate value="${projectcontentinfo.projectReportData.reportDate}" pattern="yyyy-MM-dd"/>"/>
 				</div>
 			</div>
@@ -1357,7 +1357,7 @@
 										${fns:getProjectTypeName(projectContentData.type,"")}
 								</td>
 								<td>
-										${projectContentData.masterName}
+										${projectContentData.master.name}
 								</td>
 								<td>
 									<fmt:formatDate value="${projectContentData.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>

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

@@ -94,7 +94,7 @@
 				</div>
 			</c:if>
 		</div>
-		<div class="form-group layui-row first lw12">
+		<%--<div class="form-group layui-row first lw12">
 			<div class="form-group-label"><h2>项目信息</h2></div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">送审价(元)：</label>
@@ -144,7 +144,7 @@
 					<input  id="projectReportData.installFee"  readonly="true" class="form-control layui-input number" value="<fmt:formatNumber value="${projectcontentinfo.projectReportData.installFee}" pattern="#,##0.00#"/>"/>
 				</div>
 			</div>
-		</div>
+		</div>--%>
 		<div class="form-group layui-row first lw12">
 			<div class="form-group-label"><h2>依据性资料明细</h2></div>
 			<div class="layui-item layui-col-xs12 form-table-container">
@@ -391,7 +391,7 @@
 				</table>
 			</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="contentTable2" class="table details table-bordered table-condensed">
@@ -436,7 +436,7 @@
 					</tbody>
 				</table>
 			</div>
-		</div>
+		</div>--%>
 		<c:if test="${not empty projectcontentinfo.projectReportData.act.procInsId}">
 		<div class="form-group layui-row">
 			<div class="form-group-label"><h2>审批意见</h2></div>

src/main/webapp/webpage/modules/projectreportnum/projectReportNumList.jsp

@@ -108,11 +108,11 @@
 				treeDefaultClose: false,//是否默认折叠
 				treeLinkage: true,//父级展开时是否自动展开所有子级
 				elem: '#permissionTable',
-				url: '${ctx}/projectreportnum/projectReportNum/getReportNumList?projectTypeId=${projectTypeId}&projectId=${projectId}&reportType=${reportType}&projectType=${projectType}',
+				url: '${ctx}/projectreportnum/projectReportNum/getReviewReportNumList?projectTypeId=${projectTypeId}&projectId=${projectId}&reportType=${reportType}&projectType=${projectType}',
 				page: false,
 				cols: [[
 					{field:'',align:'center', type:'numbers' ,width:60, title: '序号'},
-					{field:'num',align:'center',width:260,title: '报告号'},
+					{field:'num',align:'center',width:350,title: '报告号'},
 					{field:'stageName',align:'center',  width:110,title: '阶段'},
 					{field:'typeName',align:'center',  title: '工作内容'},
 					{field:'createId',align:'center',width:80,title: '领取人'},

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

@@ -772,7 +772,7 @@
 				}
 
 				//案例项目申请按钮
-				if(d.reportedState == 5 && d.projectReportRecordStatus == 5 ){
+				if((d.reportedState == 5 || d.reportedState == 7) && (d.projectReportRecordStatus == 5 || d.projectReportRecordStatus == 7)){
 					if (d.caseType != 1 && d.caseStatus !=2 && d.caseStatus !=5 && d.caseStatus !=4 ){
 						xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogreCaseBase('${ctx}/ruralProject/ruralCostProjectMessage/caseBase?projectId=" + d.id + " ')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 申请案例项目</a>";
 					}
@@ -886,7 +886,7 @@
 				if(d.projectReportStatusTwo == 0){
 					if(d.projectReportStatus == 5 || d.projectReportStatus == 7){
 						if(d.emergencyProject == 1){
-							if(d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5 ){
+							if(d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5  && d.projectReportRecordStatus != 7 ){
 								if (d.defectRecordStatus==0) {
 									xml+="<a href=\"#\" onclick=\"openDialogreTwo('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?reportId=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 资料缺失说明</a>";
 								}
@@ -907,7 +907,7 @@
 					}
 				}else{
 					if(d.projectReportStatusTwo == 5){
-						if(d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
+						if(d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5  && d.projectReportRecordStatus != 7){
 							if (d.defectRecordStatus==0) {
 								xml+="<a href=\"#\" onclick=\"openDialogreTwo('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?reportId=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 资料缺失说明</a>";
 							}
@@ -1387,10 +1387,10 @@
 						return "<font style = 'font-size:14px;font-weight:500;'></font>";
 					}
 				}}
-				,{field: 'submitMoneyStr', align:'center', title: '项目等级',width:100,templet: function(d){
+				,{field: 'submitMoneyStr', align:'center', title: '项目等级',width:105,templet: function(d){
 						return "<font style = 'font-size:14px;'>"+d.submitMoneyStr+"</font>";
 				}}
-                ,{align:'center', title: '质量复核',  width:110,templet:function(d){
+                ,{align:'center', title: '质量复核'+ helpShowDetail('bz-0003'),  width:110,templet:function(d){
                         var st = getAuditState(d.projectReportStatus);
                         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=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
@@ -1398,7 +1398,7 @@
                             var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-				,{align:'center', title: '报告签发',  width:90,templet:function(d){
+				,{align:'center', title: '报告签发'+ helpShowDetail('bz-0004'),  width:105,templet:function(d){
 						var st = getReportIssueState(""+d.projectReportStatusTwo);
 						if(st.action)
 							var xml = "<span onclick=\"openDialogReportTwoView('流程追踪', '${ctx}/ruralProject/ruralProjectMessageNewTwo/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+d.id+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
@@ -1406,7 +1406,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-                ,{align:'left', title: '电子/超期天数',  width:150,templet:function(d){
+                ,{align:'left', title: '电子/超期天数'+ helpShowDetail('bz-0001'),  width:170,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
 						var de = getdefectRecordState(""+d.defectRecordStatus);
 						var noArchivedDays=d.noArchivedDays;
@@ -1442,7 +1442,7 @@
 				<%--			var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
 				<%--		return xml;--%>
 				<%--	}}--%>
-				,{align:'left', title: '纸质/超期天数',  width:140,templet:function(d){
+				,{align:'left', title: '纸质/超期天数'+ helpShowDetail('bz-0002'),  width:140,templet:function(d){
 						if (d.submitMoney=="1"){
 							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
 						}else if (d.submitMoney=="2"){
@@ -1474,7 +1474,7 @@
 				// 			return "<font style = 'font-size:14px;font-weight:500;'></font>";
 				// 		}
 				// 	}}
-				,{align:'center', title: '上报',  width:110,templet:function(d){
+				,{align:'center', title: '上报'+ helpShowDetail('bz-0005'),  width:105,templet:function(d){
 						var st = getReportedState(d.reportedState);
 						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>";
@@ -1490,7 +1490,7 @@
 				<%--			var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
 				<%--		return xml;--%>
 				<%--	}}--%>
-				,{align:'center', title: '案例项目申报',  width:150,templet:function(d){
+				,{align:'center', title: '案例项目申报'+ helpShowDetail('bz-0006'),  width:125,templet:function(d){
 						var st = getCaseBaseAuditState(d.caseStatus);
 						if(st.action)
 							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.caseProcessId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";

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

@@ -1187,7 +1187,7 @@
 
 						//选定案例项目 按钮  权限
 						<shiro:hasPermission name="ruralProject:RuralProjectRecordsCaseBase:selectCaseBase">
-						if(d.reportedState == 5 && d.projectReportRecordStatus == 5){
+						if((d.reportedState == 5 || d.reportedState == 7) && (d.projectReportRecordStatus == 5 || d.projectReportRecordStatus == 7)){
 							if (d.caseType != 1 && d.caseStatus !=2 && d.caseStatus !=5 ){
 								xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogreCaseBase('${ctx}/ruralProject/RuralProjectRecordsCaseBase/selectCaseBase?projectId=" + d.id + " ')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 选定为案例项目</a>";
 							}

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

@@ -958,7 +958,7 @@
 				,{field: 'submitMoneyStr', align:'center', title: '项目等级',width:100,templet: function(d){
 						return "<font style = 'font-size:14px;'>"+d.submitMoneyStr+"</font>";
 					}}
-                ,{align:'center', title: '质量复核',  width:110,templet:function(d){
+                ,{align:'center', title: '质量复核'+ helpShowDetail('bz-0003'),  width:105,templet:function(d){
                         var st = getAuditState(d.projectReportStatus);
                         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=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
@@ -966,7 +966,7 @@
                             var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-				,{align:'center', title: '报告签发',  width:110,templet:function(d){
+				,{align:'center', title: '报告签发'+ helpShowDetail('bz-0004'),  width:105,templet:function(d){
 						var st = getReportIssueState(""+d.projectReportStatusTwo);
 						if(st.action)
 							var xml = "<span onclick=\"openDialogReportTwoView('流程追踪', '${ctx}/ruralProject/ruralProjectMessageNewTwo/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+d.id+"','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
@@ -974,7 +974,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-                ,{align:'left', title: '电子/超期天数',  width:150,templet:function(d){
+                ,{align:'left', title: '电子/超期天数'+ helpShowDetail('bz-0001'),  width:170,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
 						var de = getdefectRecordState(""+d.defectRecordStatus);
 						var noArchivedDays=d.noArchivedDays;
@@ -1002,7 +1002,7 @@
 				<%--			var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
 				<%--		return xml;--%>
 				<%--	}}--%>
-                ,{align:'left', title: '纸质/超期天数',  width:140,templet:function(d){
+                ,{align:'left', title: '纸质/超期天数'+ helpShowDetail('bz-0002'),  width:140,templet:function(d){
 						if (d.submitMoney=="1"){
 							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
 						}else if (d.submitMoney=="2"){
@@ -1024,7 +1024,7 @@
 						}
                         return xml;
                     }}
-                ,{align:'center', title: '上报',  width:110,templet:function(d){
+                ,{align:'center', title: '上报'+ helpShowDetail('bz-0005'),  width:105,templet:function(d){
                         var st = getReportedState(d.reportedState);
                         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>";
@@ -1032,15 +1032,15 @@
                             var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-				,{align:'center', title: '材料库',  width:110,templet:function(d){
+				/*,{align:'center', title: '材料库',  width:110,templet:function(d){
 						var st = getProjectMaterialStorageStatus(d.projectMaterialStorageStatus);
 						if(st.action)
 							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/project/projectMaterialStorage/form?reportedProcessInstanceId=" + 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;
-					}}
-				,{align:'center', title: '案例项目申报',  width:150,templet:function(d){
+					}}*/
+				,{align:'center', title: '案例项目申报'+ helpShowDetail('bz-0006'),  width:125,templet:function(d){
 						var st = getCaseBaseAuditState(d.caseStatus);
 						if(st.action)
 							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.caseProcessId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
@@ -1090,7 +1090,7 @@
 								<%--xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告质量复核吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";--%>
 							}
 							//案例项目申请按钮
-							if(d.reportedState == 5 && d.projectReportRecordStatus == 5){
+							if((d.reportedState == 5 || d.reportedState == 7) && (d.projectReportRecordStatus == 5 || d.projectReportRecordStatus == 7)){
 								if (d.caseType != 1 && d.caseStatus !=2 && d.caseStatus !=5 && d.caseStatus != 4 ){
 									xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogreCaseBase('${ctx}/ruralProject/ruralCostProjectMessage/caseBase?projectId=" + d.id + " ')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 申请案例项目</a>";
 								}
@@ -1193,7 +1193,7 @@
 							if(d.projectReportStatusTwo == 0){
 								if(d.projectReportStatus == 5 || d.projectReportStatus == 7){
 									if(d.emergencyProject == 1){
-										if( d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
+										if( d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5 && d.projectReportRecordStatus != 7){
 											if (d.defectRecordStatus==0) {
 												xml+="<a href=\"#\" onclick=\"openDialogreTwo('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?reportId=" + d.id +"&view=zixun','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 资料缺失说明</a>";
 											}
@@ -1216,7 +1216,7 @@
 								}
 							}else{
 								if(d.projectReportStatusTwo == 5){
-									if( d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
+									if( d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5 && d.projectReportRecordStatus != 7){
 										if (d.defectRecordStatus==0) {
 											xml+="<a href=\"#\" onclick=\"openDialogreTwo('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?reportId=" + d.id +"&view=zixun','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 资料缺失说明</a>";
 										}

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

@@ -18,7 +18,7 @@
 	<link href="${ctxStatic}/awesome/4.4/css/font-awesome.min.css" rel="stylesheet" />
 	<!-- jeeplus -->
 	<link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-	<script src="${ctxStatic}/common/jeeplus.js?9" type="text/javascript"></script>
+	<script src="${ctxStatic}/common/jeeplus.js?10" type="text/javascript"></script>
 	<link rel="shortcut icon" href="images/favicon.png" type="image/png">
 	<!-- text fonts -->
 	<link rel="stylesheet" href="${ctxStatic }/common/login/ace-fonts.css" />

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

@@ -16,7 +16,7 @@
 		<link href="${ctxStatic}/awesome/4.4/css/font-awesome.min.css" rel="stylesheet" />
 		<!-- jeeplus -->
 		<link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-		<script src="${ctxStatic}/common/jeeplus.js?9" type="text/javascript"></script>
+		<script src="${ctxStatic}/common/jeeplus.js?10" type="text/javascript"></script>
 		<link rel="shortcut icon" href="images/favicon.png" type="image/png">
 		<!-- text fonts -->
 		<link rel="stylesheet" href="${ctxStatic }/common/login/ace-fonts.css" />

src/main/webapp/webpage/modules/workcontent/workContentBranchAccountList.jsp

@@ -2,6 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <script type="text/javascript">
     function beforeCostSum(obj,index) {
+        getFee(obj,index)
         updateSum("contractAccount")
         updateSum("submitAccount")
         updateSum("setAccount")
@@ -26,6 +27,63 @@
             document.getElementById(name).innerHTML=totalSum.toFixed(2);;
         }
     }
+
+
+    function getFee(obj,index) {
+        //送审价
+
+        var submitAccount = parseFloat($("#investmentCostList"+index+"_submitAccount").val());
+        //审定价
+        var setAccount = parseFloat($("#investmentCostList"+index+"_setAccount").val());
+        if(!isNaN(submitAccount) && submitAccount !== '' && submitAccount !== '0.00' && !isNaN(setAccount) && setAccount !=='' && setAccount !=='0.00'){
+            //核增核减额（正数为核增额；负数为核减额）
+            var hf = (setAccount*100-submitAccount*100)/100;
+            if(hf < 0){
+                //如果为核减额 则先将核减额乘-1 转为正数
+                hf = hf * -1;
+                $("#investmentCostList"+index+"_businessAdd").val(0)
+                $("#investmentCostList"+index+"_businessReduce").val(hf.toFixed(2))
+            }else{
+                $("#investmentCostList"+index+"_businessAdd").val(hf.toFixed(2))
+                $("#investmentCostList"+index+"_businessReduce").val(0)
+            }
+            //核增、核减率（核增核减额/送审价）
+            var rate = parseFloat(hf) / parseFloat(submitAccount) * 100
+            $("#investmentCostList"+index+"_businessRate").val(rate.toFixed(2))
+        }else{
+            console.log(12321)
+            $("#investmentCostList"+index+"_businessAdd").val('')
+            $("#investmentCostList"+index+"_businessReduce").val('')
+            $("#investmentCostList"+index+"_businessRate").val('')
+        }
+    }
+
+    function getApprovalFee(obj,index) {
+        //送审价
+        var submitAccount = parseFloat($("#investmentCostList"+index+"_submitAccount").val());
+        //审定价
+        var setAccount = parseFloat($("#investmentCostList"+index+"_setAccount").val());
+        if(submitAccount != '' && submitAccount != '0.00' && setAccount !='' && setAccount !='0.00'){
+            //核增核减额（正数为核增额；负数为核减额）
+            var hf = (setAccount*100-submitAccount*100)/100;
+            if(hf < 0){
+                //如果为核减额 则先将核减额乘-1 转为正数
+                hf = hf * -1;
+                $("#investmentCostList"+index+"_businessAdd").val(0)
+                $("#investmentCostList"+index+"_businessReduce").val(hf.toFixed(2))
+            }else{
+                $("#investmentCostList"+index+"_businessAdd").val(hf.toFixed(2))
+                $("#investmentCostList"+index+"_businessReduce").val(0)
+            }
+            //核增、核减率（核增核减额/送审价）
+            var rate = parseFloat(hf) / parseFloat(submitAccount) * 100
+            $("#investmentCostList"+index+"_businessRate").val(rate.toFixed(2))
+        }else{
+            $("#investmentCostList"+index+"_businessAdd").val('')
+            $("#investmentCostList"+index+"_businessReduce").val('')
+            $("#investmentCostList"+index+"_businessRate").val('')
+        }
+    }
 </script>
 
 <form id="subForm"  action="#" onsubmit="return false;" method="post" class="form-horizontal">
@@ -93,22 +151,22 @@
                 <input id="investmentCostList{{idx}}_accountName" subName="accountName" value="{{row.accountName}}" type="text" class="form-control contentDetail"/>
             </td>
             <td>
-                <input id="investmentCostList{{idx}}_contractAccount" subName="contractAccount" onchange="beforeCostSum(this,{{idx}});" type="text" value="{{row.contractAccount}}"  class="form-control number contentDetail money"/>
+                <input id="investmentCostList{{idx}}_contractAccount" subName="contractAccount" onchange="beforeCostSum(this,{{idx}});" type="text" value="{{row.contractAccount}}"   class="form-control number contentDetail money"/>
             </td>
             <td>
-                <input id="investmentCostList{{idx}}_submitAccount" subName="submitAccount" onchange="beforeCostSum(this,{{idx}});" type="text" value="{{row.submitAccount}}"   class="form-control number contentDetail money"/>
+                <input id="investmentCostList{{idx}}_submitAccount" subName="submitAccount" onchange="beforeCostSum(this,{{idx}});" type="text" value="{{row.submitAccount}}" class="form-control number contentDetail money"/>
             </td>
             <td>
-                <input id="investmentCostList{{idx}}_setAccount" subName="setAccount" onchange="beforeCostSum(this,{{idx}});" type="text" value="{{row.setAccount}}"   class="form-control number contentDetail money"/>
+                <input id="investmentCostList{{idx}}_setAccount" subName="setAccount" onchange="beforeCostSum(this,{{idx}});" type="text" value="{{row.setAccount}}" class="form-control number contentDetail money"/>
             </td>
             <td>
-                <input id="investmentCostList{{idx}}_businessAdd" subName="businessAdd" onchange="beforeCostSum(this,{{idx}});" type="text"  value="{{row.businessAdd}}"  class="form-control number  contentDetail money"/>
+                <input id="investmentCostList{{idx}}_businessAdd" subName="businessAdd" style="background-color:#f1f1f1" onchange="beforeCostSum(this,{{idx}});" type="text"  value="{{row.businessAdd}}" readonly="true" class="form-control number  contentDetail money"/>
             </td>
             <td>
-                <input id="investmentCostList{{idx}}_businessReduce" subName="businessReduce" onchange="beforeCostSum(this,{{idx}});" type="text"    value="{{row.businessReduce}}"  class="form-control number contentDetail"/>
+                <input id="investmentCostList{{idx}}_businessReduce" subName="businessReduce" style="background-color:#f1f1f1" onchange="beforeCostSum(this,{{idx}});" type="text"  readonly="true"  value="{{row.businessReduce}}"  class="form-control number contentDetail"/>
             </td>
             <td>
-                <input id="investmentCostList{{idx}}_businessRate" subName="businessRate" type="text"  value="{{row.businessRate}}"  class="form-control number contentDetail"/>
+                <input id="investmentCostList{{idx}}_businessRate" subName="businessRate" style="background-color:#f1f1f1" type="text"  value="{{row.businessRate}}" readonly="true" class="form-control number contentDetail"/>
             </td>
 
             <td class="text-center op-td">
@@ -122,14 +180,14 @@
             <td style="text-align: center">
                 合计
             </td>
-            <td style="text-align: center"></td>
-            <td id="contractAccount"></td>
-            <td id="submitAccount"></td>
-            <td id="setAccount"></td>
-            <td id="businessAdd"></td>
-            <td id="businessReduce"></td>
-            <td style="text-align: center"></td>
-            <td class="text-center op-td" style="text-align: center"></td>
+            <td style="text-align: center;background-color:#f1f1f1" ></td>
+            <td id="contractAccount" style="background-color:#f1f1f1" ></td>
+            <td id="submitAccount" style="background-color:#f1f1f1" ></td>
+            <td id="setAccount" style="background-color:#f1f1f1" ></td>
+            <td id="businessAdd" style="background-color:#f1f1f1" ></td>
+            <td id="businessReduce" style="background-color:#f1f1f1" ></td>
+            <td style="text-align: center;background-color:#f1f1f1"></td>
+            <td class="text-center op-td" style="text-align: center;background-color:#f1f1f1; "></td>
         </tr>//-->
     </script>
     <script type="text/javascript">

src/main/webapp/webpage/modules/workcontent/workContentContractSumFormView.jsp

@@ -99,7 +99,7 @@
             <%--</div>--%>
         <%--</div>--%>
         <%--<div class="layui-item layui-col-sm6 double-line">--%>
-            <%--<label class="layui-form-label">索赔管理(元)：</label>--%>
+            <%--<label class="layui-form-label">索赔审核(元)：</label>--%>
             <%--<div class="layui-input-block">--%>
                 <%--<input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.claimFee}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>--%>
             <%--</div>--%>

src/main/webapp/webpage/modules/workcontent/workProjectBranchListView.jsp

@@ -4,7 +4,7 @@
     <table id="contentTable" class="table table-bordered table-condensed">
         <thead>
         <tr>
-            <th colspan="10" style="font-size: 20px">分布结算审核单</th>
+            <th colspan="10" style="font-size: 20px">分部结算审核单</th>
         </tr>
         <tr>
             <th class="hide"></th>