فهرست منبع

首页-待办功能

user5 4 سال پیش
والد
کامیت
8286e8988a
22فایلهای تغییر یافته به همراه1856 افزوده شده و 16 حذف شده
  1. 3 0
      src/main/java/com/jeeplus/modules/oa/service/OaNotifyService.java
  2. 13 0
      src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java
  3. 7 0
      src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java
  4. 3 0
      src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractBorrowService.java
  5. 7 0
      src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java
  6. 3 0
      src/main/java/com/jeeplus/modules/workcontractrecord/service/WorkContractRecordService.java
  7. 14 0
      src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceService.java
  8. 1 1
      src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceController.java
  9. 40 0
      src/main/java/com/jeeplus/modules/workprojectnotify/dao/WorkProjectNotifyDao.java
  10. 48 0
      src/main/java/com/jeeplus/modules/workprojectnotify/service/WorkProjectNotifyService.java
  11. 30 1
      src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java
  12. 7 0
      src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementService.java
  13. 5 3
      src/main/resources/mappings/modules/workactivity/WorkActivityProcessDao.xml
  14. 241 4
      src/main/resources/mappings/modules/workprojectnotify/WorkProjectNotifyDao.xml
  15. 3 1
      src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp
  16. 1 1
      src/main/webapp/webpage/modules/workcontractrecord/workContractRecordForm.jsp
  17. 1 1
      src/main/webapp/webpage/modules/workcontractrecord/workContractRecordModifyApply.jsp
  18. 1 1
      src/main/webapp/webpage/modules/worklog/workLogFormView.jsp
  19. 1 1
      src/main/webapp/webpage/modules/worklog/workMeetFormView.jsp
  20. 690 0
      src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyBacklogListByMine.jsp
  21. 47 2
      src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyList.jsp
  22. 690 0
      src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyReadBacklogList.jsp

+ 3 - 0
src/main/java/com/jeeplus/modules/oa/service/OaNotifyService.java

@@ -407,6 +407,9 @@ public class OaNotifyService extends CrudService<OaNotifyDao, OaNotify> {
         oaNotify.setProcessInstanceId(processInstance.getId());
         oaNotify.setStatus(String.valueOf(ProjectStatusEnum.IN_APRL.getValue()));
         dao.updateProcessIdAndStatus(oaNotify);
+        //通知添加流程实例ID
+        workProjectNotify.setProcessInstanceId(processInstance.getId());
+        workProjectNotifyService.save(workProjectNotify);
         return "";
     }
 

+ 13 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -967,6 +967,9 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         // 修改更新流程实例ID
         projectReportRecord.setProcessInstanceId(processInstance.getId());
         dao.updateProcessInstanceId(projectReportRecord);
+        //通知添加流程实例ID
+        workProjectNotify.setProcessInstanceId(processInstance.getId());
+        workProjectNotifyService.save(workProjectNotify);
         List<Activity> list = workActivityMenu.getActivities();
         if (list != null && list.size() != 0) {
             workActivityProcessService.saveList(list, processInstance.getId());
@@ -1258,6 +1261,9 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         // 更新流程实例ID
         projectReportData.setProcessInstanceId(processInstance.getId());
         projectReportDataDao.updateProcessInstanceId(projectReportData);
+        //通知添加流程实例ID
+        workProjectNotify.setProcessInstanceId(processInstance.getId());
+        workProjectNotifyService.save(workProjectNotify);
         List<Activity> list = workActivityMenu.getActivities();
         if (list != null && list.size() != 0) {
             workActivityProcessService.saveList(list, processInstance.getId());
@@ -1445,6 +1451,11 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
     @Transactional(readOnly = false)
     public void deleteReport(ProjectReportData projectReportData){
         dao.deleteReport(projectReportData);
+        //删除流程表信息
+        workProjectNotifyService.deleteActivityProcess(projectReportData.getProcessInstanceId());
+        //删除流程人员表信息
+        workProjectNotifyService.deleteActivityProcessUser(projectReportData.getProcessInstanceId());
+
     }
 
     /**
@@ -1468,6 +1479,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         RuralProjectRecords records = dao.getRecordsInfo(projectRecords);
         if(records.getReportedType().equals("1") && records.getReportedState().equals("5") && null != records.getAuditPassDate()){
             projectRecords.setReportedState("7");
+        }else{
+            projectRecords.setReportedState("5");
         }
         return dao.updateReported(projectRecords);
     }

+ 7 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -474,6 +474,10 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				UserUtils.pushMeIm(user.getId());
 			}
 		}
+		//删除流程表信息
+		workProjectNotifyService.deleteActivityProcess(projectRecords.getProcessInstanceId());
+		//删除流程人员表信息
+		workProjectNotifyService.deleteActivityProcessUser(projectRecords.getProcessInstanceId());
 	}
 
 	/**
@@ -639,6 +643,9 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
             projectRecords.setProcessInstanceId(processInstance.getId());
             projectRecords.setProjectStatus(ProjectStatusEnum.IN_APRL.getValue());
             dao.updateProcessIdAndStatus(projectRecords);
+			//通知添加流程实例ID
+			workProjectNotify.setProcessInstanceId(processInstance.getId());
+			workProjectNotifyService.save(workProjectNotify);
         }catch (Exception e){
             logger.error("启动审批流程异常:",e);
             throw e;

+ 3 - 0
src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractBorrowService.java

@@ -206,6 +206,9 @@ public class WorkContractBorrowService extends CrudService<WorkContractBorrowDao
 			// 更新流程实例ID
 			workCntractBorrow.setProcessInstanceId(processInstance.getId());
 			dao.updateProcessInstanceId(workCntractBorrow);
+		//通知添加流程实例ID
+		workProjectNotify.setProcessInstanceId(processInstance.getId());
+		workProjectNotifyService.save(workProjectNotify);
 			List<Activity> list = workActivityMenu.getActivities();
 			if (list != null && list.size() != 0) {
 				workActivityProcessService.saveList(list, processInstance.getId());

+ 7 - 0
src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -768,6 +768,9 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		// 更新流程实例ID
 		workContractInfo.setProcessInstanceId(processInstance.getId());
 		workContractInfoDao.updateProcessInstanceId(workContractInfo);
+		//通知添加流程实例ID
+		workProjectNotify.setProcessInstanceId(processInstance.getId());
+		workProjectNotifyService.save(workProjectNotify);
 
 		List<Activity> list = workActivityMenu.getActivities();
 		if (list != null && list.size() != 0) {
@@ -892,6 +895,10 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 	@Transactional(readOnly = false)
 	public void delete(WorkContractInfo workContractInfo) {
 		super.delete(workContractInfo);
+		//删除流程表信息
+		workProjectNotifyService.deleteActivityProcess(workContractInfo.getProcessInstanceId());
+		//删除流程人员表信息
+		workProjectNotifyService.deleteActivityProcessUser(workContractInfo.getProcessInstanceId());
 //		WorkClientAttachment workClientAttachment=workContractInfo.getWorkContractAnnexList().get(0);
 
 

+ 3 - 0
src/main/java/com/jeeplus/modules/workcontractrecord/service/WorkContractRecordService.java

@@ -251,6 +251,9 @@ public class WorkContractRecordService extends CrudService<WorkContractRecordDao
 			// 更新流程实例ID
 			workContractRecord.setProcessInstanceId(processInstance.getId());
 			workContractRecordDao.updateProcessInstanceId(workContractRecord);
+		//通知添加流程实例ID
+		workProjectNotify.setProcessInstanceId(processInstance.getId());
+		workProjectNotifyService.save(workProjectNotify);
 			List<Activity> list = workActivityMenu.getActivities();
 			if (list != null && list.size() != 0) {
 				workActivityProcessService.saveList(list, processInstance.getId());

+ 14 - 0
src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceService.java

@@ -313,6 +313,9 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 			// 更新流程实例ID
 			workInvoice.setProcessInstanceId(processInstance.getId());
 			workInvoiceDao.updateProcessInstanceId(workInvoice);
+		//通知添加流程实例ID
+		workProjectNotify.setProcessInstanceId(processInstance.getId());
+		workProjectNotifyService.save(workProjectNotify);
 			List<Activity> list = workActivityMenu.getActivities();
 		long s11=System.currentTimeMillis();
 			if (list != null && list.size() != 0) {
@@ -474,6 +477,9 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 			// 更新流程实例ID
 			workInvoice.setProcessInstanceId(processInstance.getId());
 			workInvoiceDao.updateProcessInstanceId(workInvoice);
+		//通知添加流程实例ID
+		workProjectNotify.setProcessInstanceId(processInstance.getId());
+		workProjectNotifyService.save(workProjectNotify);
 			List<Activity> list = workActivityMenu.getActivities();
 		long s11=System.currentTimeMillis();
 			if (list != null && list.size() != 0) {
@@ -501,7 +507,12 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 	}
 	@Transactional(readOnly = false)
 	public void delete(WorkInvoice workInvoice) {
+		dao.get(workInvoice);
 		dao.deleteByLogic(workInvoice);
+		//删除流程表信息
+		workProjectNotifyService.deleteActivityProcess(workInvoice.getProcessInstanceId());
+		//删除流程人员表信息
+		workProjectNotifyService.deleteActivityProcessUser(workInvoice.getProcessInstanceId());
 		/*for (WorkInvoiceDetail workAccount : workInvoice.getWorkAccountList()){
 			workInvoiceDetailDao.delete(workAccount);
 		}*/
@@ -1549,6 +1560,9 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 		// 更新流程实例ID
 		workInvoice.setProcessInstanceId(processInstance.getId());
 		workInvoiceDao.updateProcessInstanceId(workInvoice);
+		//通知添加流程实例ID
+		workProjectNotify.setProcessInstanceId(processInstance.getId());
+		workProjectNotifyService.save(workProjectNotify);
 		List<Activity> list = workActivityMenu.getActivities();
 		if (list != null && list.size() != 0) {
 			workActivityProcessService.saveList(list, processInstance.getId());

+ 1 - 1
src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceController.java

@@ -522,7 +522,7 @@ public class WorkInvoiceController extends BaseController {
 	@RequestMapping(value = "receiptMoney")
 	public String receiptMoney(WorkInvoice workInvoice, RedirectAttributes redirectAttributes) {
 		workInvoiceService.receiptMoney(workInvoice);
-		addMessage(redirectAttributes, "作废发票管理成功");
+		addMessage(redirectAttributes, "发票收款成功");
 		return "redirect:"+Global.getAdminPath()+"/workinvoice/workInvoice/?repage";
 	}
 	

+ 40 - 0
src/main/java/com/jeeplus/modules/workprojectnotify/dao/WorkProjectNotifyDao.java

@@ -38,4 +38,44 @@ public interface WorkProjectNotifyDao extends CrudDao<WorkProjectNotify> {
     int updateReadStateByNotifyRoleAndUser(WorkProjectNotify notify);
 
     WorkProjectNotify getByNotifyIdAndNotifyUser(@Param("notifyId") String notifyId, @Param("notifyUserId") String notifyUserId);
+
+    /**
+     * 获取已审批信息
+     * @param workProjectNotify
+     * @return
+     */
+    List<WorkProjectNotify> findReadList(WorkProjectNotify workProjectNotify);
+
+    /**
+     * 获取已审批数据数量
+     * @param workProjectNotify
+     * @return
+     */
+    Integer queryReadCount(WorkProjectNotify workProjectNotify);
+
+    /**
+     * 获取我发起的信息
+     * @param workProjectNotify
+     * @return
+     */
+    List<WorkProjectNotify> findListByMine(WorkProjectNotify workProjectNotify);
+
+    /**
+     * 获取我发起的数据数量
+     * @param workProjectNotify
+     * @return
+     */
+    Integer queryCountByMine(WorkProjectNotify workProjectNotify);
+
+    /**
+     * 删除流程表信息
+     * @param processInstanceId
+     */
+    void deleteActivityProcess(String processInstanceId);
+
+    /**
+     * 删除流程人员表信息
+     * @param processInstanceId
+     */
+    void deleteActivityProcessUser(String processInstanceId);
 }

+ 48 - 0
src/main/java/com/jeeplus/modules/workprojectnotify/service/WorkProjectNotifyService.java

@@ -47,6 +47,10 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 		//workProjectNotify.getSqlMap().put("dsf", dataScopeFilterOR(workProjectNotify.getCurrentUser(), "o", "u","s", MenuStatusEnum.PROJECT_NOTIFY.getValue()));
 		return super.findList(workProjectNotify);
 	}
+	public List<WorkProjectNotify> findReadList(WorkProjectNotify workProjectNotify) {
+		//workProjectNotify.getSqlMap().put("dsf", dataScopeFilterOR(workProjectNotify.getCurrentUser(), "o", "u","s", MenuStatusEnum.PROJECT_NOTIFY.getValue()));
+		return dao.findReadList(workProjectNotify);
+	}
 	public List<WorkProjectNotify> findListByAPP(WorkProjectNotify workProjectNotify) {
 		//workProjectNotify.getSqlMap().put("dsf", dataScopeFilterOR(workProjectNotify.getCurrentUser(), "o", "u","s", MenuStatusEnum.PROJECT_NOTIFY.getValue()));
 		return dao.findListByAPP(workProjectNotify);
@@ -82,6 +86,36 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 		page.setList(findList(workProjectNotify));
 		return page;
 	}
+
+	/**
+	 * 已办数据信息
+	 * @param page
+	 * @param workProjectNotify
+	 * @return
+	 */
+	public Page<WorkProjectNotify> findReadPage(Page<WorkProjectNotify> page, WorkProjectNotify workProjectNotify) {
+		int count = dao.queryReadCount(workProjectNotify);
+		page.setCount(count);
+		page.setCountFlag(false);
+		workProjectNotify.setPage(page);
+		page.setList(findReadList(workProjectNotify));
+		return page;
+	}
+
+	/**
+	 * 我发起的待办列表页面
+	 * @param page
+	 * @param workProjectNotify
+	 * @return
+	 */
+	public Page<WorkProjectNotify> findPageByMine(Page<WorkProjectNotify> page, WorkProjectNotify workProjectNotify) {
+		int count = dao.queryCountByMine(workProjectNotify);
+		page.setCount(count);
+		page.setCountFlag(false);
+		workProjectNotify.setPage(page);
+		page.setList(dao.findListByMine(workProjectNotify));
+		return page;
+	}
 	public Page<WorkProjectNotify> findPages(Page<WorkProjectNotify> page, WorkProjectNotify workProjectNotify) {
 		workProjectNotify.setPage(page);
 		workProjectNotify.getSqlMap().put("dsf", dataScopeFilterOR(workProjectNotify.getCurrentUser(), "o", "u","s", MenuStatusEnum.PROJECT_NOTIFY.getValue()));
@@ -180,6 +214,20 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 		return workProjectNotifyDao.getByNotifyIdAndNotifyUser(notifyId,notifyUserId);
 	}
 
+	/**
+	 * 删除流程表信息
+	 */
+	public void deleteActivityProcess(String processInstanceId){
+		dao.deleteActivityProcess(processInstanceId);
+	}
+
+	/**
+	 * 删除流程人员表信息
+	 */
+	public void deleteActivityProcessUser(String processInstanceId){
+		dao.deleteActivityProcessUser(processInstanceId);
+	}
+
 
 
 }

+ 30 - 1
src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -38,7 +38,6 @@ import com.jeeplus.modules.oaperformance.service.OaPerformanceService;
 import com.jeeplus.modules.officeintroduce.dao.OfficeintroduceDao;
 import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
-import com.jeeplus.modules.projectType.entity.ProjectType;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectContentData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
@@ -461,6 +460,36 @@ public class WorkProjectNotifyController extends BaseController {
 		return "modules/workprojectnotify/workProjectNotifyList";
 	}
 
+
+	/**
+	 * 已审批待办列表页面
+	 */
+	@RequestMapping(value = {"backlogListReadShow"})
+	public String backlogListReadShow(WorkProjectNotify workProjectNotify, HttpServletRequest request, HttpServletResponse response, Model model) {
+		User user = UserUtils.getUser();
+		workProjectNotify.setUser(user);
+		workProjectNotify.setStatus("2");
+		workProjectNotify.setRemarks("待通知");
+		workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
+		Page<WorkProjectNotify> pageList = workProjectNotifyService.findReadPage(new Page<WorkProjectNotify>(request, response),workProjectNotify);
+		model.addAttribute("page", pageList);
+		return "modules/workprojectnotify/workProjectNotifyReadBacklogList";
+	}
+
+
+	/**
+	 * 我发起的待办列表页面
+	 */
+	@RequestMapping(value = {"backlogListByMine"})
+	public String backlogListByMine(WorkProjectNotify workProjectNotify, HttpServletRequest request, HttpServletResponse response, Model model) {
+		User user = UserUtils.getUser();
+		workProjectNotify.setUser(user);
+		workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
+		Page<WorkProjectNotify> pageList = workProjectNotifyService.findPageByMine(new Page<WorkProjectNotify>(request, response),workProjectNotify);
+		model.addAttribute("page", pageList);
+		return "modules/workprojectnotify/workProjectNotifyBacklogListByMine";
+	}
+
 	/**
 	 * 通知列表页面
 	 */

+ 7 - 0
src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementService.java

@@ -420,6 +420,9 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
         // 更新流程实例ID
         workReimbursement.setProcessInstanceId(processInstance.getId());
         workReimbursementDao.updateProcessInstanceId(workReimbursement);
+        //通知添加流程实例ID
+        workProjectNotify.setProcessInstanceId(processInstance.getId());
+        workProjectNotifyService.save(workProjectNotify);
         List<Activity> list = workActivityMenu.getActivities();
         if (list != null && list.size() != 0) {
             workActivityProcessService.saveList(list, processInstance.getId());
@@ -483,6 +486,10 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
                 UserUtils.pushMeIm(user.getId());
             }
         }
+        //删除流程表信息
+        workProjectNotifyService.deleteActivityProcess(workReimbursement.getProcessInstanceId());
+        //删除流程人员表信息
+        workProjectNotifyService.deleteActivityProcessUser(workReimbursement.getProcessInstanceId());
     }
     @Transactional(readOnly = false)
     public void updateWorkReimbursementInfo(WorkReimbursement workReimbursement) {

+ 5 - 3
src/main/resources/mappings/modules/workactivity/WorkActivityProcessDao.xml

@@ -314,9 +314,11 @@
 	</update>
 	<!--逻辑删除-->
 	<update id="deleteProcessIdAuditUsers">
-		DELETE FROM work_activity_process_user
-		WHERE
-			process_id = #{processInstanceId}
+		update work_activity_process_user
+		set
+		process_id = #{processInstanceId}
+		where
+		process_id = #{processInstanceId}
 	</update>
 
 	

+ 241 - 4
src/main/resources/mappings/modules/workprojectnotify/WorkProjectNotifyDao.xml

@@ -102,10 +102,10 @@
 				AND a.type in (${types})
 			</if>
 			<if test="startDate != null and startDate != ''">
-				AND a.create_date &gt; #{startDate}
+				AND a.create_date &gt;= #{startDate}
 			</if>
 			<if test="endDate != null and endDate != ''">
-				AND a.create_date &lt; #{endDate}
+				AND a.create_date &lt;= #{endDate}
 			</if>
 			<choose>
 				<when test="status !=null and status != '' and status == '-1'">
@@ -176,10 +176,10 @@
 				AND a.type in (${types})
 			</if>
 			<if test="startDate != null and startDate != ''">
-				AND a.create_date &gt; #{startDate}
+				AND a.create_date &gt;= #{startDate}
 			</if>
 			<if test="endDate != null and endDate != ''">
-				AND a.create_date &lt; #{endDate}
+				AND a.create_date &lt;= #{endDate}
 			</if>
 			<choose>
 				<when test="status !=null and status != '' and status == '-1'">
@@ -368,6 +368,9 @@
 			status = #{status},
 			kind = #{kind},
 			officeId = #{officeId}
+			<if test="processInstanceId != null and processInstanceId != ''">
+				,process_instance_id = #{processInstanceId}
+			</if>
 		WHERE id = #{id}
 	</update>
 	<update id="updateReadStateByNotifyIdAndNotifyUser">
@@ -430,5 +433,239 @@
 	<select id="findUniqueByProperty" resultType="WorkProjectNotify" statementType="STATEMENT">
 		select * FROM work_project_notify  where ${propertyName} = '${value}'
 	</select>
+
+
+	<select id="findReadList" resultType="WorkProjectNotify" >
+		SELECT
+		<include refid="workProjectNotifyColumns"/>
+		FROM work_project_notify a
+		<include refid="workProjectNotifyJoins"/>
+		<where>
+			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>
+			<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>
+			<if test="user != null and user.id != null and user.id != ''">
+				AND a.notify_user = #{user.id}
+			</if>
+			<if test="userName != null and userName != ''">
+				AND u.name LIKE
+				<if test="dbName == 'oracle'">'%'||#{userName}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{userName}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{userName},'%')</if>
+			</if>
+
+			<if test="companyId != null and companyId != ''">
+				AND a.company_id = #{companyId}
+			</if>
+			<if test="type != null and type != ''">
+				AND a.type = #{type}
+			</if>
+			<if test="types != null and types != ''">
+				AND a.type in (${types})
+			</if>
+			<if test="startDate != null and startDate != ''">
+				AND a.create_date &gt;= #{startDate}
+			</if>
+			<if test="endDate != null and endDate != ''">
+				AND a.create_date &lt;= #{endDate}
+			</if>
+			and a.create_by is not null
+
+			and a.process_instance_id in( select process_instance_id from work_activity_process
+			where process_instance_id in(select process_id from work_activity_process_user where user_id = #{user.id})
+			and del_flag = 0 and (remarks !='[强制撤销]' or remarks is null) and is_approval != 0
+			group by process_instance_id)
+
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.create_date DESC
+			</otherwise>
+		</choose>
+	</select>
+
+	<select id="queryReadCount" resultType="Integer" >
+		SELECT count(1)
+		FROM work_project_notify a
+		<if test="userName != null and userName != ''">
+			LEFT JOIN sys_user u ON u.id = a.create_by
+		</if>
+		<where>
+			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>
+			<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>
+			<if test="user != null and user.id != null and user.id != ''">
+				AND a.notify_user = #{user.id}
+			</if>
+			<if test="userName != null and userName != ''">
+				AND u.name LIKE
+				<if test="dbName == 'oracle'">'%'||#{userName}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{userName}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{userName},'%')</if>
+			</if>
+
+			<if test="companyId != null and companyId != ''">
+				AND a.company_id = #{companyId}
+			</if>
+			<if test="type != null and type != ''">
+				AND a.type = #{type}
+			</if>
+			<if test="types != null and types != ''">
+				AND a.type in (${types})
+			</if>
+			<if test="startDate != null and startDate != ''">
+				AND a.create_date &gt;= #{startDate}
+			</if>
+			<if test="endDate != null and endDate != ''">
+				AND a.create_date &lt;= #{endDate}
+			</if>
+			and a.create_by is not null
+			and a.process_instance_id in( select process_instance_id from work_activity_process
+			where process_instance_id in(select process_id from work_activity_process_user where user_id = #{user.id})
+			and del_flag = 0 and (remarks !='[强制撤销]' or remarks is null) and is_approval != 0
+			group by process_instance_id)
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.create_date DESC
+			</otherwise>
+		</choose>
+	</select>
+
+	<delete id="deleteActivityProcess">
+		delete from work_activity_process where process_instance_id = #{processInstanceId}
+	</delete>
+
+	<delete id="deleteActivityProcessUser">
+		delete from work_activity_process_user where process_id = #{processInstanceId}
+	</delete>
+
+
+
+
+	<select id="findListByMine" resultType="WorkProjectNotify" >
+		SELECT
+		<include refid="workProjectNotifyColumns"/>
+		FROM work_project_notify a
+		<if test="userName != null and userName != ''">
+			LEFT JOIN sys_user u ON u.id = a.create_by
+		</if>
+		<where>
+			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>
+			<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>
+			and a.create_by = #{user.id}
+			<if test="companyId != null and companyId != ''">
+				AND a.company_id = #{companyId}
+			</if>
+			<if test="type != null and type != ''">
+				AND a.type = #{type}
+			</if>
+			<if test="types != null and types != ''">
+				AND a.type in (${types})
+			</if>
+			<if test="startDate != null and startDate != ''">
+				AND a.create_date &gt;= #{startDate}
+			</if>
+			<if test="endDate != null and endDate != ''">
+				AND a.create_date &lt;= #{endDate}
+			</if>
+		</where>
+		group by a.notify_id
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.create_date DESC
+			</otherwise>
+		</choose>
+	</select>
+
+	<select id="queryCountByMine" resultType="Integer" >
+		select count(1) from (
+		SELECT count(1)
+		FROM work_project_notify a
+		<if test="userName != null and userName != ''">
+			LEFT JOIN sys_user u ON u.id = a.create_by
+		</if>
+		<where>
+			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>
+			<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>
+			and a.create_by = #{user.id}
+			<if test="companyId != null and companyId != ''">
+				AND a.company_id = #{companyId}
+			</if>
+			<if test="type != null and type != ''">
+				AND a.type = #{type}
+			</if>
+			<if test="types != null and types != ''">
+				AND a.type in (${types})
+			</if>
+			<if test="startDate != null and startDate != ''">
+				AND a.create_date &gt;= #{startDate}
+			</if>
+			<if test="endDate != null and endDate != ''">
+				AND a.create_date &lt;= #{endDate}
+			</if>
+		</where>
+		group by a.notify_id
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.create_date DESC
+			</otherwise>
+		</choose>
+		) b
+	</select>
 	
 </mapper>

+ 3 - 1
src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -565,7 +565,9 @@
 					</shiro:hasPermission>
 					<%--<shiro:hasPermission name="workcontractinfo:workContractInfo:export">
 					</shiro:hasPermission>--%>
-					<table:exportExcel url="${ctx}/workcontractinfo/workContractInfo/export"></table:exportExcel><!-- 导出按钮 -->
+					<shiro:hasPermission name="workcontractinfo:workContractInfo:export">
+						<table:exportExcel url="${ctx}/workcontractinfo/workContractInfo/export"></table:exportExcel><!-- 导出按钮 -->
+					</shiro:hasPermission>
 					<%--<table:importInfoErr url="${ctx}/workcontractinfo/workContractInfo/importInfoErr" title="导入日志"></table:importInfoErr>--%>
 
 					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i> 刷新</button>

+ 1 - 1
src/main/webapp/webpage/modules/workcontractrecord/workContractRecordForm.jsp

@@ -44,7 +44,7 @@
             //     elem: '#createDate',
             //     event: 'focus',
             //     type : 'date'
-, trigger: 'click'
+			//, trigger: 'click'
             // });
         });
         function insertTitle(tValue){

+ 1 - 1
src/main/webapp/webpage/modules/workcontractrecord/workContractRecordModifyApply.jsp

@@ -44,7 +44,7 @@
             //     elem: '#createDate',
             //     event: 'focus',
             //     type : 'date'
-, trigger: 'click'
+			//, trigger: 'click'
             // });
 		});
         function insertTitle(tValue){

+ 1 - 1
src/main/webapp/webpage/modules/worklog/workLogFormView.jsp

@@ -62,7 +62,7 @@
 			// 	elem: '#startDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎,因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
 			// 	format: 'yyyy-MM-dd',
 			// 	type : 'date'
-, trigger: 'click'
+			//, trigger: 'click'
 			// });
 
 

+ 1 - 1
src/main/webapp/webpage/modules/worklog/workMeetFormView.jsp

@@ -52,7 +52,7 @@
 			// 	elem: '#startDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎,因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
 			// 	format: 'yyyy-MM-dd',
 			// 	type : 'date'
-, trigger: 'click'
+			//, trigger: 'click'
 			// });
 
 			// $("#attachment_btn").click(function () {

+ 690 - 0
src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyBacklogListByMine.jsp

@@ -0,0 +1,690 @@
+<%@ 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">
+		$(document).ready(function() {
+			//搜索框收放
+			$('#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");
+				}
+			});
+			laydate.render({
+				elem: '#startDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎,因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event,则按照默认的click
+				type : 'date'
+			});
+			laydate.render({
+				elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎,因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event,则按照默认的click
+				type : 'date'
+			});
+		});
+        function openDialogre(title,url,width,height,target){
+            if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端,就使用自适应大小弹窗
+                width='auto';
+                height='auto';
+            }else{//如果是PC端,根据用户设置的width和height显示。
+
+            }
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+				skin:"three-btns",
+                maxmin: true, //开启最大化最小化按钮
+                content: url ,
+                btn: ['通过','驳回','关闭'],
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(1) ){
+                        top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                },
+                btn2:function(index,layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(2) ){
+                        top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                    return false;
+                },
+                btn3: function(index){
+            }
+            });
+
+        }
+        function openDialogreExample(title,url,width,height,target){
+            if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端,就使用自适应大小弹窗
+                width='auto';
+                height='auto';
+            }else{//如果是PC端,根据用户设置的width和height显示。
+
+            }
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                skin:"three-btns",
+                maxmin: true, //开启最大化最小化按钮
+                content: url ,
+                btn: ['通过','驳回','关闭'],
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmita(1) ){
+                        //top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                },
+                btn2:function(index,layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmita(2) ){
+                        //top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                    return false;
+                },
+                btn3: function(index){
+                }
+            });
+
+        }
+        function openDialogres(title,url,width,height,target) {
+            parent.index = "";
+            if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端,就使用自适应大小弹窗
+                width = 'auto';
+                height = 'auto';
+            } else {//如果是PC端,根据用户设置的width和height显示。
+
+            }
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                maxmin: true, //开启最大化最小化按钮
+                content: url,
+                shin:"two-btns",
+                btn: ['重新申请', '关闭'],
+                btn1: function (index, layero) {
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if (target) {
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    } else {
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target", top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if (iframeWin.contentWindow.doSubmit(3)) {
+                        top.layer.close(index);//关闭对话框。
+                        setTimeout(function () {
+                            top.layer.close(index)
+                        }, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                },
+                btn2: function(index){
+                }
+            });
+        }
+        /*案例审核人审批*/
+        function openDialogPass(title,url,width,height,target){
+            if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端,就使用自适应大小弹窗
+                width='auto';
+                height='auto';
+            }else{//如果是PC端,根据用户设置的width和height显示。
+
+            }
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                maxmin: true, //开启最大化最小化按钮
+                content: url ,
+                skin:"three-btns",
+                btn: ['通过','关闭'],
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(1) ){
+                        // top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                },
+                btn3: function(index){
+                }
+            });
+
+        }
+        function openDialogPass2(title,url,width,height,target){
+            if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端,就使用自适应大小弹窗
+                width='auto';
+                height='auto';
+            }else{//如果是PC端,根据用户设置的width和height显示。
+
+            }
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                maxmin: true, //开启最大化最小化按钮
+                content: url ,
+                skin:"three-btns",
+                btn: ['提交','关闭'],
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(1) ){
+                        // top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                },
+                btn3: function(index){
+                }
+            });
+
+        }
+        function openDialogreAttendance(title,url,width,height,target){
+            if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端,就使用自适应大小弹窗
+                width='auto';
+                height='auto';
+            }else{//如果是PC端,根据用户设置的width和height显示。
+
+            }
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                skin:"three-btns",
+                maxmin: true, //开启最大化最小化按钮
+                content: url ,
+                btn: ['确认','重算','关闭'],
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(1) ){
+                        //top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                },
+                btn2:function(index,layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    parent.layer.confirm('确定要进行重算吗?',{icon: 3, title:'系统提示'}, function(index){
+                        if(iframeWin.contentWindow.doSubmit(2) ){
+                            //top.layer.close(index);//关闭对话框。
+                            //setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                        }
+                        parent.layer.close(index);
+                    }, function(index){
+                        parent.layer.close(index)
+                    });
+
+                    return false;
+                },
+                btn3: function(index){
+                }
+            });
+
+        }
+
+        function openDialogreAttendanceAudit(title,url,width,height,target){
+            if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端,就使用自适应大小弹窗
+                width='auto';
+                height='auto';
+            }else{//如果是PC端,根据用户设置的width和height显示。
+
+            }
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                skin:"three-btns",
+                maxmin: true, //开启最大化最小化按钮
+                content: url ,
+                btn: ['同意','驳回','关闭'],
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(1) ){
+                        //top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                },
+                btn2: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(2) ){
+                        //top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                },
+                btn3: function(index){
+                }
+            });
+
+        }
+	</script>
+	<style>
+		body{
+			background-color:transparent;
+			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
+			color:#ffffff;
+			background-color:rgba(255,255,255,0);
+			height:100%;
+		}
+	</style>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<sys:message content="${message}"/>
+	<div class="layui-row">
+		<div class="full-width fl">
+			<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
+				<ul class="list-tabs" >
+					<li><a href="${ctx}/workprojectnotify/workProjectNotify/list">待办</a></li>
+					<li><a href="${ctx}/workprojectnotify/workProjectNotify/backlogListReadShow">已办</a></li>
+					<li class="active"><a href="${ctx}/workprojectnotify/workProjectNotify/backlogListByMine">我发起的</a></li>
+				</ul>
+			</div>
+			<div class="contentShadow layui-row" id="queryDiv">
+
+			<form:form id="searchForm" modelAttribute="workProjectNotify" action="${ctx}/workprojectnotify/workProjectNotify/backlogListByMine" method="post" class="form-inline">
+				<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+				<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+				<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
+
+				<div class="commonQuery">
+					<div class="layui-item query athird">
+						<label class="layui-form-label">内容:</label>
+						<div class="layui-input-block">
+							<form:input path="content" 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">
+							<form:select id="type" path="type" class="form-control simple-select">
+								<form:option value="" label=""/>
+								<form:options items="${fns:getDictList('new_project_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+							</form:select>
+						</div>
+					</div>
+					<div class="layui-item athird">
+						<div class="input-group">
+							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
+							<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+						</div>
+					</div>
+					<div style="    clear:both;"></div>
+				</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">
+							<input id="startDate" name="startDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+								   value="<fmt:formatDate value="${workProjectNotify.startDate}" pattern="yyyy-MM-dd"/>"/>
+							</input>
+							<span class="group-sep">-</span>
+							<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+								   value="<fmt:formatDate value="${workProjectNotify.endDate}" pattern="yyyy-MM-dd"/>"/>
+							</input>
+						</div>
+					</div>
+				</div>
+			</form:form>
+			</div>
+		</div>
+		<div class="full-width fl">
+			<div class="contentShadow layui-form contentDetails">
+				<div class="nav-btns">
+					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div style="clear: both;"></div>
+				</div>
+				<table class="oa-table layui-table" id="contentTable"></table>
+
+				<!-- 分页代码 -->
+				<table:page page="${page}"></table:page>
+				<div style="clear: both;"></div>
+			</div>
+		</div>
+	</div>
+	<div id="changewidth"></div>
+</div>
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script>
+    layui.use('table', function(){
+        layui.table.render({
+            limit:${ page.pageSize }
+            ,elem: '#contentTable'
+            ,page: false
+            ,cols: [[
+                // {checkbox: true, fixed: true},
+                {field:'index',align:'center',  width:40,title: '序号'}
+                ,{align:'center', title: '类型', width:100,templet:function(d){
+                        return "<span title='"+ d.type1 +"'>" + d.type1 + "</span>";
+                    }}
+                ,{align:'center', title: '环节', width:120,templet:function(d){
+                        return "<span title='"+ d.step +"'>" + d.step + "</span>";
+                    }}
+                ,{align:'center', title: '标题', minWidth:150,templet:function(d){
+
+                    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>";
+						}
+                    }
+                    else if(d.type == "18"){
+                        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.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>";
+					}
+                    else if(d.type == "57" && d.step == '申请人归档'){
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+                            "</a>";
+                    }
+                    else if(d.type == "60" && d.remarks == '待审批'){
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+                            "</a>";
+                    }
+                    else if(d.type == "61" && d.step == '行政主管'){
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+                            "</a>";
+                    }
+                    else if(d.type == "40" && d.step == '主管会计审核'){
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${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>"
+					}
+                    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>";
+                    }
+                    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>";
+                    }
+                    else if(d.type == "66" && d.step == '转正人补充信息'){
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+                            "</a>";
+                    }
+                    else if(d.type == "40" && d.step == '主管会计审核'){
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+                            "</a>";
+                    }
+                    else if(d.type == "76" && d.step == '案例审核人审批'){
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreExample('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+                            "</a>";
+                    }
+                    else if(d.type == "83"){
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreAttendanceAudit('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${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>";
+                    }
+                    else if(d.remarks == "待审批" && d.status != "1" && d.type == "76" && d.step == '案例审核人审批') {
+                        return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogreExample('待审批', '${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){
+                        return "<span title='"+ d.content +"'>" + d.content + "</span>";
+                    }}
+                ,{align:'center',title: '提交人', width:80,templet:function(d){
+                        return "<span title='"+ d.submit +"'>" + d.submit + "</span>";
+                    }}
+                ,{field:'op',align:'center', title: '创建时间', width:140,templet:function(d){
+                        return "<span title='"+ d.date +"'>" + d.ymddate + "</span>";
+                    }}
+            ]]
+            ,data: [
+                <c:if test="${ not empty page.list}">
+                <c:forEach items="${page.list}" var="workProjectNotify" varStatus="index">
+                <c:if test="${index.index != 0}">,</c:if>
+                {
+                    "index":"${index.index+1}"
+                    ,"id":"${workProjectNotify.id}"
+                    ,"type":"${workProjectNotify.type}"
+                    ,"type1":"${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}"
+                    ,"step":"${workProjectNotify.notifyRole}"
+                    ,"title":"${workProjectNotify.title}"
+                    ,"content":"${workProjectNotify.content}"
+                    ,"submit":"${fns:getUserById(workProjectNotify.createBy.id).name}"
+					,"status":"${workProjectNotify.status}"
+                    ,"status1":"${fns:getDictLabel(workProjectNotify.status, 'project_notify_class', '')}"
+                    ,"date":"<fmt:formatDate value="${workProjectNotify.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
+					,"remarks":"${workProjectNotify.remarks}"
+					,"ymddate":"<fmt:formatDate value="${workProjectNotify.createDate}" pattern="yyyy-MM-dd"/>"
+                }
+                </c:forEach>
+                </c:if>
+            ]
+            // ,even: true
+            // ,height: 315
+        });
+
+    })
+
+    resizeListTable(140);
+    $("a").on("click",addLinkVisied);
+</script>
+<script>
+    resizeListWindow1();
+    $(window).resize(function(){
+        resizeListWindow1();
+    });
+</script>
+</body>
+</html>

+ 47 - 2
src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyList.jsp

@@ -6,6 +6,28 @@
 	<meta name="decorator" content="default"/>
 	<script type="text/javascript">
 		$(document).ready(function() {
+
+			//搜索框收放
+			$('#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");
+				}
+			});
+			laydate.render({
+				elem: '#startDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎,因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event,则按照默认的click
+				type : 'date'
+			});
+			laydate.render({
+				elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎,因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event,则按照默认的click
+				type : 'date'
+			});
 		});
         function openDialogre(title,url,width,height,target){
             if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端,就使用自适应大小弹窗
@@ -352,6 +374,13 @@
 	<sys:message content="${message}"/>
 	<div class="layui-row">
 		<div class="full-width fl">
+			<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
+				<ul class="list-tabs" >
+					<li class="active"><a href="${ctx}/workprojectnotify/workProjectNotify/list">待办</a></li>
+					<li><a href="${ctx}/workprojectnotify/workProjectNotify/backlogListReadShow">已办</a></li>
+					<li><a href="${ctx}/workprojectnotify/workProjectNotify/backlogListByMine">我发起的</a></li>
+				</ul>
+			</div>
 			<div class="contentShadow layui-row" id="queryDiv">
 
 			<form:form id="searchForm" modelAttribute="workProjectNotify" action="${ctx}/workprojectnotify/workProjectNotify/list" method="post" class="form-inline">
@@ -377,12 +406,27 @@
 					</div>
 					<div class="layui-item athird">
 						<div class="input-group">
-							<button style="margin-right: 0px;" id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
+							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
 							<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
 						</div>
 					</div>
 					<div style="    clear:both;"></div>
 				</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">
+							<input id="startDate" name="startDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+								   value="<fmt:formatDate value="${workProjectNotify.startDate}" pattern="yyyy-MM-dd"/>"/>
+							</input>
+							<span class="group-sep">-</span>
+							<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+								   value="<fmt:formatDate value="${workProjectNotify.endDate}" pattern="yyyy-MM-dd"/>"/>
+							</input>
+						</div>
+					</div>
+				</div>
 			</form:form>
 			</div>
 		</div>
@@ -604,7 +648,7 @@
                     }}
                 ,{field:'status1', align:'center',title: '审批状态',width:100}
                 ,{field:'op',align:'center', title: '创建时间', width:140,templet:function(d){
-                        return "<span title='"+ d.date +"'>" + d.date + "</span>";
+                        return "<span title='"+ d.date +"'>" + d.ymddate + "</span>";
                     }}
             ]]
             ,data: [
@@ -623,6 +667,7 @@
 					,"status":"${workProjectNotify.status}"
                     ,"status1":"${fns:getDictLabel(workProjectNotify.status, 'project_notify_class', '')}"
                     ,"date":"<fmt:formatDate value="${workProjectNotify.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
+                    ,"ymddate":"<fmt:formatDate value="${workProjectNotify.createDate}" pattern="yyyy-MM-dd"/>"
 					,"remarks":"${workProjectNotify.remarks}"
                 }
                 </c:forEach>

+ 690 - 0
src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyReadBacklogList.jsp

@@ -0,0 +1,690 @@
+<%@ 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">
+		$(document).ready(function() {
+			//搜索框收放
+			$('#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");
+				}
+			});
+			laydate.render({
+				elem: '#startDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎,因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event,则按照默认的click
+				type : 'date'
+			});
+			laydate.render({
+				elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎,因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event,则按照默认的click
+				type : 'date'
+			});
+		});
+        function openDialogre(title,url,width,height,target){
+            if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端,就使用自适应大小弹窗
+                width='auto';
+                height='auto';
+            }else{//如果是PC端,根据用户设置的width和height显示。
+
+            }
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+				skin:"three-btns",
+                maxmin: true, //开启最大化最小化按钮
+                content: url ,
+                btn: ['通过','驳回','关闭'],
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(1) ){
+                        top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                },
+                btn2:function(index,layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(2) ){
+                        top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                    return false;
+                },
+                btn3: function(index){
+            }
+            });
+
+        }
+        function openDialogreExample(title,url,width,height,target){
+            if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端,就使用自适应大小弹窗
+                width='auto';
+                height='auto';
+            }else{//如果是PC端,根据用户设置的width和height显示。
+
+            }
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                skin:"three-btns",
+                maxmin: true, //开启最大化最小化按钮
+                content: url ,
+                btn: ['通过','驳回','关闭'],
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmita(1) ){
+                        //top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                },
+                btn2:function(index,layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmita(2) ){
+                        //top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                    return false;
+                },
+                btn3: function(index){
+                }
+            });
+
+        }
+        function openDialogres(title,url,width,height,target) {
+            parent.index = "";
+            if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端,就使用自适应大小弹窗
+                width = 'auto';
+                height = 'auto';
+            } else {//如果是PC端,根据用户设置的width和height显示。
+
+            }
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                maxmin: true, //开启最大化最小化按钮
+                content: url,
+                shin:"two-btns",
+                btn: ['重新申请', '关闭'],
+                btn1: function (index, layero) {
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if (target) {
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    } else {
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target", top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if (iframeWin.contentWindow.doSubmit(3)) {
+                        top.layer.close(index);//关闭对话框。
+                        setTimeout(function () {
+                            top.layer.close(index)
+                        }, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                },
+                btn2: function(index){
+                }
+            });
+        }
+        /*案例审核人审批*/
+        function openDialogPass(title,url,width,height,target){
+            if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端,就使用自适应大小弹窗
+                width='auto';
+                height='auto';
+            }else{//如果是PC端,根据用户设置的width和height显示。
+
+            }
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                maxmin: true, //开启最大化最小化按钮
+                content: url ,
+                skin:"three-btns",
+                btn: ['通过','关闭'],
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(1) ){
+                        // top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                },
+                btn3: function(index){
+                }
+            });
+
+        }
+        function openDialogPass2(title,url,width,height,target){
+            if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端,就使用自适应大小弹窗
+                width='auto';
+                height='auto';
+            }else{//如果是PC端,根据用户设置的width和height显示。
+
+            }
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                maxmin: true, //开启最大化最小化按钮
+                content: url ,
+                skin:"three-btns",
+                btn: ['提交','关闭'],
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(1) ){
+                        // top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                },
+                btn3: function(index){
+                }
+            });
+
+        }
+        function openDialogreAttendance(title,url,width,height,target){
+            if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端,就使用自适应大小弹窗
+                width='auto';
+                height='auto';
+            }else{//如果是PC端,根据用户设置的width和height显示。
+
+            }
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                skin:"three-btns",
+                maxmin: true, //开启最大化最小化按钮
+                content: url ,
+                btn: ['确认','重算','关闭'],
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(1) ){
+                        //top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                },
+                btn2:function(index,layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    parent.layer.confirm('确定要进行重算吗?',{icon: 3, title:'系统提示'}, function(index){
+                        if(iframeWin.contentWindow.doSubmit(2) ){
+                            //top.layer.close(index);//关闭对话框。
+                            //setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                        }
+                        parent.layer.close(index);
+                    }, function(index){
+                        parent.layer.close(index)
+                    });
+
+                    return false;
+                },
+                btn3: function(index){
+                }
+            });
+
+        }
+
+        function openDialogreAttendanceAudit(title,url,width,height,target){
+            if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端,就使用自适应大小弹窗
+                width='auto';
+                height='auto';
+            }else{//如果是PC端,根据用户设置的width和height显示。
+
+            }
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                skin:"three-btns",
+                maxmin: true, //开启最大化最小化按钮
+                content: url ,
+                btn: ['同意','驳回','关闭'],
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(1) ){
+                        //top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                },
+                btn2: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(2) ){
+                        //top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                },
+                btn3: function(index){
+                }
+            });
+
+        }
+	</script>
+	<style>
+		body{
+			background-color:transparent;
+			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
+			color:#ffffff;
+			background-color:rgba(255,255,255,0);
+			height:100%;
+		}
+	</style>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<sys:message content="${message}"/>
+	<div class="layui-row">
+		<div class="full-width fl">
+			<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
+				<ul class="list-tabs" >
+					<li><a href="${ctx}/workprojectnotify/workProjectNotify/list">待办</a></li>
+					<li class="active"><a href="${ctx}/workprojectnotify/workProjectNotify/backlogListReadShow">已办</a></li>
+					<li><a href="${ctx}/workprojectnotify/workProjectNotify/backlogListByMine">我发起的</a></li>
+				</ul>
+			</div>
+			<div class="contentShadow layui-row" id="queryDiv">
+
+			<form:form id="searchForm" modelAttribute="workProjectNotify" action="${ctx}/workprojectnotify/workProjectNotify/backlogListReadShow" method="post" class="form-inline">
+				<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+				<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+				<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
+
+				<div class="commonQuery">
+					<div class="layui-item query athird">
+						<label class="layui-form-label">内容:</label>
+						<div class="layui-input-block">
+							<form:input path="content" 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">
+							<form:select id="type" path="type" class="form-control simple-select">
+								<form:option value="" label=""/>
+								<form:options items="${fns:getDictList('new_project_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+							</form:select>
+						</div>
+					</div>
+					<div class="layui-item athird">
+						<div class="input-group">
+							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
+							<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+						</div>
+					</div>
+					<div style="    clear:both;"></div>
+				</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">
+							<input id="startDate" name="startDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+								   value="<fmt:formatDate value="${workProjectNotify.startDate}" pattern="yyyy-MM-dd"/>"/>
+							</input>
+							<span class="group-sep">-</span>
+							<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+								   value="<fmt:formatDate value="${workProjectNotify.endDate}" pattern="yyyy-MM-dd"/>"/>
+							</input>
+						</div>
+					</div>
+				</div>
+			</form:form>
+			</div>
+		</div>
+		<div class="full-width fl">
+			<div class="contentShadow layui-form contentDetails">
+				<div class="nav-btns">
+					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div style="clear: both;"></div>
+				</div>
+				<table class="oa-table layui-table" id="contentTable"></table>
+
+				<!-- 分页代码 -->
+				<table:page page="${page}"></table:page>
+				<div style="clear: both;"></div>
+			</div>
+		</div>
+	</div>
+	<div id="changewidth"></div>
+</div>
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script>
+    layui.use('table', function(){
+        layui.table.render({
+            limit:${ page.pageSize }
+            ,elem: '#contentTable'
+            ,page: false
+            ,cols: [[
+                // {checkbox: true, fixed: true},
+                {field:'index',align:'center',  width:40,title: '序号'}
+                ,{align:'center', title: '类型', width:100,templet:function(d){
+                        return "<span title='"+ d.type1 +"'>" + d.type1 + "</span>";
+                    }}
+                ,{align:'center', title: '环节', width:120,templet:function(d){
+                        return "<span title='"+ d.step +"'>" + d.step + "</span>";
+                    }}
+                ,{align:'center', title: '标题', minWidth:150,templet:function(d){
+
+                    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>";
+						}
+                    }
+                    else if(d.type == "18"){
+                        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.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>";
+					}
+                    else if(d.type == "57" && d.step == '申请人归档'){
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+                            "</a>";
+                    }
+                    else if(d.type == "60" && d.remarks == '待审批'){
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+                            "</a>";
+                    }
+                    else if(d.type == "61" && d.step == '行政主管'){
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+                            "</a>";
+                    }
+                    else if(d.type == "40" && d.step == '主管会计审核'){
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${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>"
+					}
+                    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>";
+                    }
+                    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>";
+                    }
+                    else if(d.type == "66" && d.step == '转正人补充信息'){
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+                            "</a>";
+                    }
+                    else if(d.type == "40" && d.step == '主管会计审核'){
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+                            "</a>";
+                    }
+                    else if(d.type == "76" && d.step == '案例审核人审批'){
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreExample('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+                            "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+                            "</a>";
+                    }
+                    else if(d.type == "83"){
+                        return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreAttendanceAudit('待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','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('待审批', '${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>";
+                    }
+                    else if(d.remarks == "待审批" && d.status != "1" && d.type == "76" && d.step == '案例审核人审批') {
+                        return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogreExample('待审批', '${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){
+                        return "<span title='"+ d.content +"'>" + d.content + "</span>";
+                    }}
+                ,{align:'center',title: '提交人', width:80,templet:function(d){
+                        return "<span title='"+ d.submit +"'>" + d.submit + "</span>";
+                    }}
+                ,{field:'op',align:'center', title: '创建时间', width:140,templet:function(d){
+                        return "<span title='"+ d.date +"'>" + d.ymddate + "</span>";
+                    }}
+            ]]
+            ,data: [
+                <c:if test="${ not empty page.list}">
+                <c:forEach items="${page.list}" var="workProjectNotify" varStatus="index">
+                <c:if test="${index.index != 0}">,</c:if>
+                {
+                    "index":"${index.index+1}"
+                    ,"id":"${workProjectNotify.id}"
+                    ,"type":"${workProjectNotify.type}"
+                    ,"type1":"${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}"
+                    ,"step":"${workProjectNotify.notifyRole}"
+                    ,"title":"${workProjectNotify.title}"
+                    ,"content":"${workProjectNotify.content}"
+                    ,"submit":"${fns:getUserById(workProjectNotify.createBy.id).name}"
+					,"status":"${workProjectNotify.status}"
+                    ,"status1":"${fns:getDictLabel(workProjectNotify.status, 'project_notify_class', '')}"
+                    ,"date":"<fmt:formatDate value="${workProjectNotify.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
+					,"remarks":"${workProjectNotify.remarks}"
+					,"ymddate":"<fmt:formatDate value="${workProjectNotify.createDate}" pattern="yyyy-MM-dd"/>"
+                }
+                </c:forEach>
+                </c:if>
+            ]
+            // ,even: true
+            // ,height: 315
+        });
+
+    })
+
+    resizeListTable(140);
+    $("a").on("click",addLinkVisied);
+</script>
+<script>
+    resizeListWindow1();
+    $(window).resize(function(){
+        resizeListWindow1();
+    });
+</script>
+</body>
+</html>