批量归档调整

src/main/java/com/jeeplus/modules/centerservice/utils/RestTemplateService.java

@@ -60,7 +60,7 @@ public class RestTemplateService {
             }
             String url = getUrl(hostAddress, path, paramMap);
             HttpHeaders httpHeaders = new HttpHeaders();
-            httpHeaders.add("token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2ODMyNTM4NTYsInVzZXJuYW1lIjoi5r2Y5LitIn0.fWlfAzHkyscE-_09kLWvJJLVKHPT1PW64r6wFkVXqcM");
+            httpHeaders.add("token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3Mjk3NTMzMzIsInVzZXJuYW1lIjoiYWRtaW4ifQ.lArBO53lU3GlRwpG6q4g4fsXEZLEFWkgJUqB-pNbZ8k");
             httpHeaders.add("Accept", MediaType.ALL_VALUE);
             //        httpHeaders.add("cookie", "jeeplus.session.id=0635611b0f5a4401836262c7d23ae98e");
             httpHeaders.setContentType(new MediaType("application", "json", Charset.forName("UTF-8")));

src/main/java/com/jeeplus/modules/projectFilingBatch/dao/ProjectFilingbatchRelationDao.java

@@ -29,4 +29,6 @@ public interface ProjectFilingbatchRelationDao extends CrudDao<ProjectFilingbatc
      * @param filingBatchId
      */
     void updateDelFlagByFilingBatch(String  filingBatchId);
+
+    Integer deleteByFilingBatchId(String filingBatchId);
 }

src/main/java/com/jeeplus/modules/projectFilingBatch/service/ProjectFilingBatchService.java

@@ -548,8 +548,8 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             identityService.setAuthenticatedUserId(projectFilingBatch.getCurrentUser().getId());
             Office office = projectFilingBatch.getOffice();
             office = officeService.get(office.getId());
-            String contentStr = "。归档项目批次【"+ projectFilingBatch.getFilingBatch()+"】待审批，归档批次编号："+projectFilingBatch.getId() + "。报告号"+projectFilingBatch.getReportNumber();
-            String titleStr = "归档项目批次【"+ projectFilingBatch.getFilingBatch()+"】待审批" + "报告号"+projectFilingBatch.getReportNumber();
+            String contentStr = "归档项目批次【"+ projectFilingBatch.getFilingBatch()+"】待审批，归档批次编号："+projectFilingBatch.getFilingBatch() + "。报告号"+projectFilingBatch.getReportNumber();
+            String titleStr = "归档项目批次【"+ projectFilingBatch.getFilingBatch()+"】待审批，" + "报告号"+projectFilingBatch.getReportNumber();
             String businessKey = projectFilingBatch.getId();
             Activity activity = new Activity();
             WorkActivityMenu workActivityMenu = workActivityMenuService.findByParentAndOffice("7854872f45b84acd893010e66a3db2c8", office);
@@ -743,7 +743,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
      * @throws Exception
      */
     @Transactional(readOnly = false)
-    public String auditSave(ProjectFilingBatch projectFilingBatch, List<User> auditUsers,String[] proInfos, String[] flags) throws Exception {
+    public String auditSave(ProjectFilingBatch projectFilingBatch, List<User> auditUsers,String[] projectId,String[] proInfos, String[] flags) throws Exception {
         this.queryInfo(projectFilingBatch);
         Integer filingStatus = projectFilingBatch.getFilingStatus();
         String taskDefKey = projectFilingBatch.getAct().getTaskDefKey();
@@ -766,6 +766,23 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             comment = ("yes".equals(projectFilingBatch.getAct().getFlag())?"[同意] ":"[驳回] ");
         }
 
+        //获取前端选择的项目信息
+        //保存要归档的项目
+        if(null!=projectId){
+            //删除现有关联的项目信息
+            projectFilingbatchRelationDao.deleteByFilingBatchId(projectFilingBatch.getId());
+            for (int i=0;i<projectId.length;i++){
+                String id=projectId[i].split("/")[0];
+                ProjectFilingbatchRelation filingbatchRelation=new ProjectFilingbatchRelation();
+                filingbatchRelation.setFilingBatch(projectFilingBatch.getId());
+                filingbatchRelation.setProjectId(id);
+                filingbatchRelation.setSort(i);
+                filingbatchRelation.setStatus(2);
+                filingbatchRelation.preInsert();
+                projectFilingbatchRelationDao.insert(filingbatchRelation);
+            }
+        }
+
         /**
          * 流程驳回修改所有项目归档状态
          */
@@ -960,7 +977,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             }
             //审核完成提示框
             String title = "归档批次号【"+projectFilingBatch.getFilingBatch()+"】"+ "。报告号"+projectFilingBatch.getReportNumber()+"。归档成功";
-            String content = "归档批次号【"+projectFilingBatch.getFilingBatch()+"】" + "。报告号"+projectFilingBatch.getReportNumber()+"。归档成功，归档批次编号："+projectFilingBatch.getId();
+            String content = "归档批次号【"+projectFilingBatch.getFilingBatch()+"】" + "。报告号"+projectFilingBatch.getReportNumber()+"。归档成功，归档批次编号："+projectFilingBatch.getFilingBatch();
             if ("yes".equals(projectFilingBatch.getAct().getFlag())) {
                 projectFilingBatch.setFilingStatus(ProjectStatusEnum.SIGNED.getValue());
                 WorkProjectNotify notify = new WorkProjectNotify();
@@ -1148,12 +1165,65 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
 
     /**
      * 项目归档表逻辑删除
-     * @param filingBatch
+     * @param projectFilingBatch
      */
     @Transactional(readOnly = false)
-    public void delete(ProjectFilingBatch filingBatch){
-        super.delete(filingBatch);
-        projectFilingbatchRelationDao.updateDelFlagByFilingBatch(filingBatch.getId());
+    public void delete(ProjectFilingBatch projectFilingBatch){
+        //判定流程状态，若流程状态未完成且发起或驳回状态，则需要将当前流程进行结束处理
+        if(projectFilingBatch.getFilingStatus() != 5 && StringUtils.isNotBlank(projectFilingBatch.getProcessinstanceId())){
+            //判定流程是否存在或是否结束
+
+            WorkActivityProcess process = new WorkActivityProcess();
+            process.setProcessInstanceId(projectFilingBatch.getProcessinstanceId());
+            process.setIsApproval("0");
+            //List<WorkActivityProcess> processList1 = workActivityProcessService.findByProcInsId(process);
+            WorkActivityProcess workActivityProcess = new WorkActivityProcess();
+            workActivityProcess.setProcessInstanceId(projectFilingBatch.getProcessinstanceId());
+            List<WorkActivityProcess> processList = workActivityProcessService.findList(workActivityProcess);
+            WorkProjectNotify notify = new WorkProjectNotify();
+            notify.setNotifyId(projectFilingBatch.getId());
+            List<User> userList = workProjectNotifyService.readByNotifyId(notify);
+            if (userList!=null && userList.size()!=0) {
+                for (User u : userList) {
+                    User user = UserUtils.get(u.getId());
+                    UserUtils.pushIm(u.getId(),"申请人 "+user.getName() +",项目归档批次审批:"+projectFilingBatch.getFilingBatch() +" 强制撤销!");
+                }
+            }
+            if(processList!=null && processList.size()>0) {
+                for (int i = 0; i < processList.size(); i++) {
+                    WorkActivityProcess p = processList.get(i);
+                    if (StringUtils.isNotBlank(p.getIsApproval()) && "0".equals(p.getIsApproval())) {
+                        p.setIsApproval("-1");
+                        p.setDelFlag("1");
+                        workActivityProcessDao.updateDelFlagAndIsApproval(p);
+                    }
+                }
+                WorkActivityProcess pro = new WorkActivityProcess();
+                pro.setId("");
+                pro.setDelFlag("0");
+                pro.preInsert();
+                pro.setRemarks("[强制撤销]");
+                pro.setProcessKey(processList.get(0).getProcessKey());
+                pro.setIsApproval("1");
+                pro.setProcessInstanceId(processList.get(0).getProcessInstanceId());
+                pro.setCount(0);
+                workActivityProcessDao.insert(pro);
+
+                //结束该流程,设为"撤销"状态月
+                ProjectFilingBatch filingBatch = new ProjectFilingBatch();
+                filingBatch.setId(projectFilingBatch.getId());
+                filingBatch.setFilingStatus(ProjectStatusEnum.RECALL.getValue());
+                filingBatch.preUpdate();
+                dao.updateProcessIdAndStatus(filingBatch);
+                try {
+                    actTaskService.endProcessInstance(projectFilingBatch.getProcessinstanceId(), "项目归档批次-撤回");
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        super.delete(projectFilingBatch);
+        projectFilingbatchRelationDao.updateDelFlagByFilingBatch(projectFilingBatch.getId());
     }
 
     /**

src/main/java/com/jeeplus/modules/projectFilingBatch/web/ProjectFilingBatchController.java

@@ -547,7 +547,7 @@ public class ProjectFilingBatchController extends BaseController {
                     return "redirect:"+Global.getAdminPath()+"/projectFilingBatch/projectFilingBatchInfo/?repage";
                 }
 
-                String str = projectFilingBatchService.auditSave(projectFilingBatch,users,proInfos,flags);
+                String str = projectFilingBatchService.auditSave(projectFilingBatch,users,proId,proInfos,flags);
                 addMessage(redirectAttributes, str);
                 //新增项目树形信息
                 if (proInfos!=null) {

src/main/java/com/jeeplus/modules/sys/service/UserService.java

@@ -702,7 +702,7 @@ public class UserService extends BaseController {
 
                 // 将毫秒数转换为天数
                 long diffInDays = TimeUnit.DAYS.convert(diffInMillies, TimeUnit.MILLISECONDS);
-                if(diffInDays > 30){
+                if(diffInDays > 90){
                     user.setFirstFlag("1");
                     userDao.updatePasswordById(user);
                     // 清除用户缓存

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

@@ -861,7 +861,7 @@ public class UserController extends BaseController {
 
                 NewPassword psd = new NewPassword().newpassword(newPassword);
                 systemService.updatePasswordById(user.getId(), user.getLoginName(), newPassword);
-                model.addAttribute("message", "修改密码成功");
+                model.addAttribute("message", "修改密码成功,请重新登录");
             }else{
                 model.addAttribute("message", "修改密码失败，旧密码错误");
             }

src/main/java/com/jeeplus/modules/szCenterservice/utils/SzRestTemplateService.java

@@ -207,7 +207,7 @@ public class SzRestTemplateService {
             }
             String url = getUrl(hostAddress, path, paramMap);
             HttpHeaders httpHeaders = new HttpHeaders();
-            httpHeaders.add("token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2ODMyNTM4NTYsInVzZXJuYW1lIjoi5r2Y5LitIn0.fWlfAzHkyscE-_09kLWvJJLVKHPT1PW64r6wFkVXqcM");
+            httpHeaders.add("token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3Mjk3NTMzMzIsInVzZXJuYW1lIjoiYWRtaW4ifQ.lArBO53lU3GlRwpG6q4g4fsXEZLEFWkgJUqB-pNbZ8k");
             httpHeaders.add("Accept", MediaType.ALL_VALUE);
             //        httpHeaders.add("cookie", "jeeplus.session.id=0635611b0f5a4401836262c7d23ae98e");
             httpHeaders.setContentType(new MediaType("application", "json", Charset.forName("UTF-8")));

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceService.java

@@ -1008,7 +1008,7 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 		String str = "";
 		//所属部门
 
-		String userName = UserUtils.get(workInvoice.getCreateBy().getId()).getName();
+		//String userName = UserUtils.get(workInvoice.getCreateBy().getId()).getName();
 		//项目名称获取
 		List<String> projectNameList = getProjectNameList(workInvoice);
 		String projectNameStr = String.join(",", projectNameList);

src/main/resources/mappings/modules/projectGuidang/ProjectFilingbatchRelationDao.xml

@@ -24,6 +24,9 @@
 	<delete id="deleteByprojectId">
 		DELETE FROM project_flingbatch_relation WHERE filing_batch=#{filingBatch} and project_id=#{projectId}
 	</delete>
+	<delete id="deleteByFilingBatchId">
+		DELETE FROM project_flingbatch_relation WHERE filing_batch=#{filingBatchId}
+	</delete>
 	<update id="update">
 		update project_flingbatch_relation
 		<set>

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchApply.jsp

@@ -168,16 +168,16 @@
 							}
 							if(flag) {
 								$("#projectList").append("<tr class='rowSize' onclick='listTr(this)'>" +
-										"<td ><input type=\"hidden\" name=\"proId\" id='" + tid + "' value=" + obj.id + "><input type=\"hidden\" name=\"projectid\" value=" + obj.id + "/><span class='default_open ' style=\"padding-right: 15px; \"></span>" + obj.projectId + "</td>" +
-										"<td >" + obj.projectName + "</td>" +
-										"<td >" + obj.projectReportNumber + "</td>" +
+										"<td><span class='default_open ' style=\"padding-right: 15px; \"></span><input type=\"hidden\" name=\"proId\" id='" + tid + "' value=" + obj.id + "><input type=\"hidden\" name=\"projectid\" value=" + obj.id + ">" + obj.projectId + "</td>" +
+										"<td>" + obj.projectName + "</td>" +
+										"<td>" + obj.projectReportNumber + "</td>" +
 										"<td class=\"text-center op-td\" >" +
 										"<span class=\"op-btn op-btn-add\" onclick=\"addRowInfoForm("+tid+","+id+")\" title=\"添加\"><i class=\"fa fa-plus\"></i>&nbsp;添加</span>" +
-										"<span class=\"op-btn op-btn-delete\" onclick=\"delListRow(this," + id + ")\" title=\"删除\"><i class=\"glyphicon glyphicon-remove\"></i>&nbsp;删除</span>" +
+										"<span class=\"op-btn op-btn-delete\" onclick=\"delListRow(this," + id + ",'" + obj.projectReportNumber + "')\" title=\"删除\"><i class=\"glyphicon glyphicon-remove\"></i>&nbsp;删除</span>" +
 										"</td>" +
 										"</tr>")
 								$("#projectList").append("<tr class='"+obj.id+"' style='display: none;'> <td colspan='4' style='padding: 0px;'>" +
-										"<table style=\"width: 100%;padding: 0px;margin: 0px;\" class=\"table table-bordered table-condensed can-edit\">" +
+										"<table style=\"width: 100%;padding: 0px;margin: 0px;\" class=\"table table-bordered table-condensed details\">" +
 										"<tbody id='" + id + "'>" +
 										"<input type='text' id='" + id + "_len' style='display: none;' name='flags' />"+
 										"</tbody>" +
@@ -199,17 +199,17 @@
 										$(iid).parent().parent().parent().show();
 										$.each(result.data,function(index,value){
 											$(iid).append(
-													"<tr class='listInfo'>"+
+													"<tr class='listInfo' style='position: relative'>"+
 													// "<td class=\"hide\">"+
 													// "<input type='file' multiple='multiple' style='display: none;' onChange='if(this.value)insertAccording(this.value,"+obj.id+",this);'/>"+
 													// "<input type='hidden' style='display: none;' id='attId' value='"+value.id+"'/>"+
 													// "<input type='hidden' style='display: none;' id='fileUrl' value='"+value.url+"'/>"+
 													// "</td>"+
 													"<td style=\"text-align: center;position: relative;\" width=\"20%\">" +
-													"<input name='proInfoType' style='text-align: center' readonly='true' class=\"form-control\" value='"+value.proInfoType+"'/></td>"+
+													"<input name='proInfoType' onChange='upwType(this)' style='text-align: center' readonly='true' class=\"form-control required\" value='"+value.proInfoType+"'/></td>"+
 													"<td style=\"text-align: center\" width=\"20%\"><input  readonly='true' name='proInfoName' style='text-align: center' class=\"form-control\" value='"+value.proInfoName+"'/></td>"+
 													"<td style=\"text-align: center\" width=\"20%\"></td>"+
-													"<td width=\"20%\" style='padding-top : 8px;'>" +
+													"<td width=\"20%\">" +
 													"<span href=javascript:void(0); onclick=\"addRowInfoForm("+tid+","+id+")\"   class=\"op-btn op-btn-edit\" title=\"上传附件\"><i class=\"glyphicon glyphicon-edit\"></i>&nbsp;编辑</span>" +
 													"<span class=\"op-btn op-btn-delete\" onclick=\"delListInfoRow(this)\" title=\"删除\"><i class=\"glyphicon glyphicon-remove\"></i>&nbsp;删除</span>" +
 													"<input type='text' class='" + id + "_json' style='display: none;' name='proInfos' />"+

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchAudit.jsp

@@ -307,7 +307,7 @@
 			</div>--%>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>项目基础信息</h2></div>
+				<div class="form-group-label"><h2>项目基础信息<span style="color: red">  （注：点击确认即采用下表中的同意驳回处理结果，点击驳回全部即将该流程进行驳回处理）</span></h2></div>
 					<table id="contentTable" class="table table-bordered table-condensed can-edit tree_table">
 						<thead>
 						<tr>

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

@@ -186,6 +186,60 @@
             });
 
         }
+
+        function openFilingBatchDialogre(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 openDialogres(title,url,width,height,target) {
             parent.index = "";
             if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
@@ -1070,7 +1124,10 @@
         <c:when test="${workProjectNotify.type == 84 }">
         xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogreAttendance('${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
         </c:when>
-        <c:when test="${workProjectNotify.remarks eq '待审批' && workProjectNotify.status != 1 }">
+        <c:when test="${workProjectNotify.remarks eq '待审批' && workProjectNotify.status != 1 && workProjectNotify.type == 100 }">
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openFilingBatchDialogre('${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
+        </c:when>
+        <c:when test="${workProjectNotify.remarks eq '待审批' && workProjectNotify.status != 1 && workProjectNotify.type != 100 }">
         xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogre('${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%')\">";
         </c:when>
 

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

@@ -93,6 +93,59 @@
             });
 
         }
+        function openFilingBatchDialogre(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';
@@ -1123,9 +1176,15 @@
 									"<span title=\""+ d.title +"\">"+"【通过】"+  d.title +"</span>" +
 									"</a>";
 						}else {
-							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
-									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
-									"</a>";
+							if (d.type === "100"){
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openFilingBatchDialogre('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+							}else{
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+										"</a>";
+							}
 						}
 
                     }