发票、报销、公告、项目新增报告、咨询报告 首页被删除，列表页添加存在判断

src/main/java/com/jeeplus/modules/oa/service/OaNotifyService.java

@@ -102,8 +102,10 @@ public class OaNotifyService extends CrudService<OaNotifyDao, OaNotify> {
 
     public OaNotify get(String id) {
         OaNotify oaNotify = dao.get(id);
-        List<Workattachment> attachmentList = workattachmentService.getListByAttachmentIdAndFlag(id, "79");
-        oaNotify.setWorkAttachments(attachmentList);
+        if(null != oaNotify){
+            List<Workattachment> attachmentList = workattachmentService.getListByAttachmentIdAndFlag(id, "79");
+            oaNotify.setWorkAttachments(attachmentList);
+        }
         return oaNotify;
     }
 

src/main/java/com/jeeplus/modules/oa/web/OaNotifyController.java

@@ -127,6 +127,27 @@ public class OaNotifyController extends BaseController {
 	}
 
 	/**
+	 * 获取公告是否存在判定
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "getOaNotify")
+	@ResponseBody
+	public Map<String,String> getOaNotify(String id){
+		Map map = new HashMap();
+		OaNotify oaNotify = null;
+		if (StringUtils.isNotBlank(id)){
+			oaNotify = oaNotifyService.get(id);
+		}
+		if(null != oaNotify){
+			map.put("success",true);
+		}else{
+			map.put("success",false);
+		}
+		return map;
+	}
+
+	/**
 	 * 查看，增加，编辑报告表单页面
 	 */
 	@RequiresPermissions(value={"oa:oaNotify:view","oa:oaNotify:add","oa:oaNotify:edit"},logical=Logical.OR)

src/main/java/com/jeeplus/modules/projectConstruction/web/ContractController.java

@@ -506,6 +506,27 @@ public class ContractController extends BaseController {
         return map;
     }
 
+
+
+    /**
+     * 判断是否含有报告信息
+     * @param projectFollowReport
+     * @return
+     */
+    @RequestMapping("/getFollowExist")
+    @ResponseBody
+    public Map<String,String> getFollowExist(ProjectFollowReport projectFollowReport){
+        Map map = new HashMap();
+        //通过id获取跟踪咨询报告信息
+        ProjectFollowReport follow = projectImplementEarlyService.getFollow(projectFollowReport);
+        if(null != follow){
+            map.put("success",true);
+        }else{
+            map.put("success",false);
+        }
+        return map;
+    }
+
     /**
      * 跳转新增页
      * @param projectFollowReport

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

@@ -43,6 +43,7 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
@@ -301,6 +302,26 @@ public class RuralCostProjectMessageController extends BaseController {
         return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
     }
 
+
+    /**
+     * 判断是否含有报告信息
+     * @param id
+     * @return
+     */
+    @RequestMapping("/getReportExist")
+    @ResponseBody
+    public Map<String,String> getReportExist(String id){
+        Map map = new HashMap();
+        Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(id);
+        ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
+        if(null != projectReportData){
+            map.put("success",true);
+        }else{
+            map.put("success",false);
+        }
+        return map;
+    }
+
     /**
      * 编辑项目表单页面
      */
@@ -455,8 +476,11 @@ public class RuralCostProjectMessageController extends BaseController {
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
         //修改工作内容中的信息（将工作内容的info_id清空）
         ruralProjectMessageService.updateProjectcontentinfo(projectcontentinfo1);
-        //删除报告信息
-        ruralProjectMessageService.deleteReport(projectReportData);
+        if(null != projectReportData){
+            //删除报告信息
+            ruralProjectMessageService.deleteReport(projectReportData);
+        }
+        addMessage(redirectAttributes, "删除成功");
         return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
     }
 

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

@@ -304,6 +304,25 @@ public class RuralProjectMessageController extends BaseController {
     }
 
     /**
+     * 判断是否含有报告信息
+     * @param id
+     * @return
+     */
+    @RequestMapping("/getReportExist")
+    @ResponseBody
+    public Map<String,String> getReportExist(String id){
+        Map map = new HashMap();
+        Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(id);
+        ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
+        if(null != projectReportData){
+            map.put("success",true);
+        }else{
+            map.put("success",false);
+        }
+        return map;
+    }
+
+    /**
      * 编辑项目表单页面
      */
     @RequiresPermissions(value={"ruralProject:ruralProjectMessage:edit"},logical= Logical.OR)
@@ -451,13 +470,16 @@ public class RuralProjectMessageController extends BaseController {
      * @return
      */
     @RequestMapping(value = "deleteReport")
-    public String deleteReport(RuralProjectcontentinfo projectcontentinfo) {
+    public String deleteReport(RuralProjectcontentinfo projectcontentinfo, RedirectAttributes redirectAttributes) {
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
         //修改工作内容中的信息（将工作内容的info_id清空）
         ruralProjectMessageService.updateProjectcontentinfo(projectcontentinfo1);
-        //删除报告信息
-        ruralProjectMessageService.deleteReport(projectReportData);
+        if(null != projectReportData){
+            //删除报告信息
+            ruralProjectMessageService.deleteReport(projectReportData);
+        }
+        addMessage(redirectAttributes, "删除成功");
         return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
     }
 

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

@@ -116,22 +116,24 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 		if(StringUtils.isNotBlank(id)){
 			workInvoice = super.get(id);
 		}
-		//查询收款信息
-		WorkInvoiceReceipt erceipt = new WorkInvoiceReceipt();
-		erceipt.setInvoiceId(id);
-		List<WorkInvoiceReceipt> receiptList = workInvoiceReceiptDao.findList(erceipt);
-		workInvoice.setWorkReceiptList(receiptList);
+		if(null != workInvoice) {
+			//查询收款信息
+			WorkInvoiceReceipt erceipt = new WorkInvoiceReceipt();
+			erceipt.setInvoiceId(id);
+			List<WorkInvoiceReceipt> receiptList = workInvoiceReceiptDao.findList(erceipt);
+			workInvoice.setWorkReceiptList(receiptList);
 
-		if(workInvoice!=null){
-			if(workInvoice.getProject()!=null){
-				ProjectRecords project = projectRecordsService.getRuralInfo(workInvoice.getProject().getId());
-				workInvoice.setProject(project);
-			}
-			if(StringUtils.isNotBlank(workInvoice.getId())){
-				WorkInvoiceDetail workInvoiceDetail = new WorkInvoiceDetail();
-				workInvoiceDetail.setInvoiceId(workInvoice.getId());
-				List<WorkInvoiceDetail> list = workInvoiceDetailDao.findList(workInvoiceDetail);
-				workInvoice.setWorkAccountList(list);
+			if (workInvoice != null) {
+				if (workInvoice.getProject() != null) {
+					ProjectRecords project = projectRecordsService.getRuralInfo(workInvoice.getProject().getId());
+					workInvoice.setProject(project);
+				}
+				if (StringUtils.isNotBlank(workInvoice.getId())) {
+					WorkInvoiceDetail workInvoiceDetail = new WorkInvoiceDetail();
+					workInvoiceDetail.setInvoiceId(workInvoice.getId());
+					List<WorkInvoiceDetail> list = workInvoiceDetailDao.findList(workInvoiceDetail);
+					workInvoice.setWorkAccountList(list);
+				}
 			}
 		}
 		return workInvoice;

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

@@ -18,6 +18,7 @@ import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.act.utils.ActUtils;
+import com.jeeplus.modules.oa.entity.OaNotify;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
@@ -538,6 +539,29 @@ public class WorkInvoiceController extends BaseController {
 		addMessage(redirectAttributes, "保存发票成功");
 		return "redirect:"+Global.getAdminPath()+"/workinvoice/workInvoice/?repage";
 	}
+
+	/**
+	 * 获取公告是否存在判定
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "getInvoiceExist")
+	@ResponseBody
+	public Map<String,String> getInvoiceExist(String id){
+		Map map = new HashMap();
+		WorkInvoice workInvoice = null;
+		if (StringUtils.isNotBlank(id)){
+			workInvoice = workInvoiceService.get(id);
+		}
+		if(null != workInvoice){
+			map.put("success",true);
+		}else{
+			map.put("success",false);
+		}
+		return map;
+	}
+
+
 	/**
 	 * 删除开票管理
 	 */
@@ -545,7 +569,7 @@ public class WorkInvoiceController extends BaseController {
 	@RequestMapping(value = "delete")
 	public String delete(WorkInvoice workInvoice, RedirectAttributes redirectAttributes) {
 		workInvoiceService.delete(workInvoice);
-		addMessage(redirectAttributes, "作废发票管理成功");
+		addMessage(redirectAttributes, "删除发票管理成功");
 		return "redirect:"+Global.getAdminPath()+"/workinvoice/workInvoice/?repage";
 	}
 	/**

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementService.java

@@ -134,33 +134,34 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
     @SuppressWarnings("unchecked")
     public WorkReimbursement get(String id) {
         WorkReimbursement workReimbursement = super.get(id);
-        List<WorkAccount> workAccounts = workAccountDao.findList(new WorkAccount(workReimbursement));
-        for (WorkAccount workAccount:workAccounts){
-            List<WorkAccountAudit> workAccountAudits = workAccountDao.findByWorkAccount(workAccount);
-            if (workAccountAudits!=null && workAccountAudits.size()!=0){
-                workAccount.setWorkAccountAuditList(workAccountAudits);
+        if(null != workReimbursement){
+            List<WorkAccount> workAccounts = workAccountDao.findList(new WorkAccount(workReimbursement));
+            for (WorkAccount workAccount:workAccounts){
+                List<WorkAccountAudit> workAccountAudits = workAccountDao.findByWorkAccount(workAccount);
+                if (workAccountAudits!=null && workAccountAudits.size()!=0){
+                    workAccount.setWorkAccountAuditList(workAccountAudits);
+                }
+                if (StringUtils.isNotBlank(workReimbursement.getExt()) && workReimbursement.getExt().equals("1")){
+                    workAccount.setFinancialSubjectss(workAccount.getFinancialSubjects());
+                    workAccount.setFinancialSubjects("");
+                }
+                if(null != workAccount.getProjectRadio() && workAccount.getProjectRadio() == 0){
+                    workAccount.getProject().setProjectName(workAccount.getReimburseRemarks());
+                }
             }
-            if (StringUtils.isNotBlank(workReimbursement.getExt()) && workReimbursement.getExt().equals("1")){
-                workAccount.setFinancialSubjectss(workAccount.getFinancialSubjects());
-                workAccount.setFinancialSubjects("");
+            workReimbursement.setWorkAccountList(workAccounts);
+            workReimbursement.setReimbursementVATTaxes(reimbursementVATTaxDao.findList(new ReimbursementVATTax(workReimbursement)));
+            WorkClientAttachment workClientAttachment = new WorkClientAttachment();
+            workClientAttachment.setAttachmentId(id);
+            workClientAttachment.setAttachmentFlag(VarStr.attachmentFlag[1]);
+            workReimbursement.setWorkAttachments(workClientAttachmentDao.findList(workClientAttachment));
+            if (workReimbursement!=null && StringUtils.isNotBlank(workReimbursement.getSubmitterId())){
+                workReimbursement.setSubmitterName(UserUtils.get(workReimbursement.getSubmitterId()).getName());
             }
-            if(null != workAccount.getProjectRadio() && workAccount.getProjectRadio() == 0){
-                workAccount.getProject().setProjectName(workAccount.getReimburseRemarks());
+            if (workReimbursement!=null && StringUtils.isNotBlank(workReimbursement.getOfficeId())){
+                workReimbursement.setOfficeName(UserUtils.getOfficeById(workReimbursement.getOfficeId()).getName());
             }
-        }
-        workReimbursement.setWorkAccountList(workAccounts);
-        workReimbursement.setReimbursementVATTaxes(reimbursementVATTaxDao.findList(new ReimbursementVATTax(workReimbursement)));
-        WorkClientAttachment workClientAttachment = new WorkClientAttachment();
-        workClientAttachment.setAttachmentId(id);
-        workClientAttachment.setAttachmentFlag(VarStr.attachmentFlag[1]);
-        workReimbursement.setWorkAttachments(workClientAttachmentDao.findList(workClientAttachment));
-        if (workReimbursement!=null && StringUtils.isNotBlank(workReimbursement.getSubmitterId())){
-            workReimbursement.setSubmitterName(UserUtils.get(workReimbursement.getSubmitterId()).getName());
-        }
-        if (workReimbursement!=null && StringUtils.isNotBlank(workReimbursement.getOfficeId())){
-            workReimbursement.setOfficeName(UserUtils.getOfficeById(workReimbursement.getOfficeId()).getName());
-        }
-        //暂存状态不操作流程
+            //暂存状态不操作流程
 		/*if(!"1".equals(workReimbursement.getStatus())){
             Map<String,Object> variables=null;
             HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().processInstanceId(workReimbursement.getProcessInstanceId()).singleResult();
@@ -171,44 +172,45 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
             }
             workReimbursement.setVariables(variables);
         }*/
-        if (workReimbursement.getProject()!=null && StringUtils.isNotBlank(workReimbursement.getProject().getId())){
-            List<User> users = workProjectUserDao.queryProjectUsers(workReimbursement.getProject().getId(), "1");
-            String projectMasterName = "";
-            if(users!=null && users.size()!=0){
-                for (int i = 0; i < users.size(); i++) {
-                    if(i == users.size() -1){
-                        projectMasterName += UserUtils.get(users.get(i).getId()).getName();
-                    }else{
-                        projectMasterName += UserUtils.get(users.get(i).getId()).getName()+",";
+            if (workReimbursement.getProject()!=null && StringUtils.isNotBlank(workReimbursement.getProject().getId())){
+                List<User> users = workProjectUserDao.queryProjectUsers(workReimbursement.getProject().getId(), "1");
+                String projectMasterName = "";
+                if(users!=null && users.size()!=0){
+                    for (int i = 0; i < users.size(); i++) {
+                        if(i == users.size() -1){
+                            projectMasterName += UserUtils.get(users.get(i).getId()).getName();
+                        }else{
+                            projectMasterName += UserUtils.get(users.get(i).getId()).getName()+",";
+                        }
                     }
+                    workReimbursement.setProjectMasterName(projectMasterName);
                 }
-                workReimbursement.setProjectMasterName(projectMasterName);
             }
-        }
-        WorkReimbursementBack workReimbursementBack=new WorkReimbursementBack();
-        workReimbursementBack.setWorkReimbursementId(id);
-        workReimbursementBack.setAchivesId(workReimbursement.getAchivesId());
-        List<WorkReimbursementBack> list=workReimbursementBackDao.findList(workReimbursementBack);
-        List<WorkReimbursementBack> newList=new ArrayList<>();
-        if(list!=null&&list.size()>0){
-            for(WorkReimbursementBack workReimbursementBack1:list){
-               if(workReimbursementBack1.getWorkLoan()!=null){
-                   List<WorkRepay> workRepayList= workRepayDao.findWorkRepayView(workReimbursementBack1.getWorkLoan().getId(),id);
-                   if(workRepayList!=null&&workRepayList.size()>0){
-                   }else{
-                       WorkLoan workLoan=workLoanService.getLon(workReimbursementBack1.getWorkLoan().getId());
-                       if(workLoan.getType().equals("1")){
-                           workLoan.setType("行政借款");
-                       }else{
-                           workLoan.setType("项目借款");
-                       }
-                       workReimbursementBack1.setWorkLoan(workLoan);
-                       newList.add(workReimbursementBack1);
-                   }
-               }
+            WorkReimbursementBack workReimbursementBack=new WorkReimbursementBack();
+            workReimbursementBack.setWorkReimbursementId(id);
+            workReimbursementBack.setAchivesId(workReimbursement.getAchivesId());
+            List<WorkReimbursementBack> list=workReimbursementBackDao.findList(workReimbursementBack);
+            List<WorkReimbursementBack> newList=new ArrayList<>();
+            if(list!=null&&list.size()>0){
+                for(WorkReimbursementBack workReimbursementBack1:list){
+                    if(workReimbursementBack1.getWorkLoan()!=null){
+                        List<WorkRepay> workRepayList= workRepayDao.findWorkRepayView(workReimbursementBack1.getWorkLoan().getId(),id);
+                        if(workRepayList!=null&&workRepayList.size()>0){
+                        }else{
+                            WorkLoan workLoan=workLoanService.getLon(workReimbursementBack1.getWorkLoan().getId());
+                            if(workLoan.getType().equals("1")){
+                                workLoan.setType("行政借款");
+                            }else{
+                                workLoan.setType("项目借款");
+                            }
+                            workReimbursementBack1.setWorkLoan(workLoan);
+                            newList.add(workReimbursementBack1);
+                        }
+                    }
+                }
             }
+            workReimbursement.setReimbursementBackList( workReimbursementBackDao.findList(workReimbursementBack));
         }
-        workReimbursement.setReimbursementBackList( workReimbursementBackDao.findList(workReimbursementBack));
         return workReimbursement;
     }
 

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementController.java

@@ -38,6 +38,7 @@ import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
 import com.jeeplus.modules.workfullmanage.service.WorkFullManageService;
 import com.jeeplus.modules.projectrecord.dao.WorkProjectUserDao;
+import com.jeeplus.modules.workinvoice.entity.WorkInvoice;
 import com.jeeplus.modules.workreimbursement.entity.WorkAccount;
 import com.jeeplus.modules.workreimbursement.entity.WorkAccountAudit;
 import com.jeeplus.modules.workreimbursement.entity.WorkReimbursement;
@@ -154,6 +155,27 @@ public class WorkReimbursementController extends BaseController {
 
 
 	/**
+	 * 获取报销是否存在判定
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "getExist")
+	@ResponseBody
+	public Map<String,String> getExist(String id){
+		Map map = new HashMap();
+		WorkReimbursement workReimbursement = null;
+		if (StringUtils.isNotBlank(id)){
+			workReimbursement = workReimbursementService.get(id);
+		}
+		if(null != workReimbursement){
+			map.put("success",true);
+		}else{
+			map.put("success",false);
+		}
+		return map;
+	}
+
+	/**
 	 * 查看，增加，编辑报销单表单页面
 	 */
 //	@RequiresPermissions(value={"workreimbursement:workReimbursement:view","workreimbursement:workReimbursement:add","workreimbursement:workReimbursement:edit"},logical=Logical.OR)

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

@@ -81,7 +81,7 @@
 			<include refid="workInvoiceColumns"/>
 		FROM work_invoice a
 		<include refid="workInvoiceJoins"/>
-		WHERE a.id = #{id}
+		WHERE a.id = #{id} and a.del_flag = 0
 	</select>
 	
 	<select id="findList" resultType="WorkInvoice" >

src/main/webapp/webpage/modules/ProjectFollowReport/ProjectFollowReportList.jsp

@@ -181,6 +181,95 @@
 				}
 			});
 		}
+
+		function openDialogreModify(title,url,id,width,height,target) {
+
+			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+				width = 'auto';
+				height = 'auto';
+			} else {//如果是PC端，根据用户设置的width和height显示。
+
+			}
+
+			$.ajax({
+				async: false,
+				url: "${ctx}/project/constructionContract/getFollowExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						top.layer.open({
+							type: 2,
+							area: [width, height],
+							title: title,
+							skin: 'three-btns',
+							maxmin: true, //开启最大化最小化按钮
+							content: url ,
+							btn: ['提交','关闭'],
+							btn1: function(index, layero){
+								var body = top.layer.getChildFrame('body', index);
+								var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+								var inputForm = body.find('#inputForm');
+								var top_iframe;
+								if(target){
+									top_iframe = target;//如果指定了iframe，则在改frame中跳转
+								}else{
+									top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+								}
+								inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+								if(iframeWin.contentWindow.doSubmit(1) ){
+									top.layer.close(index);//关闭对话框。
+									setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+								}
+							},
+							btn2: function(index){
+							}
+						});
+					}else{
+						top.layer.msg("该咨询报告信息不存在！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+
+
+		}
+
+
+		//打开对话框(查看)
+		function openDialogListView(title,url,id,width,height){
+
+
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			$.ajax({
+				async: false,
+				url: "${ctx}/project/constructionContract/getFollowExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						top.layer.open({
+							type: 2,
+							skin: 'one-btn',
+							area: [width, height],
+							title: title,
+							maxmin: true, //开启最大化最小化按钮
+							content: url ,
+							btn: ['关闭'],
+							cancel: function(index){
+							}
+						});
+					}else{
+						top.layer.msg("该咨询报告信息不存在！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+
+		}
 	</script>
 	<style>
 		body{
@@ -301,7 +390,7 @@
 							if(0 == d.pid){
 								return "<a class=\"attention-info pid\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/project/projectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";
 							}else{
-								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看跟踪咨询报告内容', '${ctx}/project/constructionContract/followForm?view=view&id="+d.id+"&project.id="+d.pid+"','95%', '95%')\">" + d.projectName + "</a>";
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogListView('查看跟踪咨询报告内容', '${ctx}/project/constructionContract/followForm?view=view&id="+d.id+"&project.id="+d.pid+"','"+ d.id +"','95%', '95%')\">" + d.projectName + "</a>";
 							}
 						}},
 					{field: 'projectLeader', align:'center', title: '项目负责人',templet: function(d){
@@ -332,7 +421,7 @@
 							if(d.pid !=0){
 								var st = getAuditState(""+d.status);
 								if(st.action)
-									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/project/constructionContract/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+									var xml = "<span onclick=\"openDialogListView('流程追踪', '${ctx}/project/constructionContract/getProcess?id=" + d.id + "','"+d.id+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 								else
 									var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 								return xml;
@@ -393,7 +482,7 @@
 						].join('');
 					}else if(d.status == 4){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改跟踪咨询报告内容\', \'${ctx}/project/constructionContract/modify?id='+d.id+'&project.id='+d.pid+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+							'<a href="javascript:void(0)" onclick="openDialogreModify(\'修改跟踪咨询报告内容\', \'${ctx}/project/constructionContract/modify?id='+d.id+'&project.id='+d.pid+ '\',\''+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
 							'<a href="${ctx}/project/constructionContract/deleteFollow?project.id='+d.pid+'&id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该跟踪咨询报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
 						].join('');
 					}else if(d.status == 5){

src/main/webapp/webpage/modules/oa/oaNotifyList.jsp

@@ -207,6 +207,115 @@
                 }
             });
         }
+
+        function openDialogreModify(title,url,id,width,height,target,buttons) {
+
+            if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+                width = 'auto';
+                height = 'auto';
+            } else {//如果是PC端，根据用户设置的width和height显示。
+
+            }
+
+			$.ajax({
+				async: false,
+				url: "${ctx}/oa/oaNotify/getOaNotify?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						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
+								}
+								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){
+								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
+								}
+								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) {
+							}
+						});
+					}else{
+						top.layer.msg("该公告信息不存在！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+
+
+        }
+
+
+		//打开对话框(查看)
+		function openDialogListView(title,url,id,width,height){
+
+
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			$.ajax({
+				async: false,
+				url: "${ctx}/oa/oaNotify/getOaNotify?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						top.layer.open({
+							type: 2,
+							skin: 'one-btn',
+							area: [width, height],
+							title: title,
+							maxmin: true, //开启最大化最小化按钮
+							content: url ,
+							btn: ['关闭'],
+							cancel: function(index){
+							}
+						});
+					}else{
+						top.layer.msg("该公告信息不存在！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+
+		}
 	</script>
 
 	<style>
@@ -328,7 +437,7 @@
                 // {checkbox: true, fixed: true},
                 {field:'index',align:'center',  width:40,title: '序号'}
 				,{field:'title',align:'center', title: '公告标题', minWidth:150,templet:function(d){
-						var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看公告', '${ctx}/oa/oaNotify/form?id=" + d.id + "&view=view','95%','95%')\">" +
+						var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogListView('查看公告', '${ctx}/oa/oaNotify/form?id=" + d.id + "&view=view','" + d.id + "','95%','95%')\">" +
 								"<span title=" + d.title + ">" + d.title + "</span></a>";
 						return xml;
 					}}
@@ -352,7 +461,7 @@
 					}}
                 ,{align:'center', title: '公告状态',  width:70,templet:function(d){
                         var st = getAuditState(d.status)
-                        var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/oa/oaNotify/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                        var xml = "<span onclick=\"openDialogListView('流程追踪', '${ctx}/oa/oaNotify/getProcess?id=" + d.id + "','" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
                 // ,{fixed: 'right',align:'center', toolbar: '#op',title:"操作"}
@@ -366,7 +475,7 @@
                         if(d.candel != undefined && d.candel == "1")
                             xml += "<a href=\"${ctx}/oa/oaNotify/delete?id="+ d.id +"\" onclick=\"return confirmx('确认要关闭该公告吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 关闭</a>";
                         if(d.canmodify != undefined && d.canmodify =="1"){
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改公告', '${ctx}/oa/oaNotify/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogreModify('修改公告', '${ctx}/oa/oaNotify/modify?id=" + d.id + "','95%', '95%','" + d.id + "','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
                         }
                         if(d.cancancel != undefined && d.cancancel =="1"){
                             xml+="<a href=\"${ctx}/oa/oaNotify/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该公告吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordModify.jsp

@@ -661,6 +661,13 @@
 					</table>
 				</div>
 			</div>--%>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<act:flowChart procInsId="${projectReportRecord.processInstanceId}"/>
+					<act:histoicFlow procInsId="${projectReportRecord.processInstanceId}"/>
+				</div>
+			</div>
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportModify.jsp

@@ -806,6 +806,14 @@
 					</td>
                 </tr>//-->
 			</script>
+
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<act:flowChart procInsId="${processInstanceId}"/>
+					<act:histoicFlow procInsId="${processInstanceId}"/>
+				</div>
+			</div>
 		<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>

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

@@ -977,6 +977,13 @@
                 </div>
             </div>
 
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <act:flowChart procInsId="${ruralProjectRecordsReported.processInstanceId}"/>
+                    <act:histoicFlow procInsId="${ruralProjectRecordsReported.processInstanceId}"/>
+                </div>
+            </div>
             <div class="form-group layui-row page-end"></div>
         </form:form>
     </div>

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

@@ -148,6 +148,115 @@
                 }
             });
         }
+
+
+		//打开对话框(查看)
+		function openDialogReportView(title,url,id,width,height){
+
+
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			$.ajax({
+				async: false,
+				url: "${ctx}/ruralProject/ruralCostProjectMessage/getReportExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						top.layer.open({
+							type: 2,
+							skin: 'one-btn',
+							area: [width, height],
+							title: title,
+							maxmin: true, //开启最大化最小化按钮
+							content: url ,
+							btn: ['关闭'],
+							cancel: function(index){
+							}
+						});
+					}else{
+						top.layer.msg("该项目报告信息不存在！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+
+		}
+
+
+
+		function openDialogreReport(title,url,id,width,height,target,buttons) {
+
+			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+				width = 'auto';
+				height = 'auto';
+			} else {//如果是PC端，根据用户设置的width和height显示。
+
+			}
+
+			$.ajax({
+				async: false,
+				url: "${ctx}/ruralProject/ruralCostProjectMessage/getReportExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						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
+								}
+								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){
+								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
+								}
+								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) {
+							}
+						});
+					}else{
+						top.layer.msg("该项目报告信息不存在！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+		}
 	</script>
 	<style>
 		body{
@@ -283,7 +392,7 @@
                 // {checkbox: true, fixed: true},
                 {field:'index',align:'center', fixed: 'left', title: '序号',width:40}
 				,{field:'projectReportNumber',align:'center', fixed: 'left', title: '报告号',minWidth:180,templet:function(d){
-						return "<a class=\"attention-info\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','95%', '95%')\">" + d.projectReportNumber + "</a>";
+						return "<a class=\"attention-info\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";
 					}}
                 ,{field:'projName',align:'center', title: '项目名称', fixed: 'left',minWidth:200,templet:function(d){
                         return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralCostProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
@@ -307,7 +416,7 @@
                 ,{align:'center', title: '报告状态',  width:70,templet:function(d){
                         var st = getAuditState(d.projectReportStatus);
                         if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml = "<span onclick=\"openDialogReportView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+ d.id +"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         else
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
@@ -347,7 +456,7 @@
                         }
                         if(d.canedit2 != undefined && d.canedit2 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=report','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogreReport('调整报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=report','"+ d.id +"','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
 							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除报告</a>";
                         }
                         if(d.canrecall != undefined && d.canrecall =="1")

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

@@ -1224,6 +1224,13 @@
                     </table>
                 </div>
             </div>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <act:flowChart procInsId="${projectRecords.processInstanceId}"/>
+                    <act:histoicFlow procInsId="${projectRecords.processInstanceId}"/>
+                </div>
+            </div>
             <div class="form-group layui-row page-end"></div>
         </form:form>
     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordModify.jsp

@@ -660,6 +660,13 @@
 					</table>
 				</div>
 			</div>--%>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<act:flowChart procInsId="${projectReportRecord.processInstanceId}"/>
+					<act:histoicFlow procInsId="${projectReportRecord.processInstanceId}"/>
+				</div>
+			</div>
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>

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

@@ -1217,8 +1217,8 @@
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
-                    <act:flowChart procInsId="${processInstanceId}"/>
-                    <act:histoicFlow procInsId="${processInstanceId}"/>
+                    <act:flowChart procInsId="${projectRecords.processInstanceId}"/>
+                    <act:histoicFlow procInsId="${projectRecords.processInstanceId}"/>
                 </div>
             </div>
             <div class="form-group layui-row page-end"></div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportModify.jsp

@@ -807,6 +807,13 @@
                 </tr>//-->
 			</script>
 
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<act:flowChart procInsId="${processInstanceId}"/>
+					<act:histoicFlow procInsId="${processInstanceId}"/>
+				</div>
+			</div>
 		<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>

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

@@ -983,6 +983,17 @@
                 </div>
             </div>
 
+            <div class="form-group layui-row lw8">
+                <div class="form-group-label"><h2>审批意见</h2></div>
+                <div class="layui-item layui-col-sm12  with-textarea">
+                    <label class="layui-form-label">审批意见：</label>
+                    <div class="layui-input-block">
+                        <form:textarea path="act.comment" class="form-control" rows="4" maxlength="127" />
+                        <input type="file" name="upload_files" style="display: none;">
+                    </div>
+                </div>
+            </div>
+
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >

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

@@ -149,6 +149,114 @@
                 }
             });
         }
+
+		//打开对话框(查看)
+		function openDialogReportView(title,url,id,width,height){
+
+
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			$.ajax({
+				async: false,
+				url: "${ctx}/ruralProject/ruralProjectMessage/getReportExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						top.layer.open({
+							type: 2,
+							skin: 'one-btn',
+							area: [width, height],
+							title: title,
+							maxmin: true, //开启最大化最小化按钮
+							content: url ,
+							btn: ['关闭'],
+							cancel: function(index){
+							}
+						});
+					}else{
+						top.layer.msg("该项目报告信息不存在！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+
+		}
+
+
+
+		function openDialogreReport(title,url,id,width,height,target,buttons) {
+
+			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+				width = 'auto';
+				height = 'auto';
+			} else {//如果是PC端，根据用户设置的width和height显示。
+
+			}
+
+			$.ajax({
+				async: false,
+				url: "${ctx}/ruralProject/ruralProjectMessage/getReportExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						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
+								}
+								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){
+								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
+								}
+								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) {
+							}
+						});
+					}else{
+						top.layer.msg("该项目报告信息不存在！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+		}
 	</script>
 	<style>
 		body{
@@ -284,7 +392,7 @@
                 // {checkbox: true, fixed: true},
                 {field:'index',align:'center', fixed: 'left', title: '序号',width:40}
 				,{field:'projectReportNumber',align:'center', fixed: 'left', title: '报告号',minWidth:180,templet:function(d){
-						return "<a class=\"attention-info\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','95%', '95%')\">" + d.projectReportNumber + "</a>";
+						return "<a class=\"attention-info\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";
 					}}
                 ,{field:'projName',align:'center',fixed: 'left', title: '项目名称',minWidth:200,templet:function(d){
                         return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
@@ -308,7 +416,7 @@
                 ,{align:'center', title: '报告状态',  width:70,templet:function(d){
                         var st = getAuditState(d.projectReportStatus);
                         if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml = "<span onclick=\"openDialogReportView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+d.id+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         else
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
@@ -349,7 +457,7 @@
                         if(d.canedit2 != undefined && d.canedit2 =="1")
                         {
                         	//驳回操作
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=report','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogreReport('调整报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
                             xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除报告</a>";
                         }
                         if(d.canrecall != undefined && d.canrecall =="1")

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

@@ -239,6 +239,116 @@
             });
 
         }
+
+		function openDialogreModify(title,url,id,width,height,target,buttons) {
+
+			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+				width = 'auto';
+				height = 'auto';
+			} else {//如果是PC端，根据用户设置的width和height显示。
+
+			}
+
+			$.ajax({
+				async: false,
+				url: "${ctx}/workinvoice/workInvoice/getInvoiceExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						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
+								}
+								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){
+								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
+								}
+								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) {
+							}
+						});
+					}else{
+						top.layer.msg("该发票信息不存在！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+
+
+		}
+
+
+		//打开对话框(查看)
+		function openDialogListView(title,url,id,width,height){
+
+
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			$.ajax({
+				async: false,
+				url: "${ctx}/workinvoice/workInvoice/getInvoiceExist?id="+id,
+				dataType: "json",
+				success: function (data) {
+					if(data.success){
+						top.layer.open({
+							type: 2,
+							skin: 'one-btn',
+							area: [width, height],
+							title: title,
+							maxmin: true, //开启最大化最小化按钮
+							content: url ,
+							btn: ['关闭'],
+							cancel: function(index){
+							}
+						});
+					}else{
+						top.layer.msg("该发票信息不存在！", {icon: 0});
+						window.location.reload();
+					}
+				}
+			});
+
+		}
+
 	</script>
 	<style>
 		body{
@@ -423,7 +533,7 @@
 						return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.projectId +"','95%', '95%')\">" + d.projName + "</a>";
 					}}
                 ,{field:'invoiceNum',align:'center', sort:true,title: '发票申请编号', minWidth:130,templet:function(d){
-                        return "<a class=\"attention-info\" title=\""+ d.invoiceNum +"\"href=\"javascript:void(0);\" onclick=\"openDialogView('查看发票管理', '${ctx}/workinvoice/workInvoice/form?id=" + d.id + "&tabId=1','95%', '95%')\">" + d.invoiceNum + "</a>";
+                        return "<a class=\"attention-info\" title=\""+ d.invoiceNum +"\"href=\"javascript:void(0);\" onclick=\"openDialogListView('查看发票管理', '${ctx}/workinvoice/workInvoice/form?id=" + d.id + "&tabId=1','"+ d.id +"','95%', '95%')\">" + d.invoiceNum + "</a>";
                     }}
 				,{field:'clientName', align:'center',title: '开票单位', minWidth:160,templet:function(d){
 						return "<span title='"+ d.clientName +"'>" + d.clientName + "</span>";
@@ -463,7 +573,7 @@
                         <%--return xml;--%>
                         var st = getAuditState(d.status);
                         if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/workinvoice/workInvoice/getProcessOne?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml = "<span onclick=\"openDialogListView('流程追踪', '${ctx}/workinvoice/workInvoice/getProcessOne?id=" + d.id + "','"+ d.id +"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         else
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
@@ -477,7 +587,7 @@
                         }
                         if(d.canedit2 != undefined && d.canedit2 =="1")
                         {
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('修改发票', '${ctx}/workinvoice/workInvoice/form?id=" + d.id + "&tabId=3','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('修改发票', '${ctx}/workinvoice/workInvoice/form?id=" + d.id + "&tabId=3','"+ d.id +"','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
                         }
                         if(d.canedit3 != undefined && d.canedit3 =="1")
                         {

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

@@ -151,7 +151,7 @@
                 // {checkbox: true, fixed: true},
                 {field:'submitterId',align:'center',  width:40,title: '序号'}
                 ,{field:'number',align:'center', title: '报销编号', width:150,templet:function(d){
-                        var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看报销单', '${ctx}/workreimbursement/workReimbursement/form?id=" + d.id + "&tabId=1','95%','95%')\">" +
+                        var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogListView('查看报销单', '${ctx}/workreimbursement/workReimbursement/form?id=" + d.id + "&tabId=1','"+ d.id +"','95%','95%')\">" +
                             "<span title=" + d.realnumber + ">" + d.number + "</span></a>";
                         return xml;
                     }}
@@ -181,7 +181,7 @@
                         <%--return xml;--%>
                         var st = getAuditState(d.status);
                         if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/workreimbursement/workReimbursement/getProcessOne?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml = "<span onclick=\"openDialogListView('流程追踪', '${ctx}/workreimbursement/workReimbursement/getProcessOne?id=" + d.id + "','"+ d.id +"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         else
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
@@ -195,7 +195,7 @@
                         if(d.canedit1 != undefined && d.canedit1 == "1")
                             xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改报销单', '${ctx}/workreimbursement/workReimbursement/form?id="+ d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
                         if(d.canedit2 != undefined && d.canedit2 == "1")
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('修改报销单', '${ctx}/workreimbursement/workReimbursement/form?id="+ d.id + "&tabId=3','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('修改报销单', '${ctx}/workreimbursement/workReimbursement/form?id="+ d.id + "&tabId=3','"+ d.id +"','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
                         if(d.canedit3 != undefined && d.canedit3 == "1")
                             xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请报销单', '${ctx}/workreimbursement/workReimbursement/form?id=" + d.id + "&tabId=4','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
                         if(d.candelete != undefined && d.candelete == "1")
@@ -395,6 +395,98 @@
             }
         });
     }
+
+
+    function openDialogreModify(title,url,id,width,height,target) {
+
+        if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+            width = 'auto';
+            height = 'auto';
+        } else {//如果是PC端，根据用户设置的width和height显示。
+
+        }
+
+        $.ajax({
+            async: false,
+            url: "${ctx}/workreimbursement/workReimbursement/getExist?id="+id,
+            dataType: "json",
+            success: function (data) {
+                if(data.success){
+                    top.layer.open({
+                        type: 2,
+                        area: [width, height],
+                        title: title,
+                        skin: 'two-btns',
+                        maxmin: true, //开启最大化最小化按钮
+                        content: url ,
+                        btn: ['重新申请','关闭'],
+                        yes: 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() ){
+                                top.layer.close(index);//关闭对话框。
+                                //setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+                            }
+
+                        },
+                        cancel: function(index){
+                        }
+                    });
+                }else{
+                    top.layer.msg("该报销信息不存在！", {icon: 0});
+                    window.location.reload();
+                }
+            }
+        });
+
+
+    }
+
+
+    //打开对话框(查看)
+    function openDialogListView(title,url,id,width,height){
+
+
+        if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+            width='auto';
+            height='auto';
+        }else{//如果是PC端，根据用户设置的width和height显示。
+
+        }
+        $.ajax({
+            async: false,
+            url: "${ctx}/workreimbursement/workReimbursement/getExist?id="+id,
+            dataType: "json",
+            success: function (data) {
+                if(data.success){
+                    top.layer.open({
+                        type: 2,
+                        skin: 'one-btn',
+                        area: [width, height],
+                        title: title,
+                        maxmin: true, //开启最大化最小化按钮
+                        content: url ,
+                        btn: ['关闭'],
+                        cancel: function(index){
+                        }
+                    });
+                }else{
+                    top.layer.msg("该报销信息不存在！", {icon: 0});
+                    window.location.reload();
+                }
+            }
+        });
+
+    }
 </script>
 </body>
 </html>