案例项目部分功能提交

src/main/java/com/jeeplus/modules/projectmaterialstorage/entity/ProjectMaterialStorage.java

@@ -54,6 +54,7 @@ public class ProjectMaterialStorage extends DataEntity<ProjectMaterialStorage> {
     private String endTaxRate; //结束税率
     private Date beginQuotedPriceDate; //开始报价时间
     private Date endQuotedPriceDate; //结束报价时间
+    private String storageFlag;	//材料库判定参数
 
     //材料信息数据表集合
     private List<ProjectMaterialStorageImport> projectMaterialStorageList = Lists.newArrayList();
@@ -313,4 +314,12 @@ public class ProjectMaterialStorage extends DataEntity<ProjectMaterialStorage> {
     public void setEndQuotedPriceDate(Date endQuotedPriceDate) {
         this.endQuotedPriceDate = endQuotedPriceDate;
     }
+
+    public String getStorageFlag() {
+        return storageFlag;
+    }
+
+    public void setStorageFlag(String storageFlag) {
+        this.storageFlag = storageFlag;
+    }
 }

src/main/java/com/jeeplus/modules/projectmaterialstorage/web/ProjectMaterialStorageController.java

@@ -87,6 +87,9 @@ public class ProjectMaterialStorageController extends BaseController {
         if(projectMaterialStorageList2.size()<=0){
             addMessage(redirectAttributes, "项目名称、材料名称、价格等获取失败，请重试");
 //            pageId 1代表这是从工程咨询进来的 2是从造价审核进来的
+            if(StringUtils.isNotBlank(projectMaterialStorage.getStorageFlag() ) && "caseBase".equals(projectMaterialStorage.getStorageFlag())){
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/RuralProjectRecordsCaseBase/?repage";
+            }
             if("1".equals(pageId)){
                 return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessageAll/?repage";
             }
@@ -108,6 +111,10 @@ public class ProjectMaterialStorageController extends BaseController {
             //       判断项目名称、材料名称、价格是否为空
             if(projectMaterialStorageList.get(k).getProjectNumber()==null || projectMaterialStorageList.get(k).getMaterialName() ==null || projectMaterialStorageList.get(k).getSpecifications() == null || projectMaterialStorageList.get(k).getUnit()== null){
                 addMessage(redirectAttributes, "第"+i+"个项目名称、材料名称、规格型号、单位等获取失败，请重试");
+
+                if(StringUtils.isNotBlank(projectMaterialStorage.getStorageFlag() ) && "caseBase".equals(projectMaterialStorage.getStorageFlag())){
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/RuralProjectRecordsCaseBase/?repage";
+                }
                 if("1".equals(pageId)){
                     return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessageAll/?repage";
                 }
@@ -117,6 +124,10 @@ public class ProjectMaterialStorageController extends BaseController {
         Map map = projectMaterialStorageService.qureyCountAboutProjectMaterialStorage(projectMaterialStorageList);
         if((map.containsKey("failure"))){
             addMessage(redirectAttributes, map.get("failure").toString());
+
+            if(StringUtils.isNotBlank(projectMaterialStorage.getStorageFlag() ) && "caseBase".equals(projectMaterialStorage.getStorageFlag())){
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/RuralProjectRecordsCaseBase/?repage";
+            }
             if("1".equals(pageId)){
                 return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessageAll/?repage";
             }
@@ -128,6 +139,10 @@ public class ProjectMaterialStorageController extends BaseController {
 //           修改2代表已处理
         ruralProjectRecords.setprojectMaterialStorageStatus("2");
         projectMaterialStorageService.modifyProjectMaterialStorageStatus(ruralProjectRecords);
+
+        if(StringUtils.isNotBlank(projectMaterialStorage.getStorageFlag() ) && "caseBase".equals(projectMaterialStorage.getStorageFlag())){
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/RuralProjectRecordsCaseBase/?repage";
+        }
         if("1".equals(pageId)){
             return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessageAll/?repage";
         }
@@ -248,12 +263,14 @@ public class ProjectMaterialStorageController extends BaseController {
      */
     @RequestMapping(value = "form")
     public String form(RuralProjectRecords projectRecords, Model model,String pageId) {
+        String storageFlag = projectRecords.getStorageFlag();
         if (projectRecords != null && StringUtils.isNotBlank(projectRecords.getId())) {
             projectRecords = ruralProjectRecordsService.getQueryProjectUsers(projectRecords.getId());
 //            RuralProjectcontentinfo ruralProjectcontentinfo = projectRecordsService.formAccessory(projectRecords);
 //            projectRecordsService.disposeData(ruralProjectcontentinfo);
 //            model.addAttribute("projectcontentinfo", ruralProjectcontentinfo);
         }
+        projectRecords.setStorageFlag(storageFlag);
         model.addAttribute("pageId",pageId);
         model.addAttribute("projectRecords",projectRecords);
         return "modules/projectMaterialStorage/projectMaterialStorageForm";

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -424,6 +424,8 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String createNamePhone;
 	private String leaderNamePhone;
 	private String projectMasterPhone;
+	private String storageFlag;	//材料库判定参数
+	private String caseBaseStatus;	//案例文件审核状态
 
 
 	private ProjectReportDataVo projectReportDataVo;
@@ -2793,4 +2795,20 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setBelongingDepartmentName(String belongingDepartmentName) {
 		this.belongingDepartmentName = belongingDepartmentName;
 	}
+
+	public String getStorageFlag() {
+		return storageFlag;
+	}
+
+	public void setStorageFlag(String storageFlag) {
+		this.storageFlag = storageFlag;
+	}
+
+	public String getCaseBaseStatus() {
+		return caseBaseStatus;
+	}
+
+	public void setCaseBaseStatus(String caseBaseStatus) {
+		this.caseBaseStatus = caseBaseStatus;
+	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsCaseBaseService.java

@@ -84,52 +84,6 @@ public class RuralProjectRecordsCaseBaseService extends CrudService<RuralProject
         projectRecords.setPage(page);
         List<RuralProjectRecords> recordsList = findList(projectRecords);
 
-        //查询所有和当前登陆人有关的项目的审核
-        /*WorkProjectNotify workProjectNotify = new WorkProjectNotify();
-        workProjectNotify.setUser(UserUtils.getUser());
-        workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
-        workProjectNotify.setRemarks("待审批");
-        //添加发票对应编号
-        workProjectNotify.setType("92");
-        //查询所有需要当前登录人进行处理的项目信息
-        List<WorkProjectNotify> notifyList = workProjectNotifyService.findList(workProjectNotify);
-
-        //添加发票对应编号
-        workProjectNotify.setType("51");
-        //查询所有需要当前登录人进行处理的项目信息
-        List<WorkProjectNotify> recordNotifyList = workProjectNotifyService.findList(workProjectNotify);
-
-        //添加发票对应编号
-        workProjectNotify.setType("95");
-        //查询所有需要当前登录人进行处理的项目信息
-        List<WorkProjectNotify> reportedNotifyList = workProjectNotifyService.findList(workProjectNotify);
-
-        //查询新的新增报告流程信息代办
-        workProjectNotify.setType("96");
-        //查询所有需要当前登录人进行处理的项目信息
-        List<WorkProjectNotify> newReportNotifyList = workProjectNotifyService.findList(workProjectNotify);
-        //查询新的新增报告流程信息代办
-        workProjectNotify.setType("97");
-        //查询所有需要当前登录人进行处理的项目信息
-        List<WorkProjectNotify> newReportNotifyListTwo = workProjectNotifyService.findList(workProjectNotify);
-        //查询新的新增报告流程信息代办
-        workProjectNotify.setType("99");
-        //查询所有需要当前登录人进行处理的项目信息
-        List<WorkProjectNotify> materialDefectRecord = workProjectNotifyService.findList(workProjectNotify);
-        //查询新的归档流程信息代办
-        workProjectNotify.setType("101");
-        //查询所有需要当前登录人进行处理的项目信息
-        List<WorkProjectNotify> newRecordNotifyList = workProjectNotifyService.findList(workProjectNotify);
-        //添加上报对应编号
-        workProjectNotify.setType("98");
-        //查询所有需要当前登录人进行处理的项目信息
-        List<WorkProjectNotify> newReportedNotifyList = workProjectNotifyService.findList(workProjectNotify);
-        //查询新的归档流程信息代办
-        workProjectNotify.setType("103");
-        //查询所有需要当前登录人进行处理的项目信息
-        List<WorkProjectNotify> newRecordTwoNotifyList = workProjectNotifyService.findList(workProjectNotify);
-*/
-
 
         //查询负责人信息
         for (RuralProjectRecords records : recordsList) {
@@ -156,140 +110,11 @@ public class RuralProjectRecordsCaseBaseService extends CrudService<RuralProject
                     records.setFilingStatus(filingBatch.getFilingStatus());
                 }
             }
-            //判定 如果项目上报信息超期 并且没有上报则江状态改为超期未上报
-            /*if(records.getReportedType().equals("1") && !records.getReportedState().equals("5") && !records.getReportedState().equals("7") && null != records.getAuditPassDate()){
-                records.setReportedState("6");
-            }else
-                //判定 如果项目上报信息超期 并且已经上报则将状态改为超期上报
-            if(records.getReportedType().equals("1") && records.getReportedState().equals("5") && null != records.getAuditPassDate()){
-                records.setReportedState("7");
-            }*/
 
             if(0 != records.getProjectRecordStatus() && 0 == records.getProjectReportRecordStatus()){
                 records.setProjectReportRecordStatus(records.getProjectRecordStatus());
             }
 
-            //新增报告展示
-            /*for (WorkProjectNotify notify: notifyList) {
-                if(notify.getNotifyId().equals(records.getPrdId())){
-                    records.setReportNotifyId(notify.getId());
-                    if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
-                        records.setReportNotifyFlag(1);
-                    }
-                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
-                        records.setReportAuditNotifyFlag(1);
-                    }
-                    break;
-                }
-            }
-            //线上归档展示
-            for (WorkProjectNotify notify: recordNotifyList) {
-                if(notify.getNotifyId().equals(records.getPrrId())){
-                    records.setReportNotifyId(notify.getId());
-                    if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
-                        records.setRecordNotifyFlag(1);
-                    }
-                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
-                        records.setRecordAuditNotifyFlag(1);
-                    }
-                    break;
-                }
-            }
-            //上报展示
-            for (WorkProjectNotify notify: reportedNotifyList) {
-                if(notify.getNotifyId().equals(records.getId())){
-                    records.setReportNotifyId(notify.getId());
-                    if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
-                        records.setReportedNotifyFlag(1);
-                    }
-                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
-                        records.setReportedAuditNotifyFlag(1);
-                    }
-                    break;
-                }
-            }
-            //新代办修改权限处理
-            for (WorkProjectNotify notify: newReportNotifyList) {
-                if(notify.getNotifyId().equals(records.getPrdId())){
-                    records.setReportNotifyId(notify.getId());
-                    if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
-                        records.setNewReportNotifyFlag(1);
-                    }
-                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
-                        records.setNewReportAuditNotifyFlag(1);
-                    }
-                    break;
-                }
-            }
-            //新代办流程2修改权限处理
-            for (WorkProjectNotify notify: newReportNotifyListTwo) {
-                if(notify.getNotifyId().equals(records.getPrdtId())){
-                    records.setReportNotifyId(notify.getId());
-                    if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
-                        records.setNewReportNotifyFlag(1);
-                    }
-                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
-                        records.setNewReportAuditNotifyFlag(1);
-                    }
-                    break;
-                }
-            }
-            //报告归档资料缺失说明修改权限处理
-            for (WorkProjectNotify notify: materialDefectRecord) {
-                if(notify.getNotifyId().equals(records.getPrdtId())){
-                    records.setReportNotifyId(notify.getId());
-                    if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
-                        records.setNewReportNotifyFlag(1);
-                    }
-                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
-                        records.setNewReportAuditNotifyFlag(1);
-                    }
-                    break;
-                }
-            }
-            //新代办修改权限处理
-            for (WorkProjectNotify notify: newRecordNotifyList) {
-                if(notify.getNotifyId().equals(records.getPrrId())){
-                    records.setNewRecordNotifyId(notify.getId());
-                    if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
-                        records.setNewRecordNotifyFlag(1);
-                    }
-                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
-                        records.setNewRecordNotifyFlag(1);
-                    }
-                    break;
-                }
-            }
-
-            //新代办修改权限处理
-            for (WorkProjectNotify notify: newReportedNotifyList) {
-                if(notify.getNotifyId().equals(records.getId())){
-                    records.setNewRecordNotifyId(notify.getId());
-                    if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
-                        records.setNewReportedNotifyFlag(1);
-                    }
-                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
-                        records.setNewReportedNotifyFlag(1);
-                    }
-                    break;
-                }
-            }
-
-            //新代办修改权限处理
-            for (WorkProjectNotify notify: newRecordTwoNotifyList) {
-                if(notify.getNotifyId().equals(records.getPrrId())){
-                    records.setNewRecordNotifyId(notify.getId());
-                    if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
-                        records.setNewRecordTwoNotifyFlag(1);
-                    }
-                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
-                        records.setNewRecordTwoAuditNotifyFlag(1);
-                    }
-                    break;
-                }
-            }*/
-
-
         }
         page.setList(recordsList);
         return page;

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsCaseBaseController.java

@@ -210,6 +210,8 @@ public class RuralProjectRecordsCaseBaseController extends BaseController {
         }else {
             caseBaseService.insertCaseBase(records);
         }
+        //取消之后判定案例是否存在送审流程，若存在，则需要将流程一起撤回
+
         map.put("result",1);
         map.put("msg","选定案例项目取消成功");
         return map;

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsOwnCaseBaseController.java

@@ -315,16 +315,17 @@ public class RuralProjectRecordsOwnCaseBaseController extends BaseController {
      */
     @RequestMapping(value = "storeCaseBaseRecord")
     public String storeCaseBaseRecord(ProjectCaseBaseAudit projectCaseBaseAudit, Model model, RedirectAttributes redirectAttributes) throws Exception {
-        //根据项目id查询案例文件流程信息
-        projectCaseBaseAudit = service.getByProjectId(projectCaseBaseAudit.getProjectId());
-        addMessage(redirectAttributes, "案例项目文件暂存成功");
+        //获取项目信息
+        RuralProjectRecords ruralProjectRecords = projectRecordsService.get(projectCaseBaseAudit.getProjectId());
 
-        if (null != projectCaseBaseAudit) {//编辑表单保存
-            projectCaseBaseAudit.setIsNewRecord(false);
-            projectCaseBaseAudit.setStatus(1);
-            service.store(projectCaseBaseAudit);//保存
+        //根据项目id查询案例文件流程信息
+        ProjectCaseBaseAudit t = service.getByProjectId(projectCaseBaseAudit.getProjectId());
+        if (null != t) {
+            MyBeanUtils.copyBeanNotNull2Bean(projectCaseBaseAudit, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+            t.setStatus(1);
+            t.setIsNewRecord(false);
+            service.store(t);//保存
         } else {//新增表单保存
-            projectCaseBaseAudit = new ProjectCaseBaseAudit();
             projectCaseBaseAudit.setStatus(1);
             projectCaseBaseAudit.setCompany(UserUtils.getUser().getCompany());
             projectCaseBaseAudit.setOffice(UserUtils.getUser().getOffice());
@@ -333,6 +334,18 @@ public class RuralProjectRecordsOwnCaseBaseController extends BaseController {
             service.store(projectCaseBaseAudit);//保存
         }
         addMessage(redirectAttributes, "案例项目文件暂存成功");
+
+        if (StringUtils.isNotBlank(projectCaseBaseAudit.getHome()) && "home".equals(projectCaseBaseAudit.getHome())) {
+            //修改代办状态
+            workProjectNotifyService.updateCaseBaseNotifyStatus(ruralProjectRecords.getId(), "113");
+            return "redirect:" + Global.getAdminPath() + "/home/?repage";
+        } else if (StringUtils.isNotBlank(projectCaseBaseAudit.getHome()) && "notifyList".equals(projectCaseBaseAudit.getHome())) {
+            //修改代办状态
+            workProjectNotifyService.updateCaseBaseNotifyStatus(ruralProjectRecords.getId(), "113");
+            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
+        }
+        //跳转到个人案例项目页面
+        workProjectNotifyService.updateCaseBaseNotifyStatus(ruralProjectRecords.getId(), "113");
         return "redirect:" + Global.getAdminPath() + "/ruralProject/RuralProjectRecordsOwnCaseBase/?repage";
     }
 
@@ -369,6 +382,7 @@ public class RuralProjectRecordsOwnCaseBaseController extends BaseController {
             return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
         }
         //跳转到个人案例项目页面
+        workProjectNotifyService.updateCaseBaseNotifyStatus(ruralProjectRecords.getId(), "113");
         return "redirect:" + Global.getAdminPath() + "/ruralProject/RuralProjectRecordsOwnCaseBase/?repage";
     }
 

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

@@ -11051,10 +11051,27 @@ public class WorkProjectNotifyController extends BaseController {
 	private String getProjectCaseBase(WorkProjectNotify workProjectNotify,Model model) throws Exception {
 		//查询“配农网”工程类型id
 		String engineeringId = engineeringService.getEngineeringId("202");
-		//查询案例流程信息
-		ProjectCaseBaseAudit projectCaseBaseAudit = ruralProjectRecordsOwnCaseBaseService.get(workProjectNotify.getNotifyId());
-		//获取项目信息
-		RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.getQueryProjectUsers(projectCaseBaseAudit.getProjectId());
+		RuralProjectRecords ruralProjectRecords = new RuralProjectRecords();
+		ProjectCaseBaseAudit projectCaseBaseAudit = new ProjectCaseBaseAudit();
+		if (workProjectNotify.getRemarks().contains("待处理") && !"1".equals(workProjectNotify.getStatus())) {
+
+			//获取项目信息
+			ruralProjectRecords = ruralProjectRecordsService.getQueryProjectUsers(workProjectNotify.getNotifyId());
+			projectCaseBaseAudit.setCompany(UserUtils.getUser().getCompany());
+			projectCaseBaseAudit.setOffice(UserUtils.getUser().getOffice());
+			projectCaseBaseAudit.setProjectId(ruralProjectRecords.getId());
+			projectCaseBaseAudit.setArea(ruralProjectRecords.getArea());
+			projectCaseBaseAudit.setProvince(ruralProjectRecords.getProvince());
+			projectCaseBaseAudit.setCity(ruralProjectRecords.getCity());
+			if (StringUtils.isBlank(projectCaseBaseAudit.getProjectDomain())) {
+				projectCaseBaseAudit.setProjectDomain("1");
+			}
+		}else {
+			//查询案例流程信息
+			projectCaseBaseAudit = ruralProjectRecordsOwnCaseBaseService.get(workProjectNotify.getNotifyId());
+			//获取项目信息
+			ruralProjectRecords = ruralProjectRecordsService.getQueryProjectUsers(projectCaseBaseAudit.getProjectId());
+		}
 		//查询项目是否时案例项目
 		ruralProjectRecords = ruralProjectRecordsService.getCaseBaseByProjectId(ruralProjectRecords);
 		ProjectReportData projectReportData = projectReportDataService.getByNumber(ruralProjectRecords.getProjectReportNumber());
@@ -11078,7 +11095,12 @@ public class WorkProjectNotifyController extends BaseController {
 				projectReportRecord.setChargeCriterionList(chargeCriterionList);
 			}
 		}
-		Act act = getByAct(projectCaseBaseAudit.getProcessInstanceId());
+		Act act = new Act();
+		if (workProjectNotify.getRemarks().contains("待处理") && !"1".equals(workProjectNotify.getStatus())) {
+
+		}else {
+			act = getByAct(projectCaseBaseAudit.getProcessInstanceId());
+		}
 		projectCaseBaseAudit.setAct(act);
 
 		if (StringUtils.isNotBlank(workProjectNotify.getHome())) {
@@ -11224,17 +11246,19 @@ public class WorkProjectNotifyController extends BaseController {
 		projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
 		projectReportRecord.setFileCaseBaseList(projectcontentinfo.getFileCaseBaseList());
 
-		if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
-			model.addAttribute("identificationName", "归档审核意见");
+		if (workProjectNotify.getRemarks().contains("待处理") && !"1".equals(workProjectNotify.getStatus())) {
+			return "modules/projectcontentinfo/projectCaseBaseSupplementpendingForm";
+		} else if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+			model.addAttribute("identificationName", "案例文件审核意见");
 			return "modules/projectcontentinfo/projectCaseBaseSupplementForm";
 		} else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
-			model.addAttribute("identificationName", "归档审核意见");
+			model.addAttribute("identificationName", "案例文件审核意见");
 			return "modules/projectcontentinfo/projectCaseBaseSupplementAudit";
 		} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
-			model.addAttribute("identificationName", "归档审核意见");
+			model.addAttribute("identificationName", "案例文件审核意见");
 			return "modules/projectcontentinfo/projectCaseBaseSupplementModify";
 		} else {
-			model.addAttribute("identificationName", "归档审核意见");
+			model.addAttribute("identificationName", "案例文件审核意见");
 			return "modules/projectcontentinfo/projectCaseBaseSupplementForm";
 		}
     }

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

@@ -102,6 +102,9 @@
 			<if test="projectId != null and projectId != ''">
 				AND a.project_id like concat('%',#{projectId},'%')
 			</if>
+			<if test="caseBaseStatus != null and caseBaseStatus != ''">
+				AND pcda.status = #{caseBaseStatus}
+			</if>
 			<if test="projectName != null and projectName != ''">
 				AND a.project_name like concat(concat('%',#{projectName}),'%')
 			</if>
@@ -342,6 +345,9 @@
 			<if test="projectId != null and projectId != ''">
 				AND a.project_id like concat('%',#{projectId},'%')
 			</if>
+			<if test="caseBaseStatus != null and caseBaseStatus != ''">
+				AND pcda.status = #{caseBaseStatus}
+			</if>
 			<if test="projectName != null and projectName != ''">
 				AND a.project_name like concat(concat('%',#{projectName}),'%')
 			</if>
@@ -508,7 +514,7 @@
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				ORDER BY a.update_date DESC
+				ORDER BY pcda.update_date desc, a.update_date DESC
 			</otherwise>
 		</choose>
 	</select>

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

@@ -24,6 +24,7 @@
 		a.office_id AS "office.id",
 		a.alter_process_id AS "alterProcessId",
 		area.name AS "area.name",
+		area.type as "area.type",
 		a.province,
 		a.city,
 		a.area_name AS "county",
@@ -111,6 +112,7 @@
 		a.office_id AS "office.id",
 		a.alter_process_id AS "alterProcessId",
 		area.name AS "area.name",
+		area.type as "area.type",
 		a.province,
 		a.city,
 		a.area_name AS "county",
@@ -159,6 +161,7 @@
 		a.office_id AS "office.id",
 		a.alter_process_id AS "alterProcessId",
 		area.name AS "area.name",
+		area.type as "area.type",
 		a.province,
 		a.city,
 		a.area_name AS "county",

src/main/webapp/WEB-INF/tags/sys/treeselectProjectCityArea.tag

@@ -78,7 +78,6 @@
 							}
 							ids.push(nodes[i].id);
 							names.push(nodes[i].name);//<c:if test="${!checked}">
-							console.log(1231)
 							var level = 1 + nodes[i].level
 							$("#areaType").val(level);
 							break; // 如果为非复选框选择，则返回第一个选择  </c:if>

src/main/webapp/webpage/modules/projectMaterialStorage/projectMaterialStorageForm.jsp

@@ -168,6 +168,7 @@
 	<div class="container">
 	<form:form id="inputForm" modelAttribute="projectRecords" action="${ctx}/project/projectMaterialStorage/save?projectNumber=${projectRecords.id}&&pageId=1"  method="post" class="form-horizontal">
 <%--		<form:hidden path="id" name = "projectNumber"/>--%>
+		<input type="hidden" id="storageFlag" name="storageFlag" value="${projectRecords.storageFlag}">
 		<div class="form-group layui-row first lw14">
 			<div class="form-group-label"><h2>材料处理</h2></div>
 			<div class="layui-item nav-btns">

src/main/webapp/webpage/modules/projectcontentinfo/projectCaseBaseSupplementAudit.jsp

@@ -314,7 +314,7 @@
 					<div class="layui-item layui-col-sm6 lw6">
 						<label class="layui-form-label double-line">工作开始日期：</label>
 						<div class="layui-input-block">
-							<input class="laydate-icondate form-control layui-input layer-date ash"  style="background-color: #f1f1f1" readonly="true"  name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+							<input class="laydate-icondate form-control layui-input layer-date ash"  style="background-color: #f1f1f1" readonly="true"  value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6 lw6">

src/main/webapp/webpage/modules/projectcontentinfo/projectCaseBaseSupplementModify.jsp

@@ -7,6 +7,11 @@
 	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	</div><script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+	<script src="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.js" charset="utf-8"></script>
+	<script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
+	<script src="${ctxStatic}/common/html/js/script.js"></script>
 	<%@include file="/webpage/include/treetable.jsp" %>
 	<script type="text/javascript">
 		var validateForm;
@@ -36,14 +41,26 @@
 				if(obj == 1) {
 					$("#flag").val("yes");
 					if(boolFlag){
+						var areaType = $("#areaType").val()
+						if (areaType !=3){
+							top.layer.msg("项目所在地只能选择市级地区，请重新选择！", {icon: 0});
+							$("#onsubmit").val(true);
+							return false;
+						}
+						var projectDomain = $("#projectDomain").val()
+						if("1" == projectDomain){
+							var engineeringType = $("#engineeringType").val()
+							if (!engineeringType){
+								top.layer.msg("工程类型不可为空，请选择工程类型！", {icon: 0});
+								$("#onsubmit").val(true);
+								return false;
+							}
+						}
 						var caseBase = $("#file_caseBase tr").length;
 						for(var i=0; i<caseBase; i++) {
 							var numberStr = $("#file_caseBase tr").eq(i).find("td:first").html();
 							var second = $("#file_caseBase tr").eq(i).find("td:eq(1)").html();
 							var fileFlag = $("#file_caseBase tr").eq(i).find("td:last").html();
-							console.log(numberStr)
-							console.log(second)
-							console.log(fileFlag)
 							if(second == 1){
 								if(numberStr != undefined && numberStr !=null && numberStr !=''){
 									if (fileFlag==1){
@@ -117,6 +134,88 @@
 				$(id).removeAttr("class","hide");
 
 			})
+
+			var value = '${projectCaseBaseAudit.projectDomain}';
+			if (value === '1') {
+				document.getElementById('engineeringTypeBlock').style.display = '';
+			} else {
+				document.getElementById('engineeringTypeBlock').style.display = 'none';
+			}
+
+
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+
+				form.on('select', function(data){
+					var value = data.value;
+					if (value === '1') {
+						document.getElementById('engineeringTypeBlock').style.display = '';
+					} else {
+						document.getElementById('engineeringTypeBlock').style.display = 'none';
+					}
+				});
+
+				$.ajax({
+					type : "POST",
+					url : "${ctx}/ruralProject/RuralProjectRecordsOwnCaseBase/engineeringTreeMenu",
+					//请求成功
+					success : function(result) {
+						var s='{"title": "menu item 4","id": "4"}'
+						var str=jQuery.parseJSON(result);
+						//工程类型树形菜单
+						layui.dropdown.render({
+							elem: '#demo100'
+							,style: 'width: 450px;'
+							,data:str
+							,click: function(item){
+								$("#demo100").find("span").html(item.title)
+								$("#demo100").find("#engineeringType").val(item.id)
+							}
+						});
+					}
+				});
+
+
+				laydate.render({
+					elem: '#startDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+					event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+					type : 'date'
+					, trigger: 'click'
+				});
+				laydate.render({
+					elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+					event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+					type : 'date'
+					, trigger: 'click'
+				});
+			})
+
+			$('#areaId').on("change", function () {
+				console.log(3213213)
+				var areaId = $("#areaId").val();
+				$("#province").val('');
+				$("#city").val('');
+				$("#county").val('');
+				$.ajax({
+					type : "POST",
+					url : "${ctx}/sys/area/getParent",
+					data : {'areaId':areaId},
+					//请求成功
+					success : function(result) {
+						var pro = result.province;
+						var city = result.city;
+						if(pro != '') {
+							$("#province").val(pro);
+						}
+						if(city != '') {
+							$("#city").val(city);
+						}
+						$("#areaShow").html(pro+"-"+city);
+					},
+
+				});
+			})
+
 		});
 		function insertTitle(tValue){
 			var list = "${projectReportRecord.workAttachments}";
@@ -184,6 +283,7 @@
 	<div class="container">
 		<form:form id="inputForm" modelAttribute="projectCaseBaseAudit" action="${ctx}/ruralProject/RuralProjectRecordsOwnCaseBase/saveAudit" method="post" class="form-horizontal layui-form">
 			<input type="hidden" id="onsubmit" value="true">
+			<input type="hidden" id="areaType" value="${projectCaseBaseAudit.area.type}">
 			<form:hidden path="home"/>
 			<form:hidden id="projectId" path="projectId"/>
 			<form:hidden path="createBy.id"/>
@@ -194,7 +294,10 @@
 			<form:hidden path="act.procDefId"/>
 			<form:hidden id="flag" path="act.flag"/>
 			<input type="hidden" id="opinion" name="act.comment" value="" maxlength="250">
+			<input type="hidden" id="selectedIds" name="selectedIds" value="" />
 			<input type="hidden" id="id" name="id" value="${projectCaseBaseAudit.id}" maxlength="250">
+			<input type="hidden" id="province" name="province" value="${projectCaseBaseAudit.province}">
+			<input type="hidden" id="city" name="city" value="${projectCaseBaseAudit.city}">
 			<sys:message content="${message}"/>
 			<div class="form-group layui-row first lw12">
 				<div class="tapfixed" style="width: 80%;">
@@ -207,7 +310,8 @@
 							<li><a>项目计划信息</a><span class="hide">planView</span></li>
 							<li><a>质量复核信息</a><span class="hide">qualityView</span></li>
 							<li><a>报告签发信息</a><span class="hide">issueView</span></li>
-							<li class="active"><a>档案信息</a><span class="hide">AccessoryView</span></li>
+							<li><a>档案信息</a><span class="hide">AccessoryView</span></li>
+							<li class="active"><a>案例信息</a><span class="hide">caseBaseView</span></li>
 						</ul>
 					</div>
 				</div>
@@ -311,13 +415,13 @@
 					<div class="layui-item layui-col-sm6 lw6">
 						<label class="layui-form-label double-line">工作开始日期：</label>
 						<div class="layui-input-block">
-							<input class="laydate-icondate form-control layui-input layer-date ash"  style="background-color: #f1f1f1" readonly="true"  name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+							<input class="laydate-icondate form-control layui-input layer-date ash"  style="background-color: #f1f1f1" readonly="true" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6 lw6">
 						<label class="layui-form-label double-line">工作结束日期：</label>
 						<div class="layui-input-block">
-							<input class="laydate-icondate form-control layui-input layer-date "  style="background-color: #f1f1f1" readonly="true"  name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+							<input class="laydate-icondate form-control layui-input layer-date "  style="background-color: #f1f1f1" readonly="true" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6 lw6">
@@ -1279,219 +1383,7 @@
 
 					</c:if>
 				</div>
-				<div class="form-group layui-row first" id="AccessoryView">
-
-
-
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>案例文件</h2></div>
-						<div id="addFile_caseBase" style="display: none" class="upload-progress">
-							<span id="fileName_caseBase" ></span>
-							<span id="_caseBase" ></span>
-							<b><span id="baifenbi_caseBase" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_caseBase" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="caseBase_file" type="file" name="caseBase_file" multiple="multiple" style="display: none;" onChange="if(this.value)caseBaseInsertTitle(this.value);"/>
-						<span id="caseBase_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable_caseBase" class="table table-bordered table-condensed tree_table">
-								<thead>
-								<tr>
-										<%-- <th>序号</th>--%>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_caseBase">
-								<c:forEach items="${projectReportRecord.fileCaseBaseList}" var = "filecaseBase" varStatus="status">
-									<tr id="file_caseBase_${filecaseBase.id}_tr" onclick="listTr(this)">
-											<%-- <td>${status.index + 1}</td>--%>
-										<td style="display:none">${filecaseBase.id}</td>
-										<td style="display:none">${filecaseBase.mustFlag}</td>
-										<c:choose>
-											<c:when test="${filecaseBase.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span class='default_open ' style="padding-right: 15px; "></span><span style="color: red">* </span>${filecaseBase.attachName}<input type="hidden" value="${filecaseBase.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${filecaseBase.attachName}<input type="hidden" value="${filecaseBase.attachName}"/></td>
-											</c:otherwise>
-										</c:choose>
-										<td>
-												<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${filecaseBase.attachName}</div></div>--%>
-											<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${filecaseBase.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${filecaseBase.attachTypes}</div>
-										</td>
-										<td></td>
-										<td></td>
-										<td></td>
-										<td class="op-td">
-												<div class="op-btn-box" >
-                                                    <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${filecaseBase.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable_caseBase')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-                                                </div>
-										</td>
-										<td style="display:none">${filecaseBase.fileFlag}</td>
-
-									</tr>
-									<c:forEach items="${filecaseBase.workAttachments}" var = "workClientAttachment" varStatus="status">
-										<tr class="addFile_caseBase_${filecaseBase.id}_tr">
-											<td></td>
-											<c:choose>
-												<c:when test="${projectReportRecord.uploadMode == 2}">
-													<c:choose>
-														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-															<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(filecaseBase.attachName,'rar')
-																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-																			<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-																		</c:when>
-																		<c:otherwise>
-																			<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-															<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}"></td>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(filecaseBase.attachName,'rar')
-																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-																			<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
-																		</c:when>
-																		<c:otherwise>
-																			<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-												</c:otherwise>
-											</c:choose>
-											<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-											<td class="op-td" style="text-align:center;">
-												<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-											</td>
-											<td class="op-td" style="text-align:center;">
-													${workClientAttachment.fileSize}
-											</td>
-											<td class="op-td">
-												<div class="op-btn-box" >
-														<%--附件下载删除--%>
-													<c:choose>
-														<c:when test="${projectReportRecord.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-																	<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																</c:when>
-																<c:otherwise>
-																	<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-														</c:otherwise>
-													</c:choose>
-
-
-													<c:choose>
-														<c:when test="${reimbursementElectronicInvoiceVATTaxes.vatTaxStatus == '1'  }">
-															<c:if test="${isChangeStatus == '1'}">
-																		<span style="line-height: 1;" id="btn-container-${reimbursementElectronicInvoiceVATTaxes.id}">
-																			<a href="javascript:void(0)"
-																			   onclick="changeStatus('0','${reimbursementElectronicInvoiceVATTaxes.id}')"
-																			   class="layui-btn layui-btn-xs layui-bg-orange"> 取消确认</a>
-																		</span>
-															</c:if>
-														</c:when>
-														<c:otherwise>
-															<c:if test="${isChangeStatus == '1'}">
-																		<span style="line-height: 1;" id="btn-container-${reimbursementElectronicInvoiceVATTaxes.id}">
-																			<a href="javascript:void(0)"
-																			   onclick="changeStatus('1','${reimbursementElectronicInvoiceVATTaxes.id}')"
-																			   class="layui-btn layui-btn-xs layui-bg-green"> 确认</a>
-																		</span>
-															</c:if>
-														</c:otherwise>
-													</c:choose>
-												</div>
-											</td>
-										</tr>
-									</c:forEach>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<script type="text/template" id="caseBaseTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="caseBaseTpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_caseBase')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-					</script>
-
-
+				<div class="form-group layui-row first hide" id="AccessoryView">
 
 					<div class="form-group layui-row">
 						<div class="form-group-label"><h2>成果文件</h2></div>
@@ -2032,14 +1924,255 @@
 					</div>
 
 				</div>
+
+				<div class="form-group layui-row first" id="caseBaseView">
+					<div class="form-group layui-row first lw12">
+						<div class="form-group-label"><h2>基本信息</h2></div>
+
+
+						<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label"><span class="require-item">*</span>项目名称：</label>
+							<div class="layui-input-block">
+								<input id="projectName" name="projectName"  htmlEscape="false" readonly="true" class="form-control  layui-input required" value="${projectRecords.projectName}"/>
+							</div>
+						</div>
+						<div class="layui-item layui-col-sm6 lw7">
+							<label class="layui-form-label"><span class="require-item">*</span>项目所在地：</label>
+							<div class="layui-input-block  with-icon">
+								<sys:treeselectProjectCityArea id="area" name="area.id" value="${projectCaseBaseAudit.area.id}" labelName="area.name" labelValue="${projectCaseBaseAudit.area.name}"
+															   cssStyle="background-color: #fff" title="区域" url="/sys/area/treeDataCity" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="false"/>
+								<span id="areaShow" style="color: red"><c:if test="${projectCaseBaseAudit.area.id!=null}">${projectCaseBaseAudit.province}-${projectCaseBaseAudit.city}</c:if></span>
+							</div>
+						</div>
+						<div class="layui-item layui-col-sm6 lw7">
+							<label class="layui-form-label double-line"><span class="require-item">*</span>工程建设开始日期：</label>
+							<div class="layui-input-block">
+								<input class="laydate-icondate judgment form-control layui-input layer-date laydate-icon" style="background-color: #fff" readonly="readonly" id="startDate" name="startDate" placeholder="请选择开始日期" value="<fmt:formatDate value="${projectCaseBaseAudit.startDate}" pattern="yyyy-MM-dd"/>">
+							</div>
+						</div>
+						<div class="layui-item layui-col-sm6 lw7">
+							<label class="layui-form-label double-line"><span class="require-item">*</span>工程建设结束日期：</label>
+							<div class="layui-input-block">
+								<input class="laydate-icondate judgment form-control layui-input layer-date laydate-icon" style="background-color: #fff" readonly="readonly" id="endDate" name="endDate" placeholder="请选择结束日期" value="<fmt:formatDate value="${projectCaseBaseAudit.endDate}" pattern="yyyy-MM-dd"/>">
+							</div>
+						</div>
+
+						<div class="layui-item layui-col-sm6 lw7">
+							<label class="layui-form-label"><span class="require-item">*</span>工程领域：</label>
+							<div class="layui-input-block readOnlyFFF">
+								<form:select placeholder="请选择" path="projectDomain" class="form-control judgment editable-select layui-input" id="projectProperties" value="${projectCaseBaseAudit.projectDomain}">
+									<form:option value=""/>
+									<form:options items="${fns:getMainDictList('project_domain')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								</form:select>
+							</div>
+						</div>
+						<div class="layui-item layui-col-sm6 lw7" id="engineeringTypeBlock" style="${showEngineeringType ? '' : 'display:none;'}">
+							<label class="layui-form-label"><span class="require-item">*</span>工程类型：</label>
+							<div class="layui-input-block">
+								<button type="button" class="layui-btn layui-btn-primary" style="width: 100%;text-align: left" id="demo100">
+									<span>${engineeringInfo.engineeringName}</span>
+									<input type="hidden" name="engineeringType" id="engineeringType" class="judgment" value="${engineeringInfo.id}"/>
+									<i class="layui-icon layui-icon-down layui-font-12" style="float: right"></i>
+								</button>
+							</div>
+						</div>
+
+					</div>
+					<div class="form-group layui-row">
+						<div class="form-group-label"><h2>案例文件</h2></div>
+						<div id="addFile_caseBase" style="display: none" class="upload-progress">
+							<span id="fileName_caseBase" ></span>
+							<span id="_caseBase" ></span>
+							<b><span id="baifenbi_caseBase" ></span></b>
+							<div class="progress">
+								<div id="jindutiao_caseBase" class="progress-bar" style="width: 0%" aria-valuenow="0">
+								</div>
+							</div>
+						</div>
+						<input id="caseBase_file" type="file" name="caseBase_file" multiple="multiple" style="display: none;" onChange="if(this.value)caseBaseInsertTitle(this.value);"/>
+						<span id="caseBase_title"></span>
+						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
+							<table id="upTable_caseBase" class="table table-bordered table-condensed tree_table">
+								<thead>
+								<tr>
+										<%-- <th>序号</th>--%>
+									<th width="20%">文件要求</th>
+									<th width="35%">文件描述/文件</th>
+									<th width="20%">文件类型</th>
+									<th width="160px">上传时间</th>
+									<th width="120px">文件大小(M)</th>
+									<th width="170px">操作</th>
+								</tr>
+								</thead>
+								<tbody id="file_caseBase">
+								<c:forEach items="${projectReportRecord.fileCaseBaseList}" var = "filecaseBase" varStatus="status">
+									<tr id="file_caseBase_${filecaseBase.id}_tr" onclick="listTr(this)">
+											<%-- <td>${status.index + 1}</td>--%>
+										<td style="display:none">${filecaseBase.id}</td>
+										<td style="display:none">${filecaseBase.mustFlag}</td>
+										<c:choose>
+											<c:when test="${filecaseBase.mustFlag == 1}">
+												<td class="tabMove" style="text-align: left;"><span class='default_open ' style="padding-right: 15px; "></span><span style="color: red">* </span>${filecaseBase.attachName}<input type="hidden" value="${filecaseBase.attachName}"/></td>
+											</c:when>
+											<c:otherwise>
+												<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${filecaseBase.attachName}<input type="hidden" value="${filecaseBase.attachName}"/></td>
+											</c:otherwise>
+										</c:choose>
+										<td>
+												<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${filecaseBase.attachName}</div></div>--%>
+											<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${filecaseBase.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${filecaseBase.attachTypes}</div>
+										</td>
+										<td></td>
+										<td></td>
+										<td></td>
+										<td class="op-td">
+											<div class="op-btn-box" >
+												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${filecaseBase.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable_caseBase')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+											</div>
+										</td>
+										<td style="display:none">${filecaseBase.fileFlag}</td>
+
+									</tr>
+									<c:forEach items="${filecaseBase.workAttachments}" var = "workClientAttachment" varStatus="status">
+										<tr id="addFile_caseBase_${workClientAttachment.id}_tr" class="addFile_caseBase_${filecaseBase.id}_tr">
+											<td></td>
+											<c:choose>
+												<c:when test="${projectReportRecord.uploadMode == 2}">
+													<c:choose>
+														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+															<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+														</c:when>
+														<c:otherwise>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<c:choose>
+																		<c:when test="${fn:containsIgnoreCase(filecaseBase.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																			<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																		</c:when>
+																		<c:otherwise>
+																			<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																		</c:otherwise>
+																	</c:choose>
+																</c:otherwise>
+															</c:choose>
+														</c:otherwise>
+													</c:choose>
+												</c:when>
+												<c:otherwise>
+													<c:choose>
+														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+															<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}"></td>
+														</c:when>
+														<c:otherwise>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<c:choose>
+																		<c:when test="${fn:containsIgnoreCase(filecaseBase.attachName,'rar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																			<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																		</c:when>
+																		<c:otherwise>
+																			<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																		</c:otherwise>
+																	</c:choose>
+																</c:otherwise>
+															</c:choose>
+														</c:otherwise>
+													</c:choose>
+												</c:otherwise>
+											</c:choose>
+											<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
+
+
+											<td class="op-td" style="text-align:center;">
+												<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
+											</td>
+											<td class="op-td" style="text-align:center;">
+													${workClientAttachment.fileSize}
+											</td>
+											<td class="op-td">
+												<div class="op-btn-box" >
+														<%--附件下载删除--%>
+													<c:choose>
+														<c:when test="${projectReportRecord.uploadMode == 2}">
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																	<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																</c:when>
+																<c:otherwise>
+																	<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																</c:otherwise>
+															</c:choose>
+														</c:when>
+														<c:otherwise>
+															<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+														</c:otherwise>
+													</c:choose>
+
+												</div>
+											</td>
+										</tr>
+									</c:forEach>
+								</c:forEach>
+								</tbody>
+							</table>
+						</div>
+					</div>
+					<script type="text/template" id="caseBaseTpl">//<!--
+                <tr id="budgetList{{idx}}">
+                    <td class="hide">
+                        <input id="caseBaseTpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
+                    </td>
+                    <td class="hide">
+                        0
+                    </td>
+                    <td style="text-align:center;">
+                        {{row.attachName}}
+                    </td>
+                    <td style="text-align:center;">
+                        {{row.attachLength}}
+                    </td>
+                    <td style="text-align:center;">
+                        {{row.attachTypes}}
+                    </td>
+                    <td style="text-align:center;">
+
+                    </td>
+					<td class="op-td">
+						<div class="op-btn-box" >
+							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_caseBase')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+						</div>
+					</td>
+                </tr>//-->
+					</script>
+
+				</div>
+
 			</div>
 
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>
 </div>
-<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
-<script src="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.js" charset="utf-8"></script>
 <script>
 	function f1(row) {
 		// window.parent.document.getElementById('opinion').value = row;

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordCaseBaseForm.jsp

@@ -67,11 +67,14 @@
 								$("#onsubmit").val(true);
 								return false;
 							}
-							var engineeringType = $("#engineeringType").val()
-							if (!engineeringType){
-								top.layer.msg("工程类型不可为空，请选择工程类型！", {icon: 0});
-								$("#onsubmit").val(true);
-								return false;
+							var projectDomain = $("#projectDomain").val()
+							if("1" == projectDomain){
+								var engineeringType = $("#engineeringType").val()
+								if (!engineeringType){
+									top.layer.msg("工程类型不可为空，请选择工程类型！", {icon: 0});
+									$("#onsubmit").val(true);
+									return false;
+								}
 							}
 							var caseBase = $("#file_caseBase tr").length;
 							for(var i=0; i<caseBase; i++) {
@@ -192,6 +195,7 @@
 			})
 
 			$('#areaId').on("change", function () {
+				console.log(3213213)
 				var areaId = $("#areaId").val();
 				$("#province").val('');
 				$("#city").val('');
@@ -285,6 +289,8 @@
 			<form:hidden path="projectId"/>
 			<input type="hidden" id="onsubmit" value="true">
 			<input type="hidden" id="areaType" value="${projectCaseBaseAudit.area.type}">
+			<input type="hidden" id="province" name="province" value="${projectCaseBaseAudit.province}">
+			<input type="hidden" id="city" name="city" value="${projectCaseBaseAudit.city}">
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>
 

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordCaseBaseView.jsp

@@ -67,11 +67,14 @@
 								$("#onsubmit").val(true);
 								return false;
 							}
-							var engineeringType = $("#engineeringType").val()
-							if (!engineeringType){
-								top.layer.msg("工程类型不可为空，请选择工程类型！", {icon: 0});
-								$("#onsubmit").val(true);
-								return false;
+							var projectDomain = $("#projectDomain").val()
+							if("1" == projectDomain){
+								var engineeringType = $("#engineeringType").val()
+								if (!engineeringType){
+									top.layer.msg("工程类型不可为空，请选择工程类型！", {icon: 0});
+									$("#onsubmit").val(true);
+									return false;
+								}
 							}
 							var caseBase = $("#file_caseBase tr").length;
 							for(var i=0; i<caseBase; i++) {

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

@@ -545,318 +545,62 @@
 			})
 		}
 
-		function show(d) {
-			////对操作进行初始化
-			var xml = '<div class=\"layui-btn-group\">';
-			if(d.falg=="1"){
-				if(d.projectReportStatus == 0){
-					xml+="<a href=\"#\" onclick=\"openDialogre('新增报告质量复核', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 新增质量复核</a>";
-				}
-				if(d.projectReportStatus == 1){
-					xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改质量复核</a>";
-					<%--xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";--%>
-				}
-				if(d.projectReportStatus == 2){
-					xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目报告质量复核审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回质量复核</a>";
-				}
-				if(d.projectReportStatus == 3){
-					//撤回操作
-					xml+="<a href=\"#\" onclick=\"openDialogre('调整报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/modify?projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改质量复核</a>";
-					<%--xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告质量复核吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";--%>
-				}
-				if(d.projectReportStatus == 4){
-					//驳回操作
-					// if(d.newReportNotifyFlag == 1){
-					xml+="<a href=\"#\" onclick=\"openDialogreReport('调整报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改质量复核</a>";
-					<%--}else{--%>
-					<%--	xml+="<a href=\"#\" onclick=\"openDialogreReport('调整报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改质量复核4</a>";--%>
-					<%--}--%>
-
-					<%--xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告质量复核吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";--%>
-				}
-				if(d.projectReportStatus == 5){
-					if(undefined != d.qualitySignatureFlag && null != d.qualitySignatureFlag && "" != d.qualitySignatureFlag){
-						if(undefined != d.qualitySignatureContractId && null != d.qualitySignatureContractId && "" != d.qualitySignatureContractId){
-							xml+="<a href=\"${ctx}/ruralProject/signatureCallBack/downLoadJudgementReportAttach?contractId="+ d.qualitySignatureContractId +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" style='height:32px;margin-top: 5px;margin-bottom: 5px;'>审定单签章下载</a>"
-						}
-					}
-				}
 
-				//报告签发操作
-				if(d.projectReportStatus == 5 && d.emergencyProject != 1){
+		function openDialogreMaterialStorage(title,url,width,height,target,buttons) {
 
-					if(d.projectReportStatusTwo == 0){
-						xml+="<a href=\"#\" onclick=\"openDialogre('报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?projectId=" + d.id +"&view=costLiu','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 报告签发</a>";
-					}
-					if(d.projectReportStatusTwo == 1){
-						xml+="<a href=\"#\" onclick=\"openDialogre('修改报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?projectId=" + d.id +"&view=costLiu','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改签发</a>";
-						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/deleteReport?projectId=" + d.id + "&view=costLiu\" onclick=\"return confirmx('确认要删除该报告签发吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 删除签发</a>";
-					}
-					if(d.projectReportStatusTwo == 2){
-						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/revoke?id=" + d.id + "&processInstanceId=" + d.prdtProcessinstanceId + "&view=costLiu\" onclick=\"return confirmx('确认要撤回该报告签发吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回签发</a>";
-					}
-					if(d.projectReportStatusTwo == 3){
-						//撤回操作
-						xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?projectId=" + d.id + "&view=costLiu','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改签发</a>";
-						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/deleteReport?projectId=" + d.id + "&view=costLiu\" onclick=\"return confirmx('确认要删除该报告签发吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 删除签发</a>";
-					}
-					if(d.projectReportStatusTwo == 4){
-						//驳回操作
-						xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?projectId=" + d.id + "&view=costLiuReport ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改签发</a>";
-						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessageNewTwo/deleteReport?projectId=" + d.id + "&view=costLiu\" onclick=\"return confirmx('确认要删除该报告签发吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 删除签发</a>";
-					}
-				}
-
-				//线上归档操作
-				if(d.projectReportStatusTwo == 0){
-					if(d.projectReportStatus == 5){
-						if(d.emergencyProject == 1){
-							/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
-							if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
-								if(8 != d.attachmentProjectSort){
-									xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改质量复核</a>";
-								}
-
-								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上归档</a>";
-							}
-							if(d.projectReportRecordStatus == 1){
-								if(8 != d.attachmentProjectSort){
-									xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改质量复核</a>";
-								}
-
-								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
-							}
-							if(d.projectReportRecordStatus == 2){
-								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回线上归档</a>";
-							}
-							if(d.projectReportRecordStatus == 3){
-								if(8 != d.attachmentProjectSort){
-									xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改质量复核</a>";
-								}
-
-								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
-							}
-							if(d.projectReportRecordStatus == 4){
-								//驳回操作
-								if(d.newRecordTwoNotifyFlag == 1){
-									<%--xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档1</a>";--%>
-									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordUrgentModify?id=" + d.prrId + "&view=urgent','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
-								}else if(d.newRecordNotifyFlag == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordUrgentModify?id=" + d.prrId + "&view=urgent ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
-									<%--xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档2</a>";--%>
-								}else{
-									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
-								}
-							}
-						}
-					}
-				}else{
-					if(d.projectReportStatusTwo == 5){
-						/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
-						if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
-							xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上归档</a>";
-						}
-						if(d.projectReportRecordStatus == 1){
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
-
-						}
-						if(d.projectReportRecordStatus == 2){
-							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回线上归档</a>";
-						}
-						if(d.projectReportRecordStatus == 3){
-							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
-						}
-						if(d.projectReportRecordStatus == 4){
-							//驳回操作
-							if(d.newRecordTwoNotifyFlag == 1){
-								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
-							}else if(d.newRecordNotifyFlag == 1){
-								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
-							}else{
-								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
-							}
-						}
-					}
-				}
-				//归档资料缺失说明
-				if(d.projectReportStatusTwo == 0){
-					if(d.projectReportStatus == 5){
-						if(d.emergencyProject == 1){
-							if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5 ){
-								if (d.defectRecordStatus==0) {
-									xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?reportId=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 资料缺失说明</a>";
-								}
-								if (d.defectRecordStatus==2){
-									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回说明</a>";
-								}
-								if (d.defectRecordStatus==3){
-									xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId + "&reportId=" + d.id+" ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</a>";
-									xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 说明作废</a>";
-								}
-								if(d.defectRecordStatus == 4){
-									//驳回操作
-									xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId+ "&reportId=" + d.id+"&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</a>";
-									xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 说明作废</a>";
-								}
-							}
-						}
-					}
-				}else{
-					if(d.projectReportStatusTwo == 5){
-						if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
-							if (d.defectRecordStatus==0) {
-								xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?reportId=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 资料缺失说明</a>";
-							}
-							if (d.defectRecordStatus==2){
-								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回说明</a>";
-							}
-							if (d.defectRecordStatus==3){
-								xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId + "&reportId=" + d.id+" ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</a>";
-								xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 说明作废</a>";
-
-							}
-							if(d.defectRecordStatus == 4){
-								//驳回操作
-								xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId+ "&reportId=" + d.id+"&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</a>";
-								xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 说明作废</a>";
+			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+				width = 'auto';
+				height = 'auto';
+			} else {//如果是PC端，根据用户设置的width和height显示。
 
-							}
-						}
+			}
+			var split = buttons.split(",");
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				maxmin: true, //开启最大化最小化按钮
+				skin: 'three-btns',
+				content: url,
+				btn: split,
+				btn1: function(index, layero){
+					var 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
 					}
-				}
-				/*上报相关按钮*/
-				if(d.projectReportStatusTwo == 0){
-					if(d.projectReportStatus == 5){
-						if(d.emergencyProject == 1){
-							if(d.syncStatus == 0){
-								if(d.reportStatus == 0){
-									if(d.reportedState == 0 || d.reportedState == 6){
-										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 上报</a>";
-										/*xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 个人上报</a>";*/
-									}
-								}else{
-									if(d.reportedState == 1){
-										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
-									}
-									if(d.reportedState == 2){
-										xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateByReported?id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回上报</a>";
-									}
-									/*撤回修改*/
-									if(d.reportedState == 3){
-										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
-									}
-									/*驳回修改*/
-									if(d.reportedState == 4){
-										//驳回操作
-										// if(d.newReportedNotifyFlag == 1){
-										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
-										<%--}else{--%>
-										<%--	xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";--%>
-										<%--}--%>
-									}
-								}
-							}
-						}
+					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
 					}
-				}else{
-					if(d.projectReportStatusTwo == 5){
-						if(d.syncStatus == 0){
-							if(d.reportStatus == 0){
-								if(d.reportedState == 0 || d.reportedState == 6){
-									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 上报</a>";
-									/*xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 个人上报</a>";*/
-								}
-							}else{
-								if(d.reportedState == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
-								}
-								if(d.reportedState == 2){
-									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateByReported?id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回上报</a>";
-								}
-								/*撤回修改*/
-								if(d.reportedState == 3){
-									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
-								}
-								/*驳回修改*/
-								if(d.reportedState == 4){
-									//驳回操作
-									// if(d.newReportedNotifyFlag == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
-									<%--}else{--%>
-									<%--	xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";--%>
-
-									<%--}--%>
-								}
-							}
-						}
+				},
+				btn2:function(index,layero){
+					if(split.length==2){return}
+					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
 					}
-				}
-				/*纸质归档*/
-				if(d.projectReportStatusTwo == 5){
-					if(d.submitMoney == "2"){
-						/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
-						if(d.paperFilingStatus == 0){
-							xml+="<a href=\"#\" onclick=\"openDialogre('新增纸质归档信息', '${ctx}/paperFiling/paperFiling/form?projectId=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 纸质归档</a>";
-						}
-						if(d.paperFilingStatus == 2){
-							xml+="<a href=\"${ctx}/paperFiling/paperFiling/cancelInvalidate?id=" + d.ppfId + "&processInstanceId=" + d.ppfProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该纸质归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回纸质归档</a>";
-						}
-						if(d.paperFilingStatus == 3){
-							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/paperFiling/paperFiling/form?id=" + d.ppfId + "&projectId=" + d.id +" ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 纸质重新归档</a>";
-						}
-						if(d.paperFilingStatus == 4){
-							//驳回操作
-							xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/paperFiling/paperFiling/modify?id=" + d.ppfId + "&projectId=" + d.id + "&processInstanceId=" + d.ppfProcessInstanceId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 纸质重新归档</a>";
-						}
+					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
+					}else {
+						return false;
 					}
+				},
+				btn3: function (index) {
 				}
-
-
-				if('1' == d.flagAdmin && d.projectReportStatus == 5)
-				{
-					xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralCostProjectMessage/adminModifyForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改报告</a>";
-					xml+="<a href=\"#\" onclick=\"openDialogView('历史报告', '${ctx}/ruralProject/ruralCostProjectMessage/getReportModifyList?projectId=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs\"  style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 历史报告</a>";
-				}
-				if('1' == d.flagArchive && d.projectReportRecordStatus == 5)
-				{
-					xml+="<a href=\"#\" onclick=\"openDialogre('修改归档案卷号', '${ctx}/ruralProject/ruralCostProjectMessage/adminRecordModifyForm?id=" + d.prrId + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改归档</a>";
-				}
-			}
-			<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:adminEdit">
-			if ('0'!=d.projectReportStatus && '1'!=d.projectReportStatus){
-				xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralCostProjectMessage/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改质量复核</a>";
-			}
-			if(d.paperFilingStatus == 5){
-				xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?id=" + d.ppfId + "&projectId=" + d.id +" ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改纸质归档</a>";
-			}
-			if(d.projectReportStatus == 5){
-				if (d.projectReportStatusTwo != 5 && d.projectReportStatusTwo != 2){
-					xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/reviewForm?projectId=" + d.id +"&view=reloadReport&edit=reviewAgain','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 重新复核</a>";
-				}
-			}
-			//项目升级按钮
-			if (d.submitMoney==1){
-				if (d.projectReportRecordStatus==0 || d.projectReportRecordStatus==1 || d.projectReportRecordStatus==2 || d.projectReportRecordStatus==3 || d.projectReportRecordStatus==6){
-					xml+="<a href=\"#\" onclick=\"projectUpgrade('"+d.id+"','"+d.projectReportRecordStatus+"','"+d.filingProjectStatus+"','"+d.projectReportStatus+"','"+d.projectReportStatusTwo+"')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 项目升级</a>";
-				}
-			}
-			</shiro:hasPermission>
-			<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportedProvincialStanding">
-			if(d.reportedState == 5 || d.reportedState == 7){
-				xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessageNew/submitReportedProvincialStanding?id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 提交省站</a>";
-			}
-			</shiro:hasPermission>
-
-			//案例项目移除按钮
-			<shiro:hasPermission name="ruralProject:RuralProjectRecordsCaseBase:canceCaseBase">
-			if(d.reportedState == 5 && d.projectReportRecordStatus == 5){
-				if(d.caseType == 1){
-					xml+="<a href=\"javascript:void(0)\" onclick=\"deleteFun('${ctx}/ruralProject/RuralProjectRecordsCaseBase/canceCaseBase?projectId=" + d.id + "')\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'  > 撤销该案例项目</a>";
-				}
-			}
-			</shiro:hasPermission>
-			xml+="</div>";
-			return[xml].join('');
+			});
 		}
 	</script>
 	<style>
@@ -1020,6 +764,16 @@
 								</form:select>
 							</div>
 						</div>
+
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">案例文件审核：</label>
+							<div class="layui-input-block readOnlyFFF">
+								<form:select path="caseBaseStatus" class="form-control simple-select">
+									<form:option value="" label=""/>
+									<form:options items="${fns:getDictList('signature_status')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								</form:select>
+							</div>
+						</div>
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>
@@ -1034,11 +788,6 @@
 <%--						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>--%>
 						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					</div>
-					<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportSwitch">
-						<div style="float: right;margin-right: 30px;">
-							<input type="checkbox" id="reportSwitch" <c:if test="${reportSwitch}">checked</c:if> lay-filter="reportSwitch" lay-skin="switch" lay-text="开启|关闭">
-						</div>
-					</shiro:hasPermission>
 					<div style="clear: both;"></div>
 				</div>
 				<table class="oa-table layui-table" id="contentTable1" lay-filter="test"></table>
@@ -1051,9 +800,6 @@
 	</div>
 	<div id="changewidth"></div>
 </div>
-<script type="text/html" id="barDemo">
-	<a class="layui-btn layui-btn-xs" lay-event="more" style="width: 75px">请选择<i class="layui-icon layui-icon-down"></i></a>
-</script>
 <script>
 	layui.use(function() {
 		//得到各种内置组件
@@ -1063,34 +809,6 @@
 		table.on('tool(test)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
 			var data = obj.data //获得当前行数据
 					, layEvent = obj.event; //获得 lay-event 对应的值
-			if (layEvent === 'more' && (data.falg == 1 || ('0'!=data.projectReportStatus && '1'!=data.projectReportStatus) || data.paperFilingStatus == 5 || data.projectReportStatus == 5 || data.submitMoney==1 || data.reportedState == 5 || data.reportedState == 7) ){
-				//下拉菜单
-				dropdown.render({
-					elem: this //触发事件的 DOM 对象
-					, show: true //外部事件触发即显示
-					, data: [{
-						title: ''
-						, id: 'must' //此项为必填项
-						// , href: '#'
-						// , target: '_blank' 默认_self
-						, templet: show(data)
-
-					}]
-					, align: 'center' //右对齐弹出（v2.6.8 新增）
-					, style: 'box-shadow: 5px 5px 10px rgb(0 0 0 / 12%);' //设置额外样式
-				})
-			}else {
-				dropdown.render({
-					elem: this
-					,show: true
-					,data:[{
-						title: '当前已无可进行操作!'
-						,id:'no'
-					}]
-					, align: 'center' //右对齐弹出（v2.6.8 新增）
-					, style: 'box-shadow: 5px 5px 10px rgb(0 0 0 / 12%);' //设置额外样式
-				})
-			}
 
 		});
 	})
@@ -1232,6 +950,15 @@
 						}
 						return xml;
 					}}
+				,{align:'center', title: '案例文件审核',  width:150,templet:function(d){
+						var st = getAuditState(d.caseAuditStatus);
+						if(st.action)
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.caseAuditProcessId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
+						else
+							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						return xml;
+					}}
+
 				<%--,{align:'center', title: '纸质',  width:90,templet:function(d){--%>
 				<%--		var st = getRuralProjectArchiveState(d.paperFilingStatus);--%>
 				<%--		if(st.action)--%>
@@ -1240,7 +967,23 @@
 				<%--			var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
 				<%--		return xml;--%>
 				<%--	}}--%>
-                ,{align:'center',title:"操作",width:150,templet:'#barDemo'}
+				,{align:'center',title:"操作",width:260,templet:function(d){
+						var xml = "";
+
+
+						<shiro:hasPermission name="project:projectMaterialStorage:add">
+						xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogreMaterialStorage('添加项目材料信息', '${ctx}/project/projectMaterialStorage/form?id=" + d.id +"&storageFlag=caseBase"+"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'  > 材料库处理</a>";
+						</shiro:hasPermission>
+						//案例项目移除按钮
+						<shiro:hasPermission name="ruralProject:RuralProjectRecordsCaseBase:canceCaseBase">
+						if(d.reportedState == 5 && d.projectReportRecordStatus == 5){
+							if(d.caseType == 1){
+								xml+="<a href=\"javascript:void(0)\" onclick=\"deleteFun('${ctx}/ruralProject/RuralProjectRecordsCaseBase/canceCaseBase?projectId=" + d.id + "')\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'  > 撤销该案例项目</a>";
+							}
+						}
+						</shiro:hasPermission>
+						return xml;
+					}}
 
 
             ]]
@@ -1297,6 +1040,9 @@
 					,"caseType":"${projectRecords.caseType}"
 					,"caseCreateBy":"${projectRecords.caseCreateBy}"
 					,"caseStatus":"${projectRecords.caseStatus}"
+					,"caseAuditId":"${projectRecords.caseAuditId}"
+					,"caseAuditStatus":"${projectRecords.caseAuditStatus}"
+					,"caseAuditProcessId":"${projectRecords.caseAuditProcessId}"
 					,"falg":
 					<c:choose>
 						<c:when test="${fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id}">

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

@@ -614,6 +614,63 @@
                 }
             });
         }
+
+        function openDialogreOnCaseBase(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, //开启最大化最小化按钮
+                skin: 'three-btns',
+                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
+                    }else {
+                        return false;
+                    }
+                },
+                btn3: function (index) {
+                }
+            });
+        }
+
+
         function openDialogreAttendance(title,url,width,height,target){
             if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
                 width='auto';
@@ -1101,7 +1158,7 @@
         xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','提交,关闭')\">";
         </c:when>
         <c:when test="${workProjectNotify.type == 113 && workProjectNotify.remarks eq '待处理'}">
-        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','提交,关闭')\">";
+        xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogreOnCaseBase('${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','提交,关闭')\">";
         </c:when>
         <c:when test="${workProjectNotify.type == 60 && workProjectNotify.remarks eq '待审批'}">
         xml = "<a  href=\"javascript:void(0)\" onclick=\"openDialogPass('${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','95%','95%','','通过,关闭')\">";

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

@@ -310,6 +310,63 @@
             });
 
         }
+
+
+		function openDialogreOnCaseBase(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, //开启最大化最小化按钮
+				skin: 'three-btns',
+				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
+					}else {
+						return false;
+					}
+				},
+				btn3: function (index) {
+				}
+			});
+		}
+
         function openDialogreAttendance(title,url,width,height,target){
             if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
                 width='auto';
@@ -1012,15 +1069,15 @@
                     }
                     else if(d.type == "113" && d.remarks == '待处理'){
 						if (d.isreply == "1"){
-							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass2('"+ d.type1 +"待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreOnCaseBase('"+ d.type1 +"待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
 									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+ d.title +"</span>" +
 									"</a>";
 						}else if (d.isreply == "2") {
-							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass2('"+ d.type1 +"待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreOnCaseBase('"+ d.type1 +"待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
 									"<span title=\""+ d.title +"\">"+"【通过】"+ d.title +"</span>" +
 									"</a>";
 						}else {
-							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogPass2('"+ d.type1 +"待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogreOnCaseBase('"+ d.type1 +"待处理', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
 									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
 									"</a>";
 						}
@@ -1087,7 +1144,7 @@
 										"<span title=\""+ d.title +"\" style=\"color: red;\">"+ "【驳回】"+d.title +"</span>" +
 										"</a>";
 							}else{
-								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+								return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogres('"+ d.type1 +"重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
 										"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+ d.title +"</span>" +
 										"</a>";
 							}