样式调整

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectReportDefectRecordController.java

@@ -33,6 +33,7 @@ import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsServic
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.entity.Workattachment;
+import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import org.activiti.engine.runtime.ProcessInstance;
@@ -79,6 +80,8 @@ public class ProjectReportDefectRecordController extends BaseController {
 	private ProjectTemplateService projectTemplateService;
 	@Autowired
 	private ProjectMaterialChooseService chooseService;
+	@Autowired
+	private WorkattachmentService workattachmentService;
 
 	/**
 	 * 获取组织架构
@@ -451,6 +454,14 @@ public class ProjectReportDefectRecordController extends BaseController {
 		}
 		//获取项目信息
 		RuralProjectRecords ruralProjectRecords = projectRecordsService.getMaterInfo(materialDefectRecord.getReportId());
+
+		if (ruralProjectRecords!=null && StringUtils.isNotBlank(ruralProjectRecords.getPmdrId())){
+			Workattachment workattachment = new Workattachment();
+			workattachment.setAttachmentId(ruralProjectRecords.getPmdrId());
+			workattachment.setAttachmentFlag("99");
+			materialDefectRecord.setWorkAttachments(workattachmentService.findList(workattachment));
+			workattachmentService.attachmentManageOnUrl(materialDefectRecord.getWorkAttachments());
+		}
 //		materialDefectRecord.setUploadMode(uploadMode);
 		ruralProjectRecords.setUploadMode(uploadMode);
 		ruralProjectRecords.setPmdrReportId(materialDefectRecord.getReportId());
@@ -458,6 +469,7 @@ public class ProjectReportDefectRecordController extends BaseController {
 //		materialDefectRecord.setRemarks(ruralProjectRecords.getRemarks());
 
 		model.addAttribute("ruralProjectRecords", ruralProjectRecords);
+		model.addAttribute("materialDefectRecord", materialDefectRecord);
 //		model.addAttribute("project", materialDefectRecord.getReport().getProject());
 
 		return "modules/ruralprojectrecords/record/cost/projectRecordDescriptionVew2";

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

@@ -359,7 +359,7 @@ public class RuralProjectRecordsExport extends ActEntity<RuralProjectRecordsExpo
 		this.recodeNum = recodeNum;
 	}
 
-	@ExcelField(title="电子归档", align=2, sort=20,dictType = "archive_state")
+	@ExcelField(title="电子归档", align=2, sort=21,dictType = "archive_state")
 	public Integer getProjectReportRecordStatus() {
 		return projectReportRecordStatus;
 	}
@@ -376,7 +376,7 @@ public class RuralProjectRecordsExport extends ActEntity<RuralProjectRecordsExpo
 		this.downProjectReportRecordStatus = downProjectReportRecordStatus;
 	}
 
-	@ExcelField(title="质量符合", align=2, sort=18,dictType = "rural_report_audit_state")
+	@ExcelField(title="质量复核", align=2, sort=19,dictType = "rural_report_audit_state")
 	public Integer getProjectReportStatus() {
 		return projectReportStatus;
 	}
@@ -940,7 +940,7 @@ public class RuralProjectRecordsExport extends ActEntity<RuralProjectRecordsExpo
 		this.constructionLinkman = constructionLinkman;
 	}
 
-	@ExcelField(title="上报状态", align=2, sort=22,dictType = "reported_state")
+	@ExcelField(title="上报状态", align=2, sort=23,dictType = "reported_state")
 	public String getReportedState() {
 		return reportedState;
 	}
@@ -1513,7 +1513,7 @@ public class RuralProjectRecordsExport extends ActEntity<RuralProjectRecordsExpo
 		this.submitScale = submitScale;
 	}
 
-	@ExcelField(title="报告签发", align=2, sort=19,dictType = "rural_report_audit_state")
+	@ExcelField(title="报告签发", align=2, sort=20,dictType = "rural_report_issue_audit_state")
 	public Integer getProjectReportStatusTwo() {
 		return projectReportStatusTwo;
 	}
@@ -1698,7 +1698,7 @@ public class RuralProjectRecordsExport extends ActEntity<RuralProjectRecordsExpo
 		this.ppfProcessInstanceId = ppfProcessInstanceId;
 	}
 
-	@ExcelField(title="纸质归档", align=2, sort=21, dictType = "archive_state" )
+	@ExcelField(title="纸质归档", align=2, sort=22, dictType = "archive_state" )
 	public String getPaperFilingStatus() {
 		return paperFilingStatus;
 	}

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

@@ -302,7 +302,7 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
         projectRecordsService.getJudgeAdvanceWeekNotice();
         logger.info("------------项目超期未质量符合定时任务结束--------------------");
 
-        logger.info("-----------项目超期未归档定时任务开始（A类纸质归档）------------------");
+        /*logger.info("-----------项目超期未归档定时任务开始（A类纸质归档）------------------");
         //projectRecordsService.saveProjectRecordListByPaperFiling();
         logger.info("------------项目超期未归档定时任务结束（A类纸质归档）------------------");
         logger.info("-----------项目纸质归档长期未处理通知（开始）------------------");
@@ -310,7 +310,7 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
         logger.info("-----------项目纸质归档长期未处理通知（结束）------------------");
         logger.info("-----------项目批量归档长期未处理通知（开始）------------------");
         projectRecordsService.getBatchArchiveNotify();
-        logger.info("-----------项目批量归档长期未处理通知（结束）------------------");
+        logger.info("-----------项目批量归档长期未处理通知（结束）------------------");*/
         map.put("msg","处理完成");
         return map;
     }

src/main/java/com/jeeplus/modules/workcalendar/service/WorkCalendarTaskService.java

@@ -238,7 +238,7 @@ public class WorkCalendarTaskService  {
      * B类项目批量归档质量复核后40天提醒通知
      */
     //设置每日凌晨30分调用通知方法
-    @Scheduled(cron= "0 30 0 * * ?")
+    //@Scheduled(cron= "0 30 0 * * ?")
     @Transactional(readOnly = false)
     public void getBatchArchiveNotify() {
         logger.info("-----------B类项目批量归档长期未处理通知（开始）------------------");

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -5576,6 +5576,13 @@ public class WorkProjectNotifyController extends BaseController {
 							}
 						}*/
 
+					//项目计划
+					RuralProjectRecords projectRecordPlans = this.planView(ruralProjectRecords.getId());
+					model.addAttribute("projectRecordPlans", projectRecordPlans);
+
+					//获取质量复核项目组成员
+					List<RuralReportConsultant> consultantinfo =this.qualityView(ruralProjectRecords,projectReportData);
+					model.addAttribute("consultantinfo", consultantinfo);
 						materialDefectRecord.setUploadMode(uploadMode);
 						model.addAttribute("projectcontentinfo", projectcontentinfo);
 						model.addAttribute("projectRecords", ruralProjectRecords);

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

@@ -244,6 +244,7 @@
 		,supmi.name as "projectMasterName"
 		,ifnull(pmdr.status,0) as "defectRecordStatus"
 		,pmdr.hiatus as "hiatus"
+		,pmdr.id as "pmdrId"
 		,pmdr.remarks as "remarks"
 		FROM rural_project_records a
 		<include refid="projectRecordsJoins"/>
@@ -2181,7 +2182,7 @@
 			and a.status = 5
 			and a.emergency_project = 1
 			and (a.reported_state=6 or a.reported_state is null)
-			and prd.status = 5
+			and (prd.status = 5 or prd.status = 7)
 			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
 		</where>
 	</select>
@@ -2231,7 +2232,7 @@
 			a.del_flag = 0
 			and a.emergency_project = 1
 			and (a.reported_state!=5 or a.reported_state is null)
-			and prd.status = 5
+			and (prd.status = 5 or prd.status = 7)
 			and now() > date_add(prd.audit_pass_date,interval #{endingCount} day)
 			and prd.audit_pass_date is not null
 			and a.reported_state is null
@@ -2582,7 +2583,7 @@
 			and a.status = 5
 			and a.emergency_project = 1
 			and (a.record_state=6 or a.record_state is null)
-			and prd.status = 5
+			and (prd.status = 5 or prd.status = 7)
 			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
 		</where>
 	</select>
@@ -2631,7 +2632,7 @@
 			a.del_flag = 0
 			and a.emergency_project = 1
 			and (a.record_state!=5 or a.record_state is null)
-			and prd.status = 5
+			and (prd.status = 5 or prd.status = 7)
 			and now() > date_add(prd.audit_pass_date,interval #{endingCount} day)
 			and prd.audit_pass_date is not null
 			and a.record_state is null
@@ -4702,6 +4703,7 @@
 			a.del_flag = 0
 			and a.submit_money = 2
 			and a.status = 5
+			and prd.status = 5
 			and (ppf.status is null or ppf.status = 1)
 			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
 			and (pmdrd.id is null or pmdrd.status = 1 or pmdrd.status = 2 or pmdrd.status = 3 or pmdrd.status = 4)
@@ -4729,7 +4731,7 @@
 		<where>
 			a.del_flag = 0
 			AND a.STATUS = 5
-			AND prd.STATUS = 5
+			and (prd.status = 5 or prd.status = 7)
 			AND a.submit_money = 1
 			AND (pfp.STATUS IS NULL or (pfp.STATUS != 5 and pfp.STATUS != 7))
 			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
@@ -4753,7 +4755,7 @@
 		left join sys_office so on so.id = su.office_id
 		WHERE
 		a.del_flag = 0 and a.status = 5
-		AND ( prd.STATUS IS NULL OR prd.STATUS = '' OR prd.STATUS = '1' OR prd.STATUS = '3' OR prd.STATUS = '4' )
+		AND ( prd.STATUS IS NULL OR prd.STATUS = '' OR prd.STATUS = '1' OR prd.STATUS = '3' OR prd.STATUS = '4' OR prd.STATUS = '6' )
 		AND datediff( now(), prd.create_date )> 60
 	</select>
 	<select id="findProjectRegistrantResponsiblePersonList" resultType="com.jeeplus.modules.sys.entity.User">
@@ -4782,15 +4784,6 @@ FROM
 		LEFT JOIN rural_project_records b ON a.id = b.project_master_id
 	WHERE
 		b.id = #{projectId}
-	UNION ALL
-	SELECT
-		a.id,
-		a.NAME,
-		a.photo
-	FROM
-		sys_user a
-	WHERE
-		a.id = '40453222a5d14dba8429ef8fdee68f0f'
 	) z
 GROUP BY
 	z.id

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

@@ -578,6 +578,30 @@ function getAuditState(id)
     return result;
 }
 
+function getReportIssueState(id)
+{
+    var result ={};
+    result.action = true;
+    switch(id)
+    {
+        case "0":result.label = "tempstore";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;
+        case "4":result.label = "reject";result.status="驳回";break;
+        case "5":result.label = "signed";result.status="已完成";break;
+        case "6":result.label = "tempstore";result.status="超期未复核";result.action = false;break;
+        case "7":result.label = "signed";result.status="超期复核";break;
+        case "9":result.label = "reject";result.status="作废驳回";break;
+        case "8":result.label = "changing";result.status="变更中";break;
+        case "10":result.label = "signed";result.status="无复核";result.action = false;break;
+        case "11":result.label = "cancel";result.status="作废撤回";break;
+        default:
+            result.label = "unknown";result.status="未知";break;
+    }
+    return result;
+}
+
 function getBusinessQuestionsAuditState(id)
 {
     var result ={};

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?6" type="text/javascript"></script>
+<script src="${ctxStatic}/common/jeeplus.js?9" type="text/javascript"></script>
 
 <!-- jquery ui -->
 <script src="${ctxStatic}/jquery-ui/jquery-ui.min.js"></script>

src/main/webapp/webpage/modules/oa/oaNotifyHomeView.jsp

@@ -6,67 +6,7 @@
     <meta name="decorator" content="default"/>
     <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
-    <style>
-        .wrapForm {
-            width: 100%;
-            height: 530px;
-            margin-top: -93px;
-        }
-        .mask{
-            width: 100%;
-            height:100%;
-        }
-        .layui-input-block{
-            border-top: 1px solid #cccccc;
-            overflow: hidden;
-            border-radius: 3px;
-        }
-
-        .comment_list {
-            padding-top:40px;
-            width:700px;
-            margin:0 auto;
-        }
-        .comment_details {
-            float:left;
-        }
-        .comment_content {
-            margin-top:10px;
-            font-size:16px;
-        }
-        .comment_add_or_last {
 
-            margin:0 auto;
-            clear: both;
-            width:600px;
-            height:40px;
-            background: #F0F0F0;
-            text-align: center;
-            line-height: 40px;   //行高（与div保持同高，垂直居中写法）
-        }
-        .imgdiv{
-            float:left;
-
-        }
-        .imgcss {
-            width:50px;
-            height:50px;
-            border-radius: 50%;
-        }
-        .comment_name {
-            margin-left:10px;
-            color:#3D9EEA;
-            font-size:15px;
-            font-weight: bolder;
-        }
-        .layui-icon {
-            font-size: 10px;
-            color: grey;
-        }
-        .del {
-            margin-left: 55px;
-        }
-    </style>
 
 
     <script>

src/main/webapp/webpage/modules/oa/oaNotifyView.jsp

@@ -6,67 +6,7 @@
     <meta name="decorator" content="default"/>
     <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
-    <style>
-        .wrapForm {
-            width: 100%;
-            height: 530px;
-            margin-top: -93px;
-        }
-        .mask{
-            width: 100%;
-            height:100%;
-        }
-        .layui-input-block{
-            border-top: 1px solid #cccccc;
-            overflow: hidden;
-            border-radius: 3px;
-        }
-
-        .comment_list {
-            padding-top:40px;
-            width:700px;
-            margin:0 auto;
-        }
-        .comment_details {
-            float:left;
-        }
-        .comment_content {
-            margin-top:10px;
-            font-size:16px;
-        }
-        .comment_add_or_last {
 
-            margin:0 auto;
-            clear: both;
-            width:600px;
-            height:40px;
-            background: #F0F0F0;
-            text-align: center;
-            line-height: 40px;   //行高（与div保持同高，垂直居中写法）
-        }
-        .imgdiv{
-            float:left;
-
-        }
-        .imgcss {
-            width:50px;
-            height:50px;
-            border-radius: 50%;
-        }
-        .comment_name {
-            margin-left:10px;
-            color:#3D9EEA;
-            font-size:15px;
-            font-weight: bolder;
-        }
-        .layui-icon {
-            font-size: 10px;
-            color: grey;
-        }
-        .del {
-            margin-left: 55px;
-        }
-    </style>
 
 
     <script>

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

@@ -1187,7 +1187,7 @@
 							<div class="layui-input-block readOnlyFFF">
 								<form:select path="projectReportStatusTwo" class="form-control  simple-select">
 									<form:option value="" label=""/>
-									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+									<form:options items="${fns:getDictList('rural_report_issue_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
 							</div>
 						</div>
@@ -1396,14 +1396,14 @@
                         return xml;
                     }}
 				,{align:'center', title: '报告签发',  width:90,templet:function(d){
-						var st = getAuditState(""+d.projectReportStatusTwo);
+						var st = getReportIssueState(""+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:'left', title: '电子',  width:110,templet:function(d){
+                ,{align:'left', title: '电子',  width:150,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
 						var de = getdefectRecordState(""+d.defectRecordStatus);
 						var noArchivedDays=d.noArchivedDays;
@@ -1414,7 +1414,7 @@
 						}
 						if(noArchivedDays != null && noArchivedDays != undefined && '' != noArchivedDays){
 							// return "<font style = 'margin-left: 5px;' class='layui-badge layui-bg-orange'>"+noArchivedDays + '天'+"</font>";
-							xml+="<span style='margin-left: 5px;'>" + noArchivedDays + "天" + "</span>";
+							xml+="<span style='margin-left: 5px;' title='未归档天数'>" + noArchivedDays + "天" + "</span>";
 						}else{
 							// return "<font style = 'margin-left: 5px;'class='layui-badge layui-bg-orange'></font>";
 						}
@@ -1439,7 +1439,7 @@
 				<%--			var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
 				<%--		return xml;--%>
 				<%--	}}--%>
-				,{align:'left', title: '纸质',  width:110,templet:function(d){
+				,{align:'left', title: '纸质',  width:140,templet:function(d){
 						if (d.submitMoney=="1"){
 							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
 						}else if (d.submitMoney=="2"){
@@ -1457,7 +1457,7 @@
 						}
 						if(paperNoArchivedDays != null && paperNoArchivedDays != undefined && '' != paperNoArchivedDays){
 							// return "<font style = 'font-size:14px;font-weight:500;'>"+paperNoArchivedDays + '天'+"</font>";
-							xml+="<span style='margin-left: 5px;'>" + paperNoArchivedDays + "天" + "</span>";
+							xml+="<span style='margin-left: 5px;' title='未归档天数'>" + paperNoArchivedDays + "天" + "</span>";
 						}else{
 							// return "<font style = 'font-size:14px;font-weight:500;'></font>";
 						}

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/projectRecordDescriptionVew2.jsp

@@ -155,13 +155,6 @@
             <input id="zuZhiList" name="zuZhiList" htmlEscape="false" readonly="true" style="display: none"/>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>说明扫描件</h2></div>
-                <div class="layui-item nav-btns">
-                    <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-                        <%--<sys:collectSelect  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
-                                            name="linkman.id"  title="选择资料库"
-                                            cssClass="form-control judgment" fieldLabels="资料库" fieldKeys="name"
-                                            searchLabel="资料库" searchKey="fileName"></sys:collectSelect>--%>
-                </div>
                 <div id="addFile_attachment" style="display: none" class="upload-progress">
                     <span id="fileName_attachment"></span>
                     <b><span id="baifenbi_attachment"></span></b>
@@ -185,7 +178,7 @@
                         </tr>
                         </thead>
                         <tbody id="file_attachment">
-                        <c:forEach items="${ruralProjectRecords.workAttachments}" var="workClientAttachment"
+                        <c:forEach items="${materialDefectRecord.workAttachments}" var="workClientAttachment"
                                    varStatus="status">
                             <tr>
 
@@ -365,7 +358,6 @@
                                         <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
                                             <a href="javascript:void(0)"
                                                onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')"
-                                               class="op-btn op-btn-delete"><i class="fa fa-trash"></i>&nbsp;删除</a>
                                         </c:if>
 
                                     </div>

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

@@ -825,7 +825,7 @@
 							<div class="layui-input-block readOnlyFFF">
 								<form:select path="projectReportStatusTwo" class="form-control  simple-select">
 									<form:option value="" label=""/>
-									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+									<form:options items="${fns:getDictList('rural_report_issue_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
 							</div>
 						</div>
@@ -1028,7 +1028,7 @@
                         return xml;
                     }}
 				,{align:'center', title: '报告签发',  width:85,templet:function(d){
-						var st = getAuditState(""+d.projectReportStatusTwo);
+						var st = getReportIssueState(""+d.projectReportStatusTwo);
 
 						if(st.action){
 							if (d.submitMoney=="1"){
@@ -1041,7 +1041,7 @@
 						}
 						return xml;
 					}}
-                ,{align:'left', title: '电子',  width:140,templet:function(d){
+                ,{align:'left', title: '电子',  width:150,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
 						var noArchivedDays=d.noArchivedDays;
                         if(st.action){
@@ -1060,14 +1060,6 @@
 						}
 						return xml;
                     }}
-				,{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>";
-						else
-							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						return xml;
-					}}
 				<%--,{align:'center', title: '资料缺失',  width:90,templet:function(d){--%>
 				<%--		var st = getdefectRecordState(""+d.defectRecordStatus);--%>
 				<%--		if(st.action)--%>
@@ -1076,7 +1068,7 @@
 				<%--			var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
 				<%--		return xml;--%>
 				<%--	}}--%>
-				,{align:'left', title: '纸质',  width:100,templet:function(d){
+				,{align:'left', title: '纸质',  width:140,templet:function(d){
 						if (d.submitMoney=="1"){
 							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
 						}else if (d.submitMoney=="2"){
@@ -1093,11 +1085,19 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
 						if(paperNoArchivedDays != null && paperNoArchivedDays != undefined && '' != paperNoArchivedDays){
-							xml+="<span style='margin-left: 5px;' >" + paperNoArchivedDays + "天" + "</span>";
+							xml+="<span style='margin-left: 5px;' title='未归档天数'>" + paperNoArchivedDays + "天" + "</span>";
 						}else{
 						}
 						return xml;
 					}}
+				,{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>";
+						else
+							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						return xml;
+					}}
 				,{align:'center', title: '上报',  width:105,templet:function(d){
 						var st = getReportedState(d.reportedState);
 						if(st.action)

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

@@ -798,7 +798,7 @@
 							<div class="layui-input-block readOnlyFFF">
 								<form:select path="projectReportStatusTwo" class=" form-control  simple-select">
 									<form:option value="" label=""/>
-									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+									<form:options items="${fns:getDictList('rural_report_issue_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
 							</div>
 						</div>
@@ -964,14 +964,14 @@
                         return xml;
                     }}
 				,{align:'center', title: '报告签发',  width:110,templet:function(d){
-						var st = getAuditState(""+d.projectReportStatusTwo);
+						var st = getReportIssueState(""+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=\"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:'left', title: '电子',  width:120,templet:function(d){
+                ,{align:'left', title: '电子',  width:150,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
 						var de = getdefectRecordState(""+d.defectRecordStatus);
 						var noArchivedDays=d.noArchivedDays;
@@ -999,7 +999,7 @@
 				<%--			var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
 				<%--		return xml;--%>
 				<%--	}}--%>
-                ,{align:'left', title: '纸质',  width:110,templet:function(d){
+                ,{align:'left', title: '纸质',  width:140,templet:function(d){
 						if (d.submitMoney=="1"){
 							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
 						}else if (d.submitMoney=="2"){
@@ -1016,7 +1016,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
 						if(paperNoArchivedDays != null && paperNoArchivedDays != undefined && '' != paperNoArchivedDays){
-							xml+="<span style='margin-left: 5px;' >" + paperNoArchivedDays + "天" + "</span>";
+							xml+="<span style='margin-left: 5px;' title='未归档天数'>" + paperNoArchivedDays + "天" + "</span>";
 						}else{
 						}
                         return xml;

src/main/webapp/webpage/modules/sys/sysLogin.jsp

@@ -18,7 +18,7 @@
 	<link href="${ctxStatic}/awesome/4.4/css/font-awesome.min.css" rel="stylesheet" />
 	<!-- jeeplus -->
 	<link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-	<script src="${ctxStatic}/common/jeeplus.js?6" type="text/javascript"></script>
+	<script src="${ctxStatic}/common/jeeplus.js?9" type="text/javascript"></script>
 	<link rel="shortcut icon" href="images/favicon.png" type="image/png">
 	<!-- text fonts -->
 	<link rel="stylesheet" href="${ctxStatic }/common/login/ace-fonts.css" />

src/main/webapp/webpage/modules/sys/sysLogin2.jsp

@@ -16,7 +16,7 @@
 		<link href="${ctxStatic}/awesome/4.4/css/font-awesome.min.css" rel="stylesheet" />
 		<!-- jeeplus -->
 		<link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-		<script src="${ctxStatic}/common/jeeplus.js" type="text/javascript"></script>
+		<script src="${ctxStatic}/common/jeeplus.js?9" type="text/javascript"></script>
 		<link rel="shortcut icon" href="images/favicon.png" type="image/png">
 		<!-- text fonts -->
 		<link rel="stylesheet" href="${ctxStatic }/common/login/ace-fonts.css" />