Browse Source

复核标准电子归档(总审评价)

[user3] 3 năm trước cách đây
mục cha
commit
4c8947d885

+ 10 - 0
src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportRecord.java

@@ -11,6 +11,7 @@ import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.entity.Workattachment;
+import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
 import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.activiti.engine.runtime.ProcessInstance;
@@ -64,6 +65,7 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	private List<ProjectTemplateInfo> fileOtherList;   //其他文件
 	private ProjectReportData projectReportData;		// 报告信息(仅作为展示用)
 	private List<String> chargeCriterionList;	//合同收费标准
+	private List<WorkReviewAudit> projectReviewList;	//复核抽查标准
 
 	private List<RuralReportConsultant> reportedConsultantList= Lists.newArrayList();;//咨询员列表
 
@@ -452,4 +454,12 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	public void setReportedConsultantList(List<RuralReportConsultant> reportedConsultantList) {
 		this.reportedConsultantList = reportedConsultantList;
 	}
+
+	public List<WorkReviewAudit> getProjectReviewList() {
+		return projectReviewList;
+	}
+
+	public void setProjectReviewList(List<WorkReviewAudit> projectReviewList) {
+		this.projectReviewList = projectReviewList;
+	}
 }

+ 40 - 4
src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectReportRecordController.java

@@ -3,10 +3,7 @@
  */
 package com.jeeplus.modules.projectcontentinfo.web;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -26,6 +23,9 @@ import com.jeeplus.modules.sys.dao.UserDao;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
+import com.jeeplus.modules.workreview.entity.WorkReviewStandard;
+import com.jeeplus.modules.workreview.service.WorkReviewStandardService;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.shiro.authz.annotation.Logical;
@@ -70,6 +70,8 @@ public class ProjectReportRecordController extends BaseController {
 	@Autowired
 	private ProjectMaterialDefectRecordService materialDefectRecordService;
 	@Autowired
+	private WorkReviewStandardService workReviewStandardService;
+	@Autowired
 	private UserDao userDao;
 
 	@ModelAttribute
@@ -581,6 +583,40 @@ public class ProjectReportRecordController extends BaseController {
 			Office office = UserUtils.getSelectOffice();
 			//查询项目新增报告信息
 			ProjectReportData reportData = projectReportDataService.get(projectReportRecord.getReport().getId());
+			//重新生成质量复核标准送审数据
+			String infoId="";
+			List<WorkReviewAudit> workReviewAudits = new ArrayList<>();
+			RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(reportData.getProject().getId());
+			if (projectReportRecord.getProjectReviewList()!=null && projectReportRecord.getProjectReviewList().size()!=0){
+				for (WorkReviewAudit workReviewAudit:projectReportRecord.getProjectReviewList()){
+					if (StringUtils.isNotBlank(workReviewAudit.getDeductOption())){
+						infoId=reportData.getId();
+						WorkReviewStandard reviewStandard = workReviewStandardService.get(workReviewAudit.getStandardId());
+						if (reviewStandard==null){
+							workReviewAudit = workReviewStandardService.getAudit(workReviewAudit.getId());
+							workReviewAudits.add(workReviewAudit);
+						}else{
+							workReviewAudit.setReportId(infoId);
+							workReviewAudit.setMaxDeduct(reviewStandard.getMaxDeduct());
+							workReviewAudit.setOrderNum(reviewStandard.getOrderNum());
+							workReviewAudit.setStandardDetail(reviewStandard.getStandardDetail());
+							workReviewAudit.setSort(reviewStandard.getSort());
+							workReviewAudit.setId(null);
+							workReviewAudit.setType("4");
+							workReviewAudit.setParent(new WorkReviewAudit("0"));
+							workReviewAudits.add(workReviewAudit);
+						}
+					}
+				}
+			}
+			workReviewStandardService.deleteAuditType(infoId);
+			if (workReviewAudits!=null && workReviewAudits.size()!=0){
+				for (WorkReviewAudit workReviewAudit:workReviewAudits){
+					workReviewStandardService.saveAudit(workReviewAudit);
+				}
+			}
+
+
 			// 对不同环节的业务逻辑进行操作
 			List<User> users = null;
 			User auditUser = null;

+ 29 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectViewController.java

@@ -777,7 +777,36 @@ public class RuralProjectViewController extends BaseController {
 
         }
         //}
+        //获取复核标准
+        String reviewId="";
+        if ("2".equals(ruralProjectRecords.getSubmitMoney())){
+            reviewId="1";
+        }else{
+            if(StringUtils.isBlank(ruralProjectRecords.getEmergencyProject()) ||"0".equals(ruralProjectRecords.getEmergencyProject())){
+                reviewId="2";
+            }else if ("1".equals(ruralProjectRecords.getEmergencyProject())){
+                reviewId="3";
+            }
+        }
+        List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"紧急项目");
+        //展示
+        ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
 
+        WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+        String type = "4";
+        workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
+        workReviewAudit.setType(type);
+        workReviewAudit.setReportId(projectReportData.getId());
+        List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
+        for(WorkReviewAudit reviewAudit:workReviewAudits){
+            for (WorkReviewAudit audit:audits){
+                if (reviewAudit.getId().equals(audit.getStandardId())){
+                    reviewAudit.setDeductOption(audit.getDeductOption());
+                    break;
+                }
+            }
+        }
+        model.addAttribute("list", workReviewAudits);
         model.addAttribute("projectReportRecord", projectReportRecord);
         model.addAttribute("project", projectReportRecord.getReport().getProject());
         return "modules/ruralprojectrecords/view/projectReportRecordView";

+ 30 - 0
src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -3890,6 +3890,20 @@ public class WorkProjectNotifyController extends BaseController {
 					projectcontentinfo.setProjectReportData(projectReportData);
 					//获取项目信息
 					RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.getQueryProjectUsers(projectReportRecord.getReport().getProject().getId());
+					//获取复核标准
+					String reviewId="";
+					if ("2".equals(ruralProjectRecords.getSubmitMoney())){
+						reviewId="1";
+					}else{
+						if(StringUtils.isBlank(ruralProjectRecords.getEmergencyProject()) ||"0".equals(ruralProjectRecords.getEmergencyProject())){
+							reviewId="2";
+						}else if ("1".equals(ruralProjectRecords.getEmergencyProject())){
+							reviewId="3";
+						}
+					}
+					List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"紧急项目");
+					model.addAttribute("list", workReviewAudits);
+
 					//获取子项目列表信息
 					List<SubProjectInfo> subProjectInfos=this.queryReportDetails(ruralProjectRecords.getId());
 					//获取合同信息
@@ -4014,6 +4028,22 @@ public class WorkProjectNotifyController extends BaseController {
 					model.addAttribute("projectReportRecord", projectReportRecord);
 					model.addAttribute("project", projectReportRecord.getReport().getProject());
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						//展示
+						WorkReviewAudit workReviewAudit = new WorkReviewAudit();
+						String type = "4";
+						workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
+						workReviewAudit.setType(type);
+						workReviewAudit.setReportId(projectReportData.getId());
+						List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
+						for(WorkReviewAudit reviewAudit:workReviewAudits){
+							for (WorkReviewAudit audit:audits){
+								if (reviewAudit.getId().equals(audit.getStandardId())){
+									reviewAudit.setDeductOption(audit.getDeductOption());
+									break;
+								}
+							}
+						}
+						model.addAttribute("list", workReviewAudits);
 						projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
 						projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
 						projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));

+ 6 - 6
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -820,12 +820,12 @@
 											//驳回操作
 											if(d.newRecordTwoNotifyFlag == 1){
 												<%--xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档1</a>";--%>
-												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordUrgentModify?id=" + d.prrId + "&view=urgent','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档1</a>";
+												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordUrgentModify?id=" + d.prrId + "&view=urgent','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 											}else if(d.newRecordNotifyFlag == 1){
-												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordUrgentModify?id=" + d.prrId + "&view=urgent ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档2</a>";
+												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordUrgentModify?id=" + d.prrId + "&view=urgent ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 												<%--xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档2</a>";--%>
 											}else{
-												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档3</a>";
+												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 											}
 										}
 									}
@@ -849,11 +849,11 @@
 									if(d.projectReportRecordStatus == 4){
 										//驳回操作
 										if(d.newRecordTwoNotifyFlag == 1){
-											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档4</a>";
+											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 										}else if(d.newRecordNotifyFlag == 1){
-											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档5</a>";
+											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 										}else{
-											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档6</a>";
+											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 										}
 									}
 								}

+ 89 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp

@@ -1420,15 +1420,54 @@
 					</div>
 				</div>
 			</c:if>
-
+			<c:if test="${type=='1'}">
+				<div style="overflow:hidden;">
+					<div class="form-group-label">
+						<h2>质量复核内容</h2>
+					</div>
+					<div>
+						<div class="layui-item layui-col-xs12" >
+							<table id="treeTable2" class="table table-bordered table-condensed reviews no-bottom-margin">
+								<thead>
+								<tr>
+									<th width="40%">符合内容及评分标准</th>
+									<th width="10%">自校</th>
+									<th >意见</th>
+								</tr>
+								</thead>
+								<tbody id="projectReviewList">
+								<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
+									<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+										<td class="hide">
+											<input id="projectReviewList${index.index}_standardId" name="projectReviewList[${index.index}].standardId" type="hidden" value="${workReviewAudit.id}"/>
+										</td>
+										<td title="${workReviewAudit.standardDetail}">
+												${workReviewAudit.standardDetail}
+										</td>
+										<td>
+											<i class="fa fa-check"></i>
+										</td>
+										<td class="input-td">
+											<input id="deductOpinion" name="projectReviewList[${index.index}].deductOption" placeholder="请输入意见" readonly="true" style="background-color: #FFFFFF;" value="" onclick="openDeductInfo(this.value,'${workReviewAudit.id}',this)" class="form-control layui-input"/>
+										</td>
+									</tr>
+								</c:forEach>
+								</tbody>
+							</table>
+						</div>
+					</div>
+				</div>
+			</c:if>
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
+		<div>
 		<div class="form-group-label">
 			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${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>
 		</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>
+		</div>
+		</div>
 </div>
 <script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 <script src="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.js" charset="utf-8"></script>
@@ -1725,6 +1764,54 @@
 			});
 		}
 	}
+	function openDeductInfo(value,id,obj) {
+		top.layer.open({
+			type: 2,
+			area: ['80%','65%'],
+			title:"意见",
+			name:'friend',
+			skin:"two-btns",
+			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectDeduct?deductOpinion="+value+"&identification=ReportjinjiComments"),
+			btn: ['确定', '关闭'],
+			yes: function(index, layero){
+				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+				var item = iframeWin.getSelectedItem();
+				console.log(item);
+				if(item == "-1"){
+					return;
+				}
+				var items = item.split('_item_');
+				console.log(items)
+				var option=items[1];
+				$.ajax({
+					url:"${ctx}/workreview/workReviewStandard/reportDeductOption",
+					data:{
+						"deductOption":option,
+						"id":id,
+					},
+					type:"post",
+					success:function(data){
+						if(data.status){
+							$(obj).val(option);
+							// parent.layer.msg('输入意见项成功',{icon:1});
+						}else {
+							parent.layer.msg(data.error,{icon:2});
+						}
+					}
+				});
+				top.layer.close(index);//关闭对话框。
+			},
+			cancel: function(index){
+			}
+		});
+	}
+	function readOpenInfo(value) {
+		layer.open({
+			title: '意见',
+			btn: ['关闭'],
+			content: value
+		});
+	}
 </script>
 </body>
 </html>

+ 6 - 6
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -817,13 +817,13 @@
 										if(d.projectReportRecordStatus == 4){
 											//驳回操作
 											if(d.newRecordTwoNotifyFlag == 1){
-												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordUrgentModify?id=" + d.prrId + "&view=Reurgent','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档1</a>";
+												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordUrgentModify?id=" + d.prrId + "&view=Reurgent','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 												<%--xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档1</a>";--%>
 											}else if(d.newRecordNotifyFlag == 1){
-												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordUrgentModify?id=" + d.prrId + "&view=Reurgent ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档2</a>";
+												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordUrgentModify?id=" + d.prrId + "&view=Reurgent ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 												<%--xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";--%>
 											}else{
-												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档3</a>";
+												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 											}
 										}
 									}
@@ -846,11 +846,11 @@
 									if(d.projectReportRecordStatus == 4){
 										//驳回操作
 										if(d.newRecordTwoNotifyFlag == 1){
-											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档4</a>";
+											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 										}else if(d.newRecordNotifyFlag == 1){
-											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档5</a>";
+											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 										}else{
-											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档6</a>";
+											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 										}
 									}
 								}

+ 38 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/view/projectReportRecordView.jsp

@@ -338,6 +338,44 @@
 					</div>
 				</div>
 			</div>
+			<div>
+				<div class="form-group-label">
+					<h2>质量复核内容</h2>
+				</div>
+				<div>
+					<div class="layui-item layui-col-xs12" >
+						<table id="treeTable2" class="table table-bordered table-condensed reviews no-bottom-margin">
+							<thead>
+							<tr>
+									<%--<th width="25%">序号</th>--%>
+								<th width="40%">符合内容及评分标准</th>
+								<th width="10%">自校</th>
+									<%--								<th width="10%">最高分</th>--%>
+									<%--								<th width="10%">扣分</th>--%>
+								<th >意见</th>
+
+									<%--<th width="15%">操作</th>--%>
+							</tr>
+							</thead>
+							<tbody>
+							<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
+								<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+									<td title="${workReviewAudit.standardDetail}">
+											${workReviewAudit.standardDetail}
+									</td>
+									<td>
+										<i class="fa fa-check"></i>
+									</td>
+									<td class="input-td">
+										<input id="deductOpinion" style="text-align: center;background-color: #fff" title="${workReviewAudit.deductOption}" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
+									</td>
+								</tr>
+							</c:forEach>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >