首页通知消息添加已读页签

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

@@ -853,6 +853,21 @@ public class WorkProjectNotifyController extends BaseController {
 	}
 
 	/**
+	 * 已读通知列表页面
+	 */
+	@RequestMapping(value = {"listReadShow"})
+	public String listReadShow(WorkProjectNotify workProjectNotify, HttpServletRequest request, HttpServletResponse response, Model model) {
+		User user = UserUtils.getUser();
+		workProjectNotify.setUser(user);
+		workProjectNotify.setStatus("2");
+		workProjectNotify.setRemarks("待通知");
+		workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
+		Page<WorkProjectNotify> pageList = workProjectNotifyService.findPage(new Page<WorkProjectNotify>(request, response),workProjectNotify);
+		model.addAttribute("page", pageList);
+		return "modules/workprojectnotify/workProjectNotifyReadShowList";
+	}
+
+	/**
 	 * 查看，增加，编辑通知表单页面
 	 */
 	@RequestMapping(value = "form")

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordModifyApply.jsp

@@ -104,28 +104,6 @@
 
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>案卷号：</label>
-					<div class="layui-input-block">
-						<div class="input-group">
-							<input htmlEscape="false" id="fileNum" name="fileNum"  class="form-control required layui-input" value="${projectReportRecord.fileNum}"/>
-							<span class="input-group-btn">
-								<label class="form-status">
-									<c:choose>
-										<c:when test="${not empty projectReportRecord.status}">${fns:getDictLabel(projectReportRecord.status, 'audit_record_state', '')}
-										</c:when>
-										<c:otherwise>新添</c:otherwise>
-									</c:choose></label>
-							 </span>
-						</div>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>确认案卷号：</label>
-					<div class="layui-input-block">
-						<input id="fileNumTow" name="fileNumTow" type="text"  class="layui-input required form-control" equalTo="#fileNum"/>
-					</div>
-				</div>
 				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>归档申请编号：</label>
 					<div class="layui-input-block">
@@ -169,21 +147,21 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
+					<label class="layui-form-label">合同编号：</label>
 					<div class="layui-input-block">
-						<form:input id="contractNum" path="contractNum" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
+						<form:input id="contractNum" path="contractNum" htmlEscape="false" readonly="true" class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
+					<label class="layui-form-label">合同名称：</label>
 					<div class="layui-input-block">
-						<form:input id="contractName" path="contractName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
+						<form:input id="contractName" path="contractName" htmlEscape="false" readonly="true" class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
-						<form:input id="clientName" path="clientName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
+						<form:input id="clientName" path="clientName" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordView.jsp

@@ -38,7 +38,7 @@
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">确认案卷号：</label>
 				<div class="layui-input-block">
-					<input id="fileNumTow" name="fileNumTow" readonly="true" type="text"  class="layui-input form-control" equalTo="#fileNum"/>
+					<input id="fileNumTow" name="fileNumTow" readonly="true" type="text"  class="layui-input form-control" equalTo="#fileNum" value="${projectReportRecord.fileNumTow}"/>
 				</div>
 			</div>
 			<%--<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyShowList.jsp

@@ -130,6 +130,12 @@
 	<sys:message content="${message}"/>
 	<div class="layui-row">
 		<div class="full-width fl">
+			<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
+				<ul class="list-tabs" >
+					<li class="active"><a href="${ctx}/workprojectnotify/workProjectNotify/listShow">未读通知</a></li>
+					<li><a href="${ctx}/workprojectnotify/workProjectNotify/listReadShow">已读通知</a></li>
+				</ul>
+			</div>
 			<div class="contentShadow layui-row" id="queryDiv">
 				<form:form id="searchForm" modelAttribute="workProjectNotify" action="${ctx}/workprojectnotify/workProjectNotify/listShow" method="post" class="form-inline">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>