* 质量复核等 鼠标放上去显示审核时间

* 项目编号、报告号、负责人等 宽度设置（因为是固定长度，宽度进行设定。项目名称可多给）
* B类项目质量复核没有点击功能

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -309,6 +309,10 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String caseStatus;				//案例项目的状态
 	private String caseProcessId;			//案例项目的流程id
 	private String ziXunBDE;			//上报中的咨询标的额
+	private Date projectReportRecordAuditDate;  //电子归档审核时间
+	private Date projectPaperAuditPassDate;  //A类项目纸质归档时间
+	private Date projectFlingbatchRelationAuditPassDate;  //B类项目批量归档时间
+	private Date projectRecordsReportedAuditPassDate;  //项目上报审核通过时间
 
 
 
@@ -2261,4 +2265,36 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setprojectMaterialStorageStatus(String projectMaterialStorageStatus) {
 		this.projectMaterialStorageStatus = projectMaterialStorageStatus;
 	}
+
+	public Date getProjectReportRecordAuditDate() {
+		return projectReportRecordAuditDate;
+	}
+
+	public void setProjectReportRecordAuditDate(Date projectReportRecordAuditDate) {
+		this.projectReportRecordAuditDate = projectReportRecordAuditDate;
+	}
+
+	public Date getProjectPaperAuditPassDate() {
+		return projectPaperAuditPassDate;
+	}
+
+	public void setProjectPaperAuditPassDate(Date projectPaperAuditPassDate) {
+		this.projectPaperAuditPassDate = projectPaperAuditPassDate;
+	}
+
+	public Date getProjectFlingbatchRelationAuditPassDate() {
+		return projectFlingbatchRelationAuditPassDate;
+	}
+
+	public void setProjectFlingbatchRelationAuditPassDate(Date projectFlingbatchRelationAuditPassDate) {
+		this.projectFlingbatchRelationAuditPassDate = projectFlingbatchRelationAuditPassDate;
+	}
+
+	public Date getProjectRecordsReportedAuditPassDate() {
+		return projectRecordsReportedAuditPassDate;
+	}
+
+	public void setProjectRecordsReportedAuditPassDate(Date projectRecordsReportedAuditPassDate) {
+		this.projectRecordsReportedAuditPassDate = projectRecordsReportedAuditPassDate;
+	}
 }

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

@@ -341,12 +341,14 @@ END) as projectScale*/
 		,ifnull(prd.status,0) as "projectReportStatus"
 		,ifnull(prd.name,"") as "projectReportName"
 		,ifnull(prr.status,0) as "projectReportRecordStatus"
+		,prr.accomplish_date as "projectReportRecordAuditDate"
 		,(case
 		when a.submit_money = '1' then
 		ifnull(pfp.status,0)
 		when a.submit_money = '2' then
 		ifnull(prrd.status,0) else 0
 		end) as downProjectReportRecordStatus,
+		pfp.audit_pass_date as "projectFlingbatchRelationAuditPassDate",
 		(case
 		when a.submit_money = '1' and pfp.status = '5' then
 		'已归档'
@@ -376,6 +378,7 @@ END) as projectScale*/
 		,pmdr.process_instance_id as "pmdrProcessInstanceId"
 		,pmdr.id as pmdrId
 		,ifnull(ppf.status,0) as "paperFilingStatus"
+		,ppf.audit_pass_date as "projectPaperAuditPassDate"
 		,ppf.process_instance_id as "ppfProcessInstanceId"
 		,ppf.id as "ppfId"
 		,pfp.filing_batch as "filingBatch"
@@ -407,6 +410,7 @@ END) as projectScale*/
 		,cb.case_create_by as "caseCreateBy"
 		,if(case_status > 0 ,case_status,"0") as "caseStatus"
 		,rprr.ZiXunBDE as "ziXunBDE"
+		,rprr.accomplish_date as "projectRecordsReportedAuditPassDate"
 		,a.project_material_storage_status as "projectMaterialStorageStatus"
 		FROM rural_project_records a
 		left join case_base cb on a.id = cb.project_id

src/main/webapp/static/common/jeeplus.js

@@ -601,7 +601,7 @@ function getCaseBaseAuditState(id)
     result.action = true;
     switch(id)
     {
-        case "0":result.label = "tempstores";result.status="未上报";break;
+        case "0":result.label = "tempstores";result.status="未上报";result.action = false;break;
         case "1":result.label = "tempstore";result.status="暂存";result.action = false;break;
         case "2":result.label = "auditing";result.status="审批中";break;
         case "3":result.label = "cancel";result.status="撤回";break;

src/main/webapp/webpage/include/head.jsp

@@ -36,7 +36,7 @@
 
 <!-- jeeplus -->
 <link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-<script src="${ctxStatic}/common/jeeplus.js?3" type="text/javascript"></script>
+<script src="${ctxStatic}/common/jeeplus.js?4" type="text/javascript"></script>
 
 <!-- jquery ui -->
 <script src="${ctxStatic}/jquery-ui/jquery-ui.min.js"></script>

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

@@ -939,9 +939,9 @@
             ,page: false
             ,cols: [[
                 // {checkbox: true, fixed: true},
-                {field:'index',align:'center',  title: '序号',width:40}
-				,{field: 'projId',align:'center', title: '项目编号/项目定义号',width:160}
-				,{field:'projName',align:'center', title: '项目名称', minWidth:200,templet:function(d){
+                {field:'index',align:'center',  title: '序号',width:60}
+				,{field: 'projId',align:'center', title: '项目编号',width:145}
+				,{field:'projName',align:'center', title: '项目名称', minWidth:400,templet:function(d){
 						var xml="";
 						<shiro:hasPermission name="ruralProject:ruralProjectView:listAllView">
 						xml+="<a class=\"attention-info pid\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">"
@@ -953,7 +953,7 @@
 						return xml;
 						<%--return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralCostProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";--%>
 					}}
-				,{field:'projectReportNumber',align:'center', title: '报告号',minWidth:180,templet:function(d){
+				,{field:'projectReportNumber',align:'center', title: '报告号',width:175,templet:function(d){
 						if(""!= d.projectReportNumber){
 							<%--return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";--%>
 							return d.projectReportNumber;
@@ -971,41 +971,53 @@
 						}
 					<%--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:75,templet: function(d){
 						return "<font style = 'font-size:14px;'>"+d.projMaster+"</font>";
 					}}
-				,{field: 'client', align:'center', title: '委托方',width:200,templet: function(d){
+				,{field: 'client', align:'center', title: '委托方',width:285,templet: function(d){
 						return "<font style = 'font-size:14px;font-weight:500;'>"+d.client+"</font>";
 					}}
                 ,{field:'money',align:'center', title: '咨询营业收入(万元)',  width:140}
-                ,{field:'createName',align:'center', title: '登记人',  width:80}
-                ,{field: 'createDate', align:'center', title: '创建日期/打包时间',width:100,templet: function(d){
+                ,{field:'createName',align:'center', title: '登记人',  width:75}
+                ,{field: 'createDate', align:'center', title: '创建日期',width:110,templet: function(d){
 					var date=d.createDate;
 					return "<font style = 'font-size:14px;font-weight:500;'>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
 				}}
-				,{field: 'submitMoneyStr', align:'center', title: '项目等级',width:100,templet: function(d){
+				,{field: 'submitMoneyStr', align:'center', title: '项目等级',width:80,templet: function(d){
 						return "<font style = 'font-size:14px;'>"+d.submitMoneyStr+"</font>";
 				}}
-                ,{align:'center', title: '质量复核',  width:70,templet:function(d){
+                ,{align:'center', title: '质量复核',  width:85,templet:function(d){
                         var st = getAuditState(d.projectReportStatus);
-                        if(st.action)
-                            var xml = "<span onclick=\"openDialogReportView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/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>";
+                        if(st.action){
+							if (d.submitMoney=="1"){
+								var xml = "<span title='质量复核时间："+ d.reportAuditDate +"' class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							}else if (d.submitMoney=="2"){
+								var xml = "<span title='质量复核时间："+ d.reportAuditDate +"' onclick=\"openDialogReportView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/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:90,templet:function(d){
+				,{align:'center', title: '报告签发',  width:85,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
+
+						if(st.action){
+							if (d.submitMoney=="1"){
+								var xml = "<span title='报告签发时间："+ d.reportTwoAuditDate +"' class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							}else if (d.submitMoney=="2"){
+								var xml = "<span title='报告签发时间："+ d.reportTwoAuditDate +"' 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:140,templet:function(d){
+                ,{align:'center', title: '电子',  width:110,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
                         if(st.action){
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?id="+d.prrId+"&processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+
+							var xml = "<span  title='电子归档时间："+ d.projectReportRecordAuditDate +"' onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?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>";
 						}
@@ -1015,7 +1027,7 @@
 						}
 						return xml;
                     }}
-				,{align:'center', title: '材料库',  width:110,templet:function(d){
+				,{align:'center', title: '材料库',  width:105,templet:function(d){
 						var st = getProjectMaterialStorageStatus(d.projectMaterialStorageStatus);
 						if(st.action)
 							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/project/projectMaterialStorage/form?reportedProcessInstanceId=" + d.reportedProcessInstanceId +"&&pageId=1"+ "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
@@ -1031,7 +1043,7 @@
 				<%--			var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
 				<%--		return xml;--%>
 				<%--	}}--%>
-				,{align:'center', title: '线下',  width:70,templet:function(d){
+				,{align:'center', title: '线下',  width:85,templet:function(d){
 						if (d.submitMoney=="1"){
 							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
 						}else if (d.submitMoney=="2"){
@@ -1039,24 +1051,24 @@
 						}
 						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 title='批量归档时间："+ d.projectFlingbatchRelationAuditPassDate +"' onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?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 title='纸质归档时间："+ d.projectPaperAuditPassDate +"' onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?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>";
 						}
 						return xml;
 					}}
-				,{align:'center', title: '上报',  width:90,templet:function(d){
+				,{align:'center', title: '上报',  width:105,templet:function(d){
 						var st = getReportedState(d.reportedState);
 						if(st.action)
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							var xml = "<span title='上报时间："+ d.projectRecordsReportedAuditPassDate +"' onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?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;
 					}}
-				,{align:'center', title: '案例项目申报',  width:150,templet:function(d){
+				,{align:'center', title: '案例项目申报',  width:105,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>";
@@ -1228,6 +1240,12 @@
                     ,"caseType":"${projectRecords.caseType}"
                     ,"caseCreateBy":"${projectRecords.caseCreateBy}"
                     ,"caseStatus":"${projectRecords.caseStatus}"
+					,"reportAuditDate":"<fmt:formatDate value="${projectRecords.reportAuditDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
+					,"reportTwoAuditDate":"<fmt:formatDate value="${projectRecords.reportTwoAuditDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
+					,"projectReportRecordAuditDate":"<fmt:formatDate value="${projectRecords.projectReportRecordAuditDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
+					,"projectPaperAuditPassDate":"<fmt:formatDate value="${projectRecords.projectPaperAuditPassDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
+					,"projectFlingbatchRelationAuditPassDate":"<fmt:formatDate value="${projectRecords.projectFlingbatchRelationAuditPassDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
+					,"projectRecordsReportedAuditPassDate":"<fmt:formatDate value="${projectRecords.projectRecordsReportedAuditPassDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
 					,"projectMaterialStorageStatus":"${projectRecords.projectMaterialStorageStatus}"
                     ,"falg":
                     <c:choose>