Merge remote-tracking branch 'origin/master'

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

@@ -259,6 +259,12 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
         }
         //新增报告状态
         projectRecordTreeData.setProjectReportStatus(info.getProjectReportStatus());
+        //报告签发状态
+        projectRecordTreeData.setProjectReportStatusTwo(info.getProjectReportStatusTwo());
+        //报告签发流程2id
+        projectRecordTreeData.setPrdtId(info.getPrdtId());
+        //报告签发流程2流程id
+        projectRecordTreeData.setPrdtProcessinstanceId(info.getPrdtProcessinstanceId());
         //线上归档状态
         projectRecordTreeData.setProjectReportRecordStatus(info.getProjectReportRecordStatus());
         //线下归档状态

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

@@ -27,6 +27,7 @@ import com.jeeplus.modules.projectcontentinfo.dao.ProjectcontentinfoDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectreportnum.service.ProjectReportNumService;
@@ -511,7 +512,13 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			}
 		}*/
 		//添加项目工作内容表
-		Projectcontentinfo projectcontentinfo = new Projectcontentinfo();
+		Projectcontentinfo projectcontentinfo = null;
+		if(StringUtils.isNotBlank(projectRecords.getId())){
+			projectcontentinfo = projectcontentinfoDao.getByProjectId(projectRecords.getId());
+		}
+		if (null==projectcontentinfo){
+			projectcontentinfo = new Projectcontentinfo();
+		}
 		projectcontentinfo.setProjectOnRural(projectRecords);
 		projectcontentinfo.setCompanyId(projectRecords.getCompany().getId());
 		projectcontentinfo.setOfficeId(projectRecords.getOffice().getId());
@@ -519,8 +526,12 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		projectcontentinfo.setParentIds("0,");
 		projectcontentinfo.setParent(new Projectcontentinfo("0"));
 		projectcontentinfo.setName(projectRecords.getProjectId());
-		projectcontentinfo.preInsert();
-		projectcontentinfoDao.insertOnRural(projectcontentinfo);
+		if (StringUtils.isNotBlank(projectcontentinfo.getId())){
+			projectcontentinfoDao.update(projectcontentinfo);
+		}else{
+			projectcontentinfo.preInsert();
+			projectcontentinfoDao.insertOnRural(projectcontentinfo);
+		}
 		logger.info("保存项目耗时：{}ms;启动流程耗时：{}ms",t4-t1,System.currentTimeMillis()-t4);
 	}
 

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

@@ -7,6 +7,8 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.historical.entity.HistoricalData;
 import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
+import com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo;
+import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
@@ -65,6 +67,8 @@ public class RuralProjectMessageAllController extends BaseController {
     private ProjectReportDataService projectReportDataService;
     @Autowired
     private RuralProjectMessageService ruralProjectMessageService;
+    @Autowired
+    private ProjectEngineeringService engineeringService;
 
     @ModelAttribute
     public RuralProjectRecords get(@RequestParam(required=false) String id) {
@@ -320,6 +324,42 @@ public class RuralProjectMessageAllController extends BaseController {
                 consultants.add(bzshbConsultant);
             }
         }
+
+        //查询上报信息表中是否含有数据，没有则进行获取基础数据
+        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
+        if(reported == null){
+            model.addAttribute("reportedFalg", false);
+
+        }else{
+            //根据上报id查询上报咨询员的信息
+            List<RuralReportConsultant> reportedConsultants=ruralProjectMessageService.getReportedConsultantsList(reported.getId());
+            //查询报告咨询员的信息
+            List<RuralReportConsultant> reportConsultants=ruralProjectMessageService.getConsultantsList(projectRecords.getId());
+            List<RuralReportConsultant> consultantLista = com.google.common.collect.Lists.newArrayList();
+            if(reportedConsultants.size() == 0){
+                //如果上报的咨询员信息为空 则处理报告咨询员信息
+                consultantLista = ruralProjectMessageService.disposeConsultant(reportConsultants, projectRecords);
+            }else{
+                //对上报的咨询员进行处理
+                consultantLista = ruralProjectMessageService.disposereportedConsultant(reportedConsultants);
+            }
+            RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(reported.getProjectId());
+            if(StringUtils.isBlank(reported.getProjectRecordId())){
+                reported.setProjectRecordId(records.getProjectId());
+            }
+            model.addAttribute("ruralProjectRecordsReported", reported);
+            projectcontent.setRecordsReported(reported);
+            //查询项目信息
+            model.addAttribute("ruralProjectRecords", records);
+            model.addAttribute("consultantInfo1", consultantLista);
+            if(StringUtils.isBlank(reported.getS1())){
+                reported.setS1("10");
+            }
+            //获取工程类型
+            ProjectEngineeringInfo engineeringInfos=engineeringService.getProjectReportedType(reported.getPorjectUse());
+            model.addAttribute("engineeringInfo", engineeringInfos);
+        }
+
         //查询总审人员信息
         List<User> auditUserList = userService.getAuditUserList();
         ruralProjectRecords.setBzshbUserList(auditUserList);
@@ -332,11 +372,7 @@ public class RuralProjectMessageAllController extends BaseController {
         model.addAttribute("id", projectcontentinfo.getId());
         model.addAttribute("projectcontentinfo", projectcontent);
         model.addAttribute("consultantinfo", consultants);
-        //获取是否含有上报信息
-        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReportedById(projectcontentinfo.getReportedId());
-        if(null != reported){
-            model.addAttribute("reportedView", 1);
-        }
+
         List<MainDictDetail> achievementTypes = DictUtils.getMainDictList("achievement_type");
         if(null != achievementTypes){
             for (MainDictDetail achievementType:achievementTypes) {

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

@@ -10,6 +10,7 @@ import com.jeeplus.modules.alterinfo.entity.AlterInfo;
 import com.jeeplus.modules.alterinfo.service.AlterInfoService;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.project.entity.Project;
 import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectAccessoryRelationService;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
@@ -815,4 +816,135 @@ public class RuralProjectViewController extends BaseController {
         }
         return "modules/ruralprojectrecords/view/selectiveSearchView";
     }
+
+    /**
+     * 报告签发查看
+     */
+    @RequestMapping(value = "reportIssue")
+    public String reportIssue(RuralProjectcontentinfo projectcontentinfo,String projectId, Integer status, Model model, RedirectAttributes redirectAttributes) {
+        RuralProjectRecords projectRecords=new RuralProjectRecords();
+        if (null!=projectId){
+            projectRecords = projectRecordsService.get(projectId);
+            model.addAttribute("projectRecords", projectRecords);
+        }
+        Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
+        if (null ==projectcontentinfo1){
+            model.addAttribute("projectReportDataTwo",null);
+            return "modules/ruralprojectrecords/view/reportIssueView";
+        }
+        ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
+        //查询报告签发
+        ProjectReportDataTwo projectReportDataTwo=new ProjectReportDataTwo();
+        if (null !=projectReportData){
+            projectReportDataTwo=projectReportDataTwoService.findTwoByProjectId(projectReportData.getProject().getId());
+        }else{
+            model.addAttribute("projectReportDataTwo",null);
+            return "modules/ruralprojectrecords/view/reportIssueView";
+        }
+        if (null ==projectReportDataTwo){
+            model.addAttribute("projectReportDataTwo",null);
+            return "modules/ruralprojectrecords/view/reportIssueView";
+        }
+        projectReportData = projectReportDataService.get(projectReportData.getId());
+        RuralProjectRecords ruralProjectRecords = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
+        Projectcontentinfo projectcontent = projectcontentinfoService.getByInfoId(projectReportData.getId());
+        projectcontent.setProjectReportData(projectReportData);
+        projectcontent.setProjectReportDataTwo(projectReportDataTwo);
+        //根据条件查询附件必填项
+        //判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
+        /*Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+
+        Boolean flag = false;
+        //如果是打包项目或者报告送审价不为null则可进行查询附件类型
+        if(1 == projectSort || null != projectReportData.getReviewFee()){
+            flag = true;
+        }
+        if(flag) {*/
+        ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+        //添加项目类型
+        relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+        relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+        //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+        /*if(0 == projectSort){*/
+        //查看送审金额是否为500w以上金额
+//        Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
+//        approvalMoney = 2;
+        String money=ruralProjectRecords.getSubmitMoney();
+        Integer approvalMoney=null;
+        if(StringUtils.isBlank(money)){
+            approvalMoney=1;
+        }else{
+            approvalMoney=Integer.parseInt(money);
+        }
+        switch (approvalMoney){
+            case 0:
+                //金额为0
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+                break;
+            case 1:
+                //500w以下金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("1");
+                break;
+            case 2:
+                //500w以上金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("2");
+                break;
+        }
+            /*}else{
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+            }*/
+
+        //添加报告类型
+        relateInfo.setRequiredStage(1);
+        relateInfo.setId(ruralProjectRecords.getId());
+        //查询报告文件、依据性文件、其他文件必填列表以及数据
+//        List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+//        for (MainDictDetail mainDict : mainDictDetails) {
+//            relateInfo.setAttachType(mainDict.getValue());
+//            switch (mainDict.getValue()) {
+//                case "11":
+//                    projectcontent.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+//                    break;
+//                case "12":
+//                    projectcontent.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+//                    break;
+//                case "13":
+//                    projectcontent.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
+//                    break;
+//            }
+//
+//        }
+        /*}*/
+
+        //查询总审人员信息
+        List<User> auditUserList = userService.getAuditUserList();
+        ruralProjectRecords.setBzshbUserList(auditUserList);
+
+        model.addAttribute("processInstanceId",projectReportDataTwo.getProcessInstanceId());
+        model.addAttribute("projectReportData",projectReportData);
+        model.addAttribute("projectReportDataTwo",projectReportDataTwo);
+        model.addAttribute("projectId", projectcontentinfo1.getProject().getId());
+        model.addAttribute("project", projectcontentinfo1.getProject());
+        model.addAttribute("reportedId", projectcontentinfo.getReportedId());
+        model.addAttribute("projectRecords", ruralProjectRecords);
+        model.addAttribute("id", projectcontentinfo.getId());
+        model.addAttribute("projectcontentinfo", projectcontent);
+        //获取是否含有上报信息
+        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReportedById(projectcontentinfo.getReportedId());
+        if(null != reported){
+            model.addAttribute("reportedView", 1);
+        }
+
+        List<MainDictDetail> achievementTypes = DictUtils.getMainDictList("achievement_type");
+        if(null != achievementTypes){
+            for (MainDictDetail achievementType:achievementTypes) {
+                if(achievementType.getValue().equals(projectReportData.getAchievementType())){
+                    projectReportData.setAchievementType(achievementType.getLabel());
+                    break;
+                }
+            }
+        }
+        return "modules/ruralprojectrecords/view/reportIssueView";
+    }
+
 }

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

@@ -71,6 +71,9 @@
 		,ifnull(rprr.report_status,0) as "reportStatus"
 		,ifnull(rprr.sync_status,0) as "syncStatus"
 		,rprr.process_instance_id as "reportedProcessInstanceId"
+		,ifnull(prdt.status,0) as "projectReportStatusTwo"
+		,prdt.id as prdtId
+		,prdt.process_instance_id as prdtProcessinstanceId
         FROM rural_project_records a
 		LEFT JOIN sys_area area ON area.id = a.area_id
 		LEFT JOIN work_project_user w on a.id = w.project_id
@@ -79,6 +82,7 @@
 		LEFT JOIN work_client_info wct on wci.client_id = wct.id
 		LEFT JOIN sys_office o ON o.id = a.office_id
 		left join project_report_data prd on prd.project_id = a.id
+		left join project_report_data_two prdt on prdt.project_id = a.id
 		LEFT JOIN sys_user su on w.user_id = su.id
 		left join rural_project_report_record prr on prr.report_id = prd.id
 		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
@@ -111,6 +115,9 @@
 		,ifnull(rprr.report_status,0) as "reportStatus"
 		,ifnull(rprr.sync_status,0) as "syncStatus"
 		,rprr.process_instance_id as "reportedProcessInstanceId"
+		,ifnull(prdt.status,0) as "projectReportStatusTwo"
+		,prdt.id as prdtId
+		,prdt.process_instance_id as prdtProcessinstanceId
 		FROM rural_project_records a
 		LEFT JOIN sys_area area ON area.id = a.area_id
 		left join rural_project_records_reported rprr on rprr.id = a.id
@@ -125,6 +132,7 @@
 		LEFT JOIN work_client_info wct on wci.client_id = wct.id
         LEFT JOIN sys_office o ON o.id = a.office_id
 		left join project_report_data prd on prd.project_id = a.id
+		left join project_report_data_two prdt on prdt.project_id = a.id
 		left join rural_project_report_record prr on prr.report_id = prd.id
 		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
 		<where>

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

@@ -542,7 +542,7 @@
                 </div>
             </div>
             <div class="form-group layui-row first lw12">
-                <div class="form-group-label"><h2>报告信息</h2></div>
+                <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 with-icon">

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

@@ -1517,7 +1517,7 @@
 	<div class="tapfixed">
 		<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 			<ul class="list-tabs">
-				<li class="active"><a>报告信息</a><span style="display: none">info</span></li>
+				<li class="active"><a>质量复核信息</a><span style="display: none">info</span></li>
 				<li><a>档案信息</a><span style="display: none">archives</span></li>
 				<li><a>上报信息</a><span style="display: none">recordsReported</span></li>
 			</ul>
@@ -1543,8 +1543,8 @@
 				<input type="hidden" id="status" value="${projectReportData.status}">
 				<div class="form-group layui-row first lw12">
 					<div class="form-group-label">
-						<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="nav-btn layui-btn" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
-						<h2>报告信息</h2>
+						<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+						<h2>质量复核信息</h2>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">送审价(元)：</label>
@@ -1640,7 +1640,7 @@
 					</div>
 				</div>
 				<div class="form-group layui-row">
-					<div style="float: right"> <a href="${ctx}/workfullmanage/workFullManage/downloadMassControl?id=${projectReportData.id}"  onclick="return confirmx('确认要下载控制流程单吗？', this.href)" class="nav-btn layui-btn" ><i class="fa fa-file-excel-o"></i> 下载流程单</a></div>
+					<div style="float: right"> <a href="${ctx}/workfullmanage/workFullManage/downloadMassControl?id=${projectReportData.id}"  onclick="return confirmx('确认要下载控制流程单吗？', this.href)" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载流程单</a></div>
 						<%--<div style="float: right"> <a href="javascript:void(0)" onclick="preview('预览','${ctx}/workfullmanage/workFullManage/preViewMassControl?id=${projectReportData.id}','80%','80%')">预览流程单</a></div>--%>
 					<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
 					<div class="layui-item layui-col-sm12 lw6">
@@ -1790,7 +1790,7 @@
 									<td>
 										<c:choose>
 											<c:when test="${fileAttachment.flag == 0}">
-												<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+<%--												<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
 												<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
 											</c:when>
 											<c:otherwise>
@@ -1922,7 +1922,7 @@
 									<td>
 										<c:choose>
 											<c:when test="${fileGistdata.flag == 0}">
-												<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+<%--												<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
 												<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
 											</c:when>
 											<c:otherwise>
@@ -2054,7 +2054,7 @@
 									<td>
 										<c:choose>
 											<c:when test="${fileOther.flag == 0}">
-												<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+<%--												<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
 												<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
 											</c:when>
 											<c:otherwise>

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

@@ -887,7 +887,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row first lw12">
-				<div class="form-group-label"><h2>报告信息</h2></div>
+				<div class="form-group-label"><h2>质量复核信息</h2></div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
 						<div class="layui-input-block with-icon">
@@ -1258,7 +1258,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+<%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
 								</td>
 								<td></td>
@@ -1438,7 +1438,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+<%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
 								</td>
 								<td></td>
@@ -1621,7 +1621,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+<%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
 								</td>
 								<td></td>

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

@@ -1125,7 +1125,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+<%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
 								</td>
 								<td></td>
@@ -1292,7 +1292,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+<%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
 								</td>
 								<td></td>
@@ -1437,7 +1437,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+<%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
 								</td>
 								<td></td>

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

@@ -801,7 +801,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row first lw12">
-				<div class="form-group-label"><h2>报告信息</h2></div>
+				<div class="form-group-label"><h2>质量复核信息</h2></div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
 						<div class="layui-input-block with-icon">

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

@@ -299,7 +299,7 @@
 		<div class="form-group layui-row first lw12">
 			<div class="form-group-label">
 				<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="nav-btn layui-btn" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
-				<h2>报告信息</h2>
+				<h2>质量复核信息</h2>
 			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">送审价(元)：</label>

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

@@ -449,7 +449,7 @@
 								<td>
 									<c:choose>
 										<c:when test="${fileAttachment.flag == 0}">
-											<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+<%--											<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
 											<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
 										</c:when>
 										<c:otherwise>
@@ -638,7 +638,7 @@
 								<td>
 									<c:choose>
 										<c:when test="${fileGistdata.flag == 0}">
-											<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+<%--											<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
 											<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
 											</c:when>
 											<c:otherwise>
@@ -826,7 +826,7 @@
 										<td>
 											<c:choose>
 												<c:when test="${fileOther.flag == 0}">
-													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
 													<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
 												</c:when>
 												<c:otherwise>

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

@@ -269,7 +269,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
 								</td>
 								<td></td>
@@ -445,7 +445,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
 								</td>
 								<td></td>
@@ -621,7 +621,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
 								</td>
 								<td></td>

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

@@ -310,7 +310,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
 								</td>
 								<td></td>
@@ -488,7 +488,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
 								</td>
 								<td></td>
@@ -669,7 +669,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
 								</td>
 								<td></td>

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordAudit.jsp

@@ -455,7 +455,7 @@
 												<td>
 													<c:choose>
 														<c:when test="${fileAttachment.flag == 0}">
-															<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+<%--															<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
 															<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
 														</c:when>
 														<c:otherwise>
@@ -612,7 +612,7 @@
 														<td>
 															<c:choose>
 																<c:when test="${fileGistdata.flag == 0}">
-																	<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+<%--																	<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
 																	<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
 																</c:when>
 																<c:otherwise>
@@ -771,7 +771,7 @@
 														<td>
 															<c:choose>
 																<c:when test="${fileOther.flag == 0}">
-																	<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+<%--																	<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
 																	<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
 																</c:when>
 																<c:otherwise>

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

@@ -275,7 +275,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
 								</td>
 								<td></td>
@@ -448,7 +448,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
 								</td>
 								<td></td>
@@ -620,7 +620,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
 								</td>
 								<td></td>

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

@@ -289,7 +289,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
 								</td>
 								<td></td>
@@ -462,7 +462,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
 								</td>
 								<td></td>
@@ -637,7 +637,7 @@
 								</c:choose>
 <%--								<td></td>--%>
 								<td>
-									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
 								</td>
 								<td></td>

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordModifyApply.jsp

@@ -282,7 +282,7 @@
 								</c:choose>
 <%--								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>--%>
 								<td>
-									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
 								</td>
 								<td></td>
@@ -437,7 +437,7 @@
 <%--								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>--%>
 <%--								<td></td>--%>
 								<td>
-									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
 								</td>
 								<td></td>
@@ -593,7 +593,7 @@
 								</c:choose>
 <%--								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>--%>
 								<td>
-									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
 								</td>
 								<td></td>

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

@@ -282,6 +282,40 @@
 
 		}
 
+		function openDialogReportTwoView(title,url,id,width,height){
+
+
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			$.ajax({
+				async: false,
+				url: "${ctx}/ruralProject/ruralProjectMessageNewTwo/getReportExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						top.layer.open({
+							type: 2,
+							skin: 'one-btn',
+							area: [width, height],
+							title: title,
+							maxmin: true, //开启最大化最小化按钮
+							content: url ,
+							btn: ['关闭'],
+							cancel: function(index){
+							}
+						});
+					}else{
+						top.layer.msg("该项目报告信息已删除！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+
+		}
 
 
 		function openDialogreReport(title,url,id,width,height,target,buttons) {
@@ -717,7 +751,7 @@
 								return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
 							}
 						}},
-					{align:'center', title: '报告状态',  width:70,templet:function(d){
+					{align:'center', title: '质量复核',  width:70,templet:function(d){
 							var st = getAuditState(""+d.projectReportStatus);
 							if(d.pid ==0){
 								if(st.action)
@@ -729,6 +763,18 @@
 								return '';
 							}
 						}},
+					{align:'center', title: '报告签发',  width:70,templet:function(d){
+							var st = getAuditState(""+d.projectReportStatusTwo);
+							if(d.pid ==0){
+								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>";
+								else
+									var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								return xml;
+							}else{
+								return '';
+							}
+						}},
 					{align:'center', title: '线上归档状态',  width:70,templet:function(d){
 							var st = getRuralProjectArchiveState(""+d.projectReportRecordStatus);
 							if(d.pid ==0){
@@ -816,7 +862,7 @@
 				}
 				if ('0'!=d.projectReportStatus){
 					<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:adminEdit">
-						xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralProjectMessageAll/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改复核信息', '${ctx}/ruralProject/ruralProjectMessageAll/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改复核信息</a>";
 					</shiro:hasPermission>
 				}
 				xml+="</div>"

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

@@ -572,7 +572,7 @@
 										<td>
 											<c:choose>
 												<c:when test="${fileAttachment.flag == 0}">
-													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
 													<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
 												</c:when>
 												<c:otherwise>
@@ -727,7 +727,7 @@
 										<td>
 											<c:choose>
 												<c:when test="${fileGistdata.flag == 0}">
-													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
 													<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
 												</c:when>
 												<c:otherwise>
@@ -885,7 +885,7 @@
 										<td>
 											<c:choose>
 												<c:when test="${fileOther.flag == 0}">
-													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
 													<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
 												</c:when>
 												<c:otherwise>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAuditTwo.jsp

@@ -566,7 +566,7 @@
 										<td>
 											<c:choose>
 												<c:when test="${fileAttachment.flag == 0}">
-													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
 													<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
 												</c:when>
 												<c:otherwise>
@@ -703,7 +703,7 @@
 										<td>
 											<c:choose>
 												<c:when test="${fileGistdata.flag == 0}">
-													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
 													<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
 												</c:when>
 												<c:otherwise>
@@ -841,7 +841,7 @@
 										<td>
 											<c:choose>
 												<c:when test="${fileOther.flag == 0}">
-													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
 													<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
 												</c:when>
 												<c:otherwise>

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

@@ -520,7 +520,7 @@
                 </div>
             </div>
             <div class="form-group layui-row first lw12">
-                <div class="form-group-label"><h2>报告信息</h2></div>
+                <div class="form-group-label"><h2>质量复核信息</h2></div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
                     <div class="layui-input-block with-icon">
@@ -845,7 +845,7 @@
                                     </c:choose>
 <%--                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>--%>
                                     <td>
-                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+<%--                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
                                         <div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
                                     </td>
                                     <td></td>
@@ -995,7 +995,7 @@
                                     </c:choose>
 <%--                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>--%>
                                     <td>
-                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+<%--                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
                                         <div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
                                     </td>
                                     <td></td>
@@ -1146,7 +1146,7 @@
                                     </c:choose>
 <%--                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>--%>
                                     <td>
-                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+<%--                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
                                         <div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
                                     </td>
                                     <td></td>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModifyTwo.jsp

@@ -421,7 +421,7 @@
                 </div>
             </div>
             <div class="form-group layui-row first lw12">
-                <div class="form-group-label"><h2>报告信息</h2></div>
+                <div class="form-group-label"><h2>质量复核信息</h2></div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
                     <div class="layui-input-block with-icon">
@@ -551,7 +551,7 @@
                                     </c:choose>
 <%--                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>--%>
                                     <td>
-                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+<%--                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
                                         <div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
                                     </td>
                                     <td></td>
@@ -681,7 +681,7 @@
                                     </c:choose>
 <%--                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>--%>
                                     <td>
-                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+<%--                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
                                         <div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
                                     </td>
                                     <td></td>
@@ -812,7 +812,7 @@
                                     </c:choose>
 <%--                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>--%>
                                     <td>
-                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+<%--                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
                                         <div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
                                     </td>
                                     <td></td>

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

@@ -1188,7 +1188,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+<%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
 								</td>
 								<td></td>
@@ -1370,7 +1370,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+<%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
 								</td>
 								<td></td>
@@ -1552,8 +1552,8 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+<%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
 								</td>
 								<td></td>
 								<td class="op-td"  style="text-align: center">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportFormTwo.jsp

@@ -808,7 +808,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+<%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
 								</td>
 								<td></td>
@@ -970,7 +970,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+<%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
 								</td>
 								<td></td>
@@ -1132,7 +1132,7 @@
 									</c:otherwise>
 								</c:choose>
 								<td>
-									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+<%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
 									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
 								</td>
 								<td></td>

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

@@ -594,7 +594,7 @@
                 </div>
             </div>
             <div class="form-group layui-row first lw12">
-                <div class="form-group-label"><h2>报告信息</h2></div>
+                <div class="form-group-label"><h2>质量复核信息</h2></div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
                     <div class="layui-input-block with-icon">

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

@@ -309,7 +309,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row first lw12">
-				<div class="form-group-label"><h2>报告信息</h2></div>
+				<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 with-icon">
@@ -445,7 +445,7 @@
 								<td style="text-align:center;">
 									<c:choose>
 										<c:when test="${fileAttachment.flag == 0}">
-											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+<%--											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
 											<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
 										</c:when>
 										<c:otherwise>
@@ -601,7 +601,7 @@
 								<td style="text-align:center;">
 									<c:choose>
 										<c:when test="${fileGistdata.flag == 0}">
-											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+<%--											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
 											<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
 										</c:when>
 										<c:otherwise>
@@ -757,7 +757,7 @@
 								<td style="text-align:center;">
 									<c:choose>
 										<c:when test="${fileOther.flag == 0}">
-											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+<%--											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
 											<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
 										</c:when>
 										<c:otherwise>

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

@@ -309,7 +309,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row first lw12">
-				<div class="form-group-label"><h2>报告信息</h2></div>
+				<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 with-icon">
@@ -538,7 +538,7 @@
 								<td>
 									<c:choose>
 										<c:when test="${fileAttachment.flag == 0}">
-											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+<%--											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
 											<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
 										</c:when>
 										<c:otherwise>
@@ -696,7 +696,7 @@
 								<td >
 									<c:choose>
 										<c:when test="${fileGistdata.flag == 0}">
-											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+<%--											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
 											<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
 										</c:when>
 										<c:otherwise>
@@ -854,7 +854,7 @@
 								<td>
 									<c:choose>
 										<c:when test="${fileOther.flag == 0}">
-											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+<%--											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
 											<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
 										</c:when>
 										<c:otherwise>

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

@@ -375,7 +375,7 @@
 		<div class="form-group layui-row first lw12">
 			<div class="form-group-label">
 				<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="nav-btn layui-btn" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
-				<h2>报告信息</h2>
+				<h2>质量复核信息</h2>
 			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">送审价(元)：</label>

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

@@ -1108,7 +1108,7 @@
 				}
 				<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:adminEdit">
 				if ('0'!=d.projectReportStatus){
-					xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralProjectMessage/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改报告</a>";
+					xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessage/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改质量复核</a>";
 				}
 				</shiro:hasPermission>
 				xml+="</div>"

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

@@ -250,16 +250,11 @@
 		<ul class="list-tabs" >
 			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
 			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
-<%--			<c:if test="${projectRecords.workContractInfo.id!=''}">--%>
-				<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同合同详情</a></li>
-<%--			</c:if>--%>
+			<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同合同详情</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-<%--			<c:if test="${reportedId!=null}">--%>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
-<%--			</c:if>--%>
-<%--			<c:if test="${flagProjectReportData.id!=null}">--%>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
-<%--			</c:if>--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>

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

@@ -66,32 +66,16 @@
 		<ul class="list-tabs">
 			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
-<%--			<c:if test="${projectRecords.workContractInfo.id!=''}">--%>
-				<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
-<%--			</c:if>--%>
+			<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-<%--			<c:if test="${reportedId!=null}">--%>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
-<%--			</c:if>--%>
-<%--			<c:if test="${flagProjectReportData.id!=null}">--%>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
-<%--			</c:if>--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
 
 		</ul>
-<%--		<ul class="list-tabs" >--%>
-<%--			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
-<%--			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>--%>
-<%--			<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>--%>
-<%--			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>--%>
-<%--			<c:if test="${reportedId!=null}">--%>
-<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>--%>
-<%--			</c:if>--%>
-<%--			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>--%>
-<%--			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
-<%--		</ul>--%>
 	</div>
 	</div>
 	<div class="container${container}" style="margin-top: 60px;">
@@ -149,7 +133,7 @@
 								<td>
 									<c:choose>
 										<c:when test="${fileAttachment.flag == 0}">
-											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+<%--											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
 											<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
 										</c:when>
 										<c:otherwise>
@@ -305,7 +289,7 @@
 								<td>
 									<c:choose>
 										<c:when test="${fileGistdata.flag == 0}">
-											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+<%--											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
 											<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
 										</c:when>
 											<c:otherwise>
@@ -460,7 +444,7 @@
 										<td>
 											<c:choose>
 												<c:when test="${fileOther.flag == 0}">
-													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
 													<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
 												</c:when>
 												<c:otherwise>

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

@@ -144,16 +144,11 @@
         <ul class="list-tabs" >
             <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
-<%--            <c:if test="${projectRecords.workContractInfo.id!=''}">--%>
-                <li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
-<%--            </c:if>--%>
+            <li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
             <li class="active"><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-<%--            <c:if test="${reportedId!=null}">--%>
-                <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
-<%--            </c:if>--%>
-<%--            <c:if test="${flagProjectReportData.id!=null}">--%>
-                <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
-<%--            </c:if>--%>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>

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

@@ -190,16 +190,11 @@
 			<ul class="list-tabs" >
 				<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
-				<%--            <c:if test="${projectRecords.workContractInfo.id!=''}">--%>
 				<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
-				<%--            </c:if>--%>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-				<%--            <c:if test="${reportedId!=null}">--%>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
-				<%--            </c:if>--%>
-				<%--            <c:if test="${flagProjectReportData.id!=null}">--%>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
-				<%--            </c:if>--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>

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

@@ -0,0 +1,457 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>报告签发</title>
+	<meta name="decorator" content="default"/>
+	<%@include file="/webpage/include/treetable.jsp" %>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+	<script type="text/javascript">
+
+		$(document).ready(function() {
+			var achievementType=$("#achievementType").val();
+			if (achievementType==null || achievementType==""){
+
+			}
+			$("#upTable").treeTable({expandLevel : 5},{ expandable: true });
+			$("#gistdata_upTable").treeTable({expandLevel : 5},{ expandable: true });
+			$("#upTable_other").treeTable({expandLevel : 5},{ expandable: true });
+			validateForm = $("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+			$("#attachment_btn").click(function () {
+				$("#attachment_file").click();
+			});
+			$("#gistdata_btn").click(function () {
+				$("#gistdata_file").click();
+			});
+			$("#other_btn").click(function () {
+				$("#other_file").click();
+			});
+			if ("${projectReportData.contractCategory}" !=null){
+				if("${projectReportData.contractCategory}"=='1'){
+					$("#contractFee").parent().parent().hide();
+					$("#contractRate").parent().parent().show();
+				}else if("${projectReportData.contractCategory}"=='0'){
+					$("#contractFee").parent().parent().show();
+					$("#contractRate").parent().parent().hide();
+				}
+			}
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+				layui.form.on('radio(jine)', function(data){
+					var span=data.value;
+					if(span==1){
+						$("#contractFee").parent().parent().hide();
+						$("#contractRate").parent().parent().show();
+					}else{
+						$("#contractFee").parent().parent().show();
+						$("#contractRate").parent().parent().hide();
+					}
+				})
+			})
+		});
+
+		function openDialogre(title,url,width,height,target,buttons) {
+			var status = $("#status").val();
+			if(5 != status){
+				parent.layer.msg("报告未审批完成，无法下载!", {icon: 5});
+				return false;
+			}
+			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+				width = 'auto';
+				height = 'auto';
+			} else {//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			var split = buttons.split(",");
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				maxmin: true, //开启最大化最小化按钮
+				skin: 'three-btns',
+				content: url,
+				btn: split,
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(1) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},
+				btn2:function(index,layero){
+					if(split.length==2){return}
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(2) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}else {
+						return false;
+					}
+				},
+				btn3: function (index) {
+				}
+			});
+		}
+
+		function readOpenInfo(value) {
+			layer.open({
+				title: '意见',
+				btn: ['关闭'],
+				content: value
+			});
+		}
+	</script>
+</head>
+
+<body>
+<div class="single-form">
+<%--	<c:if test="${reportedView==1}">--%>
+<%--		<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">--%>
+<%--			<ul class="list-tabs" >--%>
+<%--				<li class="active"><a href="${ctx}/ruralProject/ruralProjectMessage/modify?projectId=${projectId}&view=view&reportedId=${reportedId}">报告详情</a></li>--%>
+<%--				<li><a href="${ctx}/ruralProject/ruralProjectMessage/getReportedView?id=${reportedId}&projectId=${projectId}">上报信息详情</a></li>--%>
+<%--			</ul>--%>
+<%--		</div>--%>
+	<div class="tapfixed">
+		<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
+			<ul class="list-tabs" >
+				<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
+				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
+
+			</ul>
+<%--			<ul class="list-tabs" >--%>
+<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
+<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>--%>
+<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>--%>
+<%--				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}&projectId=${projectRecords.id}">报告信息</a></li>--%>
+<%--				<c:if test="${reportedId!=null}">--%>
+<%--					<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${projectcontentinfo.id}">上报信息</a></li>--%>
+<%--				</c:if>--%>
+<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>--%>
+<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
+<%--			</ul>--%>
+		</div>
+	</div>
+<%--	</c:if>--%>
+	<c:if test="${projectReportDataTwo.processInstanceId==null}">
+		<div class="topMar">
+			<h2>暂无报告签发信息</h2>
+		</div>
+	</c:if>
+	<c:if test="${projectReportDataTwo.processInstanceId!=null}">
+	<div class="container${container}  view-form" style="margin-top: 40px;">
+		<form:form id="inputForm" modelAttribute="projectcontentinfo"  method="post" class="form-horizontal layui-form">
+			<input type="hidden" id="status" value="${projectReportData.status}">
+			<div class="form-group layui-row first lw12">
+				<div class="form-group-label">
+					<div style="float: right"> <a href="${ctx}/workfullmanage/workFullManage/downloadMassControl1?id=${projectReportData.id}"  onclick="return confirmx('确认要下载签发流程单吗？', this.href)" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载签发流程单</a></div>
+<%--					<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>--%>
+					<h2>质量复核信息</h2>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">送审价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="reviewFee" path="projectReportData.reviewFee" cssStyle="background-color: #f1f1f1" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">审定价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="approvalFee" cssStyle="background-color: #f1f1f1" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">合同类别：</label>
+					<div class="layui-input-block with-icon">
+						<input type="radio" disabled title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" checked <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+						<input type="radio" disabled title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">合同价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="contractFee" cssStyle="background-color: #f1f1f1" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6" style="display: none;">
+					<label class="layui-form-label">费率(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input placeholder="请输入合同费率" id="contractRate" cssStyle="background-color: #f1f1f1" path="projectReportData.contractRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">核增核减额(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="verifyFee" cssStyle="background-color: #f1f1f1" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">核增核减率(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="verifyRate" cssStyle="background-color: #f1f1f1" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">咨询标的额(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="consultFee" cssStyle="background-color: #f1f1f1" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">土建造价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="buildingFee" cssStyle="background-color: #f1f1f1" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">安装造价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="installFee" cssStyle="background-color: #f1f1f1" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">土建比例(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="buildingRate" cssStyle="background-color: #f1f1f1" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">安装比例(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="installRate" cssStyle="background-color: #f1f1f1" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">工作开始日期：</label>
+					<div class="layui-input-block with-icon">
+						<input class=" form-control layui-input" style="background-color: #f1f1f1" readonly="readonly" id="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">工作结束日期：</label>
+					<div class="layui-input-block with-icon">
+						<input class=" form-control layui-input" style="background-color: #f1f1f1" readonly="readonly" id="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+					<div class="layui-input-block">
+						<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onkeyup="num(this)" class="form-control layui-input"/>
+					</div>
+				</div>
+			</div>
+			<c:if test="${not empty processInstanceId}">
+				<div class="form-group layui-row">
+					<div class="form-group-label"><h2>审批流程</h2></div>
+					<div class="layui-item layui-col-xs12 form-table-container" >
+						<act:flowChart procInsId="${processInstanceId}"/>
+						<act:histoicFlow procInsId="${processInstanceId}"/>
+					</div>
+				</div>
+			</c:if>
+			<div class="form-group layui-row page-end"></div>
+		</form:form>
+	</div>
+	</c:if>
+</div>
+<script>
+
+	function preview(title,url,width,height,type){
+		$.ajax({
+			type : "POST",
+			url : url,
+			//请求成功
+			success : function(result) {
+				if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+					width='auto';
+					height='auto';
+				}else{//如果是PC端，根据用户设置的width和height显示。
+
+				}
+				var u = 'http://ow365.cn/?i=14411&furl='+result;
+				if(type == 1){
+					u = result;
+				}
+				parent.layer.open({
+					type: 2,
+					area: [width, height],
+					title: title,
+					maxmin: true, //开启最大化最小化按钮
+					content:  u,
+					btn: ['关闭'],
+					cancel: function(index){
+					}
+				});
+			},
+
+		});
+
+	}
+
+	function openBill2(title,url,width,height,target,formId,tableId){
+		var rows = $(this).parent().prevAll().length + 1;
+		var frameIndex = parent.layer.getFrameIndex(window.name);
+		var urls = url+"&index="+frameIndex;
+		if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+			width='auto';
+			height='auto';
+		}else{//如果是PC端，根据用户设置的width和height显示。
+
+		}
+		top.layer.open({
+			type: 2,
+			area: [width, height],
+			title: title,
+			skin:"two-btns",
+			maxmin: false, //开启最大化最小化按钮
+			content: urls ,
+			btn: ['确定','关闭'],
+			yes: function(index, layero){
+				var body = top.layer.getChildFrame('body', index);
+				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var inputForm = body.find('#inputForm');
+				var top_iframe;
+				if(target){
+					top_iframe = target;//如果指定了iframe，则在改frame中跳转
+				}else{
+					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+				}
+				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+				inputForm.attr("action","${ctx}/projectAccessory/projectAccessory/saveWorkAttachment");//表单提交成功后，从服务器返回的url在当前tab中展示
+				var $document = iframeWin.contentWindow.document;
+
+				formSubmit2($document,formId,index,tableId);
+
+			},
+			cancel: function(index){
+			}
+		});
+	}
+	function formSubmit2($document,inputForm,index,tableId){
+
+		var validateForm = $($document.getElementById(inputForm)).validate({
+			submitHandler: function(form){
+				loading('正在提交，请稍等...');
+				form.submit();
+			},
+			errorContainer: "#messageBox",
+			errorPlacement: function(error, element) {
+				$($document.getElementById("#messageBox")).text("输入有误，请先更正。");
+				if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+					error.appendTo(element.parent().parent());
+				} else {
+					error.insertAfter(element);
+				}
+			}
+		});
+		if(validateForm.form()){
+			$($document.getElementById(inputForm)).ajaxSubmit({
+				success:function(data) {
+					var d = data;
+					//输出提示信息
+					if(d.str.length>0){
+						parent.layer.msg(d.str,{icon:1});
+					}
+					$("#"+tableId).load(location.href + " #"+tableId);
+					//关闭当前页
+					top.layer.close(index)
+				}
+			});
+		}
+	}
+
+	function formAttachment(title,url,width,height,target,formId){
+		var rows = $(this).parent().prevAll().length + 1;
+		var frameIndex = parent.layer.getFrameIndex(window.name);
+		var urls = url;
+		if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+			width='auto';
+			height='auto';
+		}else{//如果是PC端，根据用户设置的width和height显示。
+
+		}
+		top.layer.open({
+			type: 2,
+			area: [width, height],
+			title: title,
+			skin:"two-btns",
+			maxmin: false, //开启最大化最小化按钮
+			content: urls ,
+			btn: ['确定','关闭'],
+			yes: function(index, layero){
+				var body = top.layer.getChildFrame('body', index);
+				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var inputForm = body.find('#inputForm');
+				var top_iframe;
+				if(target){
+					top_iframe = target;//如果指定了iframe，则在改frame中跳转
+				}else{
+					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+				}
+				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+				inputForm.attr("action","${ctx}/projectAccessory/projectAccessory/saveWorkAttachment");//表单提交成功后，从服务器返回的url在当前tab中展示
+				var $document = iframeWin.contentWindow.document;
+				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var item = iframeWin.getSelectedItem();
+				setValuee(item);
+
+			},
+			cancel: function(index){
+			}
+		});
+	}
+	function setValuee(obj){
+		for(var i=0;i<obj.length;i++){
+			var idArr = $("#file_attachment tr:visible .clientId");
+			if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
+				addRowBaseData("#workBaseDataList",workBaseDataRowIdx,workBaseDataTpl,obj[i]);
+				$("#workBaseDataList"+workBaseDataRowIdx+"_nature").html("引用");
+				workBaseDataRowIdx=workBaseDataRowIdx+1;
+			}
+		}
+	}
+</script>
+</body>
+</html>

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

@@ -150,16 +150,11 @@
 			<ul class="list-tabs" >
 				<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
-<%--				<c:if test="${projectRecords.workContractInfo.id!=''}">--%>
-					<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
-<%--				</c:if>--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-<%--				<c:if test="${reportedId!=null}">--%>
-					<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
-<%--				</c:if>--%>
-				<%--				<c:if test="${flagProjectReportData!=null and flagProjectReportData.id!=''}">--%>
-				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
-				<%--				</c:if>--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
@@ -181,7 +176,7 @@
 <%--	</c:if>--%>
 	<c:if test="${projectReportData.id==null}">
 		<div class="topMar">
-			<h2>暂无报告</h2>
+			<h2>暂无质量复核信息</h2>
 		</div>
 	</c:if>
 	<c:if test="${projectReportData.id!=null}">
@@ -206,7 +201,7 @@
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label">
 					<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
-					<h2>报告信息</h2>
+					<h2>质量复核信息</h2>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">送审价(元)：</label>
@@ -294,10 +289,15 @@
 						<input class=" form-control layui-input" style="background-color: #f1f1f1" readonly="readonly" id="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
+					<div class="layui-input-block">
+						<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onkeyup="num(this)" class="form-control layui-input"/>
+					</div>
+				</div>
 			</div>
 			<div class="form-group layui-row">
 				<div style="float: right"> <a href="${ctx}/workfullmanage/workFullManage/downloadMassControl?id=${projectReportData.id}"  onclick="return confirmx('确认要下载控制流程单吗？', this.href)" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载流程单</a></div>
-				<div style="float: right"> <a href="${ctx}/workfullmanage/workFullManage/downloadMassControl1?id=${projectReportData.id}"  onclick="return confirmx('确认要下载咨询报告书吗？', this.href)" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载咨询报告书</a></div>
 				<%--<div style="float: right"> <a href="javascript:void(0)" onclick="preview('预览','${ctx}/workfullmanage/workFullManage/preViewMassControl?id=${projectReportData.id}','80%','80%')">预览流程单</a></div>--%>
 				<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
 				<div class="layui-item layui-col-sm12 lw6">

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

@@ -119,16 +119,11 @@
         <ul class="list-tabs" >
             <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
-<%--            <c:if test="${projectRecords.workContractInfo.id!=''}">--%>
-                <li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
-<%--            </c:if>--%>
+            <li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-<%--            <c:if test="${reportedId!=null}">--%>
-                <li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
-<%--            </c:if>--%>
-<%--            <c:if test="${flagProjectReportData.id!=null}">--%>
-                <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
-<%--            </c:if>--%>
+            <li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>

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

@@ -61,17 +61,11 @@
 		<ul class="list-tabs" >
 			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
-<%--			<c:if test="${projectRecords.workContractInfo!=null and projectRecords.workContractInfo.id!=''}">--%>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
-<%--			</c:if>--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-
-<%--			<c:if test="${reportedId!=null}">--%>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
-<%--			</c:if>--%>
-			<%--			<c:if test="${flagProjectReportData.id!=null}">--%>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
-			<%--			</c:if>--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>

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

@@ -29,17 +29,11 @@
 		<ul class="list-tabs" >
 			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
-<%--			<c:if test="${projectRecords.workContractInfo!=null and projectRecords.workContractInfo.id!=''}">--%>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
-<%--			</c:if>--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-
-<%--			<c:if test="${reportedId!=null}">--%>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
-<%--			</c:if>--%>
-			<%--			<c:if test="${flagProjectReportData.id!=null}">--%>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
-			<%--			</c:if>--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>

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

@@ -23,32 +23,15 @@
         <ul class="list-tabs" >
             <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
-<%--            <c:if test="${projectRecords.workContractInfo.id!=''}">--%>
-                <li  class="active"><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
-<%--            </c:if>--%>
+            <li  class="active"><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-<%--            <c:if test="${reportedId!=null}">--%>
-                <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
-<%--            </c:if>--%>
-            <%--            <c:if test="${flagProjectReportData.id!=null}">--%>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
-            <%--            </c:if>--%>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
-
         </ul>
-<%--        <ul class="list-tabs" >--%>
-<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
-<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>--%>
-<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>--%>
-<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>--%>
-<%--            <c:if test="${reportedId!=null}">--%>
-<%--                <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>--%>
-<%--            </c:if>--%>
-<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>--%>
-<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
-<%--        </ul>--%>
     </div>
     </div>
     <c:if test="${workContractInfo.id==null}">