Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java
#	src/main/webapp/webpage/modules/signatureManagement/electronicSignature/ElectronicSignatureList.jsp
#	src/main/webapp/webpage/modules/workinvoice/workInvoiceAllList.jsp

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceTwoController.java

@@ -585,6 +585,11 @@ public class WorkInvoiceTwoController extends BaseController {
 	public String cancellationForm(WorkInvoice workInvoice, Model model) {
 		String view = "conditionWorkInvoiceTwoForm";
 		String tabId = request.getParameter("tabId");
+		//对于老项目正在作废中的发票处理
+		if (StringUtils.isBlank(workInvoice.getCancellationState()) && (workInvoice.getInvoiceState().equals("6") || workInvoice.getInvoiceState().equals("9") || workInvoice.getInvoiceState().equals("11"))){
+			//将发票状态改为已完成
+			workInvoice.setInvoiceState("5");
+		}
 		if("1".equals(tabId)){
 			view = "workInvoiceView";
 		}else if("3".equals(tabId)){
@@ -648,6 +653,11 @@ public class WorkInvoiceTwoController extends BaseController {
 		User loginUser = UserUtils.getUser();
 		String invoiceState = workInvoice.getCancellationState();
 		if(null != loginUser && (loginUser.getOffice().getName().equals("财务部") || loginUser.getId().equals(workInvoice.getCreateBy().getId()))){
+			//对于老项目正在作废中的发票处理
+			if (StringUtils.isBlank(workInvoice.getCancellationState()) && (workInvoice.getInvoiceState().equals("6") || workInvoice.getInvoiceState().equals("9") || workInvoice.getInvoiceState().equals("11"))){
+				//将发票状态改为已完成
+				workInvoice.setInvoiceState("5");
+			}
 			//启动流程
 			workInvoice.setCancellationState("6");
 			String cancellationProcessInstanceId ="";

src/main/java/com/jeeplus/modules/workprojectnotify/dao/WorkProjectNotifyDao.java

@@ -129,4 +129,6 @@ public interface WorkProjectNotifyDao extends CrudDao<WorkProjectNotify> {
 
 
     void deleteByNotifyUser(@Param("content") String content,@Param("userId")String userId);
+
+    String getRemarksByProcInsId(WorkProjectNotify info);
 }

src/main/java/com/jeeplus/modules/workprojectnotify/entity/WorkProjectNotify.java

@@ -69,6 +69,15 @@ public class WorkProjectNotify extends DataEntity<WorkProjectNotify> {
 	private String auditUserName; // 审核人name
 	private String belongProject; // 所属系统
 	private String pageFlag; // 回跳页面判定
+	private String reject; //判定已办中是否驳回
+
+	public String getReject() {
+		return reject;
+	}
+
+	public void setReject(String reject) {
+		this.reject = reject;
+	}
 
 	public WorkProjectNotify() {
 		super();

src/main/java/com/jeeplus/modules/workprojectnotify/service/WorkProjectNotifyService.java

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -197,7 +198,8 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 		page.setCountFlag(false);
 		workProjectNotify.setPage(page);
 		List<WorkProjectNotify> listByMine = dao.findReadList(workProjectNotify);
-		for (WorkProjectNotify info: listByMine) {
+		for (int i = 0; i < listByMine.size(); i++) {
+			WorkProjectNotify info = listByMine.get(i);
 			if(StringUtils.isNotBlank(info.getProcessInstanceId())){
 				String histoicFlow = histoicFlowUtil.histoicFlow(info.getProcessInstanceId());
 				if(StringUtils.isNotBlank(histoicFlow)){
@@ -206,6 +208,21 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 					info.setNotifyRole("已结束");
 				}
 			}
+			//根据流程id,创建人,创建时间查找流程中的审批意见
+			String remarks = dao.getRemarksByProcInsId(info);
+			if (StringUtils.isNotBlank(remarks)){
+				if (remarks.contains("驳回")){
+//				WorkProjectNotify next = listByMine.get(i + 1);
+					info.setReject("1");
+				}
+			}
+
+			//当标题中含有'重新申请'时,则获取到下一条数据,并赋值
+//			if (info.getTitle().contains("重新申请") && i + 1 < listByMine.size()) {
+//				WorkProjectNotify next = listByMine.get(i + 1);
+//				next.setReject("1");
+//			}
+
 			//如果记录中流程开始时间为空，则通过流程id查询该流程的开始时间
 			/*if(null == info.getWapCreateDate() && StringUtils.isNotBlank(info.getProcessInstanceId())){
 				WorkActivityProcess workActivityProcess = new WorkActivityProcess();

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

@@ -2260,7 +2260,7 @@ public class WorkProjectNotifyController extends BaseController {
 							return "modules/workinvoice/conditionWorkInvoiceAudit";
 						} else if (StringUtils.isNotBlank(taskDefKey) && "fpgly".equals(taskDefKey)) {
 							workInvoice.setDrawerName(UserUtils.getUser().getName());
-							workInvoice.setInvoiceDate(new Date());
+//							workInvoice.setInvoiceDate(new Date());
 							model.addAttribute("workInvoice", workInvoice);
 							return "modules/workinvoice/conditionWorkInvoiceAudit";
 						}
@@ -7982,7 +7982,12 @@ public class WorkProjectNotifyController extends BaseController {
 					return "modules/workinvoice/workInvoiceView";
 				} else if (workProjectNotify.getType().equals("211")) {    //开票管理
 					WorkInvoice workInvoice = workInvoiceService.get(workProjectNotify.getNotifyId());
-					workInvoice.setAct(getByAct(workInvoice.getProcessInstanceId()));
+//					workInvoice.setAct(getByAct(workInvoice.getProcessInstanceId()));
+					if (StringUtils.isNotBlank(workInvoice.getCancellationProcessInstanceId())){
+						workInvoice.setAct(getByAct(workInvoice.getCancellationProcessInstanceId()));
+					}else {
+						workInvoice.setAct(getByAct(workInvoice.getProcessInstanceId()));
+					}
 					if (workInvoice.getAct() != null) {
 						String taskDefKey = workInvoice.getAct().getTaskDefKey();
 					}

src/main/resources/mappings/modules/bzshbExamin/StandardOpinionDao.xml

@@ -7,6 +7,7 @@
 		from project_report_data a
 		left join work_project_user wpu on wpu.project_id = a.project_id
 		left join sys_user su on su.id = wpu.user_id
+		left join sys_office o on o.id = a.office_id
 		left join rural_project_records rpr on rpr.id = a.project_id
 		<where>
 			and a.del_flag = 0
@@ -31,6 +32,9 @@
 					#{officeId}
 				</foreach>
 			</if>
+			<if test="officeId == '' and officeName!=null and officeName!=''">
+				AND o.name like concat('%',#{officeName},'%')
+			</if>
 		</where>
 		group by wpu.user_id
 		order by a.audit_pass_date desc
@@ -82,6 +86,7 @@
 		from project_report_data a
 		left join work_project_user wpu on wpu.project_id = a.project_id
 		left join sys_user su on su.id = wpu.user_id
+		left join sys_office o on o.id = a.office_id
 		left join rural_project_records rpr on rpr.id = a.project_id
 		<where>
 			and rpr.project_id is not null
@@ -106,6 +111,9 @@
 					#{officeId}
 				</foreach>
 			</if>
+			<if test="officeId == '' and officeName!=null and officeName!=''">
+				AND o.name like concat('%',#{officeName},'%')
+			</if>
 		</where>
 		group by wpu.user_id) z
     </select>

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

@@ -96,6 +96,9 @@
 					#{officeId}
 				</foreach>
 			</if>
+			<if test="officeId == '' and officeName!=null and officeName!=''">
+				AND so.name like concat('%',#{officeName},'%')
+			</if>
 		</where>
 		group by a.user_id
 		ORDER BY a.update_date DESC
@@ -106,6 +109,7 @@
 		count(1) from (select a.id
 		FROM rural_project_message_all_config a
 		LEFT JOIN sys_user sua ON sua.id = a.user_id
+		left join sys_office so on so.id = a.office_id
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="(userId != null and userId != '') or (userName != null and userName != '')">
@@ -117,6 +121,9 @@
 					#{officeId}
 				</foreach>
 			</if>
+			<if test="officeId == '' and officeName!=null and officeName!=''">
+				AND so.name like concat('%',#{officeName},'%')
+			</if>
 		</where>
 		group by a.user_id) z
 	</select>

src/main/resources/mappings/modules/workinvoice/WorkInvoiceDao.xml

@@ -576,6 +576,9 @@
 					#{officeId}
 				</foreach>
 			</if>
+			<if test="officeId == '' and officeName!=null and officeName!=''">
+				AND o.name like concat('%',#{officeName},'%')
+			</if>
 			<if test="invoiceNumber != null and invoiceNumber != ''">
 				AND a.invoice_number LIKE
 					<if test="dbName == 'oracle'">'%'||#{invoiceNumber}||'%'</if>
@@ -1335,6 +1338,9 @@
 					#{officeId}
 				</foreach>
 			</if>
+			<if test="officeId == '' and officeName!=null and officeName!=''">
+				AND o.name like concat('%',#{officeName},'%')
+			</if>
 			<!--<if test="submitterId != null and submitterId != ''">
 				AND a.create_by = #{submitterId}
 			</if>-->

src/main/resources/mappings/modules/workprojectnotify/WorkProjectNotifyDao.xml

@@ -683,6 +683,7 @@
 		SELECT
 		<include refid="workProjectNotifyColumns"/>
 		,a.wap_begin_date AS "wapCreateDate"
+		,a.process_instance_id AS "processInstanceId"
 		,a.wap_over_date AS "wapEndDate"
 		,su.name as "createUserName"
 		FROM work_project_notify a
@@ -711,7 +712,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>
@@ -992,4 +995,14 @@
 
 		) and content =#{content} and notify_user = #{userId}
 	</delete>
+	<select id="getRemarksByProcInsId" resultType="string">
+		SELECT remarks
+		FROM work_activity_process
+		WHERE process_instance_id = #{processInstanceId}
+		AND create_by = #{updateBy.id}
+		AND TIME(create_date) BETWEEN
+			TIME(DATE_SUB(#{updateDate}, INTERVAL 2 SECOND))
+			AND TIME(DATE_ADD(#{updateDate}, INTERVAL 2 SECOND))
+		AND remarks IS NOT NULL;
+	</select>
 </mapper>

src/main/webapp/webpage/modules/bzshStandardOpinion/StandardOpinionAllList.jsp

@@ -229,7 +229,7 @@
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="officeId" name="officeId" value="${standardOpinion.officeId}" labelName="officeName" labelValue="${standardOpinion.officeName}" cssStyle="background-color: #fff"
-												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+												title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="true"/>
 							</div>
 						</div>
 						<div style="clear:both;"></div>

src/main/webapp/webpage/modules/bzshStandardOpinion/StandardOpinionList.jsp

@@ -348,7 +348,7 @@
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="officeId" name="officeId" value="${standardOpinion.officeId}" labelName="officeName" labelValue="${standardOpinion.officeName}" cssStyle="background-color: #fff"
-												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+												title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="true"/>
 							</div>
 						</div>
 						<div style="clear:both;"></div>

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

@@ -1140,7 +1140,7 @@
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="false"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">

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

@@ -484,7 +484,7 @@
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselectMoHu id="officeId" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+												title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">

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

@@ -933,7 +933,7 @@
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=6" allowInput="true" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
 							</div>
 						</div>
 						<div class="layui-item query athird ">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -356,7 +356,7 @@
 							<label class="layui-form-label">部门:</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselectMoHu id="officeId" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+												title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
 							</div>
 						</div>
 

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

@@ -182,7 +182,7 @@
 						<label class="layui-form-label">权限部门：</label>
 						<div class="layui-input-block with-icon">
 							<sys:treeselect id="officeId" name="officeId" value="${ruralProjectMessageAllConfig.officeId}" labelName="officeName" labelValue="${ruralProjectMessageAllConfig.officeName}" cssStyle="background-color: #fff"
-											title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+											title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="true"/>
 						</div>
 					</div>
 					<%--<div class="layui-item query athird">

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

@@ -834,7 +834,7 @@
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" />
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="false" />
 							</div>
 						</div>
 

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSeal/ruralProjectMessageElectronicSealList.jsp

@@ -407,7 +407,7 @@
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" />
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=6" allowInput="true" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" />
 							</div>
 						</div>
 

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSealCZ/ruralProjectMessageElectronicSealCZList.jsp

@@ -359,7 +359,7 @@
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" />
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=6" allowInput="true" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" />
 							</div>
 						</div>
 						<div class="layui-item query athird ">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSealYC/ruralProjectMessageElectronicSealYCList.jsp

@@ -359,7 +359,7 @@
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" />
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="false" />
 							</div>
 						</div>
 						<div class="layui-item query athird ">

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">

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

@@ -751,7 +751,7 @@
 							<label class="layui-form-label">部门:</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="false"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">

src/main/webapp/webpage/modules/signature/dailyOfficeWorkSignature/DailyOfficeWorkSignatureList.jsp

@@ -295,7 +295,7 @@
                             <label class="layui-form-label">部门：</label>
                             <div class="layui-input-block with-icon">
                                 <sys:treeselectMoHu id="officeId" name="office.id" value="${dailyOfficeWork.office.id}" labelName="office.name" labelValue="${dailyOfficeWork.office.name}"
-                                                    title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+                                                    title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
                             </div>
                         </div>
                         <div class="layui-item query athird ">

src/main/webapp/webpage/modules/signatureManagement/businessSignature/BusinessSignatureList.jsp

@@ -295,7 +295,7 @@
                             <label class="layui-form-label">申请部门：</label>
                             <div class="layui-input-block with-icon">
                                 <sys:treeselectMoHu id="officeId" name="office.id" value="${electronicSignatureInfo.office.id}" labelName="office.name" labelValue="${electronicSignatureInfo.office.name}"
-                                                    title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+                                                    title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input"  allowClear="true" notAllowSelectParent="false"/>
                             </div>
                         </div>
                         <div class="layui-item query athird ">

src/main/webapp/webpage/modules/signatureManagement/electronicSignature/ElectronicSignatureList.jsp

@@ -351,7 +351,7 @@
                             <label class="layui-form-label">申请部门：</label>
                             <div class="layui-input-block with-icon">
                                 <sys:treeselectMoHu id="officeId" name="office.id" value="${electronicSignatureInfo.office.id}" labelName="office.name" labelValue="${electronicSignatureInfo.office.name}"
-                                                    title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+                                                    title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
                             </div>
                         </div>
                         <div class="layui-item query athird ">

src/main/webapp/webpage/modules/signatureManagement/electronicSignature/districtDirectorApplicationList.jsp

@@ -339,7 +339,7 @@
                             <label class="layui-form-label">申请部门：</label>
                             <div class="layui-input-block with-icon">
                                 <sys:treeselectMoHu id="officeId" name="office.id" value="${districtDirectorApplication.office.id}" labelName="office.name" labelValue="${districtDirectorApplication.office.name}"
-                                                    title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+                                                    title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
                             </div>
                         </div>
                         <div class="layui-item query athird">
@@ -381,10 +381,14 @@
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
                     <div class="layui-btn-group">
-                        <button class="layui-btn layui-btn-sm layui-bg-blue" title="地区负责人申请" onclick="openDialogDis('地区负责人申请','${ctx}/districtDirectorApplication/districtDirectorApplication/form','95%','95%')">&nbsp;地区负责人申请</button>
+                        <h2><button class="layui-btn layui-btn-sm layui-bg-blue" title="地区负责人申请" onclick="openDialogDis('地区负责人申请','${ctx}/districtDirectorApplication/districtDirectorApplication/form','95%','95%')">&nbsp;地区负责人申请</button>
 
                         <button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                            <span style="color: red;font-size: 14px">(签章责任人一般为地区负责人)</span>
+
+                        </h2>
                     </div>
+
                     <div style="clear: both;"></div>
                 </div>
                 <table class="oa-table layui-table" id="contentTable1"></table>

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,7 +1145,15 @@
             </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>" +

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllList.jsp

@@ -543,7 +543,7 @@
 							<label class="layui-form-label">经办人部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="officeId" name="officeId" value="${workInvoice.officeId}" labelName="officeName" labelValue="${workInvoice.officeName}" cssStyle="background-color: #fff"
-												title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+												title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="true"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">
@@ -786,7 +786,7 @@
                         {
                             xml += "<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogre('变更发票管理', '${ctx}/workinvoiceAll/workInvoiceAll/alterForm?id="+ d.id +"','95%','95%')\" class=\"op-btn op-btn-revert\" ><i class=\"fa fa-edit\"></i> 变更</a>";
                         }*/
-						if(d.modifyDetails != undefined && d.modifyDetails =="1" && d.financeFlag =="1" && (null == d.cancellationState || undefined == d.cancellationState || '' == d.cancellationState))
+						if(d.modifyDetails != undefined && d.modifyDetails =="1" && d.financeFlag =="1" && (d.cancellationStatus == undefined || d.cancellationStatus == null || d.cancellationStatus == '' || d.cancellationStatus == 0))
 						{
 							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('修改发票明细', '${ctx}/workinvoiceAllTwo/workinvoiceAllTwo/modifyDetails?id=" + d.id + " &home=oldInfo ','"+ d.id+"','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" >修改明细</a>";
 						}
@@ -794,7 +794,7 @@
 						{
 							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('管理员修改发票', '${ctx}/workinvoiceAll/workInvoiceAll/form?id=" + d.id + "&tabId=3','"+ d.id+"','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" >管理员修改</a>";
 						}
-						if(d.financeFlag != undefined && d.financeFlag =="1" && (null == d.cancellationState || undefined == d.cancellationState || '' == d.cancellationState))
+						if(d.financeFlag != undefined && d.financeFlag =="1" && (d.cancellationStatus == undefined || d.cancellationStatus == null || d.cancellationStatus == '' || d.cancellationStatus == 0) )
 						{
 							xml +="<a href=\"javascript:void(0)\" onclick=\"receiptInvoice('发票收款', '${ctx}/workinvoiceAll/workInvoiceAll/receiptForm?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-orange\" > 收款</a>";
 							xml+="<a href=\"${ctx}/workinvoiceAll/workInvoiceAll/saveAffirmReceipt?id=" + d.id + "\" onclick=\"return confirmx('是否确认收款？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-orange\"> 确认收款</a>";

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllTwoList.jsp

@@ -628,7 +628,7 @@
 									<label class="layui-form-label">经办人部门：</label>
 									<div class="layui-input-block with-icon">
 										<sys:treeselect id="officeId" name="officeId" value="${workInvoice.officeId}" labelName="officeName" labelValue="${workInvoice.officeName}" cssStyle="background-color: #fff"
-														title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+														title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="true"/>
 									</div>
 								</div>
 								<div class="layui-item query athird">

src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoList.jsp

@@ -671,7 +671,7 @@
 							<label class="layui-form-label">经办人部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="officeId" name="officeId" value="${workInvoice.officeId}" labelName="officeName" labelValue="${workInvoice.officeName}" cssStyle="background-color: #fff"
-												title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+												title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowInput="true" allowClear="true" notAllowSelectParent="true"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">
@@ -879,7 +879,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-				/*,{align:'center', title: '作废状态', fixed: 'right', width:70,templet:function(d){
+				,{align:'center', title: '作废状态', fixed: 'right', width:70,templet:function(d){
 						<%--var st = getAuditState(d.status);--%>
 
 						<%--var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/workinvoice/workInvoice/getProcessOne?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
@@ -890,7 +890,7 @@
 						else
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >"+ st.status + "</span>";
 						return xml;
-					}}*/
+					}}
 				,{field:'op',align:'center',title:"操作",fixed: 'right',width:140,templet:function(d){
 						////对操作进行初始化
 						var xml="<div class=\"layui-btn-group\">";
@@ -931,7 +931,7 @@
 						if(d.cancellationFlag != undefined && d.cancellationFlag =="1")
 						{
 							xml +="<a href=\"javascript:void(0)\" onclick=\"openElectronicInvoiceDialogreplay('上传电子发票', '${ctx}/workinvoiceTwo/workinvoiceTwo/electronicInvoiceForm?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上传电子发票</a>";
-							/*xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('作废发票', '${ctx}/workinvoiceTwo/workinvoiceTwo/cancellationForm?id=" + d.id + "&tabId=3','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 作废</a>";*/
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('作废发票', '${ctx}/workinvoiceTwo/workinvoiceTwo/cancellationForm?id=" + d.id + "&tabId=3','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 作废</a>";
 						}
 						if(d.conditionCanedit != undefined && d.conditionCanedit =="1")
 						{

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}"

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="${workProjectNotify.reject == '1'}">
+					,"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}"

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.notifyRole, '完成') || fn:contains(workProjectNotify.notifyRole, '通过') || fn:contains(workProjectNotify.notifyRole, '成功')}">
+					,"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}"

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.notifyRole, '完成') || fn:contains(workProjectNotify.notifyRole, '通过') || fn:contains(workProjectNotify.notifyRole, '成功')}">
+					,"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}"

src/main/webapp/webpage/modules/workreimbursement/workReimbursementAllList.jsp

@@ -127,7 +127,7 @@
                             <label class="layui-form-label">报销部门：</label>
                             <div class="layui-input-block with-icon">
                                 <sys:treeselect id="officeId" name="officeId" value="${workReimbursement.officeId}" labelName="officeName" labelValue="${workReimbursement.officeName}"
-                                                title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"  allowInput="true"/>
+                                                title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"  allowInput="true"/>
                             </div>
                         </div>
                         <div class="layui-item query athird">

src/main/webapp/webpage/modules/workreimbursement/workReimbursementList.jsp

@@ -180,7 +180,7 @@
                             <label class="layui-form-label">报销部门：</label>
                             <div class="layui-input-block with-icon">
                                 <sys:treeselect id="officeId" name="officeId" value="${workReimbursement.officeId}" labelName="officeName" labelValue="${workReimbursement.officeName}"
-                                                title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"  allowInput="true" cssStyle="background-color:#fff"/>
+                                                title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"  allowInput="true" cssStyle="background-color:#fff"/>
                             </div>
                         </div>
                         <div class="layui-item query athird">

src/main/webapp/webpage/modules/workstaff/qualificationList.jsp

@@ -143,7 +143,7 @@
                         <label class="layui-form-label">部门：</label>
                         <div class="layui-input-block with-icon">
                             <sys:treeselect id="office" name="office.id" value="${workStaffBasicInfo.office.id}" labelName="office.name" labelValue="${workStaffBasicInfo.office.name}"
-                                            title="部门" url="/sys/office/treeData?type=2" cssClass="form-control layui-input required" notAllowSelectParent="false"/>
+                                            title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input required" notAllowSelectParent="false" allowInput="true"/>
                         </div>
                     </div>
                     <%--<div class="layui-item query athird">