1

src/main/java/com/jeeplus/modules/sys/web/LoginController.java

@@ -116,7 +116,7 @@ public class LoginController extends BaseController{
 			CookieUtils.setCookie(response, "LOGINED", "false");
 		}
 
-			// 如果已经登录，则跳转到管理首页
+		// 如果已经登录，则跳转到管理首页
 		if(principal != null && !principal.isMobileLogin()){
 			return "redirect:" + adminPath;
 		}
@@ -346,7 +346,7 @@ public class LoginController extends BaseController{
 					&& indexStyle.equalsIgnoreCase("ace")) {
 				return "modules/sys/sysIndex-ace";
 			}
-            model.addAttribute("firstFlag",principal.isFirstFlag());
+			model.addAttribute("firstFlag",principal.isFirstFlag());
 			return "modules/sys/sysIndex";
 			/*if(UserUtils.getCache("selectRole")!=null){
 				return "modules/sys/sysIndex";
@@ -406,16 +406,18 @@ public class LoginController extends BaseController{
 	 * @throws IOException
 	 */
 	@RequestMapping(value = "${adminPath}/home")
-	public String home(HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
+	public String home(String type, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
 		User user = UserUtils.getUser();
 		OaNotify oaNotify = new OaNotify();
 		oaNotify.setSelf(true);
 		oaNotify.setNowDate(new Date());
+		oaNotify.setType(type);
 		//公告信息
 		Page<OaNotify> page = oaNotifyService.findMyself(new Page<OaNotify>(request, response), oaNotify);
 		model.addAttribute("page", page.getList());
 		model.addAttribute("count", page.getList().size());//未读通知条数
 		model.addAttribute("count1", page.getCount());//未读通知条数
+		model.addAttribute("type", type);//返回公告类型
 		WorkProjectNotify workProjectNotify = new WorkProjectNotify();
 		workProjectNotify.setUser(user);
 		workProjectNotify.setCompanyId(user.getComId());
@@ -450,8 +452,8 @@ public class LoginController extends BaseController{
 		model.addAttribute("notifyShowCount", notifyPageShow.getList().size());//未读通知条数
 		model.addAttribute("notifyShowCount1", notifyPageShow.getCount());//未读通知条数
 		//我的日程
-        WorkCalendar workCalendar = new WorkCalendar();
-        Page<WorkCalendar> workCalendars=workCalendarService.findHomePage(new Page<WorkCalendar>(request, response), workCalendar);
+		WorkCalendar workCalendar = new WorkCalendar();
+		Page<WorkCalendar> workCalendars=workCalendarService.findHomePage(new Page<WorkCalendar>(request, response), workCalendar);
 		model.addAttribute("calendarCount", workCalendars.getList());
 		model.addAttribute("calendarPage", workCalendars.getList().size());
 		model.addAttribute("calendarSize", workCalendars.getCount());
@@ -492,35 +494,35 @@ public class LoginController extends BaseController{
 			// String result = UserUtils.sendRandomCode(config.getSmsName(),config.getSmsPassword(), mobile, randomCode);
 			HashMap<String,Object> result = null;
 			try{
-					//调用工具类返回结果
-					result = UserUtils.sendRandomCodes(mobile, randomCode);
-					String statusCode = (String) result.get("statusCode");
-					if (("000000").equals(statusCode)) {
-						j.setSuccess(true);
-						j.setErrorCode("-1");
-						j.setMsg("短信发送成功!");
-						Jedis jedis = null;
-						try {
-							jedis = JedisUtils.getResource();
-							jedis.set(mobile, randomCode);
-							jedis.set("type",type);
-							jedis.setex(mobile, 300, randomCode);
-						} catch (Exception e) {
-							//logger.error("getActiveSessions", e);
-						} finally {
-							JedisUtils.returnResource(jedis);
-						}
-					}else if(statusCode.equals("160040")){
-						j.setSuccess(false);
-						j.setErrorCode("2");
-						j.setMsg("号码获取验证码次数已达每日上限！");
-					}else{
-						j.setSuccess(false);
-						j.setErrorCode("2");
-						//j.setMsg("短信发送失败，错误代码："+result+"，请联系管理员。");
-						j.setMsg("短信发送失败，错误代码：101，请联系管理员。");
-						j.put("ErrorXml",result);
+				//调用工具类返回结果
+				result = UserUtils.sendRandomCodes(mobile, randomCode);
+				String statusCode = (String) result.get("statusCode");
+				if (("000000").equals(statusCode)) {
+					j.setSuccess(true);
+					j.setErrorCode("-1");
+					j.setMsg("短信发送成功!");
+					Jedis jedis = null;
+					try {
+						jedis = JedisUtils.getResource();
+						jedis.set(mobile, randomCode);
+						jedis.set("type",type);
+						jedis.setex(mobile, 300, randomCode);
+					} catch (Exception e) {
+						//logger.error("getActiveSessions", e);
+					} finally {
+						JedisUtils.returnResource(jedis);
 					}
+				}else if(statusCode.equals("160040")){
+					j.setSuccess(false);
+					j.setErrorCode("2");
+					j.setMsg("号码获取验证码次数已达每日上限！");
+				}else{
+					j.setSuccess(false);
+					j.setErrorCode("2");
+					//j.setMsg("短信发送失败，错误代码："+result+"，请联系管理员。");
+					j.setMsg("短信发送失败，错误代码：101，请联系管理员。");
+					j.put("ErrorXml",result);
+				}
 
 			}catch (Exception e){
 				e.printStackTrace();

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

@@ -20,6 +20,17 @@ public class WorkProjectNotify extends DataEntity<WorkProjectNotify> {
 
 	private static final long serialVersionUID = 1L;
 	private String companyId;		// 公司主键
+
+	private String countNum; //提示次数
+
+	public String getCountNum() {
+		return countNum;
+	}
+
+	public void setCountNum(String countNum) {
+		this.countNum = countNum;
+	}
+
 	private String title;		// 标题
 	private String content;		// 内容
 	private String type;		// 类型

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

@@ -19,13 +19,15 @@
 		a.notify_role AS "notifyRole",
 		a.status AS "status",
 		a.kind AS "kind",
-		a.officeId AS "officeId"
+		a.officeId AS "officeId",
+		count(*) AS "countNum"
 	</sql>
 
+
 	<sql id="workProjectNotifyJoins">
 	</sql>
 
-    <select id="getByWorkBidingDocument" parameterType="string"  resultType="WorkProjectNotify">
+	<select id="getByWorkBidingDocument" parameterType="string"  resultType="WorkProjectNotify">
 		SELECT
 		<include refid="workProjectNotifyColumns"/>
 		FROM work_project_notify a
@@ -43,7 +45,7 @@
 
 	<select id="get" resultType="WorkProjectNotify" >
 		SELECT
-			<include refid="workProjectNotifyColumns"/>
+		<include refid="workProjectNotifyColumns"/>
 		,a.process_instance_id as "processInstanceId"
 		FROM work_project_notify a
 		<include refid="workProjectNotifyJoins"/>
@@ -51,14 +53,14 @@
 	</select>
 	<select id="getByNotifyId" resultType="WorkProjectNotify" >
 		SELECT
-			<include refid="workProjectNotifyColumns"/>
+		<include refid="workProjectNotifyColumns"/>
 		FROM work_project_notify a
 		<include refid="workProjectNotifyJoins"/>
 		WHERE a.notify_id = #{notifyId}
 	</select>
 	<select id="getByTitle" resultType="WorkProjectNotify" >
 		SELECT
-			<include refid="workProjectNotifyColumns"/>
+		<include refid="workProjectNotifyColumns"/>
 		FROM work_project_notify a
 		<include refid="workProjectNotifyJoins"/>
 		WHERE a.title = #{title}
@@ -73,7 +75,9 @@
 
 	<select id="findList" resultType="WorkProjectNotify" >
 		SELECT
-			<include refid="workProjectNotifyColumns"/>
+		<include refid="workProjectNotifyColumns"/>
+		,COUNT(*),a.title
+		-- 		,distinct a.title
 		FROM work_project_notify a
 		left join sys_user su on a.create_by = su.id
 		LEFT JOIN sys_user u ON u.id = a.create_by
@@ -82,15 +86,15 @@
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="title != null and title != ''">
 				AND a.title LIKE
-					<if test="dbName == 'oracle'">'%'||#{title}||'%'</if>
-					<if test="dbName == 'mssql'">'%'+#{title}+'%'</if>
-					<if test="dbName == 'mysql'">concat('%',#{title},'%')</if>
+				<if test="dbName == 'oracle'">'%'||#{title}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{title}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{title},'%')</if>
 			</if>
 			<if test="content != null and content != ''">
 				AND a.content LIKE
-					<if test="dbName == 'oracle'">'%'||#{content}||'%'</if>
-					<if test="dbName == 'mssql'">'%'+#{content}+'%'</if>
-					<if test="dbName == 'mysql'">concat('%',#{content},'%')</if>
+				<if test="dbName == 'oracle'">'%'||#{content}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{content}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{content},'%')</if>
 			</if>
 			<if test="user != null and user.id != null and user.id != ''">
 				AND a.notify_user = #{user.id}
@@ -139,18 +143,27 @@
 				</otherwise>
 			</choose>
 		</where>
+
+		GROUP BY a.title
+		ORDER BY a.update_date DESC
 		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+			<!--<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
 				ORDER BY a.create_date DESC,a.id
-			</otherwise>
+			</otherwise>-->
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				,${page.orderBy}
+			</when>
+			<!--<otherwise>
+				,a.create_date DESC,a.id
+			</otherwise>-->
 		</choose>
 	</select>
 
-	<select id="queryCount" resultType="Integer" >
-		SELECT count(1)
+	<select id="queryCount" resultType="Integer">
+		SELECT count(distinct a.title)
 		FROM work_project_notify a
 		LEFT JOIN sys_user u ON u.id = a.create_by
 		LEFT JOIN sys_user su ON su.id = a.create_by
@@ -297,7 +310,7 @@
 	</select>
 	<select id="findReadStateByNotifyId" resultType="User" >
 		SELECT
-			u.id ,u.name,u.login_name AS "loginName",u.photo
+		u.id ,u.name,u.login_name AS "loginName",u.photo
 		FROM work_project_notify a
 		LEFT JOIN sys_user u ON u.id = a.notify_user
 		<where>
@@ -312,7 +325,7 @@
 
 	<select id="findAllList" resultType="WorkProjectNotify" >
 		SELECT
-			<include refid="workProjectNotifyColumns"/>
+		<include refid="workProjectNotifyColumns"/>
 		FROM work_project_notify a
 		<include refid="workProjectNotifyJoins"/>
 		<where>
@@ -348,87 +361,87 @@
 			kind,
 			officeId
 		) VALUES (
-			#{id},
-			#{createBy.id},
-			#{createDate},
-			#{updateBy.id},
-			#{updateDate},
-			#{remarks},
-			#{delFlag},
-			#{companyId},
-			#{title},
-			#{content},
-			#{type},
-			#{user.id},
-			#{notifyId},
-			#{notifyRole},
-			#{status},
-			#{kind},
-			#{officeId}
-		)
+					 #{id},
+					 #{createBy.id},
+					 #{createDate},
+					 #{updateBy.id},
+					 #{updateDate},
+					 #{remarks},
+					 #{delFlag},
+					 #{companyId},
+					 #{title},
+					 #{content},
+					 #{type},
+					 #{user.id},
+					 #{notifyId},
+					 #{notifyRole},
+					 #{status},
+					 #{kind},
+					 #{officeId}
+				 )
 	</insert>
 
 	<update id="update">
 		UPDATE work_project_notify SET
-			update_by = #{updateBy.id}
-			,update_date = #{updateDate}
-			,remarks = #{remarks}
-			,company_id = #{companyId}
-			,title = #{title}
-			,content = #{content}
-			,type = #{type}
-			,notify_user = #{user.id}
-			,notify_id = #{notifyId}
-			,notify_role = #{notifyRole}
-			<if test="status != null and status != ''">
-				,status = #{status}
-			</if>
-			,kind = #{kind}
-			,officeId = #{officeId}
-			<if test="processInstanceId != null and processInstanceId != ''">
-				,process_instance_id = #{processInstanceId}
-			</if>
+		update_by = #{updateBy.id}
+		,update_date = #{updateDate}
+		,remarks = #{remarks}
+		,company_id = #{companyId}
+		,title = #{title}
+		,content = #{content}
+		,type = #{type}
+		,notify_user = #{user.id}
+		,notify_id = #{notifyId}
+		,notify_role = #{notifyRole}
+		<if test="status != null and status != ''">
+			,status = #{status}
+		</if>
+		,kind = #{kind}
+		,officeId = #{officeId}
+		<if test="processInstanceId != null and processInstanceId != ''">
+			,process_instance_id = #{processInstanceId}
+		</if>
 		WHERE id = #{id}
 	</update>
 	<update id="updateReadStateByNotifyIdAndNotifyUser">
 		UPDATE work_project_notify SET
-			update_by = #{updateBy.id},
-			update_date = #{updateDate},
-			status = #{status}
+									   update_by = #{updateBy.id},
+									   update_date = #{updateDate},
+									   status = #{status}
 		WHERE notify_id = #{notifyId}
-		AND notify_user = #{user.id}
+		  AND notify_user = #{user.id}
 	</update>
 	<update id="updateReadStateByNotifyIdAndNotifyRole">
 		UPDATE work_project_notify SET
-			update_by = #{updateBy.id},
-			update_date = #{updateDate},
-			status = #{status}
+									   update_by = #{updateBy.id},
+									   update_date = #{updateDate},
+									   status = #{status}
 		WHERE notify_id = #{notifyId}
-		AND notify_role = #{notifyRole}
+		  AND notify_role = #{notifyRole}
 	</update>
 	<update id="updateReadStateByNotifyRoleAndUser">
 		UPDATE work_project_notify SET
-		update_by = #{updateBy.id},
-		update_date = #{updateDate},
-		status = #{status}
+									   update_by = #{updateBy.id},
+									   update_date = #{updateDate},
+									   status = #{status}
 		WHERE notify_user = #{user.id}
-		AND notify_role = #{notifyRole}
+		  AND notify_role = #{notifyRole}
 	</update>
 
 
 	<update id="updateDelflagByNotifyId">
 		UPDATE work_project_notify SET
-			update_by = #{updateBy.id},
-			update_date = #{updateDate},
-			del_flag = #{delFlag}
+									   update_by = #{updateBy.id},
+									   update_date = #{updateDate},
+									   del_flag = #{delFlag}
 		WHERE notify_id = #{notifyId}
 	</update>
 
 	<update id="updateReadStateByNotifyId">
 		UPDATE work_project_notify SET
-			update_by = #{updateBy.id},
-			update_date = #{updateDate},
-			status = #{status}
+									   update_by = #{updateBy.id},
+									   update_date = #{updateDate},
+									   status = #{status}
 		WHERE notify_id = #{notifyId} AND status != '1'
 	</update>
 
@@ -693,11 +706,11 @@
 	</select>
 
 	<update id="readNotify">
-	update
-	  work_project_notify
-	set
-	  status = 2
-	where id = #{id}
+		update
+			work_project_notify
+		set
+			status = 2
+		where id = #{id}
 	</update>
 
 </mapper>

src/main/webapp/webpage/modules/identification/opinionForm.jsp

@@ -0,0 +1,132 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: huxuetao
+  Date: 2022/3/18
+  Time: 11:20 上午
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+    <title>审核意见列表</title>
+    <meta name="decorator" content="default"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+    <script src="${ctxStatic}/layer-v2.3/layui/xmSelect.js" charset="utf-8"></script>
+    <style>
+        label.error{
+            top:40px;
+            left:0;
+        }
+        #standardDetail-error{
+            top:82px;
+            left:0;
+        }
+    </style>
+    <script type="text/javascript">
+        var validateForm;
+        function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+            if(validateForm.form()){
+                $("#inputForm").submit();
+                return true;
+            }
+            return false;
+        }
+        $(document).ready(function() {
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+            });
+            validateForm = $("#inputForm").validate({
+                submitHandler: function(form){
+                    loading('正在提交，请稍等...');
+                    form.submit();
+                },
+                errorContainer: "#messageBox",
+                errorPlacement: function(error, element) {
+                    $("#messageBox").text("输入有误，请先更正。");
+                    if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+                        error.appendTo(element.parent().parent());
+                    } else {
+                        error.insertAfter(element);
+                    }
+                }
+            });
+            var edit = "${workReviewStandard.id}";
+            if(edit!=null && edit!=''){
+                $("#reviewParentButton").attr("disabled","disabled");
+            }
+        });
+
+        function getSelectedItem(){
+            var array = new Array();
+            var size = $("#contentTable tbody tr td input.i-checks:checked").size();
+            var sizeChecked = $("#contentTable tbody tr td input.i-checks:checked");
+
+            for (var i=0;i<size;i++){
+                array.push(sizeChecked[i].id);
+            }
+            if(size == 0 ){
+                top.layer.alert('请至少选择一条数据!', {icon: 0, title:'警告'});
+                return "-1";
+            }
+            /*if(size > 1 ){
+                top.layer.alert('只能选择一条数据!', {icon: 0, title:'警告'});
+                return "-1";
+            }*/
+            $("#projectFlag").val(1);
+
+            var id =  $("#contentTable tbody tr td input.i-checks:checkbox:checked").attr("id");
+            var label = $("#contentTable tbody tr td input.i-checks:checkbox:checked").parent().parent().parent().find(".codelabel").html();
+            var number = $("#contentTable tbody tr td input.i-checks:checkbox:checked").parent().parent().parent().find(".codenumber").html();
+            var details = $("#details").val();
+            var projectFlag = $("#projectFlag").val();
+            console.log(array.toString())
+            return array.toString()+"_item_"+label+"_item_"+number+"_item_"+isProject+"_item_"+details+"_item_"+projectFlag;
+        }
+
+    </script>
+</head>
+<body>
+<div class="full-width fl form-group first  project">
+    <div class="layui-item layui-col-xs12 form-table-container">
+        <table id="contentTable" class="table details table-bordered table-condensed">
+            <thead>
+            <tr>
+                <th width="50px">序号</th>
+                <th>模块</th>
+            </tr>
+            </thead>
+            <tbody>
+            <c:choose>
+                <c:when test="${not empty page.list}">
+                    <c:forEach items="${page.list}" var="obj">
+                        <tr>
+                            <td> <input type="checkbox"  class="i-checks" id="${fns:getValue(obj, 'id')}"></td>
+                            <td class="codelabel">${obj.content}</td>
+                        </tr>
+                    </c:forEach>
+                </c:when>
+                <c:otherwise>
+                    <tr>
+                        <td colspan="2" align="center">
+                            暂无数据
+                        </td>
+                    </tr>
+                </c:otherwise>
+            </c:choose>
+
+            </tbody>
+        </table>
+        <table:page page="${page}"></table:page>
+    </div>
+</div>
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script>
+
+
+</script>
+</body>
+</html>
+

src/main/webapp/webpage/modules/iframeView/opinion.jsp

@@ -27,12 +27,17 @@
                         <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
                         <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
                         <div style="padding: 5px 0px;" class="layui-col-sm8">
-                            <select id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
-                                <option value=""></option>
-                                <c:forEach items="${auditTemplates}" var="var">
-                                    <option value="${var.content}">${var.content}</option>
-                                </c:forEach>
-                            </select>
+                            <div style="float: left">
+                                <a href="javascript:void(0)" style='background-color: #FFB800 ; font-size: 14px' onclick="openForm('审核意见列表',
+                                        '${ctx}/auditTemplate/auditTemplate/opinionForm?identification=${identification}&name=${identificationName}','80%', '70%','','提交,关闭')" class="nav-btn layui-btn layui-btn-sm" >
+                                    <i class="fa fa-file-excel-o"></i> 审核意见</a>
+                            </div>
+                            <%--<select id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+                                    <option value=""></option>
+                                    <c:forEach items="${auditTemplates}" var="var">
+                                        <option value="${var.content}">${var.content}</option>
+                                    </c:forEach>
+                                </select>--%>
                         </div>
                     </div>
                 </div>
@@ -45,6 +50,35 @@
         var op=$("opinion").val();
         return op;
     }
+
+    function openForm(title,url,width,height,target,buttons) {
+        if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+            width = 'auto';
+            height = 'auto';
+        } else {//如果是PC端，根据用户设置的width和height显示。
+        }
+        var split = buttons.split(",");
+        top.layer.open({
+            type: 2,
+            area: [width, height],
+            title: title,
+            maxmin: true, //开启最大化最小化按钮
+            skin: 'three-btns',
+            content: url,
+            btn: split,
+            btn1: function(index, layero){
+                var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                var item = iframeWin.getSelectedItem();
+                top.layer.close(index)
+                document.getElementById('iframe').contentWindow.location.reload();
+            },
+            btn2: function(index, layero){
+                top.layer.close(index)
+                document.getElementById('iframe').contentWindow.location.reload();
+            }
+        });
+    }
+
     $(document).ready(function() {
         var val = parent.document.getElementById("iframe").innerHTML;
         if (val!=''){

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

@@ -197,59 +197,239 @@
 							</c:forEach>
 						</tr>
 					</thead>
-					<tbody>
-					<c:choose>
-						<c:when test="${not empty page.list}">
-							<c:forEach items="${page.list}" var="obj">
-								<tr>
-									<td> <input type="checkbox" id="${fns:getValue(obj, 'id')}" class="i-checks"></td>
-									<td class="codelabel">${obj.projectName}</td>
-									<td class="codelabel">${obj.projectId}</td>
-									<td class="codenumber">${obj.reportData.number}</td>
-									<td class="codelabel">${obj.projectRegistrant}</td>
-									<td class="codelabel">${obj.leaderNameStr}</td>
-									<td class="codelabel">${obj.workContractInfo.client.name}</td>
-									<td class="codelabel">${obj.invoiceFlag}</td>
-								</tr>
-							</c:forEach>
-						</c:when>
-						<c:otherwise>
-							<tr>
-								<td colspan="6" align="center">
-								暂无数据
-								</td>
-							</tr>
-						</c:otherwise>
-					</c:choose>
+					<tbody><%@ page contentType="text/html;charset=UTF-8" %>
+					<%@ include file="/webpage/include/taglib.jsp"%>
+					<html>
+					<head>
+						<meta name="decorator" content="default"/>
+						<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+						<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+						<script type="text/javascript">
+							$(document).ready(function() {
+								layui.use(['form', 'layer'], function () {
+									var form = layui.form;
+									form.on("radio(isproject)", function(event){
+										var isproject = $(this).val();
+										//专票必填
+										if(isproject == 1){
+											$(".project").show();
+											$("#noProject").hide();
+										}else if(isproject == 2){
+											$(".project").hide();
+											$("#noProject").show();
+										}
+									});
+								})
+								var isProject='${isProject}';
+								if(isProject=="1" || isProject==""){
+									$(".project").show();
+									$("#noProject").hide();
+								}else if(isProject=="2"){
+									$(".project").hide();
+									$("#noProject").show();
+								}
+								var isProjectFalg='${isProjectFalg}';
+								if (isProjectFalg=="1"){
+									parent.layer.msg("第一条为项目后面新增只能选择项目",{icon:6});
+									$("#isProjectFalg").hide();
+									$(".project").show();
+									$("#noProject").hide();
+									$("#projectFlag").val(1);
+								}
+								<%--var val = "<%=request.getAttribute("state")%>";--%>
+								<%--if(val!=null){--%>
+								<%--alert("++++++++++");--%>
+								<%--};--%>
 
+								$('#contentTable thead tr th input.i-checks').on('ifChecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定
+									$('#contentTable tbody tr td input.i-checks').iCheck('check');
+								});
 
-					<%--<c:choose>
-						<c:when test="${not empty page.list}">
-					<c:forEach items="${page.list}" var="obj">
-						<tr>
-							<td> <input type="checkbox" id="${fns:getValue(obj, 'id')}" class="i-checks"></td>
+								$('#contentTable thead tr th input.i-checks').on('ifUnchecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定
+									$('#contentTable tbody tr td input.i-checks').iCheck('uncheck');
+								});
 
-							<c:forEach items="${labelValues}" var="value"  varStatus="status">
-								<c:if test="${status.first==true}">
-									<td class="codelabel">${fns:getValue(obj, value)}</td>
-								</c:if>
+								//搜索框收放
+								$('#moresee').click(function(){
+									if($('#moresees').is(':visible'))
+									{
+										$('#moresees').slideUp(0,resizeListWindow1);
+										$('#moresee i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
+									}else{
+										$('#moresees').slideDown(0,resizeListWindow1);
+										$('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
+									}
+								});
 
-								<c:if test="${status.first!=true}">
-									<td>${fns:getValue(obj, value)}</td>
-								</c:if>
-							</c:forEach>
+								$("#contentTable tr td").each(function(){
+									$(this).attr("title",$(this).text());
+								});
+							});
 
-						</tr>
-					</c:forEach>
-					</c:when>
-					<c:otherwise>
-						<tr>
-							<td colspan="15" align="center">
-								暂无数据
-							</td>
-						</tr>
-					</c:otherwise>
-					</c:choose>--%>
+							function getSelectedItem(){
+								var array = new Array();
+								var isProject=$('input:radio[name="isProject"]:checked').val();
+								if (isProject==1){
+									var size = $("#contentTable tbody tr td input.i-checks:checked").size();
+									var sizeChecked = $("#contentTable tbody tr td input.i-checks:checked");
+
+									for (var i=0;i<size;i++){
+										array.push(sizeChecked[i].id);
+									}
+									if(size == 0 ){
+										top.layer.alert('请至少选择一条数据!', {icon: 0, title:'警告'});
+										return "-1";
+									}
+									/*if(size > 1 ){
+                                        top.layer.alert('只能选择一条数据!', {icon: 0, title:'警告'});
+                                        return "-1";
+                                    }*/
+									$("#projectFlag").val(1);
+								}else{
+									$("#projectFlag").val(0);
+								}
+								var id =  $("#contentTable tbody tr td input.i-checks:checkbox:checked").attr("id");
+								var label = $("#contentTable tbody tr td input.i-checks:checkbox:checked").parent().parent().parent().find(".codelabel").html();
+								var number = $("#contentTable tbody tr td input.i-checks:checkbox:checked").parent().parent().parent().find(".codenumber").html();
+								var details = $("#details").val();
+								var projectFlag = $("#projectFlag").val();
+								console.log(array.toString())
+								return array.toString()+"_item_"+label+"_item_"+number+"_item_"+isProject+"_item_"+details+"_item_"+projectFlag;
+							}
+							function page(n,s){
+								if(n) $("#pageNo").val(n);
+								if(s) $("#pageSize").val(s);
+								$("#searchForm").attr("action","${url}");
+								$("#searchForm").submit();
+								return false;
+							}
+						</script>
+					</head>
+					<body>
+					<div class="wrapper wrapper-content">
+						<div class="layui-row">
+							<div class="full-width fl">
+								<div class="layui-row" id="queryDiv">
+									<form:form id="searchForm" modelAttribute="obj" action="${url}" method="post" class="form-inline layui-form">
+										<input type="hidden" name="url" value="${url}"/>
+										<input type="hidden" name="isTotal" value="${isTotal}"/>
+										<input type="hidden" name="fieldLabels" value="${fieldLabels}"/>
+										<input type="hidden" name="fieldKeys" value="${fieldKeys}"/>
+										<input type="hidden" name="searchLabel" value="${searchLabel}"/>
+										<input type="hidden" name="searchKey" value="${searchKey}"/>
+										<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+										<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+										<input id="projectFlag" name="projectFlag" type="hidden" value=""/>
+										<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
+										<div class="layui-input-block" id="isProjectFalg">
+											<input type="radio" name="isProject" class="isProject" lay-filter="isproject" title="项目" <c:if test="${isProject ==null || isProject==1 || isProject==3  }">checked</c:if>  id="isproject" value="1">
+											<input type="radio" name="isProject" class="isProject" lay-filter="isproject" title="其它" <c:if test="${isProject==2}">checked</c:if> id="isNoproject" value="2">
+										</div>
+										<div class="project">
+											<div class="commonQuery">
+												<div class="layui-item query athird">
+													<span class="layui-form-label">项目名称：</span>
+													<div class="layui-input-block">
+														<form:input path="${searchKey}" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
+													</div>
+												</div>
+												<div class="layui-item query athird">
+													<span class="layui-form-label">项目编号：</span>
+													<div class="layui-input-block">
+														<form:input path="projectId" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
+													</div>
+												</div>
+												<div class="layui-item athird fr">
+													<div class="input-group">
+														<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+														<div class="layui-btn-group search-spacing">
+															<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+															<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
+														</div>
+													</div>
+												</div>
+												<div style="    clear:both;"></div>
+											</div>
+											<div id="moresees" style="clear:both;display:none;">
+												<div class="layui-item query athird">
+													<span class="layui-form-label">报告号：</span>
+													<div class="layui-input-block">
+														<form:input path="reportData.number" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
+													</div>
+												</div>
+												<div class="layui-item query athird">
+													<span class="layui-form-label">是否开票：</span>
+													<div class="layui-input-block readOnlyFFF">
+														<form:select path="invoiceStatus">
+															<form:option value="" label=""/>
+															<form:option value="5" label="已开票"/>
+															<form:option value="2" label="开票中"/>
+														</form:select>
+													</div>
+												</div>
+												<div style="clear:both;"></div>
+											</div>
+										</div>
+										<div id="noProject" style="margin: 20px;display: none;">
+											<span class="layui-form-label">开票详情：</span>
+											<div class="layui-input-block">
+												<form:textarea path="details" htmlEscape="false"  colspan="4" rows="6" cssStyle="width: 90%"  maxlength="250" class="form-control "/>
+											</div>
+										</div>
+									</form:form>
+								</div>
+							</div>
+							<div class="full-width fl form-group first  project">
+								<div class="layui-item layui-col-xs12 form-table-container">
+									<table id="contentTable" class="table details table-bordered table-condensed">
+										<thead>
+										<tr>
+											<th width="50px"></th>
+											<c:forEach items="${labelNames}" var="projectName"  varStatus="status">
+												<th>项目名称</th>
+												<th width="180px">项目编号</th>
+												<th width="220px">项目报告号</th>
+												<th width="80px">登记人</th>
+												<th width="80px">责任人</th>
+												<th width="250px">委托方</th>
+												<th width="80px">是否开票</th>
+											</c:forEach>
+										</tr>
+										</thead>
+										<tbody>
+										<c:choose>
+											<c:when test="${not empty page.list}">
+												<c:forEach items="${page.list}" var="obj">
+													<tr>
+														<td> <input type="checkbox" id="${fns:getValue(obj, 'id')}" class="i-checks"></td>
+														<td class="codelabel">${obj.projectName}</td>
+														<td class="codelabel">${obj.projectId}</td>
+														<td class="codenumber">${obj.reportData.number}</td>
+														<td class="codelabel">${obj.projectRegistrant}</td>
+														<td class="codelabel">${obj.leaderNameStr}</td>
+														<td class="codelabel">${obj.workContractInfo.client.name}</td>
+														<td class="codelabel">${obj.invoiceFlag}</td>
+													</tr>
+												</c:forEach>
+											</c:when>
+											<c:otherwise>
+												<tr>
+													<td colspan="6" align="center">
+														暂无数据
+													</td>
+												</tr>
+											</c:otherwise>
+										</c:choose>
+										</tbody>
+									</table>
+									<table:page page="${page}"></table:page>
+								</div>
+							</div>
+
+						</div>
+					</div>
+					</body>
+					</html>
 					</tbody>
 				</table>
 				<table:page page="${page}"></table:page>

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

@@ -27,6 +27,18 @@
         })
         $(document).ready(function() {
             WinMove();
+
+            var ggType = '${type}'
+            if(undefined !== ggType && null !== ggType && '' !== ggType){
+                $(".layui-tab-title li").eq(ggType-1).attr("class","layui-this");
+            }
+            $(".layui-tab-title li").click(function() {
+                $(".layui-tab-title li").each(function () {
+                    $(this).removeAttr("layui-this");
+                })
+                $(this).attr("layui-this");
+                location.replace("${ctx}/home?type="+$(this).val())
+            })
         });
 
         function openDialogre(title,url,width,height,target){
@@ -570,8 +582,8 @@
         }
     </script>
     <script type="text/javascript">
-       /* $(function () {
-            var userId = '${fns:getUser().id}';
+        /* $(function () {
+             var userId = '${fns:getUser().id}';
             var roleId = '${fns:getUser().roleIds}';
             var companyId = '${fns:getUser().company.id}';
             var officeId ='${fns:getUser().office.id}';
@@ -791,31 +803,31 @@
             }
         })*/
 
-       //打开对话框(查看)
-       function homeOpenDialogView(title,url,width,height){
-
-
-           if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
-               width='auto';
-               height='auto';
-           }else{//如果是PC端，根据用户设置的width和height显示。
-
-           }
-           top.layer.open({
-               type: 2,
-               skin: 'one-btn',
-               area: [width, height],
-               title: title,
-               maxmin: true, //开启最大化最小化按钮
-               content: url ,
-               btn: ['关闭'],
-               btn1: function(index){
-                   top.layer.close(index);//关闭对话框。
-                   window.location.reload();
-               }
-           });
-
-       }
+        //打开对话框(查看)
+        function homeOpenDialogView(title,url,width,height){
+
+
+            if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+                width='auto';
+                height='auto';
+            }else{//如果是PC端，根据用户设置的width和height显示。
+
+            }
+            top.layer.open({
+                type: 2,
+                skin: 'one-btn',
+                area: [width, height],
+                title: title,
+                maxmin: true, //开启最大化最小化按钮
+                content: url ,
+                btn: ['关闭'],
+                btn1: function(index){
+                    top.layer.close(index);//关闭对话框。
+                    window.location.reload();
+                }
+            });
+
+        }
     </script>
     <style>
         body{
@@ -877,7 +889,19 @@
             <div id="msg-bord" class="call-bord-content contentShadow">
                 <div class="bord-left">
                     <div class="bord-left-content">
-                        <div class="bord-title" >公告信息(${count1})</div>
+                        <div class="bord-title">
+
+                            <div class="layui-tab ggTab" id="nt4">
+                                <ul class="layui-tab-title" id="nt4_1" style="margin-top: -10px;margin-left: 0px">
+                                    <li value="1">通知</li>
+                                    <li value="2">会议通知</li>
+                                    <li value="3">公司标准或规范</li>
+                                    <li value="4">行业标准或规范</li>
+                                    <li value="5">其他</li>
+                                </ul>
+                            </div>
+                        </div>
+                        <%--                    <div class="bord-title">公告信息(${count1})</div>--%>
                         <%--<div class="bord-pic"><img src="${ctxStatic}/common/img/icon03.png" height="100%" /></div>--%>
                         <%--<div class="bord-num">${count1}</div>--%>
                     </div>
@@ -915,27 +939,27 @@
                 </div>
             </div>
         </div>
-       <%-- <div class="layui-col-sm6 layui-col-md6 call-board hide">
-            <div id="email-bord" class="call-bord-content contentShadow">
-                <div class="bord-left">
-                    <div class="bord-left-content">
-                        <div class="bord-title">邮件信息</div>
-                        <div class="bord-pic"><img src="${ctxStatic}/common/img/icon05.png" height="100%" /></div>
-                        <div class="bord-num">${noReadCount}</div>
-                    </div>
-                    <div class="bord-more">
-                        <a href="javascript:void(0)" onclick='top.openTab("${ctx}/iim/mailBox/list?orderBy=sendtime desc","邮件列表", false)'><span>更多 </span><i class="fa fa-angle-right"></i></a>
-                    </div>
-                </div>
-                <div class="bord-right">
-                    <div class="bord-contents">
-                        <span class="schedule-bord-nodata hide bord-nodata-info">暂无新的邮件信息</span>
-                        <ul>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </div>--%>
+        <%-- <div class="layui-col-sm6 layui-col-md6 call-board hide">
+             <div id="email-bord" class="call-bord-content contentShadow">
+                 <div class="bord-left">
+                     <div class="bord-left-content">
+                         <div class="bord-title">邮件信息</div>
+                         <div class="bord-pic"><img src="${ctxStatic}/common/img/icon05.png" height="100%" /></div>
+                         <div class="bord-num">${noReadCount}</div>
+                     </div>
+                     <div class="bord-more">
+                         <a href="javascript:void(0)" onclick='top.openTab("${ctx}/iim/mailBox/list?orderBy=sendtime desc","邮件列表", false)'><span>更多 </span><i class="fa fa-angle-right"></i></a>
+                     </div>
+                 </div>
+                 <div class="bord-right">
+                     <div class="bord-contents">
+                         <span class="schedule-bord-nodata hide bord-nodata-info">暂无新的邮件信息</span>
+                         <ul>
+                         </ul>
+                     </div>
+                 </div>
+             </div>
+         </div>--%>
         <div class="layui-col-sm6 layui-col-md6 call-board hide">
             <div id="statistics-bord" class="call-bord-content contentShadow">
                 <div class="bord-left">
@@ -961,155 +985,155 @@
 </div>
 <script>
 
-     var padding = 16 * 2;
-     var lineh = 44 + 1;
-     var recordcount = 8;
-     var conHeight = lineh * recordcount - 1;
-     var hasSchedule = true;
-     var hasMsg = true;
-     var hasNotify = true;
-     var hasEmail = true;
+    var padding = 16 * 2;
+    var lineh = 44 + 1;
+    var recordcount = 8;
+    var conHeight = lineh * recordcount - 1;
+    var hasSchedule = true;
+    var hasMsg = true;
+    var hasNotify = true;
+    var hasEmail = true;
 
     function initBord1(){
         var elem = $("#schedule-bord .bord-right ul");
         var xml ="";
 
         <c:forEach items="${notifyPage}" var="workProjectNotify" varStatus="status">
-            <c:if test="${status.index < 8}">
-                <c:choose>
-                <c:when test="${workProjectNotify.type == 6}">
-                    <c:if test="${workProjectNotify.status != 1}">
-                        xml = "<a href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-                    </c:if>
-                    <c:if test="${workProjectNotify.status ==1}">
-                        xml ="<a href=\"javascript:void(0)\" onclick=\"openDialogView('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-                    </c:if>
-                </c:when>
-                <c:when test="${workProjectNotify.type eq 76  &&  workProjectNotify.notifyRole eq '调整申请'}">
-                     xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogresExample('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.remarks eq '待归档'}">
-                    xml = "<a href=\"javascript:void(0)\" onclick=\"top.openTab('${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','待归档',false)\">";
-                </c:when>
-                <c:when test="${workProjectNotify.remarks eq '再次申请' && workProjectNotify.status  != 1}">
-                    xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.remarks eq '重新申请'  && workProjectNotify.status != 1}">
-                    <c:choose>
-                        <%--作废--%>
-                        <c:when test="${workProjectNotify.type eq 39 && (workProjectNotify.projectType eq 1 || workProjectNotify.projectType eq 2)}">
-                            xml = "<a  href=\"javascript:void(0)\" onclick=\"projectDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','${ctx}/workprojectnotify/workProjectNotify/cancellationNotify?id=${workProjectNotify.id}','95%','95%')\">";
-                        </c:when>
-                        <c:when test="${workProjectNotify.type eq 16}">
-                            xml = "<a  href=\"javascript:void(0)\" onclick=\"projectDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','${ctx}/workprojectnotify/workProjectNotify/cancellationNotify?id=${workProjectNotify.id}','95%','95%')\">";
-                        </c:when>
-                        <c:when test="${workProjectNotify.type eq 152}">
-                        xml = "<a  href=\"javascript:void(0)\" onclick=\"caseBaseDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','${ctx}/workprojectnotify/workProjectNotify/cancellationNotify?id=${workProjectNotify.id}','95%','95%')\">";
-                        </c:when>
-                        <%--删除--%>
-                        <c:when test="${workProjectNotify.type eq 92 || workProjectNotify.type eq 89 || workProjectNotify.type eq 21 || workProjectNotify.type eq 13 || workProjectNotify.type eq 139}">
-                            xml = "<a  href=\"javascript:void(0)\" onclick=\"deleteDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','${ctx}/workprojectnotify/workProjectNotify/deleteNotify?id=${workProjectNotify.id}','95%','95%')\">";
-                        </c:when>
-                        <c:otherwise>
-                            xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-                        </c:otherwise>
-                    </c:choose>
-                </c:when>
-                <c:when test="${workProjectNotify.type eq 86}">
-                  xml = "<a href=\"javascript:void(0)\" onclick=\"openDialogre('档案信息修改申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-                  </c:when>
-                <c:when test="${workProjectNotify.type eq 18}">
-                    xml = "<a href=\"javascript:void(0)\" onclick=\"openDialogre('企业申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-                </c:when>
-
-                <c:when test="${workProjectNotify.type eq 19}">
-                    xml = "<a href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 67 && workProjectNotify.notifyRole eq '部门主任'}">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 67 && workProjectNotify.notifyRole eq '签约人'}">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 16 && workProjectNotify.notifyRole eq '合同盖章'}">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 44 && workProjectNotify.notifyRole eq '合同盖章'}">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 50 && workProjectNotify.notifyRole eq '投标专员标书编制'}">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 50 && workProjectNotify.notifyRole eq '投标专员调整申请'}">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 57 && workProjectNotify.notifyRole eq '申请人归档'}">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 50 && workProjectNotify.notifyRole eq '盖章人盖章'}">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 50 && workProjectNotify.notifyRole eq '申请人开标'}">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 50 && workProjectNotify.notifyRole eq '市场研发管理部负责人备案'}">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 71 && workProjectNotify.notifyRole eq '各级审批'}">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','提交,关闭')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 50 && workProjectNotify.notifyRole eq '市场研发管理部负责人'}">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 55 && workProjectNotify.notifyRole eq '申请人审批'}">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 58 && workProjectNotify.remarks eq '待处理'}">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','提交,关闭')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 69 && workProjectNotify.remarks eq '待处理'}">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','提交,关闭')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 60 && workProjectNotify.remarks eq '待审批'}">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 61 && workProjectNotify.notifyRole eq '行政主管'}">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
-                </c:when>
-                 <c:when test="${workProjectNotify.type == 66 && workProjectNotify.notifyRole eq '转正人补充信息'}">
-                 xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
-                  </c:when>
-                <c:when test="${workProjectNotify.type == 40 && workProjectNotify.notifyRole eq '主管会计审核'}">
-                     xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 140 && workProjectNotify.notifyRole eq '项目负责人审批'}">
-                    xml = "<a  href=\"javascript:void(0)\" onclick=\"masterCheck('提交线下归档', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 76 && workProjectNotify.notifyRole eq '案例审核人审批'}">
-                  xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogreExample('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 83 }">
-                  xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogreAttendanceAudit('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.type == 84 }">
-                  xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogreAttendance('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-                </c:when>
-                <c:when test="${workProjectNotify.remarks eq '待审批' && workProjectNotify.status != 1 }">
-                    xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogre('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-                </c:when>
-
-                <c:otherwise>
-                    xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-                </c:otherwise>
-                </c:choose>
-
-                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:if test="${status.index < 8}">
+        <c:choose>
+        <c:when test="${workProjectNotify.type == 6}">
+        <c:if test="${workProjectNotify.status != 1}">
+        xml = "<a href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:if>
+        <c:if test="${workProjectNotify.status ==1}">
+        xml ="<a href=\"javascript:void(0)\" onclick=\"openDialogView('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:if>
+        </c:when>
+        <c:when test="${workProjectNotify.type eq 76  &&  workProjectNotify.notifyRole eq '调整申请'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogresExample('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.remarks eq '待归档'}">
+        xml = "<a href=\"javascript:void(0)\" onclick=\"top.openTab('${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','待归档',false)\">";
+        </c:when>
+        <c:when test="${workProjectNotify.remarks eq '再次申请' && workProjectNotify.status  != 1}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.remarks eq '重新申请'  && workProjectNotify.status != 1}">
+        <c:choose>
+        <%--作废--%>
+        <c:when test="${workProjectNotify.type eq 39 && (workProjectNotify.projectType eq 1 || workProjectNotify.projectType eq 2)}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"projectDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','${ctx}/workprojectnotify/workProjectNotify/cancellationNotify?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type eq 16}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"projectDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','${ctx}/workprojectnotify/workProjectNotify/cancellationNotify?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type eq 152}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"caseBaseDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','${ctx}/workprojectnotify/workProjectNotify/cancellationNotify?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:when>
+        <%--删除--%>
+        <c:when test="${workProjectNotify.type eq 92 || workProjectNotify.type eq 89 || workProjectNotify.type eq 21 || workProjectNotify.type eq 13 || workProjectNotify.type eq 139}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"deleteDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','${ctx}/workprojectnotify/workProjectNotify/deleteNotify?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:when>
+        <c:otherwise>
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:otherwise>
+        </c:choose>
+        </c:when>
+        <c:when test="${workProjectNotify.type eq 86}">
+        xml = "<a href=\"javascript:void(0)\" onclick=\"openDialogre('档案信息修改申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type eq 18}">
+        xml = "<a href=\"javascript:void(0)\" onclick=\"openDialogre('企业申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:when>
+
+        <c:when test="${workProjectNotify.type eq 19}">
+        xml = "<a href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 67 && workProjectNotify.notifyRole eq '部门主任'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 67 && workProjectNotify.notifyRole eq '签约人'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 16 && workProjectNotify.notifyRole eq '合同盖章'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 44 && workProjectNotify.notifyRole eq '合同盖章'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 50 && workProjectNotify.notifyRole eq '投标专员标书编制'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 50 && workProjectNotify.notifyRole eq '投标专员调整申请'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 57 && workProjectNotify.notifyRole eq '申请人归档'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 50 && workProjectNotify.notifyRole eq '盖章人盖章'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 50 && workProjectNotify.notifyRole eq '申请人开标'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 50 && workProjectNotify.notifyRole eq '市场研发管理部负责人备案'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 71 && workProjectNotify.notifyRole eq '各级审批'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','提交,关闭')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 50 && workProjectNotify.notifyRole eq '市场研发管理部负责人'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 55 && workProjectNotify.notifyRole eq '申请人审批'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 58 && workProjectNotify.remarks eq '待处理'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','提交,关闭')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 69 && workProjectNotify.remarks eq '待处理'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','提交,关闭')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 60 && workProjectNotify.remarks eq '待审批'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 61 && workProjectNotify.notifyRole eq '行政主管'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 66 && workProjectNotify.notifyRole eq '转正人补充信息'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 40 && workProjectNotify.notifyRole eq '主管会计审核'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 140 && workProjectNotify.notifyRole eq '项目负责人审批'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"masterCheck('提交线下归档', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 76 && workProjectNotify.notifyRole eq '案例审核人审批'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogreExample('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 83 }">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogreAttendanceAudit('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type == 84 }">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogreAttendance('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.remarks eq '待审批' && workProjectNotify.status != 1 }">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogre('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:when>
+
+        <c:otherwise>
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:otherwise>
+        </c:choose>
+
+        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:forEach>
 
         <c:if test="${notifyCount1 eq 0}">
-            hasSchedule = false
+        hasSchedule = false
         </c:if>
     }
 
@@ -1120,45 +1144,45 @@
 
         <c:forEach items="${notifyShowPage}" var="workProjectNotify" varStatus="status">
         <c:if test="${status.index < 8}">
-            <c:choose>
-            <c:when test="${workProjectNotify.type == 6}">
-            <c:if test="${workProjectNotify.status !=1}">
-                xml = "<a href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-            </c:if>
-            <c:if test="${workProjectNotify.status ==1}">
-                xml = "<a href=\"javascript:void(0)\" onclick=\"openDialogView('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-            </c:if>
-            </c:when>
-            <c:when test="${workProjectNotify.remarks eq '待审批!'}">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialog('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-            </c:when>
-            <c:when test="${workProjectNotify.remarks eq '三级校审' && workProjectNotify.status != 1}">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogre('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">" ;
-            </c:when>
-            <c:when test="${workProjectNotify.remarks eq '重新申请'  && workProjectNotify.status != 1}">
-                xml = "<a href=\"javascript:void(0)\" onclick=\"top.openTab('${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','重新申请信息',false)\">" ;
-            </c:when>
-            <c:when test="${workProjectNotify.type eq 18}">
-                xml = "<a href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请','${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-            </c:when>
-            <c:when test="${workProjectNotify.type eq 19}">
-                xml = "<a href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请','${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-            </c:when>
-            <c:when test="${workProjectNotify.remarks eq '待审批' && workProjectNotify.status != 1 }">
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"top.openTab('${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','待审批', false)\">";
-            </c:when>
-            <c:otherwise>
-                xml = "<a  href=\"javascript:void(0)\" onclick=\"homeOpenDialogView('查看通知', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
-            </c:otherwise>
-            </c:choose>
-
-            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:choose>
+        <c:when test="${workProjectNotify.type == 6}">
+        <c:if test="${workProjectNotify.status !=1}">
+        xml = "<a href=\"javascript:void(0)\" onclick=\"openDialog('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:if>
+        <c:if test="${workProjectNotify.status ==1}">
+        xml = "<a href=\"javascript:void(0)\" onclick=\"openDialogView('确认定投标', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:if>
+        </c:when>
+        <c:when test="${workProjectNotify.remarks eq '待审批!'}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialog('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.remarks eq '三级校审' && workProjectNotify.status != 1}">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogre('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">" ;
+        </c:when>
+        <c:when test="${workProjectNotify.remarks eq '重新申请'  && workProjectNotify.status != 1}">
+        xml = "<a href=\"javascript:void(0)\" onclick=\"top.openTab('${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','重新申请信息',false)\">" ;
+        </c:when>
+        <c:when test="${workProjectNotify.type eq 18}">
+        xml = "<a href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请','${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.type eq 19}">
+        xml = "<a href=\"javascript:void(0)\" onclick=\"openDialogView('企业申请','${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.remarks eq '待审批' && workProjectNotify.status != 1 }">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"top.openTab('${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','待审批', false)\">";
+        </c:when>
+        <c:otherwise>
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"homeOpenDialogView('查看通知', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:otherwise>
+        </c:choose>
+
+        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:forEach>
 
         <c:if test="${notifyShowCount1 eq 0}">
-            hasNotify = false
+        hasNotify = false
         </c:if>
     }
 
@@ -1167,42 +1191,42 @@
         var xml = "";
         <c:forEach items="${page}" var="oaNotify" varStatus="index">
         <c:if test="${index.index < 8}">
-            xml ="<a href=\"javascript:void(0)\" onclick=\"homeOpenDialogView('查看公告', '${ctx}/oa/oaNotify/homeView?id=${oaNotify.id}&readAttr=disabled','95%','95%')\"  >";
+        xml ="<a href=\"javascript:void(0)\" onclick=\"homeOpenDialogView('查看公告', '${ctx}/oa/oaNotify/homeView?id=${oaNotify.id}&readAttr=disabled','95%','95%')\"  >";
 
-            elem.append('<li>' + xml + "<span class=\"bord-record-type\" title=\"${fns:getMainDictLabel(oaNotify.type, 'oa_notify_type', '')}\">${fns:getMainDictLabel(oaNotify.type, 'oa_notify_type', '')}</span>"+
-                "<span class=\"bord-record\" title=\"${oaNotify.title}\">${oaNotify.title}</span>"+
-                '<span class="bord-record-flag">'+'${oaNotify.readFlagStr}'+'</span>' +
-                '<span class="bord-record-time">' + '<fmt:formatDate value="${oaNotify.updateDate}" pattern="yyyy-MM-dd"/>' + '</span></a></li>');
+        elem.append('<li>' + xml + "<span class=\"bord-record-type\" title=\"${fns:getMainDictLabel(oaNotify.type, 'oa_notify_type', '')}\">${fns:getMainDictLabel(oaNotify.type, 'oa_notify_type', '')}</span>"+
+            "<span class=\"bord-record\" title=\"${oaNotify.title}\">${oaNotify.title}</span>"+
+            '<span class="bord-record-flag">'+'${oaNotify.readFlagStr}'+'</span>' +
+            '<span class="bord-record-time">' + '<fmt:formatDate value="${oaNotify.updateDate}" pattern="yyyy-MM-dd"/>' + '</span></a></li>');
         </c:if>
         </c:forEach>
 
         <c:if test="${count1 eq 0}">
-            hasMsg = false
+        hasMsg = false
         </c:if>
 
     }
-     function initBord4(){
-         var elem = $("#email-bord .bord-right ul");
-         var xml = "";
-         <c:forEach items="${projectCount}" var="project" varStatus="index">
-         xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/ruralProject/ruralProjectRecords/view?id=${project.id}','95%','95%')\">";
-         elem.append('<li>' + xml + "<span class=\"bord-record-type\" title=\"${fns:getDictLabel(project.projectType, 'project_type', '')}\">${fns:getDictLabel(project.projectType, 'project_type', '')}</span><span class=\"bord-record\" title=\"${project.projectName}\">${project.projectName}</span>" +
-             '<span class="bord-record-time">' + '<fmt:formatDate value="${project.updateDate}" pattern="yyyy-MM-dd"/>' + '</span></a></li>');
-         <%--<c:if test="${index.index < 8}">
-         xml ="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作日历', '${ctx}/workcalendar/workCalendar/view?id=${workCalendar.id}','95%', '95%')\" >";
-         elem.append('<li>' + xml + "<span class=\"bord-record-type\" title=\"${workCalendar.subject }\">${workCalendar.subject }</span><span class=\"bord-record\" title=\"${workCalendar.content}\">${workCalendar.content}</span>" +
-             '<span class="bord-record-time">' + '<fmt:formatDate value="${workCalendar.startDate}" pattern="yyyy-MM-dd"/>' + '</span></a></li>');
-         </c:if>--%>
-         </c:forEach>
+    function initBord4(){
+        var elem = $("#email-bord .bord-right ul");
+        var xml = "";
+        <c:forEach items="${projectCount}" var="project" varStatus="index">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogView('查看通知', '${ctx}/ruralProject/ruralProjectRecords/view?id=${project.id}','95%','95%')\">";
+        elem.append('<li>' + xml + "<span class=\"bord-record-type\" title=\"${fns:getDictLabel(project.projectType, 'project_type', '')}\">${fns:getDictLabel(project.projectType, 'project_type', '')}</span><span class=\"bord-record\" title=\"${project.projectName}\">${project.projectName}</span>" +
+            '<span class="bord-record-time">' + '<fmt:formatDate value="${project.updateDate}" pattern="yyyy-MM-dd"/>' + '</span></a></li>');
+        <%--<c:if test="${index.index < 8}">
+        xml ="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作日历', '${ctx}/workcalendar/workCalendar/view?id=${workCalendar.id}','95%', '95%')\" >";
+        elem.append('<li>' + xml + "<span class=\"bord-record-type\" title=\"${workCalendar.subject }\">${workCalendar.subject }</span><span class=\"bord-record\" title=\"${workCalendar.content}\">${workCalendar.content}</span>" +
+            '<span class="bord-record-time">' + '<fmt:formatDate value="${workCalendar.startDate}" pattern="yyyy-MM-dd"/>' + '</span></a></li>');
+        </c:if>--%>
+        </c:forEach>
 
-         <c:if test="${projectSize < 7}">
-            hasEmail = false
-         </c:if>
-     }
-   /*  function initBord4(){
-         var elem = $("#email-bord .bord-right ul");
-         var xml = "";
-         <c:forEach items="${mailPage}" var="mailBox" varStatus="index">
+        <c:if test="${projectSize < 7}">
+        hasEmail = false
+        </c:if>
+    }
+    /*  function initBord4(){
+          var elem = $("#email-bord .bord-right ul");
+          var xml = "";
+<c:forEach items="${mailPage}" var="mailBox" varStatus="index">
              <c:if test="${index.index < 8}">
          xml ="<a href=\"javascript:void(0)\" onclick=\"openDialogView('${fns:abbr(mailBox.mail.title,30)}', '${ctx}/iim/mailBox/detail?id=${mailBox.id}','95%', '95%')\" >";