项目管理

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

@@ -143,6 +143,9 @@ public class RuralProjectMessageController extends BaseController {
     @RequiresPermissions("ruralProject:ruralProjectMessage:list")
     @RequestMapping(value = {"list", ""})
     public String list(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //添加标识
+        String flag = projectRecords.getCompanyType();
+        model.addAttribute("companyType", flag);
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }

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

@@ -598,7 +598,7 @@
 	<div class="layui-row">
 		<div class="full-width fl">
 			<div class="layui-row contentShadow shadowLR" id="queryDiv">
-				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralProjectMessage/" method="post" class="layui-form">
+				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralProjectMessage/?companyType=${companyType}" method="post" class="layui-form">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 					<input id="toflag" name="toflag" type="hidden" value="1"/>
@@ -787,7 +787,7 @@
 				,{field:'projName',align:'center', title: '项目名称', minWidth:200,templet:function(d){
 						var xml="";
 						<shiro:hasPermission name="ruralProject:ruralProjectView:consultinglistView">
-						xml+="<a class=\"attention-info pid\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">"
+						xml+="<a class=\"attention-info pid\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?companyType=${companyType}&id=" + d.id +"','95%', '95%')\">"
 						</shiro:hasPermission>
 						xml+=d.projName
 						<shiro:hasPermission name="ruralProject:ruralProjectView:consultinglistView">
@@ -807,7 +807,7 @@
 					}}
 				,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
 						if(""!= d.contract && null!= d.contract ){
-							return "<a class=\"attention-info pid\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contract + "</a>";
+							return "<a class=\"attention-info pid\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?companyType=${companyType}&id=" + d.contractId + "','95%', '95%')\">" + d.contract + "</a>";
 							// return d.contractName;
 						}else{
 							return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
@@ -839,7 +839,7 @@
                 ,{align:'center', title: '质量复核',  width:70,templet:function(d){
                         var st = getAuditState(d.projectReportStatus);
                         if(st.action)
-                            var xml = "<span onclick=\"openDialogReportView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+d.id+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml = "<span onclick=\"openDialogReportView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getProcessOne?companyType=${companyType}&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;
@@ -847,7 +847,7 @@
 				,{align:'center', title: '报告签发',  width:90,templet:function(d){
 						var st = getAuditState(""+d.projectReportStatusTwo);
 						if(st.action)
-							var xml = "<span onclick=\"openDialogReportTwoView('流程追踪', '${ctx}/ruralProject/ruralProjectMessageNewTwo/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+d.id+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							var xml = "<span onclick=\"openDialogReportTwoView('流程追踪', '${ctx}/ruralProject/ruralProjectMessageNewTwo/getProcessOne?companyType=${companyType}&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;
@@ -856,12 +856,12 @@
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
 						var de = getdefectRecordState(""+d.defectRecordStatus);
 						if(st.action){
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?id="+d.prrId+"&processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?companyType=${companyType}&id="+d.prrId+"&processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}else{
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
 						if (d.defectRecordStatus>0){
-							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcessInformation?processInstanceId=" + d.pmdrProcessInstanceId + "&reportId=" + d.bid + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
+							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcessInformation?companyType=${companyType}&processInstanceId=" + d.pmdrProcessInstanceId + "&reportId=" + d.bid + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
 						}
                         return xml;
                     }}
@@ -881,9 +881,9 @@
 						}
                         if(st.action){
                         	if (d.submitMoney=="1"){
-								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?companyType=${companyType}&processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 							}else if (d.submitMoney=="2"){
-								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?companyType=${companyType}&processInstanceId=" + d.ppfProcessInstanceId + "','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>";
@@ -893,7 +893,7 @@
                 ,{align:'center', title: '上报',  width:90,templet:function(d){
                         var st = getReportedState(d.reportedState);
                         if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?companyType=${companyType}&processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         else
                             var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
@@ -901,11 +901,11 @@
 				,{align:'center', title: '案例项目申报',  width:150,templet:function(d){
 						var st = getCaseBaseAuditState(d.caseStatus);
 						if(st.action)
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.caseProcessId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?companyType=${companyType}&processInstanceId=" + d.caseProcessId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
 						else
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						if (d.caseType == 1){
-							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.caseProcessId + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">是</span>";
+							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?companyType=${companyType}&processInstanceId=" + d.caseProcessId + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">是</span>";
 						}
 						return xml;
 					}}
@@ -923,10 +923,10 @@
 						var xml = '<div class=\"layui-btn-group\">';
 						if(d.falg=="1"){
 							if(d.projectReportStatus == 0){
-								xml+="<a href=\"#\" onclick=\"openDialogre('新增报告质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 新增质量复核</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('新增报告质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 新增质量复核</a>";
 							}
 							if(d.projectReportStatus == 1){
-								xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
 								<%--xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";--%>
 							}
 							if(d.projectReportStatus == 2){
@@ -934,13 +934,13 @@
 							}
 							if(d.projectReportStatus == 3){
 								//撤回操作
-								xml+="<a href=\"#\" onclick=\"openDialogre('调整质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/modify?projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('调整质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/modify?companyType=${companyType}&projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
 								<%--xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告质量复核吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";--%>
 							}
 							if(d.projectReportStatus == 4){
 								//驳回操作
 								// if(d.newReportNotifyFlag == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogreReport('调整质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogreReport('调整质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/modify?companyType=${companyType}&projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
 								<%--}else{--%>
 								<%--	xml+="<a href=\"#\" onclick=\"openDialogreReport('调整质量复核', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";--%>
 								<%--}--%>
@@ -950,14 +950,14 @@
 							//案例项目申请按钮
 							if(d.reportedState == 5 && d.projectReportRecordStatus == 5){
 								if (d.caseType != 1 && d.caseStatus !=2 && d.caseStatus !=5 && d.caseStatus != 4 ){
-									xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogreCaseBase('${ctx}/ruralProject/ruralCostProjectMessage/caseBase?projectId=" + d.id + " ')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 申请案例项目</a>";
+									xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogreCaseBase('${ctx}/ruralProject/ruralCostProjectMessage/caseBase?companyType=${companyType}&projectId=" + d.id + " ')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 申请案例项目</a>";
 								}
 								if(d.caseType != 1 && d.caseStatus ==2){
-									xml+="<a href=\"javascript:void(0)\" onclick=\"deleteFun('${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateCaseBase?projectId=" + d.id + "')\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤销案例项目申请</a>";
+									xml+="<a href=\"javascript:void(0)\" onclick=\"deleteFun('${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateCaseBase?companyType=${companyType}&projectId=" + d.id + "')\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤销案例项目申请</a>";
 								}
 								if(d.caseType != 1){
 									if(d.caseStatus == 4){
-										xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogreNew('重新申请案例项目','${ctx}/workprojectnotify/workProjectNotify/form?notifyId=" + d.id + "&type=152&remarks=重新申请','95%', '95%','','重新申请,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\"  > 重新申请案例项目</a>";
+										xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogreNew('重新申请案例项目','${ctx}/workprojectnotify/workProjectNotify/form?companyType=${companyType}&notifyId=" + d.id + "&type=152&remarks=重新申请','95%', '95%','','重新申请,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\"  > 重新申请案例项目</a>";
 									}
 								}
 							}
@@ -965,24 +965,24 @@
 							if(d.projectReportStatus == 5 && d.emergencyProject != 1){
 
 								if(d.projectReportStatusTwo == 0){
-									xml+="<a href=\"#\" onclick=\"openDialogre('报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 报告签发</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 报告签发</a>";
 								}
 								if(d.projectReportStatusTwo == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogre('修改报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改签发</a>";
-									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该报告签发吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除签发</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('修改报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改签发</a>";
+									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/deleteReport?companyType=${companyType}&projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该报告签发吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除签发</a>";
 								}
 								if(d.projectReportStatusTwo == 2){
-									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/revoke?id=" + d.id + "&processInstanceId=" + d.prdtProcessinstanceId + "\" onclick=\"return confirmx('确认要撤回该报告签发审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-btn-red\" > 撤回签发</a>";
+									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/revoke?companyType=${companyType}&id=" + d.id + "&processInstanceId=" + d.prdtProcessinstanceId + "\" onclick=\"return confirmx('确认要撤回该报告签发审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-btn-red\" > 撤回签发</a>";
 								}
 								if(d.projectReportStatusTwo == 3){
 									//撤回操作
-									xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改签发</a>";
-									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该报告签发吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除签发</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?companyType=${companyType}&projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改签发</a>";
+									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/deleteReport?companyType=${companyType}&projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该报告签发吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除签发</a>";
 								}
 								if(d.projectReportStatusTwo == 4){
 									//驳回操作
-									xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?projectId=" + d.id + "&view=report ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改签发</a>";
-									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该报告签发吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除签发</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?companyType=${companyType}&projectId=" + d.id + "&view=report ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改签发</a>";
+									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/deleteReport?companyType=${companyType}&projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该报告签发吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除签发</a>";
 								}
 							}
 
@@ -992,30 +992,30 @@
 									if(d.emergencyProject == 1){
 										/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 										if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
-											xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
-											xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
+											xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
+											xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
 										}
 										if(d.projectReportRecordStatus == 1){
-											xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
-											xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
+											xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
+											xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
 										}
 										if(d.projectReportRecordStatus == 2){
-											xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线上报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回线上归档</a>";
+											xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?companyType=${companyType}&id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线上报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回线上归档</a>";
 										}
 										if(d.projectReportRecordStatus == 3){
-											xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
-											xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
+											xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改质量复核</a>";
+											xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
 										}
 										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\" > 线上重新归档</a>";
+												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordUrgentModify?companyType=${companyType}&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\" > 线上重新归档</a>";
+												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordUrgentModify?companyType=${companyType}&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\" > 线上重新归档</a>";
+												xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 											}
 										}
 									}
@@ -1024,25 +1024,25 @@
 								if(d.projectReportStatusTwo == 5){
 									/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 									if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
-										xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
+										xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
 									}
 									if(d.projectReportRecordStatus == 1){
-										xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
+										xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
 									}
 									if(d.projectReportRecordStatus == 2){
-										xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线上报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回线上归档</a>";
+										xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?companyType=${companyType}&id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线上报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回线上归档</a>";
 									}
 									if(d.projectReportRecordStatus == 3){
-										xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
+										xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
 									}
 									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\" > 线上重新归档</a>";
+											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&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\" > 线上重新归档</a>";
+											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?companyType=${companyType}&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\" > 线上重新归档</a>";
+											xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 										}
 									}
 								}
@@ -1053,20 +1053,20 @@
 									if(d.emergencyProject == 1){
 										if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
 											if (d.defectRecordStatus==0) {
-												xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?reportId=" + d.id +"&view=zixun','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 资料缺失说明</a>";
+												xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?companyType=${companyType}&reportId=" + d.id +"&view=zixun','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 资料缺失说明</a>";
 											}
 											if (d.defectRecordStatus==2){
-												xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "&view=zixun\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回说明</a>";
+												xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?companyType=${companyType}&id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "&view=zixun\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回说明</a>";
 											}
 											if (d.defectRecordStatus==3){
-												xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId + "&reportId=" + d.id+"&view=zixun ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
-												xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
+												xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId + "&reportId=" + d.id+"&view=zixun ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
+												xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?companyType=${companyType}&id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
 
 											}
 											if(d.defectRecordStatus == 4){
 												//驳回操作
-												xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId+ "&reportId=" + d.id+"&view=zixunModify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
-												xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
+												xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId+ "&reportId=" + d.id+"&view=zixunModify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
+												xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?companyType=${companyType}&id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
 
 											}
 										}
@@ -1076,19 +1076,19 @@
 								if(d.projectReportStatusTwo == 5){
 									if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
 										if (d.defectRecordStatus==0) {
-											xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?reportId=" + d.id +"&view=zixun','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 资料缺失说明</a>";
+											xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?companyType=${companyType}&reportId=" + d.id +"&view=zixun','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 资料缺失说明</a>";
 										}
 										if (d.defectRecordStatus==2){
-											xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "&view=zixun\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回说明</a>";
+											xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?companyType=${companyType}&id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "&view=zixun\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回说明</a>";
 										}
 										if (d.defectRecordStatus==3){
-											xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId + "&reportId=" + d.id+"&view=zixun ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
-											xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
+											xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId + "&reportId=" + d.id+"&view=zixun ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
+											xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?companyType=${companyType}&id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
 										}
 										if(d.defectRecordStatus == 4){
 											//驳回操作
-											xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId+ "&reportId=" + d.id+"&view=zixunModify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
-											xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
+											xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?companyType=${companyType}&id=" + d.pmdrId+ "&reportId=" + d.id+"&view=zixunModify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
+											xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?companyType=${companyType}&id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
 										}
 									}
 								}
@@ -1100,25 +1100,25 @@
 										if(d.syncStatus == 0){
 											if(d.reportStatus == 0){
 												if(d.reportedState == 0 || d.reportedState == 6){
-													xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上报</a>";
+													xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上报</a>";
 													/*xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 个人上报</a>";*/
 												}
 											}else{
 												if(d.reportedState == 1){
-													xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
+													xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
 												}
 												if(d.reportedState == 2){
-													xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidateByReported?id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回上报</a>";
+													xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidateByReported?companyType=${companyType}&id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回上报</a>";
 												}
 												/*撤回修改*/
 												if(d.reportedState == 3){
-													xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
+													xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
 												}
 												/*驳回修改*/
 												if(d.reportedState == 4){
 													//驳回操作
 													// if(d.newReportedNotifyFlag == 1){
-														xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
+														xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/reportedModify?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
 													<%--}else{--%>
 													<%--	xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";--%>
 													<%--}--%>
@@ -1133,25 +1133,25 @@
 									if(d.syncStatus == 0){
 										if(d.reportStatus == 0){
 											if(d.reportedState == 0 || d.reportedState == 6){
-												xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上报</a>";
+												xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上报</a>";
 												/*xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 个人上报</a>";*/
 											}
 										}else{
 											if(d.reportedState == 1){
-												xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
+												xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
 											}
 											if(d.reportedState == 2){
-												xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidateByReported?id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回上报</a>";
+												xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidateByReported?companyType=${companyType}&id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回上报</a>";
 											}
 											/*撤回修改*/
 											if(d.reportedState == 3){
-												xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
+												xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
 											}
 											/*驳回修改*/
 											if(d.reportedState == 4){
 												//驳回操作
 												// if(d.newReportedNotifyFlag == 1){
-													xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
+													xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/reportedModify?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
 												<%--}else{--%>
 												<%--	xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";--%>
 												<%--}--%>
@@ -1167,17 +1167,17 @@
 								if(d.submitMoney == "2"){
 									/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 									if(d.paperFilingStatus == 0){
-										xml+="<a href=\"#\" onclick=\"openDialogre('新增纸质归档信息', '${ctx}/paperFiling/paperFiling/form?projectId=" + d.id +"&view=filing','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 纸质归档</a>";
+										xml+="<a href=\"#\" onclick=\"openDialogre('新增纸质归档信息', '${ctx}/paperFiling/paperFiling/form?companyType=${companyType}&projectId=" + d.id +"&view=filing','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 纸质归档</a>";
 									}
 									if(d.paperFilingStatus == 2){
-										xml+="<a href=\"${ctx}/paperFiling/paperFiling/cancelInvalidate?id=" + d.ppfId + "&view=filing&processInstanceId=" + d.ppfProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该纸质归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回纸质归档</a>";
+										xml+="<a href=\"${ctx}/paperFiling/paperFiling/cancelInvalidate?companyType=${companyType}&id=" + d.ppfId + "&view=filing&processInstanceId=" + d.ppfProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该纸质归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回纸质归档</a>";
 									}
 									if(d.paperFilingStatus == 3){
-										xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/paperFiling/paperFiling/form?id=" + d.ppfId + "&projectId=" + d.id +"&view=filing ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 纸质重新归档</a>";
+										xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/paperFiling/paperFiling/form?companyType=${companyType}&id=" + d.ppfId + "&projectId=" + d.id +"&view=filing ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 纸质重新归档</a>";
 									}
 									if(d.paperFilingStatus == 4){
 										//驳回操作
-										xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/paperFiling/paperFiling/modify?id=" + d.ppfId + "&projectId=" + d.id + "&processInstanceId=" + d.ppfProcessInstanceId + "&view=filing ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 纸质重新归档</a>";
+										xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/paperFiling/paperFiling/modify?companyType=${companyType}&id=" + d.ppfId + "&projectId=" + d.id + "&processInstanceId=" + d.ppfProcessInstanceId + "&view=filing ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 纸质重新归档</a>";
 									}
 								}
 							}
@@ -1186,20 +1186,20 @@
 
 							if('1' == d.flagAdmin && d.projectReportStatus == 5)
 							{
-								xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralProjectMessage/adminModifyForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告</a>";
-								xml+="<a href=\"#\" onclick=\"openDialogView('历史报告', '${ctx}/ruralProject/ruralProjectMessage/getReportModifyList?projectId=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-orange\" > 历史报告</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralProjectMessage/adminModifyForm?companyType=${companyType}&projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogView('历史报告', '${ctx}/ruralProject/ruralProjectMessage/getReportModifyList?companyType=${companyType}&projectId=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-orange\" > 历史报告</a>";
 							}
 							if('1' == d.flagArchive && d.projectReportRecordStatus == 5)
 							{
-								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档案卷号', '${ctx}/ruralProject/ruralProjectMessage/adminRecordModifyForm?id=" + d.prrId + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档案卷号', '${ctx}/ruralProject/ruralProjectMessage/adminRecordModifyForm?companyType=${companyType}&id=" + d.prrId + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改归档</a>";
 							}
 						}
 						<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:adminEdit">
 						if ('0'!=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\" > 修改质量复核</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessage/adminEditForm?companyType=${companyType}&projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改质量复核</a>";
 						}
 						if(d.paperFilingStatus == 5){
-							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\" > 修改纸质归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?companyType=${companyType}&id=" + d.ppfId + "&projectId=" + d.id +"&view=filing ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改纸质归档</a>";
 						}
 						//项目升级按钮
 						if (d.submitMoney==1){
@@ -1209,14 +1209,14 @@
 						}
 						if(d.projectReportStatus == 5){
 							if (d.projectReportStatusTwo != 5 && d.projectReportStatusTwo != 2){
-								xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralProjectMessageNew/reviewForm?projectId=" + d.id +"&view=reloadReport&edit=reviewAgain','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 重新复核</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralProjectMessageNew/reviewForm?companyType=${companyType}&projectId=" + d.id +"&view=reloadReport&edit=reviewAgain','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 重新复核</a>";
 							}
 						}
 						</shiro:hasPermission>
 
 						<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportedProvincialStanding">
 						if(d.reportedState == 5 || d.reportedState == 7){
-							xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/submitReportedProvincialStanding?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 提交省站</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/submitReportedProvincialStanding?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 提交省站</a>";
 						}
 						</shiro:hasPermission>