项目管理页面部分修改

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

@@ -75,6 +75,7 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	private Integer recordAuditType;//归档状态（1：总审驳回，2：归档管理员驳回）
 	private String infoId;
 	private String recordRemarks;	//归档内容
+	private String companyType;			//公司类型（1：赣能；0：东兴）
 
 	public Integer getType() {
 		return type;
@@ -489,4 +490,12 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	public void setRecordRemarks(String recordRemarks) {
 		this.recordRemarks = recordRemarks;
 	}
+
+	public String getCompanyType() {
+		return companyType;
+	}
+
+	public void setCompanyType(String companyType) {
+		this.companyType = companyType;
+	}
 }

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

@@ -27,27 +27,23 @@ import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportRecordService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
+import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
 import com.jeeplus.modules.projectrecord.service.ProjectPlanService;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordsReported;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectcontentinfo;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
-import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.sys.entity.Area;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
-import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.UserService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
-import com.jeeplus.modules.workactivity.entity.Activity;
-import com.jeeplus.modules.workactivitymenu.entity.WorkActivityMenu;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
-import com.jeeplus.modules.workcontractrecord.entity.WorkContractRecord;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import com.jeeplus.modules.workstaff.service.WorkStaffBasicInfoService;
@@ -61,12 +57,14 @@ import org.json.JSONArray;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -191,6 +189,7 @@ public class RuralCostProjectMessageController extends BaseController {
         }
         model.addAttribute("beginDate", projectRecords.getBeginDate());
         model.addAttribute("endDate", projectRecords.getEndDate());
+        model.addAttribute("companyType", projectRecords.getCompanyType());
         model.addAttribute("reportSwitch", BaseController.REPORTSWITCH);
         return "modules/ruralprojectrecords/cost/ruralCostProjectMessageList";
     }

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

@@ -347,8 +347,7 @@
 		,a.submit_money as "submitMoney"
 		,a.project_type as projectType,
 		wci.name AS "workContractInfo.name",
-		wct.id AS "workContractInfo.client.id",
-		wct.name AS "workContractInfo.client.name",
+		wci.clientName AS "workContractInfo.clientName",
 		o.top_company AS "office.name",
 		ifnull(prd.number ,"") as "projectReportNumber"
 		,ifnull(prd.status,0) as "projectReportStatus"
@@ -414,6 +413,9 @@
 		left join project_paper_filing ppf on ppf.project_id = a.id
 		<where>
 			a.status = 5
+			<if test="companyType != null and companyType != ''">
+				AND a.company_type = #{companyType}
+			</if>
 			<if test="projectId != null and projectId != ''">
 				AND a.project_id like concat('%',#{projectId},'%')
 			</if>
@@ -453,8 +455,8 @@
 			<if test="workContractInfo !=null and workContractInfo.contractType !=null and workContractInfo.contractType !=''">
 				AND wci.contract_type = #{workContractInfo.contractType}
 			</if>
-			<if test="workContractInfo!=null and workContractInfo.client !=null and workContractInfo.client.name !=null and workContractInfo.client.name !=''">
-				AND wct.name like concat(concat('%',#{workContractInfo.client.name}),'%')
+			<if test="workContractInfo!=null and workContractInfo.clientName !=null and workContractInfo.clientName !=''">
+				AND wci.name like concat(concat('%',#{workContractInfo.clientName}),'%')
 			</if>
             <!--<if test="leaderNameStr !=null and leaderNameStr !=''">
                 AND su.name like concat(concat('%',#{leaderNameStr}),'%') AND w.is_master = '1' AND w.del_flag='0'
@@ -639,64 +641,67 @@
 		left join project_paper_filing ppf on ppf.project_id = a.id
 		LEFT JOIN sys_office o ON o.id = a.office_id
 		<where>
-            a.status = 5
-            <if test="projectId != null and projectId != ''">
-                AND a.project_id like concat('%',#{projectId},'%')
-            </if>
-            <if test="projectName != null and projectName != ''">
-                AND a.project_name like concat(concat('%',#{projectName}),'%')
-            </if>
-            <if test="scaleType != null and scaleType != ''">
-                AND a.scale_type = #{scaleType}
-            </if>
-            <if test="scaleUnit != null and scaleUnit != ''">
-                AND a.scale_unit = #{scaleUnit}
-            </if>
-            <if test="scaleQuantity != null and scaleQuantity != ''">
-                AND a.scale_quantity = #{scaleQuantity}
-            </if>
-            <if test="projectSite != null and projectSite != ''">
-                AND a.project_site LIKE concat('%',#{projectSite},'%')
-            </if>
-            <if test="remarks != null and remarks != ''">
-                AND a.remarks LIKE concat('%',#{remarks},'%')
-            </if>
-            <if test="projectDesc != null and projectDesc != ''">
-                AND a.project_desc LIKE concat('%',#{projectDesc},'%')
-            </if>
-            <if test="area != null and area.id != null and area.id != ''">
-                AND a.area_id = #{area.id}
-            </if>
-            <if test="workContractInfo !=null and workContractInfo.name !=null and workContractInfo.name !=''">
-                AND wci.name like concat(concat('%',#{workContractInfo.name}),'%')
-            </if>
-            <if test="workContractInfo !=null and workContractInfo.contractNum !=null and workContractInfo.contractNum !=''">
-                AND wci.contract_num like concat(concat('%',#{workContractInfo.contractNum}),'%')
-            </if>
-            <if test="workContractInfo !=null and workContractInfo.contractPrice !=null and workContractInfo.contractPrice !=''">
-                AND wci.contract_price = #{workContractInfo.contractPrice}
-            </if>
-            <if test="workContractInfo !=null and workContractInfo.contractType !=null and workContractInfo.contractType !=''">
-                AND wci.contract_type = #{workContractInfo.contractType}
-            </if>
-            <if test="workContractInfo!=null and workContractInfo.client !=null and workContractInfo.client.name !=null and workContractInfo.client.name !=''">
-                AND wct.name like concat(concat('%',#{workContractInfo.client.name}),'%')
-            </if>
-            <!--<if test="leaderNameStr !=null and leaderNameStr !=''">
+			a.status = 5
+			<if test="companyType != null and companyType != ''">
+				AND a.company_type = #{companyType}
+			</if>
+			<if test="projectId != null and projectId != ''">
+				AND a.project_id like concat('%',#{projectId},'%')
+			</if>
+			<if test="projectName != null and projectName != ''">
+				AND a.project_name like concat(concat('%',#{projectName}),'%')
+			</if>
+			<if test="scaleType != null and scaleType != ''">
+				AND a.scale_type = #{scaleType}
+			</if>
+			<if test="scaleUnit != null and scaleUnit != ''">
+				AND a.scale_unit = #{scaleUnit}
+			</if>
+			<if test="scaleQuantity != null and scaleQuantity != ''">
+				AND a.scale_quantity = #{scaleQuantity}
+			</if>
+			<if test="projectSite != null and projectSite != ''">
+				AND a.project_site LIKE concat('%',#{projectSite},'%')
+			</if>
+			<if test="remarks != null and remarks != ''">
+				AND a.remarks LIKE concat('%',#{remarks},'%')
+			</if>
+			<if test="projectDesc != null and projectDesc != ''">
+				AND a.project_desc LIKE concat('%',#{projectDesc},'%')
+			</if>
+			<if test="area != null and area.id != null and area.id != ''">
+				AND a.area_id = #{area.id}
+			</if>
+			<if test="workContractInfo !=null and workContractInfo.name !=null and workContractInfo.name !=''">
+				AND wci.name like concat(concat('%',#{workContractInfo.name}),'%')
+			</if>
+			<if test="workContractInfo !=null and workContractInfo.contractNum !=null and workContractInfo.contractNum !=''">
+				AND wci.contract_num like concat(concat('%',#{workContractInfo.contractNum}),'%')
+			</if>
+			<if test="workContractInfo !=null and workContractInfo.contractPrice !=null and workContractInfo.contractPrice !=''">
+				AND wci.contract_price = #{workContractInfo.contractPrice}
+			</if>
+			<if test="workContractInfo !=null and workContractInfo.contractType !=null and workContractInfo.contractType !=''">
+				AND wci.contract_type = #{workContractInfo.contractType}
+			</if>
+			<if test="workContractInfo!=null and workContractInfo.clientName !=null and workContractInfo.clientName !=''">
+				AND wci.name like concat(concat('%',#{workContractInfo.clientName}),'%')
+			</if>
+			<!--<if test="leaderNameStr !=null and leaderNameStr !=''">
                 AND su.name like concat(concat('%',#{leaderNameStr}),'%') AND w.is_master = '1' AND w.del_flag='0'
             </if>-->
 			<if test="(leaderNameStr != null and leaderNameStr != '') or (leaderId != null and leaderId != '')">
 				AND ((w.user_id = #{leaderId}) or su.name like concat('%',#{leaderNameStr},'%')) AND w.is_master = '1' AND w.del_flag='0'
 			</if>
-            <if test="projectStatus !=null">
-                AND a.status = #{projectStatus}
-            </if>
-            <if test="beginDate !=null">
-                AND a.create_date >= #{beginDate}
-            </if>
-            <if test="endDate !=null">
-                AND a.create_date &lt; #{endDate}
-            </if>
+			<if test="projectStatus !=null">
+				AND a.status = #{projectStatus}
+			</if>
+			<if test="beginDate !=null">
+				AND a.create_date >= #{beginDate}
+			</if>
+			<if test="endDate !=null">
+				AND a.create_date &lt; #{endDate}
+			</if>
 			<if test="emergencyProject !=null and emergencyProject != ''">
 				<choose>
 					<when test="emergencyProject == 0">
@@ -709,11 +714,10 @@
 			</if>
 			<!--<if test="createBy != null and createBy.id !=null and createBy.id !=''">
 				AND a.create_by = #{createBy.id}
-			</if>-->
+ 			</if>-->
 			<if test="createBy != null and((createBy.id != null and createBy.id != '') or (createBy.name != null and createBy.name != ''))">
 				AND (a.create_by = #{createBy.id} or sua.name like concat('%',#{createBy.name},'%'))
 			</if>
-
 			<choose>
 				<when test="downProjectReportRecordStatus == 0">
 					<choose>
@@ -758,15 +762,14 @@
 			<if test="office!=null and office.id=='' and office.name!=null and office.name!='' ">
 				and  o.name like concat('%',#{office.name},'%')
 			</if>
+
 			<if test="officeIdList!=null and officeIdList.size!=0">
 				and a.office_id in
 				<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">
 					#{officeId}
 				</foreach>
 			</if>
-			<if test="projectReportStatus != null and projectReportStatus != ''">
-				AND prd.status = #{projectReportStatus}
-			</if>
+
 			<if test="reportedState !=null and reportedState !=''">
 				<choose>
 					<when test="reportedState == 0">
@@ -777,6 +780,11 @@
 					</otherwise>
 				</choose>
 			</if>
+
+
+			<if test="projectReportStatus != null and projectReportStatus != ''">
+				AND prd.status = #{projectReportStatus}
+			</if>
 			<if test="submitMoney != null and submitMoney != ''">
 				AND a.submit_money = #{submitMoney}
 			</if>
@@ -806,6 +814,10 @@
 					</choose>
 				</otherwise>
 			</choose>
+
+			<if test="projectType != null and projectType != ''">
+				AND a.project_type = #{projectType}
+			</if>
 			<choose>
 				<when test="projectReportStatusTwo == 0">
 					AND prdt.status is null
@@ -816,14 +828,12 @@
 					</if>
 				</otherwise>
 			</choose>
-			<if test="projectType != null and projectType != ''">
-				AND a.project_type = #{projectType}
+
+			AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
+				AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id} )${sqlMap.dsf} )
 			</if>
-            AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
-            <if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
-                AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id})${sqlMap.dsf} )
-            </if>
-        </where>
+		</where>
     </select>
 
 	<select id="findListByStatus" resultType="RuralProjectRecords" >

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

@@ -644,40 +644,32 @@
 			var xml = '<div class=\"layui-btn-group\">';
 			if(d.falg=="1"){
 				if(d.projectReportStatus == 0){
-					xml+="<a href=\"#\" onclick=\"openDialogre('新增报告质量复核', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 新增质量复核</a>";
+					xml+="<a href=\"#\" onclick=\"openDialogre('新增报告质量复核', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 新增质量复核</a>";
 				}
 				if(d.projectReportStatus == 1){
-					xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?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=\"${ctx}/ruralProject/ruralCostProjectMessage/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/ruralCostProjectMessageNew/form?companyType=${companyType}&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(d.projectReportStatus == 2){
-					xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目报告质量复核审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回质量复核</a>";
+					xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/revoke?companyType=${companyType}&id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目报告质量复核审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回质量复核</a>";
 				}
 				if(d.projectReportStatus == 3){
 					//撤回操作
-					xml+="<a href=\"#\" onclick=\"openDialogre('调整报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/modify?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=\"${ctx}/ruralProject/ruralCostProjectMessage/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/ruralCostProjectMessageNew/modify?companyType=${companyType}&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(d.projectReportStatus == 4){
 					//驳回操作
-					// if(d.newReportNotifyFlag == 1){
-					xml+="<a href=\"#\" onclick=\"openDialogreReport('调整报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改质量复核</a>";
-					<%--}else{--%>
-					<%--	xml+="<a href=\"#\" onclick=\"openDialogreReport('调整报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改质量复核4</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>";--%>
+					xml+="<a href=\"#\" onclick=\"openDialogreReport('调整报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/modify?companyType=${companyType}&projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改质量复核</a>";
 				}
 				if(d.projectReportStatus == 5){
 					if(undefined != d.qualitySignatureFlag && null != d.qualitySignatureFlag && "" != d.qualitySignatureFlag){
 						if(undefined != d.qualitySignatureContractId && null != d.qualitySignatureContractId && "" != d.qualitySignatureContractId){
-							xml+="<a href=\"${ctx}/ruralProject/signatureCallBack/downLoadJudgementReportAttach?contractId="+ d.qualitySignatureContractId +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" style='height:32px;margin-top: 5px;margin-bottom: 5px;'>审定单签章下载</a>"
+							xml+="<a href=\"${ctx}/ruralProject/signatureCallBack/downLoadJudgementReportAttach?companyType=${companyType}&contractId="+ d.qualitySignatureContractId +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" style='height:32px;margin-top: 5px;margin-bottom: 5px;'>审定单签章下载</a>"
 						}
 					}
 				}
 
 				//案例项目申请按钮
-				if(d.reportedState == 5 && d.projectReportRecordStatus == 5 ){
+				/*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\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 申请案例项目</a>";
 					}
@@ -689,10 +681,10 @@
 							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\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'  > 重新申请案例项目</a>";
 						}
 					}
-				}
+				}*/
 
 				//报告签发操作
-				if(d.projectReportStatus == 5 && d.emergencyProject != 1){
+				/*if(d.projectReportStatus == 5 && d.emergencyProject != 1){
 
 					if(d.projectReportStatusTwo == 0){
 						xml+="<a href=\"#\" onclick=\"openDialogre('报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?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>";
@@ -714,54 +706,50 @@
 						xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?projectId=" + d.id + "&view=costLiuReport ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改签发</a>";
 						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/deleteReport?projectId=" + d.id + "&view=costLiu\" onclick=\"return confirmx('确认要删除该报告签发吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 删除签发</a>";
 					}
-				}
+				}*/
 
 				//线上归档操作
 				if(d.projectReportStatusTwo == 0){
 					if(d.projectReportStatus == 5){
 						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){
 								if(8 != d.attachmentProjectSort){
-									xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?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=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?project.companyType=${companyType}&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=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上归档</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\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上归档</a>";
 							}
 							if(d.projectReportRecordStatus == 1){
 								if(8 != d.attachmentProjectSort){
-									xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?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=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?companyType=${companyType}&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=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</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- layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
 							}
 							if(d.projectReportRecordStatus == 2){
-								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回线上归档</a>";
+								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?companyType=${companyType}&id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回线上归档</a>";
 							}
 							if(d.projectReportRecordStatus == 3){
 								if(8 != d.attachmentProjectSort){
-									xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?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=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?companyType=${companyType}&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=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + " ','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=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?companyType=${companyType}&id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</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\" > 线上重新归档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\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordUrgentModify?companyType=${companyType}&id=" + d.prrId + "&view=urgent','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</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\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</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>";--%>
+									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordUrgentModify?companyType=${companyType}&id=" + d.prrId + "&view=urgent ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</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\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</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\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
 								}
 							}
 						}
 					}
 				}else{
 					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\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上归档</a>";
 						}
@@ -841,7 +829,6 @@
 								if(d.reportStatus == 0){
 									if(d.reportedState == 0 || d.reportedState == 6){
 										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 上报</a>";
-										/*xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/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){
@@ -857,11 +844,7 @@
 									/*驳回修改*/
 									if(d.reportedState == 4){
 										//驳回操作
-										// if(d.newReportedNotifyFlag == 1){
 										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
-										<%--}else{--%>
-										<%--	xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";--%>
-										<%--}--%>
 									}
 								}
 							}
@@ -873,7 +856,6 @@
 							if(d.reportStatus == 0){
 								if(d.reportedState == 0 || d.reportedState == 6){
 									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 上报</a>";
-									/*xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/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){
@@ -889,21 +871,16 @@
 								/*驳回修改*/
 								if(d.reportedState == 4){
 									//驳回操作
-									// if(d.newReportedNotifyFlag == 1){
 									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
-									<%--}else{--%>
-									<%--	xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";--%>
-
-									<%--}--%>
 								}
 							}
 						}
 					}
 				}
 				/*纸质归档*/
-				if(d.projectReportStatusTwo == 5){
+				/*if(d.projectReportStatusTwo == 5){
 					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>";*/
+						/!*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 +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 纸质归档</a>";
 						}
@@ -918,7 +895,7 @@
 							xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/paperFiling/paperFiling/modify?id=" + d.ppfId + "&projectId=" + d.id + "&processInstanceId=" + d.ppfProcessInstanceId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 纸质重新归档</a>";
 						}
 					}
-				}
+				}*/
 
 
 				if('1' == d.flagAdmin && d.projectReportStatus == 5)
@@ -978,7 +955,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/ruralCostProjectMessage/" method="post" class="layui-form">
+				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralCostProjectMessage/list?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"/>
@@ -1048,7 +1025,7 @@
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">委托方：</label>
 							<div class="layui-input-block">
-								<input id="workContractInfoClientName" name="workContractInfo.client.name" value="${workContractInfoClientName}" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+								<input id="workContractInfoClientName" name="workContractInfo.clientName" value="${workContractInfoClientName}" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item query athird ">
@@ -1072,7 +1049,7 @@
 								</form:select>
 							</div>
 						</div>
-						<div class="layui-item query athird ">
+						<%--<div class="layui-item query athird ">
 							<label class="layui-form-label double-line">签发状态：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<form:select path="projectReportStatusTwo" class="form-control  simple-select">
@@ -1080,9 +1057,9 @@
 									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
 							</div>
-						</div>
+						</div>--%>
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">电子归档：</label>
+							<label class="layui-form-label">归档：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<form:select id="projectReportRecordStatus" path="projectReportRecordStatus" class=" form-control  simple-select">
 									<form:option value="" label=""/>
@@ -1090,7 +1067,7 @@
 								</form:select>
 							</div>
 						</div>
-						<div class="layui-item query athird ">
+						<%--<div class="layui-item query athird ">
 							<label class="layui-form-label">线下归档：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<form:select path="downProjectReportRecordStatus" class=" form-control  simple-select">
@@ -1098,10 +1075,10 @@
 									<form:option value="0" label="未归档"/>
 									<form:option value="2" label="归档中"/>
 									<form:option value="5" label="已归档"/>
-									<%--									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+									&lt;%&ndash;									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>&ndash;%&gt;
 								</form:select>
 							</div>
-						</div>
+						</div>--%>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">上报状态：</label>
 							<div class="layui-input-block readOnlyFFF">
@@ -1111,18 +1088,18 @@
 								</form:select>
 							</div>
 						</div>
-						<div class="layui-item query athird ">
+						<%--<div class="layui-item query athird ">
 							<label class="layui-form-label double-line">项目等级：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<form:select path="submitMoney" class="form-control simple-select">
 									<form:option value="" label=""/>
 									<form:option value="2" label="A级"/>
 									<form:option value="1" label="B级"/>
-									<%--<form:option value="3" label="B级紧急"/>
-									<form:option value="1" label="B级非紧急"/>--%>
+									&lt;%&ndash;<form:option value="3" label="B级紧急"/>
+									<form:option value="1" label="B级非紧急"/>&ndash;%&gt;
 								</form:select>
 							</div>
-						</div>
+						</div>--%>
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>
@@ -1240,7 +1217,7 @@
 						}
 					<%--return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contract + "</a>";--%>
 					}}
-				,{field: 'projMaster', align:'center', title: '责任人',width:100,templet: function(d){
+				,{field: 'projMaster', align:'center', title: '负责人',width:100,templet: function(d){
 						return "<font style = 'font-size:14px;'>"+d.projMaster+"</font>";
 					}}
 				,{field: 'client', align:'center', title: '委托方',width:300,templet: function(d){
@@ -1259,9 +1236,9 @@
 						return "<font style = 'font-size:14px;font-weight:500;'></font>";
 					}
 				}}
-				,{field: 'submitMoneyStr', align:'center', title: '项目等级',width:100,templet: function(d){
+				/*,{field: 'submitMoneyStr', align:'center', title: '项目等级',width:100,templet: function(d){
 						return "<font style = 'font-size:14px;'>"+d.submitMoneyStr+"</font>";
-				}}
+				}}*/
                 ,{align:'center', title: '质量复核',  width:100,templet:function(d){
                         var st = getAuditState(d.projectReportStatus);
                         if(st.action)
@@ -1270,15 +1247,15 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-				,{align:'center', title: '报告签发',  width:90,templet:function(d){
+				/*,{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>";
 						else
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
-					}}
-                ,{align:'center', title: '电子',  width:110,templet:function(d){
+					}}*/
+                ,{align:'center', title: '归档',  width:110,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
 						var de = getdefectRecordState(""+d.defectRecordStatus);
 						if(st.action){
@@ -1299,7 +1276,7 @@
 				<%--			var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
 				<%--		return xml;--%>
 				<%--	}}--%>
-				,{align:'center', title: '线下',  width:100,templet:function(d){
+				/*,{align:'center', title: '线下',  width:100,templet:function(d){
 						if (d.submitMoney=="1"){
 							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
 						}else if (d.submitMoney=="2"){
@@ -1315,7 +1292,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
 						return xml;
-					}}
+					}}*/
 				,{align:'center', title: '上报',  width:110,templet:function(d){
 						var st = getReportedState(d.reportedState);
 						if(st.action)
@@ -1324,7 +1301,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-				,{align:'center', title: '案例项目申报',  width:150,templet:function(d){
+				/*,{align:'center', title: '案例项目申报',  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>";
@@ -1334,7 +1311,7 @@
 							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.caseProcessId + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">是</span>";
 						}
 						return xml;
-					}}
+					}}*/
 				<%--,{align:'center', title: '纸质',  width:90,templet:function(d){--%>
 				<%--		var st = getRuralProjectArchiveState(d.paperFilingStatus);--%>
 				<%--		if(st.action)--%>
@@ -1363,7 +1340,7 @@
 					,"projMaster":"${projectRecords.leaderNameStr}"
                     ,"contract":"${projectRecords.workContractInfo.name}"
 					,"contractId":"${projectRecords.workContractInfo.id}"
-                    ,"client":"${projectRecords.workContractInfo.client.name}"
+                    ,"client":"${projectRecords.workContractInfo.clientName}"
                     ,"createName":"${projectRecords.createBy.name}"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectReportStatus":"${projectRecords.projectReportStatus}"