瀏覽代碼

待办已办调整

sangwenwei 11 月之前
父節點
當前提交
78458a0755

+ 3 - 1
src/main/resources/mappings/modules/workprojectnotify/WorkProjectNotifyDao.xml

@@ -711,7 +711,9 @@
 				<if test="dbName == 'mssql'">'%'+#{userName}+'%'</if>
 				<if test="dbName == 'mysql'">concat('%',#{userName},'%')</if>
 			</if>
-
+			<if test="(createUserId != null and createUserId != '') or (createUserName != null and createUserName != '')">
+				AND (a.create_by = #{createUserId} or su.name like concat('%',#{createUserName},'%'))
+			</if>
 			<if test="companyId != null and companyId != ''">
 				AND a.company_id = #{companyId}
 			</if>

+ 22 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageTwoView.jsp

@@ -78,6 +78,28 @@
 
 <body>
 <div class="single-form">
+	<div class="tapfixed">
+		<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
+			<ul class="list-tabs" >
+				<li ><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
+				<c:if test="${projectRecords.submitMoney eq '2'}">
+					<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
+				</c:if>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
+				<%--			<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}&submitMoney=${projectRecords.submitMoney}">纸质归档信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+				<c:if test="${projectRecords.defectRecordStatus != '0'}">
+					<li><a href="${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription2?reportId=${projectRecords.prdId}">资料缺失说明</a></li>
+				</c:if>
+			</ul>
+		</div>
+	</div>
 	<div class="container${container}  view-form">
 		<form:form id="inputForm" modelAttribute="projectcontentinfo" action="${ctx}/ruralProject/ruralProjectMessage/reportAudit" method="post" class="form-horizontal layui-form">
 			<%--<div class="form-group layui-row first lw12">

+ 26 - 2
src/main/webapp/webpage/modules/sys/sysHome.jsp

@@ -2,6 +2,7 @@
 <%@ page import="com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <html>
 <head>
     <title>首页</title>
@@ -1080,8 +1081,15 @@
                     '<span class="bord-record-time">' + '<fmt:formatDate value="${workProjectNotify.createDate}" pattern="yyyy-MM-dd"/>' + '</span></a></li>');
             </c:when>
             <c:otherwise>
+                <c:if test="${fn:contains(workProjectNotify.title, '驳回')}">
+                elem.append('<li>' + xml + "<span class=\"bord-record-type\" title=\"${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}\">${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}</span><span class=\"bord-record\" title=\"${workProjectNotify.title}\"><font color=\"red\">【驳回】${workProjectNotify.title}</font></span>" +
+                    '<span class="bord-record-time">' + '<fmt:formatDate value="${workProjectNotify.updateDate}" pattern="yyyy-MM-dd"/>' + '</span></a></li>');
+                </c:if>
+                <c:if test="${!fn:contains(workProjectNotify.title, '驳回')}">
                 elem.append('<li>' + xml + "<span class=\"bord-record-type\" title=\"${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}\">${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}</span><span class=\"bord-record\" title=\"${workProjectNotify.title}\">${workProjectNotify.title}</span>" +
                     '<span class="bord-record-time">' + '<fmt:formatDate value="${workProjectNotify.updateDate}" pattern="yyyy-MM-dd"/>' + '</span></a></li>');
+                </c:if>
+
             </c:otherwise>
         </c:choose>
         </c:if>
@@ -1137,10 +1145,26 @@
             </c:if>--%>
             <c:choose>
                 <c:when test="${workProjectNotify.repetitionCount> 1}">
-                    "<span class=\"bord-record\" title=\"${workProjectNotify.title}\"><font color=\"red\">【${workProjectNotify.repetitionCount}】</font><font>${workProjectNotify.title}</font></span>" +
+                    <c:if test="${fn:contains(workProjectNotify.title, '驳回')}">
+                        "<span class=\"bord-record\" title=\"${workProjectNotify.title}\"><font color=\"red\">【${workProjectNotify.repetitionCount}】</font><font>【驳回】${workProjectNotify.title}</font></span>" +
+                    </c:if>
+                    <c:if test="${fn:contains(workProjectNotify.title, '完成') || fn:contains(workProjectNotify.title, '通过') || fn:contains(workProjectNotify.title, '成功')}">
+                        "<span class=\"bord-record\" title=\"${workProjectNotify.title}\"><font color=\"red\">【${workProjectNotify.repetitionCount}】</font><font>【通过】${workProjectNotify.title}</font></span>" +
+                    </c:if>
+                    <c:if test="${(!fn:contains(workProjectNotify.title, '完成') || !fn:contains(workProjectNotify.title, '通过') || !fn:contains(workProjectNotify.title, '成功')) && !fn:contains(workProjectNotify.title, '驳回')}">
+                        "<span class=\"bord-record\" title=\"${workProjectNotify.title}\"><font color=\"red\">【${workProjectNotify.repetitionCount}】</font><font>${workProjectNotify.title}</font></span>" +
+                    </c:if>
                 </c:when>
                 <c:otherwise>
-                    "<span class=\"bord-record\" title=\"${workProjectNotify.title}\">${workProjectNotify.title}</span>" +
+                    <c:if test="${fn:contains(workProjectNotify.title, '驳回')}">
+                        "<span class=\"bord-record\" title=\"${workProjectNotify.title}\">【驳回】${workProjectNotify.title}</span>" +
+                    </c:if>
+                    <c:if test="${fn:contains(workProjectNotify.title, '完成') || fn:contains(workProjectNotify.title, '通过') || fn:contains(workProjectNotify.title, '成功')}">
+                        "<span class=\"bord-record\" title=\"${workProjectNotify.title}\">【通过】${workProjectNotify.title}</span>" +
+                    </c:if>
+                    <c:if test="${(!fn:contains(workProjectNotify.title, '完成') || !fn:contains(workProjectNotify.title, '通过') || !fn:contains(workProjectNotify.title, '成功')) && !fn:contains(workProjectNotify.title, '驳回')}">
+                        "<span class=\"bord-record\" title=\"${workProjectNotify.title}\">${workProjectNotify.title}</span>" +
+                    </c:if>
                 </c:otherwise>
             </c:choose>
             '<span class="bord-record-time">' + '<fmt:formatDate value="${workProjectNotify.updateDate}" pattern="yyyy-MM-dd"/>' + '</span></ a></li>');

+ 422 - 94
src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyList.jsp

@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <html>
 <head>
 	<title>待办管理</title>
@@ -567,6 +568,12 @@
 				</div>
 				<div id="moresees" style="clear:both;display:none;height: 70px;">
 					<div class="layui-item query athird">
+						<label class="layui-form-label">标题:</label>
+						<div class="layui-input-block">
+							<form:input path="title" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+						</div>
+					</div>
+					<div class="layui-item query athird">
 						<label class="layui-form-label">提交人:</label>
 						<div class="layui-input-block with-icon">
 							<sys:inquireselectUserNotReadolny id="createUser" name="createUserId" value="${workProjectNotify.createUserId}" labelName="createUserName" labelValue="${workProjectNotify.createUserName}" cssStyle="background-color: #fff"
@@ -647,98 +654,304 @@
 								"</a>";
 					}else if(d.type == "6")
 					{
-					    if( d.status != 1 )
-						{
-						    return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                                "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                "</a>";
-						}
-						else
-						{
-							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                                "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                "</a>";
+						if (d.isreply == "1"){
+							if( d.status != 1 )
+							{
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+										"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+  d.title +"</span>" +
+										"</a>";
+							}
+							else
+							{
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+										"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+  d.title +"</span>" +
+										"</a>";
+							}
+						}else if (d.isreply == "2"){
+							if( d.status != 1 )
+							{
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+"【通过】"+  d.title +"</span>" +
+										"</a>";
+							}
+							else
+							{
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+"【通过】"+  d.title +"</span>" +
+										"</a>";
+							}
+						}else {
+							if( d.status != 1 )
+							{
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+							}
+							else
+							{
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+							}
 						}
+
                     }
                     else if(d.type == "18"){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogre('企业申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+                    	if (d.isreply == "1"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogre('企业申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+  d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "2"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogre('企业申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+  d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogre('企业申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
 					}
 					else if(d.type == "19"){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+						if (d.isreply == "1"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+ "【驳回】"+ d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "2") {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ "【通过】"+ d.title +"</span>" +
+									"</a>";
+						}else {
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+						}
 					}
                     else if(d.type == "57" && d.step == '申请人归档'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+						if (d.isreply == "1"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+ "【驳回】"+ d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "2") {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+  d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
                     }
                     else if(d.type == "50" && d.step == '投标专员标书编制'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+						if (d.isreply == "1"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+ "【驳回】"+ d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "2") {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
                     }
                     else if(d.type == "50" && d.step == '投标专员调整申请'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+						if (d.isreply == "1"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+ d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "2") {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
                     }
                     else if(d.type == "50" && d.step == '市场研发管理部负责人备案'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+						if (d.isreply == "1"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+ d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "2") {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
                     }
                     else if(d.type == "16" && d.step == '合同盖章'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+						if (d.isreply == "1"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+ d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "2") {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
+
                     }
                     else if(d.type == "44" && d.step == '合同盖章'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+						if (d.isreply == "1"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+ d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "2") {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
                     }
                     else if(d.type == "67" && d.step == '部门主任'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+						if (d.isreply == "1"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+ d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "2") {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
                     }
                     else if(d.type == "67" && d.step == '签约人'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+						if (d.isreply == "1"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+ d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "2") {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
                     }
                     else if(d.type == "50" && d.step == '盖章人盖章'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+						if (d.isreply == "1"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+ d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "2") {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
                     }
                     else if(d.type == "50" && d.step == '申请人开标'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+						if (d.isreply == "1"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+ d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "2") {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
+
                     }
                     else if(d.type == "50" && d.step == '市场研发管理部负责人'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+						if (d.isreply == "1"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+ d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "2") {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
                     }
                     else if(d.type == "55" && d.step == '申请人审批'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+						if (d.isreply == "1"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+ d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "2") {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
                     }
                     else if(d.type == "58" && d.remarks == '待处理'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass2('"+ d.type1 +"待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+						if (d.isreply == "1"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass2('"+ d.type1 +"待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+ d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "2") {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass2('"+ d.type1 +"待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass2('"+ d.type1 +"待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
                     }
                     else if(d.type == "69" && d.remarks == '待处理'){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass2('"+ d.type1 +"待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+						if (d.isreply == "1"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass2('"+ d.type1 +"待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+ d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "2") {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass2('"+ d.type1 +"待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass2('"+ d.type1 +"待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
                     }
                     else if(d.type == "71" && d.step == '各级审批'){
                         return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass2('"+ d.type1 +"待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
@@ -768,31 +981,85 @@
 					}
                     else if(d.remarks == "再次申请" && d.status != "1")
                     {
-                        return " <a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
-                    }
-                    else if(d.remarks == "重新申请" && d.status != "1")
-                    {
-						<%--作废--%>
-						if(d.type == "39" && (d.projectType == "1" || d.projectType == "2")){
-							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"projectDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','${ctx}/workprojectnotify/workProjectNotify/cancellationNotify?id="+d.id+"','95%','95%')\">" +
-									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+						if (d.isreply == "2"){
+							return " <a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
 									"</a>";
-						}else if(d.type == "16"){
-							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"projectDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','${ctx}/workprojectnotify/workProjectNotify/cancellationNotify?id="+d.id+"','95%','95%')\">" +
-									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+						}else if (d.isreply == "1"){
+							return " <a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+ d.title +"</span>" +
 									"</a>";
-						<%--删除--%>
-						}else if(d.type == "92" || d.type == "89"  || d.type == "21"  || d.type == "13"  || d.type == "139" ){
-							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"projectDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','${ctx}/workprojectnotify/workProjectNotify/deleteNotify?id="+d.id+"','95%','95%')\">" +
+						}else {
+							return " <a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
 									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
 									"</a>";
-						}else{
-							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
-								"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-								"</a>";
 						}
+
+                    }
+                    else if(d.remarks == "重新申请" && d.status != "1")
+                    {
+                    	if (d.isreply == "1"){
+							<%--作废--%>
+							if(d.type == "39" && (d.projectType == "1" || d.projectType == "2")){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"projectDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','${ctx}/workprojectnotify/workProjectNotify/cancellationNotify?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\" style=\"color: red;\">"+ "【驳回】"+d.title +"</span>" +
+										"</a>";
+							}else if(d.type == "16"){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"projectDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','${ctx}/workprojectnotify/workProjectNotify/cancellationNotify?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+ d.title +"</span>" +
+										"</a>";
+								<%--删除--%>
+							}else if(d.type == "92" || d.type == "89"  || d.type == "21"  || d.type == "13"  || d.type == "139" ){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"projectDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','${ctx}/workprojectnotify/workProjectNotify/deleteNotify?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\" style=\"color: red;\">"+ "【驳回】"+d.title +"</span>" +
+										"</a>";
+							}else{
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+ d.title +"</span>" +
+										"</a>";
+							}
+						}else if (d.isreply == "2"){
+							<%--作废--%>
+							if(d.type == "39" && (d.projectType == "1" || d.projectType == "2")){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"projectDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','${ctx}/workprojectnotify/workProjectNotify/cancellationNotify?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ "【通过】"+d.title +"</span>" +
+										"</a>";
+							}else if(d.type == "16"){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"projectDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','${ctx}/workprojectnotify/workProjectNotify/cancellationNotify?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+										"</a>";
+								<%--删除--%>
+							}else if(d.type == "92" || d.type == "89"  || d.type == "21"  || d.type == "13"  || d.type == "139" ){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"projectDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','${ctx}/workprojectnotify/workProjectNotify/deleteNotify?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ "【通过】"+d.title +"</span>" +
+										"</a>";
+							}else{
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+										"</a>";
+							}
+						}else {
+							<%--作废--%>
+							if(d.type == "39" && (d.projectType == "1" || d.projectType == "2")){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"projectDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','${ctx}/workprojectnotify/workProjectNotify/cancellationNotify?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+							}else if(d.type == "16"){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"projectDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','${ctx}/workprojectnotify/workProjectNotify/cancellationNotify?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+								<%--删除--%>
+							}else if(d.type == "92" || d.type == "89"  || d.type == "21"  || d.type == "13"  || d.type == "139" ){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"projectDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','${ctx}/workprojectnotify/workProjectNotify/deleteNotify?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+							}else{
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+							}
+						}
+
                     }
                     else if(d.type == "66" && d.step == '转正人补充信息'){
                         return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
@@ -810,30 +1077,85 @@
                             "</a>";
                     }
                     else if(d.type == "83"){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreAttendanceAudit('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+                    	if (d.isreply == "2"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreAttendanceAudit('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+  d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "1"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreAttendanceAudit('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+  d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreAttendanceAudit('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
                     }
                     else if(d.type == "84"){
-                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreAttendance('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+                    	if (d.isreply == "2"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreAttendance('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "1"){
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreAttendance('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+ d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreAttendance('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
                     }
 
                     else if(d.remarks == "待审批" && d.status != "1") {
-                        return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+                    	if (d.isreply == "1"){
+							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+  d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "2"){
+							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+  d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
                     }
                     else if(d.remarks == "待审批" && d.status != "1" && d.type == "76" && d.step == '案例审核人审批') {
-                        return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogreExample('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+                    	if (d.isreply == "2"){
+							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogreExample('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+  d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "1"){
+							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogreExample('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+  d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogreExample('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
                     }
                     else{
-                        return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('"+ d.type1 +"', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                            "</a>";
+                    	if (d.isreply == "1"){
+							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('"+ d.type1 +"', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+ "【驳回】"+ d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "2"){
+							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('"+ d.type1 +"', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ "【通过】"+ d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('"+ d.type1 +"', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title+"</span>" +
+									"</a>";
+						}
+
                     }
                     }}
                 ,{align:'center',title: '内容', minWidth:150,templet:function(d){
@@ -882,6 +1204,12 @@
                     ,"type1":"${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}"
                     ,"step":"${workProjectNotify.notifyRole}"
                     ,"title":"${workProjectNotify.title}"
+					<c:if test="${fn:contains(workProjectNotify.title, '驳回')}">
+					,"isreply":"1"
+					</c:if>
+					<c:if test="${fn:contains(workProjectNotify.title, '完成') || fn:contains(workProjectNotify.title, '通过') || fn:contains(workProjectNotify.title, '成功')}">
+					,"isreply":"2"
+					</c:if>
                     ,"content":"${workProjectNotify.content}"
                     ,"initiator":"${fns:getUserById(workProjectNotify.initiator).name}"
                     ,"auditorName":"${fns:getUserById(workProjectNotify.auditor).name}"

+ 33 - 4
src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyReadBacklogList.jsp

@@ -441,6 +441,19 @@
 				</div>
 				<div id="moresees" style="clear:both;display:none;height: 70px;">
 					<div class="layui-item query athird">
+						<label class="layui-form-label">标题:</label>
+						<div class="layui-input-block">
+							<form:input path="title" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+						</div>
+					</div>
+					<div class="layui-item query athird">
+						<label class="layui-form-label">提交人:</label>
+						<div class="layui-input-block with-icon">
+							<sys:inquireselectUserNotReadolny id="createUser" name="createUserId" value="${workProjectNotify.createUserId}" labelName="createUserName" labelValue="${workProjectNotify.createUserName}" cssStyle="background-color: #fff"
+															  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+						</div>
+					</div>
+					<div class="layui-item query athird">
 						<label class="layui-form-label">创建日期:</label>
 						<div class="layui-input-block">
 							<input id="startDate" name="startDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
@@ -516,10 +529,20 @@
                         return "<span title='"+ d.step +"'>" + d.step + "</span>";
                     }}
                 ,{align:'center', title: '标题', minWidth:150,templet:function(d){
-					return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('"+ d.type1 +"', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&view=view','95%','95%')\">" +
-						"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-						"</a>";
-                    }}
+                	if (d.isreply == "1"){
+						return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('"+ d.type1 +"', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&view=view','95%','95%')\">" +
+								"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+ d.title +"</span>" +
+								"</a>";
+					} else if (d.isreply == "2") {
+						return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('"+ d.type1 +"', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&view=view','95%','95%')\">" +
+								"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+								"</a>";
+					}else {
+						return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('"+ d.type1 +"', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&view=view','95%','95%')\">" +
+								"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+								"</a>";
+					}
+					}}
                 ,{align:'center',title: '内容', minWidth:150,templet:function(d){
                         return "<span title='"+ d.content +"'>" + d.content + "</span>";
                     }}
@@ -547,6 +570,12 @@
                     ,"type1":"${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}"
                     ,"step":"${workProjectNotify.notifyRole}"
                     ,"title":"${workProjectNotify.title}"
+					<c:if test="${fn:contains(workProjectNotify.title, '驳回')}">
+					,"isreply":"1"
+					</c:if>
+					<c:if test="${fn:contains(workProjectNotify.title, '完成') || fn:contains(workProjectNotify.title, '通过')|| fn:contains(workProjectNotify.title, '成功')}">
+					,"isreply":"2"
+					</c:if>
                     ,"content":"${workProjectNotify.content}"
                     ,"submit":"${fns:getUserById(workProjectNotify.createBy.id).name}"
 					,"status":"${workProjectNotify.status}"

+ 146 - 33
src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyReadShowList.jsp

@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <html>
 <head>
 	<title>通知管理</title>
@@ -211,57 +212,163 @@
 
                         if(d.type == "6")
                         {
-                            if( d.status != 1 )
-                            {
-                                return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
-                                    "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                    "</a>";
-                            }
-                            else
-                            {
-                                return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
-                                    "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                    "</a>";
-                            }
+                        	if (d.isreply == "2"){
+								if( d.status != 1 )
+								{
+									return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+											"<span title=\""+ d.title +"\">"+"【通过】"+  d.title +"</span>" +
+											"</a>";
+								}
+								else
+								{
+									return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+											"<span title=\""+ d.title +"\">"+"【通过】"+  d.title +"</span>" +
+											"</a>";
+								}
+							}else if (d.isreply == "1"){
+								if( d.status != 1 )
+								{
+									return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+											"<span title=\""+ d.title +"\">"+"【驳回】"+  d.title +"</span>" +
+											"</a>";
+								}
+								else
+								{
+									return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+											"<span title=\""+ d.title +"\">"+"【驳回】"+  d.title +"</span>" +
+											"</a>";
+								}
+							}else {
+								if( d.status != 1 )
+								{
+									return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+											"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+											"</a>";
+								}
+								else
+								{
+									return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+											"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+											"</a>";
+								}
+							}
+
                         }
                         else if(d.type == "18"){
-                            return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请列表', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
-                                "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                "</a>";
+                        	if (d.isreply == "2"){
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请列表', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+										"</a>";
+							}else if (d.isreply == "1"){
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请列表', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+"【驳回】"+ d.title +"</span>" +
+										"</a>";
+							}else {
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请列表', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+							}
+
                         }
                         else if(d.type == "19"){
-                            return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请列表', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
-                                "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                "</a>";
+                        	if (d.isreply == "2"){
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请列表', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+										"</a>";
+							}else if (d.isreply == "1"){
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请列表', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+"【驳回】"+ d.title +"</span>" +
+										"</a>";
+							}else {
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请列表', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+							}
+
                         }
                         else if(d.remarks == "待归档")
                         {
-                            return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"top.openTab('${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','待归档',false)\">" +
-                                "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                "</a>"
+                        	if (d.isreply == "2"){
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"top.openTab('${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','待归档',false)\">" +
+										"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+										"</a>"
+							}else if (d.isreply == "1"){
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"top.openTab('${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','待归档',false)\">" +
+										"<span title=\""+ d.title +"\">"+"【驳回】"+ d.title +"</span>" +
+										"</a>"
+							}else {
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"top.openTab('${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','待归档',false)\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>"
+							}
+
                         }
                         else if(d.remarks == "再次申请" && d.status != "1")
                         {
-                            return " <a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
-                                "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                "</a>";
+                        	if (d.isreply == "2"){
+								return " <a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+										"</a>";
+							}else if (d.isreply == "1"){
+								return " <a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ "【驳回】"+d.title +"</span>" +
+										"</a>";
+							}else {
+								return " <a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+							}
+
                         }
                         else if(d.remarks == "重新申请" && d.status != "1")
                         {
-                            return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
-                                "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                "</a>";
+                        	if (d.isreply == "2"){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ "【通过】"+d.title +"</span>" +
+										"</a>";
+							}else if (d.isreply == "1"){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ "【驳回】"+d.title +"</span>" +
+										"</a>";
+							}else {
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+							}
+
                         }
                         else if(d.remarks == "待审批" && d.status != "1")
                         {
-                            return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
-                                "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                "</a>";
+                        	if (d.isreply == "2"){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+"【通过】"+d.title +"</span>" +
+										"</a>";
+							}else if (d.isreply == "1"){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+"【驳回】"+d.title +"</span>" +
+										"</a>";
+							}else {
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+							}
+
                         }
                         else{
-                            return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
-                                "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                "</a>";
+                        	if (d.isreply == "2"){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ "【通过】"+d.title +"</span>" +
+										"</a>";
+							}else if (d.isreply == "1"){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+"【驳回】"+ d.title +"</span>" +
+										"</a>";
+							}else {
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+							}
+
                         }
                     }}
                 ,{align:'center',title: '内容', minWidth:150,templet:function(d){
@@ -285,6 +392,12 @@
                     ,"type":"${workProjectNotify.type}"
                     ,"type1":"${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}"
                     ,"step":"${workProjectNotify.notifyRole}"
+					<c:if test="${fn:contains(workProjectNotify.title, '完成') || fn:contains(workProjectNotify.title, '通过') || fn:contains(workProjectNotify.title, '成功')}">
+					,"isreply":"2"
+					</c:if>
+					<c:if test="${fn:contains(workProjectNotify.title, '驳回')}">
+					,"isreply":"1"
+					</c:if>
                     ,"title":"${workProjectNotify.title}"
                     ,"content":"${workProjectNotify.content}"
                     ,"submit":"${fns:getUserById(workProjectNotify.createBy.id).name}"

+ 142 - 33
src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyShowList.jsp

@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <html>
 <head>
 	<title>通知管理</title>
@@ -216,28 +217,79 @@
 
                         if(d.type == "6")
                         {
-                            if( d.status != 1 )
-                            {
-                                return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
-                                    "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                    "</a>";
-                            }
-                            else
-                            {
-                                return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
-                                    "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                    "</a>";
-                            }
+                        	if (d.isreply == "2"){
+								if( d.status != 1 )
+								{
+									return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+											"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+											"</a>";
+								}
+								else
+								{
+									return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+											"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+											"</a>";
+								}
+							}else if (d.isreply == "1"){
+								if( d.status != 1 )
+								{
+									return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+											"<span title=\""+ d.title +"\">"+"【驳回】"+ d.title +"</span>" +
+											"</a>";
+								}
+								else
+								{
+									return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+											"<span title=\""+ d.title +"\">"+"【驳回】"+ d.title +"</span>" +
+											"</a>";
+								}
+							}else {
+								if( d.status != 1 )
+								{
+									return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+											"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+											"</a>";
+								}
+								else
+								{
+									return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+											"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+											"</a>";
+								}
+							}
+
                         }
                         else if(d.type == "18"){
-                            return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请列表', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
-                                "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                "</a>";
+                        	if (d.isreply == "2"){
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请列表', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+										"</a>";
+							}else if (d.isreply == "1"){
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请列表', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ "【驳回】"+d.title +"</span>" +
+										"</a>";
+							}else {
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请列表', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+							}
+
                         }
                         else if(d.type == "19"){
-                            return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请列表', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
-                                "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                "</a>";
+                        	if (d.isreply == "2"){
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请列表', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ "【通过】"+d.title +"</span>" +
+										"</a>";
+							}else if (d.isreply == "1"){
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请列表', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ "【驳回】"+d.title +"</span>" +
+										"</a>";
+							}else {
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请列表', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+							}
+
                         }
                         else if(d.type == "94"){
                         	if(d.exigency == '1'){
@@ -258,32 +310,83 @@
                         }
                         else if(d.remarks == "待归档")
                         {
-                            return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"top.openTab('${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','待归档',false)\">" +
-                                "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                "</a>"
+                        	if (d.isreply =="2"){
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"top.openTab('${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','待归档',false)\">" +
+										"<span title=\""+ d.title +"\">"+ "【通过】"+d.title +"</span>" +
+										"</a>"
+							}else if (d.isreply == "1"){
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"top.openTab('${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','待归档',false)\">" +
+										"<span title=\""+ d.title +"\">"+"【驳回】"+ d.title +"</span>" +
+										"</a>"
+							}else {
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"top.openTab('${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','待归档',false)\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>"
+							}
+
                         }
                         else if(d.remarks == "再次申请" && d.status != "1")
                         {
-                            return " <a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
-                                "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                "</a>";
+                        	if (d.isreply == "2"){
+								return " <a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+										"</a>";
+							}else if (d.isreply == "1"){
+								return " <a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+"【驳回】"+ d.title +"</span>" +
+										"</a>";
+							}else {
+								return " <a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+							}
+
                         }
                         else if(d.remarks == "重新申请" && d.status != "1")
                         {
-                            return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
-                                "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                "</a>";
+                        	if (d.isreply == "1"){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ "【驳回】"+d.title +"</span>" +
+										"</a>";
+							}else {
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+d.title +"</span>" +
+										"</a>";
+							}
+
                         }
                         else if(d.remarks == "待审批" && d.status != "1")
                         {
-                            return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
-                                "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                "</a>";
+                        	if (d.isreply == "2"){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ "【通过】"+d.title +"</span>" +
+										"</a>";
+							}else if (d.isreply == "1"){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+"【驳回】"+ d.title +"</span>" +
+										"</a>";
+							}else {
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+							}
+
                         }
                         else{
-                            return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
-                                "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-                                "</a>";
+                        	if (d.isreply == "2"){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
+										"</a>";
+							}else if (d.isreply == "1"){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+"【驳回】"+ d.title +"</span>" +
+										"</a>";
+							}else {
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+							}
+
                         }
                     }}
                 ,{align:'center',title: '内容', minWidth:150,templet:function(d){
@@ -307,6 +410,12 @@
                     ,"type":"${workProjectNotify.type}"
                     ,"type1":"${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}"
                     ,"step":"${workProjectNotify.notifyRole}"
+					<c:if test="${fn:contains(workProjectNotify.title, '完成') || fn:contains(workProjectNotify.title, '通过') || fn:contains(workProjectNotify.title, '成功')}">
+					,"isreply":"2"
+					</c:if>
+					<c:if test="${fn:contains(workProjectNotify.title, '驳回')}">
+					,"isreply":"1"
+					</c:if>
                     ,"title":"${workProjectNotify.title}"
                     ,"content":"${workProjectNotify.content}"
                     ,"submit":"${fns:getUserById(workProjectNotify.createBy.id).name}"