报告签发审核调整功能

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

@@ -161,4 +161,13 @@ public interface ProjectReportDataTwoDao extends CrudDao<ProjectReportDataTwo> {
      * @return
      */
     int updateStatus(ProjectReportDataTwo projectReportData);
+
+    /**
+     * 查询所有已经处理的报告签发且签发表中的auditContent参数值为空的数据
+     * @return
+     */
+    List<ProjectReportDataTwo> getNotDisposeReportSignatureAuditAchievement();
+
+
+    int updateAuditContent(ProjectReportDataTwo projectReportData);
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportDataTwo.java

@@ -58,6 +58,7 @@ public class ProjectReportDataTwo extends ActEntity<ProjectReportDataTwo> {
 	private String numberPath;
 	private String tempType;    //模板类型
 	private String bzshbUserId; //总审用户id
+	private String auditContent; //审核意见
 
 	public String getNumberPath() {
 		return numberPath;
@@ -775,4 +776,12 @@ public class ProjectReportDataTwo extends ActEntity<ProjectReportDataTwo> {
 	public void setContractRate(String contractRate) {
 		this.contractRate = contractRate;
 	}
+
+	public String getAuditContent() {
+		return auditContent;
+	}
+
+	public void setAuditContent(String auditContent) {
+		this.auditContent = auditContent;
+	}
 }

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

@@ -1625,4 +1625,17 @@ public class ProjectReportDataTwoService extends CrudService<ProjectReportDataTw
 	public ProjectReportDataTwo findTwoByProjectId(String projectId){
 		return dao.findTwoByProjectId(projectId);
 	}
+
+	/**
+	 * 查询所有已经处理的报告签发且签发表中的auditContent参数值为空的数据
+	 * @return
+	 */
+	public List<ProjectReportDataTwo> getNotDisposeReportSignatureAuditAchievement(){
+		return dao.getNotDisposeReportSignatureAuditAchievement();
+	}
+
+	@Transactional(readOnly = false)
+	public void updateAuditContent(ProjectReportDataTwo projectReportData) {
+		dao.updateAuditContent(projectReportData);
+	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectMessageDao.java

@@ -165,10 +165,6 @@ public interface RuralProjectMessageDao extends CrudDao<RuralProjectRecords> {
      */
     ProjectReportData getInfoById(String id);
 
-    /**
-     * 查询开票信息
-     * @param ruralProjectRecords
-     * @return
-     */
-//    Integer findKaiPiao(RuralProjectRecords ruralProjectRecords);
+
+    void saveReportAuditContent(ProjectReportDataTwo projectReportData);
 }

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

@@ -980,6 +980,13 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
         }
         if (!"yes".equals(flag)){
             workReviewAuditDao.delReviewAudit(projectReportData.getId());
+        }else{
+            if (null != reportData.getAct() && StringUtils.isNotBlank(reportData.getAct().getComment())){
+
+                String actComment = reportData.getAct().getComment();
+                actComment = actComment.replaceAll("\\[同意\\]", "");
+                projectReportData.setAuditContent(actComment);
+            }
         }
         projectReportData.setTechnicist(reportData.getTechnicist());
         projectReportData.setTechnicistRemarks(reportData.getTechnicistRemarks());
@@ -1071,4 +1078,14 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
         //删除流程人员表信息
         workProjectNotifyService.deleteActivityProcessUser(projectReportData.getProcessInstanceId());
     }
+
+
+    @Transactional(readOnly = false)
+    public String saveReportAuditContent(ProjectReportDataTwo projectReportData) {
+        if(StringUtils.isNotBlank(projectReportData.getAuditContent()) && StringUtils.isNotBlank(projectReportData.getId())){
+            dao.saveReportAuditContent(projectReportData);
+            return "true";
+        }
+        return "false";
+    }
 }

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

@@ -365,6 +365,106 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
         }
     }
 
+
+    /**
+     * 跳转新增报告页面
+     * @param projectcontentinfo
+     * @param request
+     * @param response
+     * @param model
+     * @param attr
+     * @return
+     */
+    @RequestMapping(value = {"adminEditForm"})
+    public String adminEditForm(RuralProjectcontentinfo projectcontentinfo, Double reviewFee, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) throws Exception {
+        //查询“配农网”工程类型id
+        String engineeringId = engineeringService.getEngineeringId("202");
+//        Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
+//        model.addAttribute("parentIds", projectcontentinfo1.getParentIds());
+        String dictType = projectcontentinfo.getDictType();
+        RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(projectcontentinfo.getProjectId());
+
+        projectcontentinfo.setProject(records);
+        ProjectReportData data=reportDataService.getReportDataByProjectId(projectcontentinfo.getProject().getId());
+        projectcontentinfo.setProjectReportData(data);
+        ProjectReportDataTwo projectReportData =projectReportDataService.findTwoByProjectId(projectcontentinfo.getProjectId());
+        if (null == projectReportData){
+            projectReportData=new ProjectReportDataTwo();
+            projectReportData.setType(dictType);
+            projectReportData.setNumber("");
+        }else{
+            projectReportData.setType(dictType);
+            if (projectcontentinfo.getProjectReportDataTwo()!=null && StringUtils.isNotBlank(projectcontentinfo.getProjectReportDataTwo().getId())) {
+                projectReportData = projectReportDataService.get(projectcontentinfo.getProjectReportDataTwo().getId());
+            }
+            if (projectReportData.getMaster()==null || StringUtils.isBlank(projectReportData.getMaster().getId())){
+                projectReportData.setMaster(UserUtils.getUser());
+            }
+            if (StringUtils.isBlank(projectReportData.getStatus())){
+                projectReportData.setFileStatus("1");
+            }
+        }
+        if(null != reviewFee){
+            projectReportData.setReviewFee(String.valueOf(reviewFee));
+        }
+
+        //获取自检的质量复核标准
+        String reviewId="";
+        if ("2".equals(records.getSubmitMoney())){
+            reviewId="1";
+        }else{
+            if (StringUtils.isBlank(records.getEmergencyProject()) || "0".equals(records.getEmergencyProject())){
+                reviewId="2";
+            }
+        }
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListIssue(reviewId,"报告签发");
+        if (null!=workReviewAudits){
+            projectReportData.setProjectReviewList(workReviewAudits);
+            model.addAttribute("workReviews",workReviewAudits);
+        }
+        projectcontentinfo.setProjectReportDataTwo(projectReportData);
+
+        ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+        //添加项目类型
+        relateInfo.setAttachmentProjectType(records.getProjectType());
+        relateInfo.setAttachmentProjectSort(records.getAttachmentProjectSort());
+        //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+        String money=projectcontentinfo.getProject().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;
+        }
+
+        //添加报告类型
+        relateInfo.setRequiredStage(1);
+        relateInfo.setId(records.getId());
+
+
+        //添加当前文件服务器类型
+        projectcontentinfo.setUploadMode(uploadMode);
+        model.addAttribute("projectRecords", records);
+        model.addAttribute("projectcontentinfo", projectcontentinfo);
+        model.addAttribute("projectReportDataTwo", projectcontentinfo.getProjectReportDataTwo());
+
+        return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportAdminFormTwo";
+    }
+
     /**
      * 新增报告信息
      * @param projectcontentinfo
@@ -836,4 +936,41 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
     }
 
 
+
+    /**
+     * 暂存报告信息
+     * @param projectcontentinfo
+     * @param model
+     * @param redirectAttributes
+     * @return
+     */
+    @RequestMapping(value = {"saveReportAuditContent"})
+    public String saveReportAuditContent(Projectcontentinfo projectcontentinfo, Model model,RedirectAttributes redirectAttributes)  {
+        try{
+            //修改报告签发审核信息
+            String str = ruralProjectMessageService.saveReportAuditContent(projectcontentinfo.getProjectReportDataTwo());
+            addMessage(redirectAttributes, "修改报告签发审核信息"+(str.equals("true")?"成功":"失败"));
+            ProjectReportDataTwo projectReportData = projectcontentinfo.getProjectReportDataTwo();
+            if (projectReportData!=null){
+                if (StringUtils.isNotBlank(projectcontentinfo.getView()) && projectcontentinfo.getView().equals("edit")){
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+                }
+                if (StringUtils.isNotBlank(projectcontentinfo.getView()) && projectcontentinfo.getView().equals("costLiu")){
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                }
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+            }
+        }catch (Exception e){
+            logger.error("ProjectcontentinfoController save Exception e"+e);
+        }
+        if(UserUtils.isManager()){
+            model.addAttribute("flag","1");
+        }
+        addMessage(redirectAttributes, "修改报告签发审核信息失败");
+        if (StringUtils.isNotBlank(projectcontentinfo.getView()) && projectcontentinfo.getView().equals("costLiu")){
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+        }
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+    }
+
 }

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

@@ -14,8 +14,10 @@ import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportRecordDao;
 import com.jeeplus.modules.projectcontentinfo.entity.DisposeProjectReportNumberInfo;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportDataTwo;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataTwoService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportRecordService;
 import com.jeeplus.modules.ruralprojectrecords.entity.PhysicsSeal;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
@@ -31,6 +33,8 @@ import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.tools.utils.SignaturePostUtil;
 import com.jeeplus.modules.utils.SftpClientUtil;
+import com.jeeplus.modules.workactivity.entity.WorkActivityProcess;
+import com.jeeplus.modules.workactivity.service.WorkActivityProcessService;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workinvoice.entity.TemporaryInvoiceInfo;
 import com.jeeplus.modules.workinvoice.service.WorkInvoiceService;
@@ -82,6 +86,10 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
     protected HistoryService historyService;
     @Autowired
     private RuralProjectSignatureOldMessageDisposeService service;
+    @Autowired
+    private ProjectReportDataTwoService projectReportDataTwoService;
+    @Autowired
+    private WorkActivityProcessService workActivityProcessService;
 
 
     @Autowired
@@ -934,4 +942,40 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
         return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessageAll/?repage";
     }
 
+    /**
+     * 处理报告签章审核结果信息
+     * @return
+     */
+    @RequestMapping(value = "/disposeReportSignatureAuditAchievement")
+    @ResponseBody
+    @Transactional(readOnly = false)
+    public Map<String,Object> disposeReportSignatureAuditAchievement(){
+        Map<String,Object> resultMap = new HashMap<>();
+        //查询所有已经处理的报告签发且签发表中的auditContent参数值为空的数据
+        //获取报告签发
+        List<ProjectReportDataTwo> projectReportDataTwoList =projectReportDataTwoService.getNotDisposeReportSignatureAuditAchievement();
+        for (ProjectReportDataTwo projectReportDataTwo : projectReportDataTwoList) {
+
+            WorkActivityProcess selectProcess = new WorkActivityProcess();
+            selectProcess.setProcessInstanceId(projectReportDataTwo.getProcessInstanceId());
+            List<WorkActivityProcess> workActivityProcesses = workActivityProcessService.findList(selectProcess);
+            if (workActivityProcesses.size()!=0){
+                WorkActivityProcess workActivityProcess=workActivityProcesses.get(0);
+                if (null!=workActivityProcess){
+                    String str=workActivityProcess.getRemarks().split("]",2)[1];
+                    if(StringUtils.isNotBlank(str)){
+
+                        projectReportDataTwo.setAuditContent(str);
+                        //修改数据信息
+                        projectReportDataTwoService.updateAuditContent(projectReportDataTwo);
+                    }
+                }
+            }
+        }
+
+        resultMap.put("msgMonth","数电发票处理完成");
+        return resultMap;
+    }
+
+
 }

src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -1681,7 +1681,12 @@ public class WorkFullManageController extends BaseController {
 			data.put("projectMonth","");
 			data.put("projectDay","");
 		}
-		WorkActivityProcess selectProcess = new WorkActivityProcess();
+		if(StringUtils.isNotBlank(projectReportDataTwo.getAuditContent())){
+			data.put("signRemarks",projectReportDataTwo.getAuditContent());
+		}else{
+			data.put("signRemarks","");
+		}
+		/*WorkActivityProcess selectProcess = new WorkActivityProcess();
 		selectProcess.setProcessInstanceId(projectReportDataTwo.getProcessInstanceId());
 		List<WorkActivityProcess> workActivityProcesses = workActivityProcessService.findList(selectProcess);
 		if (workActivityProcesses.size()!=0){
@@ -1694,7 +1699,7 @@ public class WorkFullManageController extends BaseController {
 			}
 		}else{
 			data.put("signRemarks","");
-		}
+		}*/
 		if ("5".equals(projectReportDataTwo.getStatus())){
 			User user1=UserUtils.get(projectReportDataTwo.getBzshbUserId());
 			if (StringUtils.isNotBlank(user1.getName())){

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

@@ -15,7 +15,8 @@
 		a.project_id AS "project.id",
 		a.status AS "status",
 		a.process_instance_id AS "processInstanceId",
-		a.audit_pass_date AS "auditPassDate"
+		a.audit_pass_date AS "auditPassDate",
+		a.audit_content as "auditContent"
 	</sql>
 	<sql id="projectReportDataColumns1">
 		a.id AS "id",
@@ -537,6 +538,9 @@
 		<if test="bzshbUserId != null and bzshbUserId != ''">
 			,bzshb_user_id = #{bzshbUserId}
 		</if>
+		<if test="auditContent != null and auditContent != ''">
+			,audit_content = #{auditContent}
+		</if>
 		WHERE id = #{id}
 	</update>
 
@@ -814,4 +818,26 @@
 		WHERE id = #{id}
 	</update>
 
+	<select id="getNotDisposeReportSignatureAuditAchievement"
+			resultType="com.jeeplus.modules.projectcontentinfo.entity.ProjectReportDataTwo">
+		SELECT
+		<include refid="projectReportDataColumns"/>
+		,a.bzshb_user_id as "bzshbUserId"
+		,su.name as "createName"
+		FROM
+		rural_project_records r
+		LEFT JOIN project_report_data_two a on a.project_id=r.id and a.del_flag = 0
+		left join sys_user su on su.id = a.create_by
+		<where>
+			a.status = 5 and a.audit_content is null
+		</where>
+
+	</select>
+
+	<update id="updateAuditContent">
+		UPDATE project_report_data_two SET
+		audit_content = #{auditContent}
+		WHERE id = #{id}
+	</update>
+
 </mapper>

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

@@ -1847,4 +1847,10 @@
 		from project_report_data a
 		where a.id = #{id}
 	</select>
+
+	<update id="saveReportAuditContent">
+		update project_report_data_two
+		set audit_content = #{auditContent}
+		where id = #{id}
+	</update>
 </mapper>

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

@@ -474,11 +474,14 @@
     </update>
 
 	<select id="getLastSecrecyProjectName" resultType="java.lang.String" >
-		SELECT
-		secrecy_project_name
-		FROM rural_project_records_reported
-		WHERE report_status = 5 or report_status = 7
-		order by secrecy_project_name desc  limit 1
+		select
+			secrecy_project_name
+		from
+			rural_project_records_reported
+		where
+			report_status = 5 or report_status = 7
+		order by
+			cast(secrecy_project_name as unsigned) desc limit 1
 	</select>
 
 </mapper>

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

@@ -350,6 +350,47 @@
 
 		}
 
+
+
+		//材料跳转
+		function openDialogreAdmin(title,url,width,height,target){
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				maxmin: true, //开启最大化最小化按钮
+				content: url ,
+				skin:"two-btns",
+				btn: ['提交','关闭'],
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(2) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+					return false;
+				},
+				btn2: function(index){
+				}
+			});
+
+		}
+
 		//材料跳转
 		function openDialogreTwo(title,url,width,height,target){
 			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
@@ -1032,7 +1073,10 @@
 			}
 			<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:adminEdit">
 			if ('0'!=d.projectReportStatus && '1'!=d.projectReportStatus){
-				xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralCostProjectMessage/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改质量复核</a>";
+				xml+="<a href=\"#\" onclick=\"openDialogreAdmin('修改质量复核', '${ctx}/ruralProject/ruralCostProjectMessage/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改复核信息</a>";
+			}
+			if ('0'!=d.projectReportStatusTwo && '1'!=d.projectReportStatusTwo){
+				xml+="<a href=\"#\" onclick=\"openDialogreAdmin('修改报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/adminEditForm?projectId=" + d.id + "&view=costLiu','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改签发信息</a>";
 			}
 			/*if(d.paperFilingStatus == 5 || d.paperFilingStatus == 7){
 				xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?id=" + d.ppfId + "&projectId=" + d.id +" ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改纸质归档</a>";

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

@@ -17,6 +17,10 @@
 			$("#opinion").val(ss);
             if(validateForm.form()){
                 if(obj == 1) {
+                	if(!ss){
+						top.layer.msg("请填写报告签发审核意见！", {icon: 0});
+						return ;
+					}
 					var flags=judgment();
 					if (flags){
 						$("#flag").val("yes");
@@ -89,6 +93,7 @@
 					tips: 3
 				});
 			})
+			console.log(1231251231)
 			$(".list-tabs li").click(function(){
 				$(".list-tabs li").each(function(){
 					$(this).removeAttr("class","active");
@@ -207,7 +212,7 @@
 <body >
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="projectcontentinfo" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectMessageNewTwo/reportAudit" method="post" class="form-horizontal layui-form">
+		<form:form id="inputForm" modelAttribute="projectcontentinfo" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectMessageNewTwo/reportAudit" method="post" class="layui-form">
 			<form:hidden path="id"/>
 			<form:hidden path="home"/>
 			<form:hidden path="project.id"/>
@@ -239,22 +244,22 @@
 			</div>--%>
 			<div class="form-group layui-row first lw12">
 				<div class="tapfixed" style="width: 80%;">
-					<div class="list-form-tab contentShadow list-form-tab" id="tabDiv">
+					<div class="list-form-tab contentShadow" id="tabDiv">
 						<ul class="list-tabs" >
-							<li class="active"><a>基本信息</a><span class="hide">projectInfo</span></li>
+							<li><a>基本信息</a><span class="hide">projectInfo</span></li>
 							<li><a>子项目列表</a><span class="hide">subProjectInfo</span></li>
 							<li><a>合同信息</a><span class="hide">workContractInfo</span></li>
 							<li><a>客户信息</a><span class="hide">workClientInfo</span></li>
 							<li><a>项目计划信息</a><span class="hide">planView</span></li>
 							<li><a>质量复核信息</a><span class="hide">qualityView</span></li>
-							<li><a>报告签发信息</a><span class="hide">issueView</span></li>
+							<li class="active"><a>报告签发信息</a><span class="hide">issueView</span></li>
 							<li><a>档案信息</a><span class="hide">AccessoryView</span></li>
 						</ul>
 					</div>
 				</div>
 			</div>
 			<div style="margin-top: 50px;overflow:hidden;">
-				<div class="form-group layui-row first" id="projectInfo">
+				<div class="form-group layui-row first hide" id="projectInfo">
 						<%--				<div class="form-group-label"><h2>项目基本信息</h2></div>--%>
 					<div>
 						<div class="layui-item layui-col-sm6 lw6">
@@ -1033,7 +1038,7 @@
 								<form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 							</div>
 						</div>--%>
-						<div class="layui-item layui-col-sm6 lw7">
+						<div class="layui-item layui-col-sm6 lw6">
 							<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" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
@@ -1184,8 +1189,8 @@
 						</div>
 					</c:if>
 				</div>
-				<div class="form-group layui-row first hide" id="issueView">
-					<div class="form-group layui-row first lw12">
+				<div class="form-group layui-row first" id="issueView">
+					<div class="form-group layui-row first">
 						<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>
@@ -1236,13 +1241,13 @@
 						</div>
 						<c:if test="${projectRecords.projectType == 2}">
 							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">核增核减额(元)：</label>
+								<label class="layui-form-label double-line">核增核减额(元)：</label>
 								<div class="layui-input-block with-icon">
 									<form:input id="verifyFee" 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>
+								<label class="layui-form-label double-line">核增核减率(%)：</label>
 								<div class="layui-input-block with-icon">
 									<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 								</div>
@@ -1263,25 +1268,25 @@
 						</div>
 						<c:if test="${projectRecords.projectType == 2}">
 							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">土建造价(元)：</label>
+								<label class="layui-form-label double-line">土建造价(元)：</label>
 								<div class="layui-input-block with-icon">
 									<form:input id="buildingFee" 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>
+								<label class="layui-form-label double-line">安装造价(元)：</label>
 								<div class="layui-input-block with-icon">
 									<form:input id="installFee" 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>
+								<label class="layui-form-label double-line">土建比例(%)：</label>
 								<div class="layui-input-block with-icon">
 									<form:input id="buildingRate" 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>
+								<label class="layui-form-label double-line">安装比例(%)：</label>
 								<div class="layui-input-block with-icon">
 									<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
 								</div>
@@ -1290,13 +1295,13 @@
 
 
 						<div class="layui-item layui-col-sm6">
-							<label class="layui-form-label">工作开始日期：</label>
+							<label class="layui-form-label double-line">工作开始日期：</label>
 							<div class="layui-input-block with-icon">
 								<input class=" form-control layui-input" readonly="readonly"  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>
+							<label class="layui-form-label double-line">工作结束日期：</label>
 							<div class="layui-input-block with-icon">
 								<input class=" form-control layui-input" readonly="readonly" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 							</div>
@@ -1360,7 +1365,7 @@
 					<div>
 						<div class="form-group-label">
 							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre1('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
-							<h2>审批意见</h2>
+							<h2><span class="require-item">*</span>审批意见<span style="color: red;font-size: 14px">     (请填写报告签发意见，此内容回再流程单中展示)</span></h2>
 						</div>
 						<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 					</div>

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

@@ -227,6 +227,47 @@
 			});
 		}
 
+		//材料跳转
+		function openDialogreAdmin(title,url,width,height,target){
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				maxmin: true, //开启最大化最小化按钮
+				content: url ,
+				skin:"two-btns",
+				btn: ['提交','关闭'],
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(2) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+					return false;
+				},
+				btn2: function(index){
+				}
+			});
+
+		}
+
+
+
 		function openDialogreReportSwitch(title,url,width,height,target,buttons) {
 
 			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
@@ -964,7 +1005,10 @@
 			}
 			<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:adminEdit">
 			if ('0'!=d.projectReportStatus && '6'!=d.projectReportStatus && '1'!=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\"  style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改质量复核</a>";
+				xml+="<a href=\"#\" onclick=\"openDialogreAdmin('修改质量复核', '${ctx}/ruralProject/ruralProjectMessage/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\"  style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改复核信息</a>";
+			}
+			if ('0'!=d.projectReportStatusTwo && '1'!=d.projectReportStatusTwo){
+				xml+="<a href=\"#\" onclick=\"openDialogreAdmin('修改报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/adminEditForm?projectId=" + d.id + "&view=edit','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改签发信息</a>";
 			}
 			/*if(d.paperFilingStatus == 5 || d.paperFilingStatus == 7){
 				xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?id=" + d.ppfId + "&projectId=" + d.id +"&view=filing ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\"  style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改纸质归档</a>";

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

@@ -303,10 +303,17 @@
 						<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 					</div>
 				</div>
+
+				<div class="layui-item layui-col-sm12 lw7">
+					<label class="layui-form-label double-line">报告签发审批意见：</label>
+					<div class="layui-input-block">
+						<textarea htmlEscape="false" rows="4" readonly="true"  style="background-color: #f1f1f1" maxlength="1000" class="form-control" >${projectReportDataTwo.auditContent}</textarea>
+					</div>
+				</div>
 			</div>
 			<div>
 				<div class="form-group-label">
-					<h2>质量复核内容</h2>
+					<h2>报告签发内容</h2>
 				</div>
 				<div>
 					<div class="layui-item layui-col-xs12" >