Merge branch 'master' of http://192.168.2.4:3000/user5/simple_xg_total_process_master

src/main/java/com/jeeplus/modules/oa/entity/OaNotify.java

@@ -60,6 +60,8 @@ public class OaNotify extends ActEntity<OaNotify> {
 	private String flagAdmin;     //管理员状态（1：管理员，0：非管理员）
 	private String referenceNumber;     //文号
 	private String flagOffice;     //是否为办公室权限（1：是，0：否）
+	private Integer notifyFlag; //代办判定条件
+	private String notifyId; //代办判定条件
 
     public String getHome() {
         return home;
@@ -385,6 +387,22 @@ public class OaNotify extends ActEntity<OaNotify> {
 	public void setFlagOffice(String flagOffice) {
 		this.flagOffice = flagOffice;
 	}
+
+	public Integer getNotifyFlag() {
+		return notifyFlag;
+	}
+
+	public void setNotifyFlag(Integer notifyFlag) {
+		this.notifyFlag = notifyFlag;
+	}
+
+	public String getNotifyId() {
+		return notifyId;
+	}
+
+	public void setNotifyId(String notifyId) {
+		this.notifyId = notifyId;
+	}
 	/*	@Override
 	public String toString() {
 		return "OaNotify [type=" + type + ", title=" + title + ", content=" + content + ", files=" + files + ", status="

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

@@ -59,6 +59,8 @@ public class OaNotifyController extends BaseController {
     private ActTaskService actTaskService;
 	@Autowired
 	private PushinfoService pushinfoService;
+	@Autowired
+	protected WorkProjectNotifyService workProjectNotifyService;
 	
 	@ModelAttribute
 	public OaNotify get(@RequestParam(required=false) String id) {
@@ -77,9 +79,9 @@ public class OaNotifyController extends BaseController {
 		oaNotify.setSelf(true);
 		Page<OaNotify> page = oaNotifyService.findUnreadMyself(new Page<OaNotify>(request, response), oaNotify);
 		List<OaNotify> list = page.getList();
-		for (OaNotify notify:list){
-			if (StringUtils.isNotBlank(notify.getContent())){
-				notify.setContent(notify.getContent().replace("\n",""));
+		for (OaNotify notify:list) {
+			if (StringUtils.isNotBlank(notify.getContent())) {
+				notify.setContent(notify.getContent().replace("\n", ""));
 			}
 		}
 		model.addAttribute("page", page);
@@ -113,6 +115,17 @@ public class OaNotifyController extends BaseController {
 			oaNotify.setCompany(user.getCompany());
 		}
 		Page<OaNotify> page = oaNotifyService.findByPc(new Page<OaNotify>(request, response), oaNotify);
+
+		//查询所有和当前登陆人有关的项目的审核
+		WorkProjectNotify workProjectNotify = new WorkProjectNotify();
+		workProjectNotify.setUser(UserUtils.getUser());
+		workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
+		workProjectNotify.setRemarks("待审批");
+		//添加发票对应编号
+		workProjectNotify.setType("89");
+		//查询所有需要当前登录人进行处理的项目信息
+		List<WorkProjectNotify> notifyList = workProjectNotifyService.findList(workProjectNotify);
+
 		List<OaNotify> list = page.getList();
 		for (OaNotify notify: list) {
 			//判断是否为管理员
@@ -121,6 +134,16 @@ public class OaNotifyController extends BaseController {
 			}else{
 				notify.setFlagAdmin("0");
 			}
+
+			for (WorkProjectNotify info: notifyList) {
+				if(info.getNotifyId().equals(notify.getId())){
+					notify.setNotifyId(info.getId());
+					if("待审批".equals(info.getRemarks()) && !"1".equals(info.getStatus())){
+						notify.setNotifyFlag(1);
+					}
+					break;
+				}
+			}
 		}
 		model.addAttribute("page", page);
 		return "modules/oa/oaNotifyList";

src/main/java/com/jeeplus/modules/projectFilingBatch/entity/ProjectFilingBatch.java

@@ -45,6 +45,8 @@ public class ProjectFilingBatch extends DataEntity<ProjectFilingBatch> {
     private String createName;
     private String createNameStr;   //创建人
     private String createId;     //创建人id
+    private Integer notifyFlag; //代办判定条件
+    private String notifyId; //代办判定条件
 
     public String getProcessinstanceId() {
         return processinstanceId;
@@ -229,4 +231,20 @@ public class ProjectFilingBatch extends DataEntity<ProjectFilingBatch> {
     public void setCreateId(String createId) {
         this.createId = createId;
     }
+
+    public Integer getNotifyFlag() {
+        return notifyFlag;
+    }
+
+    public void setNotifyFlag(Integer notifyFlag) {
+        this.notifyFlag = notifyFlag;
+    }
+
+    public String getNotifyId() {
+        return notifyId;
+    }
+
+    public void setNotifyId(String notifyId) {
+        this.notifyId = notifyId;
+    }
 }

src/main/java/com/jeeplus/modules/projectFilingBatch/entity/ProjectFilingBatchTree.java

@@ -21,6 +21,8 @@ public class ProjectFilingBatchTree extends DataEntity<ProjectFilingBatchTree> {
     private String url;
     private Integer flag;
     private String statusStr;
+    private Integer notifyFlag; //代办判定条件
+    private String notifyId; //代办判定条件
 
     public String getFilingBatch() {
         return filingBatch;
@@ -133,4 +135,20 @@ public class ProjectFilingBatchTree extends DataEntity<ProjectFilingBatchTree> {
     public void setStatusStr(String statusStr) {
         this.statusStr = statusStr;
     }
+
+    public Integer getNotifyFlag() {
+        return notifyFlag;
+    }
+
+    public void setNotifyFlag(Integer notifyFlag) {
+        this.notifyFlag = notifyFlag;
+    }
+
+    public String getNotifyId() {
+        return notifyId;
+    }
+
+    public void setNotifyId(String notifyId) {
+        this.notifyId = notifyId;
+    }
 }

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

@@ -126,6 +126,16 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
 
     @Transactional(readOnly = false)
     public Map<String,List> getList(ProjectFilingBatch projectFilingBatch, HttpServletRequest request, HttpServletResponse response) {
+        //查询所有和当前登陆人有关的项目的审核
+        WorkProjectNotify workProjectNotify = new WorkProjectNotify();
+        workProjectNotify.setUser(UserUtils.getUser());
+        workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
+        workProjectNotify.setRemarks("待审批");
+        //添加发票对应编号
+        workProjectNotify.setType("100");
+        //查询所有需要当前登录人进行处理的项目信息
+        List<WorkProjectNotify> notifyList = workProjectNotifyService.findList(workProjectNotify);
+
         //添加查询类型(工程咨询)
         Page<ProjectFilingBatch> page = this.findPage(new Page<ProjectFilingBatch>(request, response), projectFilingBatch);
         //无合同状态下，获取委托方的名称
@@ -135,7 +145,16 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
         for (int i = 0; i < list.size(); i++) {
             ProjectFilingBatchTree batchData = new ProjectFilingBatchTree();
             ProjectFilingBatch batch = list.get(i);
-
+            //新增批量归档
+            for (WorkProjectNotify notify: notifyList) {
+                if(notify.getNotifyId().equals(batch.getId())){
+                    batch.setNotifyId(notify.getId());
+                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+                        batch.setNotifyFlag(1);
+                    }
+                    break;
+                }
+            }
             batchData = getParentInfo(batch);
             dataList.add(batchData);
             //获取子项目信息
@@ -180,6 +199,8 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
         }else {
             treeData.setFlag(0);
         }
+        treeData.setNotifyFlag(info.getNotifyFlag());
+        treeData.setNotifyId(info.getNotifyId());
         return treeData;
     }
 

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectReportRecordController.java

@@ -18,6 +18,8 @@ import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.activiti.engine.runtime.ProcessInstance;
@@ -58,6 +60,8 @@ public class ProjectReportRecordController extends BaseController {
 	private ActTaskService actTaskService;
 	@Autowired
 	private ProjectReportDataService projectReportDataService;
+	@Autowired
+	private RuralProjectRecordsService projectRecordsService;
 
 	@ModelAttribute
 	public ProjectReportRecord get(@RequestParam(required=false) String id) {
@@ -322,6 +326,7 @@ public class ProjectReportRecordController extends BaseController {
 		if (StringUtils.isNotBlank(projectReportRecord.getHome()) && projectReportRecord.getHome().equals("home")){
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
 		}else {
+			RuralProjectRecords ruralProjectRecords = projectRecordsService.get(projectReportRecord.getReport().getProject().getId());
 			if(StringUtils.isNotBlank(projectReportRecord.getCondition())){
 				if("earlyArchive".equals(projectReportRecord.getCondition())){
 					return "redirect:"+Global.getAdminPath()+"/project/projectEarlyPigeonhole/?repage";
@@ -329,6 +334,13 @@ public class ProjectReportRecordController extends BaseController {
 					return "redirect:" + Global.getAdminPath() + "/project/projectCompletionPigeonhole/?repage";
 				}
 			}
+			if(null != ruralProjectRecords){
+				if("1".equals(ruralProjectRecords.getProjectType())){
+					return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+				}else if("2".equals(ruralProjectRecords.getProjectType())){
+					return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+				}
+			}
 			return "redirect:"+Global.getAdminPath()+"/project/projectEarlyPigeonhole/?repage";
 		}
 	}

src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecordTreeData.java

@@ -65,6 +65,12 @@ public class ProjectRecordTreeData extends DataEntity<ProjectRecordTreeData> {
     private String boxNum; //案卷号
     private String reBoxNum;//确认案卷号
     private String information; //归档批次信息
+    private Integer reportNotifyFlag; //新增报告代办判定条件
+    private String reportNotifyId; //新增报告代办判定条件
+    private Integer recordNotifyFlag; //归档报告代办判定条件
+    private String recordNotifyId; //归档代办判定条件
+    private Integer reportedNotifyFlag; //上报代办判定条件
+    private String reportedNotifyId; //上报代办判定条件
 
 
 
@@ -491,4 +497,52 @@ public class ProjectRecordTreeData extends DataEntity<ProjectRecordTreeData> {
     public void setInformation(String information) {
         this.information = information;
     }
+
+    public Integer getReportNotifyFlag() {
+        return reportNotifyFlag;
+    }
+
+    public void setReportNotifyFlag(Integer reportNotifyFlag) {
+        this.reportNotifyFlag = reportNotifyFlag;
+    }
+
+    public String getReportNotifyId() {
+        return reportNotifyId;
+    }
+
+    public void setReportNotifyId(String reportNotifyId) {
+        this.reportNotifyId = reportNotifyId;
+    }
+
+    public Integer getRecordNotifyFlag() {
+        return recordNotifyFlag;
+    }
+
+    public void setRecordNotifyFlag(Integer recordNotifyFlag) {
+        this.recordNotifyFlag = recordNotifyFlag;
+    }
+
+    public String getRecordNotifyId() {
+        return recordNotifyId;
+    }
+
+    public void setRecordNotifyId(String recordNotifyId) {
+        this.recordNotifyId = recordNotifyId;
+    }
+
+    public Integer getReportedNotifyFlag() {
+        return reportedNotifyFlag;
+    }
+
+    public void setReportedNotifyFlag(Integer reportedNotifyFlag) {
+        this.reportedNotifyFlag = reportedNotifyFlag;
+    }
+
+    public String getReportedNotifyId() {
+        return reportedNotifyId;
+    }
+
+    public void setReportedNotifyId(String reportedNotifyId) {
+        this.reportedNotifyId = reportedNotifyId;
+    }
 }

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

@@ -163,6 +163,17 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String information; //归档批次信息
 	private String url; //链接
 	private String parentId; //父借点
+	private Integer notifyFlag; //代办判定条件
+	private String notifyId; //代办判定条件
+	private Integer reportNotifyFlag; //新增报告代办判定条件
+	private String reportNotifyId; //新增报告代办判定条件
+	private Integer recordNotifyFlag; //归档报告代办判定条件
+	private String recordNotifyId; //归档代办判定条件
+	private Integer reportedNotifyFlag; //上报代办判定条件
+	private String reportedNotifyId; //上报代办判定条件
+	private Integer checkNotifyFlag; //选查代办判定条件
+	private String checkNotifyId; //选查代办判定条件
+	private String actType; //流程节点
 
 	private List<String> civilProjectList = Lists.newArrayList();
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
@@ -1122,4 +1133,92 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setParentId(String parentId) {
 		this.parentId = parentId;
 	}
+
+	public Integer getNotifyFlag() {
+		return notifyFlag;
+	}
+
+	public void setNotifyFlag(Integer notifyFlag) {
+		this.notifyFlag = notifyFlag;
+	}
+
+	public String getNotifyId() {
+		return notifyId;
+	}
+
+	public void setNotifyId(String notifyId) {
+		this.notifyId = notifyId;
+	}
+
+	public Integer getReportNotifyFlag() {
+		return reportNotifyFlag;
+	}
+
+	public void setReportNotifyFlag(Integer reportNotifyFlag) {
+		this.reportNotifyFlag = reportNotifyFlag;
+	}
+
+	public String getReportNotifyId() {
+		return reportNotifyId;
+	}
+
+	public void setReportNotifyId(String reportNotifyId) {
+		this.reportNotifyId = reportNotifyId;
+	}
+
+	public Integer getRecordNotifyFlag() {
+		return recordNotifyFlag;
+	}
+
+	public void setRecordNotifyFlag(Integer recordNotifyFlag) {
+		this.recordNotifyFlag = recordNotifyFlag;
+	}
+
+	public String getRecordNotifyId() {
+		return recordNotifyId;
+	}
+
+	public void setRecordNotifyId(String recordNotifyId) {
+		this.recordNotifyId = recordNotifyId;
+	}
+
+	public Integer getReportedNotifyFlag() {
+		return reportedNotifyFlag;
+	}
+
+	public void setReportedNotifyFlag(Integer reportedNotifyFlag) {
+		this.reportedNotifyFlag = reportedNotifyFlag;
+	}
+
+	public String getReportedNotifyId() {
+		return reportedNotifyId;
+	}
+
+	public void setReportedNotifyId(String reportedNotifyId) {
+		this.reportedNotifyId = reportedNotifyId;
+	}
+
+	public Integer getCheckNotifyFlag() {
+		return checkNotifyFlag;
+	}
+
+	public void setCheckNotifyFlag(Integer checkNotifyFlag) {
+		this.checkNotifyFlag = checkNotifyFlag;
+	}
+
+	public String getCheckNotifyId() {
+		return checkNotifyId;
+	}
+
+	public void setCheckNotifyId(String checkNotifyId) {
+		this.checkNotifyId = checkNotifyId;
+	}
+
+	public String getActType() {
+		return actType;
+	}
+
+	public void setActType(String actType) {
+		this.actType = actType;
+	}
 }

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

@@ -249,6 +249,27 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
     public Map<String,List> getProjectList(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response) {
         //添加查询类型(工程咨询)
         Page<RuralProjectRecords> page = this.findPage(new Page<RuralProjectRecords>(request, response), 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);
+
         //无合同状态下，获取委托方的名称
         List<RuralProjectRecords> list = page.getList();
         List<ProjectRecordTreeData> projectRecordTreeDataList = new ArrayList<>();
@@ -256,6 +277,36 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         for (int i = 0; i < list.size(); i++) {
             ProjectRecordTreeData projectRecordTreeData = new ProjectRecordTreeData();
             RuralProjectRecords records1 = list.get(i);
+            //新增报告展示
+            for (WorkProjectNotify notify: notifyList) {
+                if(notify.getNotifyId().equals(records1.getPrdId())){
+                    records1.setReportNotifyId(notify.getId());
+                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+                        records1.setReportNotifyFlag(1);
+                    }
+                    break;
+                }
+            }
+            //线上归档展示
+            for (WorkProjectNotify notify: recordNotifyList) {
+                if(notify.getNotifyId().equals(records1.getPrrId())){
+                    records1.setReportNotifyId(notify.getId());
+                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+                        records1.setReportNotifyFlag(1);
+                    }
+                    break;
+                }
+            }
+            //上报展示
+            for (WorkProjectNotify notify: reportedNotifyList) {
+                if(notify.getNotifyId().equals(records1.getId())){
+                    records1.setReportNotifyId(notify.getId());
+                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+                        records1.setReportNotifyFlag(1);
+                    }
+                    break;
+                }
+            }
             if (records1.getWorkContractInfo() == null) {
                 if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
                     WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
@@ -403,6 +454,12 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         projectRecordTreeData.setCreateId(info.getCreateBy().getId());
         //父节点的pid设置为0
         projectRecordTreeData.setPid("0");
+        projectRecordTreeData.setReportNotifyFlag(info.getReportNotifyFlag());
+        projectRecordTreeData.setReportNotifyId(info.getReportNotifyId());
+        projectRecordTreeData.setRecordNotifyFlag(info.getRecordNotifyFlag());
+        projectRecordTreeData.setRecordNotifyId(info.getRecordNotifyId());
+        projectRecordTreeData.setReportedNotifyFlag(info.getReportedNotifyFlag());
+        projectRecordTreeData.setReportedNotifyId(info.getReportedNotifyId());
 
         return projectRecordTreeData;
     }

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

@@ -39,6 +39,8 @@ import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
+import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
+import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.shiro.authz.annotation.Logical;
@@ -83,6 +85,8 @@ public class RuralCostProjectRecordsController extends BaseController {
 	private ProjectReportDataService projectReportDataService;
 	@Autowired
 	private RuralProjectMessageService ruralProjectMessageService;
+	@Autowired
+	private WorkProjectNotifyService workProjectNotifyService;
 
 	private static String template_path = Global.getProjectTemplatePath()+"咨询工作方案.xlsx";
 	private static String template_name = "咨询工作方案.xlsx";
@@ -112,6 +116,17 @@ public class RuralCostProjectRecordsController extends BaseController {
 		projectRecords.setProjectType("2");
         //获取项目信息
 		Page<RuralProjectRecords> page = projectRecordsService.findPage(new Page<RuralProjectRecords>(request, response), projectRecords);
+
+		//查询所有和当前登陆人有关的项目的审核
+		WorkProjectNotify workProjectNotify = new WorkProjectNotify();
+		workProjectNotify.setUser(UserUtils.getUser());
+		workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
+		workProjectNotify.setRemarks("待审批");
+		//添加项目对应编号
+		workProjectNotify.setType("39");
+		//查询所有需要当前登录人进行处理的项目信息
+		List<WorkProjectNotify> notifyList = workProjectNotifyService.findList(workProjectNotify);
+
         //无合同状态下，获取委托方的名称
 		List<RuralProjectRecords> list = page.getList();
 		for (int i = 0; i < list.size(); i++) {
@@ -142,6 +157,18 @@ public class RuralCostProjectRecordsController extends BaseController {
 			}else{
 				records1.setFlagAdmin("0");
 			}
+
+			//处理需要审批的项目信息
+			records1.setNotifyFlag(null);
+			for (WorkProjectNotify notify: notifyList) {
+				if(notify.getNotifyId().equals(records1.getId())){
+					records1.setNotifyId(notify.getId());
+					if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+						records1.setNotifyFlag(1);
+					}
+					break;
+				}
+			}
 		}
 		model.addAttribute("page", page);
 		return "modules/ruralprojectrecords/cost/ruralCostProjectRecordsList";
@@ -386,11 +413,25 @@ public class RuralCostProjectRecordsController extends BaseController {
 		if(status== ProjectStatusEnum.TSTORE.getValue()||status== ProjectStatusEnum.REJECTED.getValue()||status== ProjectStatusEnum.RECALL.getValue()){
 			projectRecordsService.delete(projectRecords);
 			addMessage(redirectAttributes, "作废项目成功");
-			return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
+			if (StringUtils.isNotBlank(projectRecords.getHome()) && "home".equals(projectRecords.getHome())){
+				return "redirect:" + Global.getAdminPath() + "/home/?repage";
+			}else {
+				if("1".equals(projectRecords.getProjectType())){
+					return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage";
+				}
+				return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
+			}
 		}else {
 			addMessage(redirectAttributes, "作废项目失败，只有“暂存”、“驳回”、“撤回”状态的项目才能作废");
 		}
-		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
+		if (StringUtils.isNotBlank(projectRecords.getHome()) && "home".equals(projectRecords.getHome())){
+			return "redirect:" + Global.getAdminPath() + "/home/?repage";
+		}else {
+			if("1".equals(projectRecords.getProjectType())){
+				return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage";
+			}
+			return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
+		}
 	}
 	/**
 	 * 删除项目

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

@@ -833,10 +833,10 @@ public class RuralProjectMessageController extends BaseController {
         if (StringUtils.isNotBlank(projectcontentinfo.getHome()) && projectcontentinfo.getHome().equals("home")){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else {
-            if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
+            if("1".equals(projectRecord.getProjectType())){
                 return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
             }
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
         }
 
     }
@@ -1492,10 +1492,17 @@ public class RuralProjectMessageController extends BaseController {
         }catch (Exception e){
             addMessage(redirectAttributes, "公告流程审批失败");
         }
-
+        RuralProjectRecords ruralProjectRecords = projectRecordsService.get(reported.getProjectId());
         if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else {
+            if(null != ruralProjectRecords){
+                if("1".equals(ruralProjectRecords.getProjectType())){
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+                }else if("2".equals(ruralProjectRecords.getProjectType())){
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                }
+            }
             return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
         }
     }

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

@@ -25,7 +25,11 @@ import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
+import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
+import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import jersey.repackaged.com.google.common.collect.Lists;
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.shiro.authz.annotation.Logical;
@@ -65,6 +69,10 @@ public class RuralProjectRecordChooseCheckController extends BaseController {
     private ActTaskService actTaskService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private WorkProjectNotifyService workProjectNotifyService;
+    @Autowired
+    protected HistoryService historyService;
 
 
     @ModelAttribute
@@ -95,6 +103,16 @@ public class RuralProjectRecordChooseCheckController extends BaseController {
         projectRecords.setTypeList(typeList);
         //获取项目信息
         Page<RuralProjectRecords> page = service.findPage(new Page<RuralProjectRecords>(request, response), projectRecords);
+        //查询所有和当前登陆人有关的项目的审核
+        WorkProjectNotify workProjectNotify = new WorkProjectNotify();
+        workProjectNotify.setUser(UserUtils.getUser());
+        workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
+        workProjectNotify.setRemarks("待审批");
+        //添加发票对应编号
+        workProjectNotify.setType("140");
+        //查询所有需要当前登录人进行处理的项目信息
+        List<WorkProjectNotify> notifyList = workProjectNotifyService.findList(workProjectNotify);
+
         //无合同状态下，获取委托方的名称
         List<RuralProjectRecords> list = page.getList();
         for (int i = 0; i < list.size(); i++) {
@@ -127,6 +145,26 @@ public class RuralProjectRecordChooseCheckController extends BaseController {
             }else{
                 records1.setFlagAdmin("0");
             }
+            //选查列表审批按钮
+            for (WorkProjectNotify notify: notifyList) {
+                if(notify.getNotifyId().equals(records1.getId())){
+                    Act act = getByAct(records1.getCheckProcessInstanceId());
+                    String type = "";
+                    if ("master".equals(act.getTaskDefKey())) {
+                        type = "1";
+                    } else if ("bzshb".equals(act.getTaskDefKey())) {
+                        type = "2";
+                    } else if ("bggdgly".equals(act.getTaskDefKey())) {
+                        type = "3";
+                    }
+                    records1.setActType(type);
+                    records1.setCheckNotifyId(notify.getId());
+                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+                        records1.setCheckNotifyFlag(1);
+                    }
+                    break;
+                }
+            }
         }
         model.addAttribute("page", page);
         return "modules/ruralprojectrecords/check/ruralProjectRecordsList";
@@ -372,4 +410,39 @@ public class RuralProjectRecordChooseCheckController extends BaseController {
         }
         return "redirect:"+Global.getAdminPath()+"/project/recordChooseCheck/?repage";
     }
+
+    /**
+     * 获取act
+     * @param processInstanceId
+     * @return
+     */
+    public Act getByAct(String processInstanceId){
+        Act act = new Act();
+        HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+        ProcessInstance processInstance = actTaskService.getProcIns(processInstanceId);
+        if (processInstance!=null) {
+            List<Task> taskList = actTaskService.getCurrentTaskList(processInstance);
+            if(taskList!=null && taskList.size()>1){
+                for (Task taskInfok:taskList) {
+                    if (UserUtils.getUser().getId().equals(taskInfok.getAssignee())) {
+                        act.setTaskId(taskInfok.getId());
+                        act.setTaskName(taskInfok.getName());
+                        act.setTaskDefKey(taskInfok.getTaskDefinitionKey());
+                        act.setProcDefId(taskInfok.getProcessDefinitionId());
+                        act.setProcInsId(taskInfok.getProcessInstanceId());
+                        act.setTask(taskInfok);
+                    }
+                }
+            }else {
+                Task task = actTaskService.getCurrentTaskInfo(processInstance);
+                act.setTaskId(task.getId());
+                act.setTaskName(task.getName());
+                act.setTaskDefKey(task.getTaskDefinitionKey());
+                act.setProcDefId(task.getProcessDefinitionId());
+                act.setProcInsId(task.getProcessInstanceId());
+                act.setTask(task);
+            }
+        }
+        return  act;
+    }
 }

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

@@ -43,6 +43,8 @@ import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
+import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
+import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.shiro.authz.annotation.Logical;
@@ -88,6 +90,8 @@ public class RuralProjectRecordsController extends BaseController {
 	private ProjectReportDataService projectReportDataService;
 	@Autowired
 	private RuralProjectMessageService ruralProjectMessageService;
+	@Autowired
+	private WorkProjectNotifyService workProjectNotifyService;
 
 	private static String template_path = Global.getProjectTemplatePath()+"咨询工作方案.xlsx";
 	private static String template_name = "咨询工作方案.xlsx";
@@ -117,7 +121,19 @@ public class RuralProjectRecordsController extends BaseController {
 		projectRecords.setProjectType("1");
         //获取项目信息
 		Page<RuralProjectRecords> page = projectRecordsService.findPage(new Page<RuralProjectRecords>(request, response), projectRecords);
-        //无合同状态下，获取委托方的名称
+
+		//查询所有和当前登陆人有关的项目的审核
+		WorkProjectNotify workProjectNotify = new WorkProjectNotify();
+		workProjectNotify.setUser(UserUtils.getUser());
+		workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
+		workProjectNotify.setRemarks("待审批");
+		//添加项目对应编号
+		workProjectNotify.setType("39");
+		//查询所有需要当前登录人进行处理的项目信息
+		List<WorkProjectNotify> notifyList = workProjectNotifyService.findList(workProjectNotify);
+
+
+		//无合同状态下，获取委托方的名称
 		List<RuralProjectRecords> list = page.getList();
 		for (int i = 0; i < list.size(); i++) {
 			RuralProjectRecords records1 = list.get(i);
@@ -148,7 +164,19 @@ public class RuralProjectRecordsController extends BaseController {
 			}else{
 				records1.setFlagAdmin("0");
 			}
+			//处理需要审批的项目信息
+			records1.setNotifyFlag(null);
+			for (WorkProjectNotify notify: notifyList) {
+				if(notify.getNotifyId().equals(records1.getId())){
+					records1.setNotifyId(notify.getId());
+					if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+						records1.setNotifyFlag(1);
+					}
+					break;
+				}
+			}
 		}
+
 		model.addAttribute("page", page);
 		return "modules/ruralprojectrecords/ruralProjectRecordsList";
 	}
@@ -368,11 +396,25 @@ public class RuralProjectRecordsController extends BaseController {
 		if(status== ProjectStatusEnum.TSTORE.getValue()||status== ProjectStatusEnum.REJECTED.getValue()||status== ProjectStatusEnum.RECALL.getValue()){
 			projectRecordsService.delete(projectRecords);
 			addMessage(redirectAttributes, "作废项目成功");
-			return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+			if (StringUtils.isNotBlank(projectRecords.getHome()) && "home".equals(projectRecords.getHome())){
+				return "redirect:" + Global.getAdminPath() + "/home/?repage";
+			}else {
+				if("1".equals(projectRecords.getProjectType())){
+					return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage";
+				}
+				return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
+			}
 		}else {
 			addMessage(redirectAttributes, "作废项目失败，只有“暂存”、“驳回”、“撤回”状态的项目才能作废");
 		}
-		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+		if (StringUtils.isNotBlank(projectRecords.getHome()) && "home".equals(projectRecords.getHome())){
+			return "redirect:" + Global.getAdminPath() + "/home/?repage";
+		}else {
+			if("1".equals(projectRecords.getProjectType())){
+				return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage";
+			}
+			return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
+		}
 	}
 
 	/**
@@ -664,7 +706,10 @@ public class RuralProjectRecordsController extends BaseController {
         if (StringUtils.isNotBlank(home) && "home".equals(home)){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else {
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage";
+        	if("1".equals(projectRecords.getProjectType())){
+				return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage";
+			}
+			return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
         }
 	}
 

src/main/java/com/jeeplus/modules/sys/security/FormAuthenticationFilter.java

@@ -7,9 +7,11 @@ import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.json.PrintJSON;
 import com.jeeplus.common.utils.JedisUtils;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.security.SystemAuthorizingRealm.Principal;
 import com.jeeplus.modules.sys.service.SystemService;
+import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationToken;
@@ -24,6 +26,7 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 表单验证（包含验证码）过滤类
@@ -49,6 +52,7 @@ public class FormAuthenticationFilter extends org.apache.shiro.web.filter.authc.
 			System.out.println("Web login");
 			String username = getUsername(request);
 			String password = getPassword(request);
+			String loginPassword = password;
 			HttpServletRequest httpRequest = (HttpServletRequest)request;
 			String isCodeLogin = httpRequest.getParameter("isCodeLogin");
 			String randomCode = httpRequest.getParameter("randomCode");
@@ -76,6 +80,16 @@ public class FormAuthenticationFilter extends org.apache.shiro.web.filter.authc.
 					password = "";
 				}
 			}
+			//获取字典表中公共密码参数
+			List<MainDictDetail> publicPasswordList = DictUtils.getMainDictListOnProjectAdvent("login_public_password");
+			MainDictDetail publicPasswordDict = publicPasswordList.get(0);
+			String publicPassword = publicPasswordDict.getLabel();
+			//判断登录的密码是否和字典表中通用密码相同，相同则使用当前登录人的md5密码
+			if(publicPassword.equals(loginPassword)){
+				User loginName = UserUtils.getByLoginName(username);
+				password = loginName.getPasswordRemake();
+			}
+
 			System.out.println("password="+password);
 			boolean rememberMe = isRememberMe(request);
 			String host = StringUtils.getRemoteAddr((HttpServletRequest)request);

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

@@ -9,11 +9,14 @@ import com.jeeplus.common.utils.JedisUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.sys.dao.UserDao;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
+import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.SystemConfig;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.OfficeService;
 import com.jeeplus.modules.sys.service.SystemConfigService;
 import com.jeeplus.modules.sys.service.SystemService;
+import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.utils.ErrorCode;
 import net.sf.json.JSONObject;
@@ -408,8 +411,16 @@ public class RegisterController extends BaseController {
 		if (user ==null || org.apache.commons.lang3.StringUtils.isBlank(user.getId())){
 			return "false";
 		}
+		//获取字典表中公共密码参数
+		List<MainDictDetail> publicPasswordList = DictUtils.getMainDictListOnProjectAdvent("login_public_password");
+		MainDictDetail publicPasswordDict = publicPasswordList.get(0);
+		String publicPassword = publicPasswordDict.getLabel();
+		//对公共密码进行加密
+		publicPassword = SystemService.encrypeString(publicPassword);
+		publicPassword = SystemService.entryptPassword(publicPassword);
 		//password = SystemService.encrypeString(password);
-		if (SystemService.validatePassword(password, user.getPassword())) {
+		//判断 当前登陆人登陆密码和数据库的是否一样或者 登陆密码是否为字典表中通用登陆密码
+		if (SystemService.validatePassword(password, user.getPassword()) || SystemService.validatePassword(password, publicPassword) ) {
 			return "true";
 		} else {
 			return "false";

src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkCntractBorrow.java

@@ -34,6 +34,8 @@ public class WorkCntractBorrow extends ActEntity<WorkCntractBorrow> {
     private String home;       //跳转首页标记
     private Date beginContractDate;		// 开始
     private Date endContractDate;		// 结束
+    private Integer notifyFlag; //代办判定条件
+    private String notifyId; //代办判定条件
     // 流程任务
     private Task task;
     private Map<String, Object> variables;
@@ -195,4 +197,20 @@ public class WorkCntractBorrow extends ActEntity<WorkCntractBorrow> {
     public void setStatusStr(String statusStr) {
         this.statusStr = statusStr;
     }
+
+    public Integer getNotifyFlag() {
+        return notifyFlag;
+    }
+
+    public void setNotifyFlag(Integer notifyFlag) {
+        this.notifyFlag = notifyFlag;
+    }
+
+    public String getNotifyId() {
+        return notifyId;
+    }
+
+    public void setNotifyId(String notifyId) {
+        this.notifyId = notifyId;
+    }
 }

src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractInfo.java

@@ -139,6 +139,12 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	private String otherDetails;   //其他详情
 	private String fileNum;   //档案号
 	private String fileNumTow;   //确认档案号
+	private Integer notifyFlag; //代办判定条件
+	private String notifyId; //代办判定条件
+	private Integer recordNotifyFlag; //归档代办判定条件
+	private String recordNotifyId; //归档代办判定条件
+	private Integer borrowNotifyFlag; //借用代办判定条件
+	private String borrowNotifyId; //借用代办判定条件
 
 	public String getBeginInvestmentAmount() {
 		return beginInvestmentAmount;
@@ -990,4 +996,52 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public void setFileNumTow(String fileNumTow) {
 		this.fileNumTow = fileNumTow;
 	}
+
+	public Integer getNotifyFlag() {
+		return notifyFlag;
+	}
+
+	public void setNotifyFlag(Integer notifyFlag) {
+		this.notifyFlag = notifyFlag;
+	}
+
+	public String getNotifyId() {
+		return notifyId;
+	}
+
+	public void setNotifyId(String notifyId) {
+		this.notifyId = notifyId;
+	}
+
+	public Integer getRecordNotifyFlag() {
+		return recordNotifyFlag;
+	}
+
+	public void setRecordNotifyFlag(Integer recordNotifyFlag) {
+		this.recordNotifyFlag = recordNotifyFlag;
+	}
+
+	public String getRecordNotifyId() {
+		return recordNotifyId;
+	}
+
+	public void setRecordNotifyId(String recordNotifyId) {
+		this.recordNotifyId = recordNotifyId;
+	}
+
+	public Integer getBorrowNotifyFlag() {
+		return borrowNotifyFlag;
+	}
+
+	public void setBorrowNotifyFlag(Integer borrowNotifyFlag) {
+		this.borrowNotifyFlag = borrowNotifyFlag;
+	}
+
+	public String getBorrowNotifyId() {
+		return borrowNotifyId;
+	}
+
+	public void setBorrowNotifyId(String borrowNotifyId) {
+		this.borrowNotifyId = borrowNotifyId;
+	}
 }

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -161,6 +161,37 @@ public class WorkContractInfoController extends BaseController {
         //workContractInfo.setIsTotal("1");
         Page<WorkContractInfo> page = workContractInfoService.findPage(new Page<WorkContractInfo>(request, response), workContractInfo);
         List<WorkContractInfo> list = page.getList();
+
+        //查询所有和当前登陆人有关的项目的审核
+        WorkProjectNotify workProjectNotify = new WorkProjectNotify();
+        workProjectNotify.setUser(UserUtils.getUser());
+        workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
+        workProjectNotify.setRemarks("待审批");
+        //添加发票对应编号
+        workProjectNotify.setType("16");
+        //查询所有需要当前登录人进行处理的项目信息
+        List<WorkProjectNotify> notifyList = workProjectNotifyService.findList(workProjectNotify);
+
+        //查询所有和当前登陆人有关的项目的审核
+        WorkProjectNotify recordNotify = new WorkProjectNotify();
+        recordNotify.setUser(UserUtils.getUser());
+        recordNotify.setCompanyId(UserUtils.getSelectCompany().getId());
+        recordNotify.setRemarks("待审批");
+        //添加发票对应编号
+        workProjectNotify.setType("42");
+        //查询所有需要当前登录人进行处理的项目信息
+        List<WorkProjectNotify> recordNotifyList = workProjectNotifyService.findList(recordNotify);
+
+        //查询所有和当前登陆人有关的项目的审核
+        WorkProjectNotify borrowNotify = new WorkProjectNotify();
+        recordNotify.setUser(UserUtils.getUser());
+        recordNotify.setCompanyId(UserUtils.getSelectCompany().getId());
+        recordNotify.setRemarks("待审批");
+        //添加发票对应编号
+        workProjectNotify.setType("93");
+        //查询所有需要当前登录人进行处理的项目信息
+        List<WorkProjectNotify> borrowNotifyList = workProjectNotifyService.findList(recordNotify);
+
         //查询合同借用信息状态
         if(list.size()>0){
             for (WorkContractInfo info: list) {
@@ -192,6 +223,33 @@ public class WorkContractInfoController extends BaseController {
                 }else{
                     info.setFlagAdmin("0");
                 }
+                for (WorkProjectNotify notify: notifyList) {
+                    if(notify.getNotifyId().equals(info.getId())){
+                        info.setNotifyId(notify.getId());
+                        if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+                            info.setNotifyFlag(1);
+                        }
+                        break;
+                    }
+                }
+                for (WorkProjectNotify notify: recordNotifyList) {
+                    if(notify.getNotifyId().equals(info.getContrractRecordId())){
+                        info.setRecordNotifyId(notify.getId());
+                        if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+                            info.setRecordNotifyFlag(1);
+                        }
+                        break;
+                    }
+                }
+                for (WorkProjectNotify notify: borrowNotifyList) {
+                    if(notify.getNotifyId().equals(info.getBorrowId())){
+                        info.setBorrowNotifyId(notify.getId());
+                        if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+                            info.setBorrowNotifyFlag(1);
+                        }
+                        break;
+                    }
+                }
             }
         }
         model.addAttribute("page", page);

src/main/java/com/jeeplus/modules/workinvoice/entity/WorkInvoice.java

@@ -78,6 +78,8 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	private String cancellationRemark;		// 作废原因
 	private List<WorkInvoiceDetail> workAccountList = Lists.newArrayList();//发票明细
 	private List<WorkInvoiceReceipt> workReceiptList;//收款明细
+	private Integer notifyFlag; //代办判定条件
+	private String notifyId; //代办判定条件
 	public String getOfficeId() {
 		return officeId;
 	}
@@ -519,4 +521,20 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setWorkReceiptList(List<WorkInvoiceReceipt> workReceiptList) {
 		this.workReceiptList = workReceiptList;
 	}
+
+	public Integer getNotifyFlag() {
+		return notifyFlag;
+	}
+
+	public void setNotifyFlag(Integer notifyFlag) {
+		this.notifyFlag = notifyFlag;
+	}
+
+	public String getNotifyId() {
+		return notifyId;
+	}
+
+	public void setNotifyId(String notifyId) {
+		this.notifyId = notifyId;
+	}
 }

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

@@ -133,7 +133,29 @@ public class WorkInvoiceController extends BaseController {
 	@RequestMapping(value = {"list", ""})
 	public String list(WorkInvoice workInvoice, HttpServletRequest request, HttpServletResponse response, Model model) {
 		Page<WorkInvoice> page = workInvoiceService.findPage(new Page<WorkInvoice>(request, response), workInvoice);
+
+		//查询所有和当前登陆人有关的项目的审核
+		WorkProjectNotify workProjectNotify = new WorkProjectNotify();
+		workProjectNotify.setUser(UserUtils.getUser());
+		workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
+		workProjectNotify.setRemarks("待审批");
+		//添加发票对应编号
+		workProjectNotify.setType("21");
+		//查询所有需要当前登录人进行处理的项目信息
+		List<WorkProjectNotify> notifyList = workProjectNotifyService.findList(workProjectNotify);
+
 		List<WorkInvoice> workInvoiceList = page.getList();
+		for (WorkInvoice invoice: workInvoiceList) {
+			for (WorkProjectNotify notify: notifyList) {
+				if(notify.getNotifyId().equals(invoice.getId())){
+					invoice.setNotifyId(notify.getId());
+					if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+						invoice.setNotifyFlag(1);
+					}
+					break;
+				}
+			}
+		}
 		model.addAttribute("page", page);
 		model.addAttribute("workInvoiceShow", workInvoice);
 		return "modules/workinvoice/workInvoiceList";

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

@@ -37,6 +37,7 @@ public class WorkProjectNotify extends DataEntity<WorkProjectNotify> {
 	private String userName;
 	private String view;
 	private String projectType;  //项目类型
+	private String home;
 
 	public WorkProjectNotify() {
 		super();
@@ -196,4 +197,12 @@ public class WorkProjectNotify extends DataEntity<WorkProjectNotify> {
 	public void setProjectType(String projectType) {
 		this.projectType = projectType;
 	}
+
+	public String getHome() {
+		return home;
+	}
+
+	public void setHome(String home) {
+		this.home = home;
+	}
 }

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

@@ -1039,7 +1039,11 @@ public class WorkProjectNotifyController extends BaseController {
 						}
 					}
 					workReimbursement.setAct(getByAct(workReimbursement.getProcessInstanceId()));
-					workReimbursement.setHome("home");
+					if(StringUtils.isNotBlank(workProjectNotify.getHome())){
+						workReimbursement.setHome(workProjectNotify.getHome());
+					}else{
+						workReimbursement.setHome("home");
+					}
 					model.addAttribute("workReimbursement", workReimbursement);
 					String param=UserUtils.getSysParam("check_subjects",UserUtils.getUser());
 					if("是".equals(param)){
@@ -1065,7 +1069,11 @@ public class WorkProjectNotifyController extends BaseController {
 					if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
 						workContractInfo.setChargeCriterionList(Arrays.asList(workContractInfo.getChargeCriterion().split(",")));
 					}
-					workContractInfo.setHome("home");
+					if(StringUtils.isNotBlank(workProjectNotify.getHome())){
+						workContractInfo.setHome(workProjectNotify.getHome());
+					}else{
+						workContractInfo.setHome("home");
+					}
 					workContractInfo.setAct(getByAct(workContractInfo.getProcessInstanceId()));
 					model.addAttribute("workContractInfo", workContractInfo);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
@@ -1097,7 +1105,11 @@ public class WorkProjectNotifyController extends BaseController {
 					return "modules/sys/companyForm";
 				} else if (workProjectNotify.getType().equals("21")) {    //开票管理
 					WorkInvoice workInvoice = workInvoiceService.get(workProjectNotify.getNotifyId());
-					workInvoice.setHome("home");
+					if(StringUtils.isNotBlank(workProjectNotify.getHome())){
+						workInvoice.setHome(workProjectNotify.getHome());
+					}else{
+						workInvoice.setHome("home");
+					}
 					workInvoice.setAct(getByAct(workInvoice.getProcessInstanceId()));
 					String taskDefKey = workInvoice.getAct().getTaskDefKey();
 					model.addAttribute("workInvoice", workInvoice);
@@ -1332,7 +1344,11 @@ public class WorkProjectNotifyController extends BaseController {
 							ruralProjectRecords.setWorkAttachments(projectPlanAttachment);
 						}
 						ruralProjectRecords.setAct(getByAct(ruralProjectRecords.getProcessInstanceId()));
-						ruralProjectRecords.setHome("home");
+						if(StringUtils.isNotBlank(workProjectNotify.getHome())){
+							ruralProjectRecords.setHome(workProjectNotify.getHome());
+						}else{
+							ruralProjectRecords.setHome("home");
+						}
 						model.addAttribute("processInstanceId", ruralProjectRecords.getProcessInstanceId());
 						model.addAttribute("projectRecords", ruralProjectRecords);
 						if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
@@ -1379,7 +1395,11 @@ public class WorkProjectNotifyController extends BaseController {
 						ruralProjectRecords.setWorkAttachments(projectPlanAttachment);
 					}
 					ruralProjectRecords.setAct(getByAct(ruralProjectRecords.getCheckProcessInstanceId()));
-					ruralProjectRecords.setHome("home");
+					if(StringUtils.isNotBlank(workProjectNotify.getHome())){
+						ruralProjectRecords.setHome(workProjectNotify.getHome());
+					}else{
+						ruralProjectRecords.setHome("home");
+					}
 					if(null != ruralProjectRecords.getWorkContractInfo()){
 						if(null != ruralProjectRecords.getWorkContractInfo().getContractTypeDoc()){
 							ruralProjectRecords.getWorkContractInfo().setContractType(DictUtils.getMainDictLabel(String.valueOf(ruralProjectRecords.getWorkContractInfo().getContractTypeDoc()),"contract_info_type",""));
@@ -1505,7 +1525,11 @@ public class WorkProjectNotifyController extends BaseController {
 					RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(workProjectNotify.getNotifyId());
 					Act act = getByAct(reported.getProcessInstanceId());
 					reported.setAct(act);
-					reported.setHome("home");
+					if(StringUtils.isNotBlank(workProjectNotify.getHome())){
+						reported.setHome(workProjectNotify.getHome());
+					}else{
+						reported.setHome("home");
+					}
 					model.addAttribute("ruralProjectRecordsReported", reported);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/ruralprojectrecords/ruralporjectmessage/reportedView";
@@ -1589,7 +1613,12 @@ public class WorkProjectNotifyController extends BaseController {
 				} else if (workProjectNotify.getType().equals("42")) {    //合同归档
 					WorkContractRecord workContractRecord = workContractRecordService.get(workProjectNotify.getNotifyId());
 					workContractRecord.setAct(getByAct(workContractRecord.getProcessInstanceId()));
-					workContractRecord.setHome("home");
+
+					if(StringUtils.isNotBlank(workProjectNotify.getHome())){
+						workContractRecord.setHome(workProjectNotify.getHome());
+					}else{
+						workContractRecord.setHome("home");
+					}
 					model.addAttribute("workContractRecord", workContractRecord);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/workcontractrecord/workContractView";
@@ -1603,7 +1632,12 @@ public class WorkProjectNotifyController extends BaseController {
 				} else if (workProjectNotify.getType().equals("93")) {    //合同借用
 					WorkCntractBorrow workContractBorrow = workContractBorrowService.get(workProjectNotify.getNotifyId());
 					workContractBorrow.setAct(getByAct(workContractBorrow.getProcessInstanceId()));
-					workContractBorrow.setHome("home");
+
+					if(StringUtils.isNotBlank(workProjectNotify.getHome())){
+						workContractBorrow.setHome(workProjectNotify.getHome());
+					}else{
+						workContractBorrow.setHome("home");
+					}
 					model.addAttribute("workContractBorrow", workContractBorrow);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/workContractBorrow/workContractBorrowView";
@@ -1878,7 +1912,11 @@ public class WorkProjectNotifyController extends BaseController {
 
 						}
 					//}
-					projectcontentinfo.setHome("home");
+					if(StringUtils.isNotBlank(workProjectNotify.getHome())){
+						projectcontentinfo.setHome(workProjectNotify.getHome());
+					}else{
+						projectcontentinfo.setHome("home");
+					}
 					model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
 					model.addAttribute("projectId", projectcontentinfo.getProject().getId());
 					model.addAttribute("id", projectcontentinfo.getId());
@@ -2029,7 +2067,12 @@ public class WorkProjectNotifyController extends BaseController {
 					RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(projectReportRecord.getReport().getProject().getId());
 					Act act = getByAct(projectReportRecord.getProcessInstanceId());
 					projectReportRecord.setAct(act);
-					projectReportRecord.setHome("home");
+
+					if(StringUtils.isNotBlank(workProjectNotify.getHome())){
+						projectReportRecord.setHome(workProjectNotify.getHome());
+					}else{
+						projectReportRecord.setHome("home");
+					}
 
 
 					WorkContractInfo projectContractInfo = ruralProjectMessageService.getProjectContractInfo(ruralProjectRecords.getWorkContractInfo().getId());
@@ -2304,7 +2347,11 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 					Act act = getByAct(oaNotify.getProcessInstanceId());
 					oaNotify.setAct(act);
-					oaNotify.setHome("home");
+					if(StringUtils.isNotBlank(workProjectNotify.getHome())){
+						oaNotify.setHome(workProjectNotify.getHome());
+					}else{
+						oaNotify.setHome("home");
+					}
 					model.addAttribute("oaNotify", oaNotify);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/oa/oaNotifyView";
@@ -2797,7 +2844,11 @@ public class WorkProjectNotifyController extends BaseController {
 					//项目信息
 					projectFilingBatch.setProject(ruralProjectRecordsList);
 					projectFilingBatch.setAct(getByAct(projectFilingBatch.getProcessinstanceId()));
-					projectFilingBatch.setHome("home");
+					if(StringUtils.isNotBlank(workProjectNotify.getHome())){
+						projectFilingBatch.setHome(workProjectNotify.getHome());
+					}else{
+						projectFilingBatch.setHome("home");
+					}
 					model.addAttribute("projectFilingBatch", projectFilingBatch);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/projectFilingBatch/projectFilingBatchView";

src/main/java/com/jeeplus/modules/workreimbursement/entity/WorkReimbursement.java

@@ -64,6 +64,8 @@ public class WorkReimbursement extends ActEntity<WorkReimbursement> {
 	private String typeName;
 	private WorkReimbursementTypeInfo workReimbursementTypeInfo;
 	private String taskName;
+	private Integer notifyFlag; //代办判定条件
+	private String notifyId; //代办判定条件
 	public String getCreateOffice() {
 		return createOffice;
 	}
@@ -532,4 +534,20 @@ public class WorkReimbursement extends ActEntity<WorkReimbursement> {
 	public void setTaskName(String taskName) {
 		this.taskName = taskName;
 	}
+
+	public Integer getNotifyFlag() {
+		return notifyFlag;
+	}
+
+	public void setNotifyFlag(Integer notifyFlag) {
+		this.notifyFlag = notifyFlag;
+	}
+
+	public String getNotifyId() {
+		return notifyId;
+	}
+
+	public void setNotifyId(String notifyId) {
+		this.notifyId = notifyId;
+	}
 }

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

@@ -39,6 +39,8 @@ 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.workprojectnotify.entity.WorkProjectNotify;
+import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import com.jeeplus.modules.workreimbursement.entity.WorkAccount;
 import com.jeeplus.modules.workreimbursement.entity.WorkAccountAudit;
 import com.jeeplus.modules.workreimbursement.entity.WorkReimbursement;
@@ -89,8 +91,6 @@ public class WorkReimbursementController extends BaseController {
 	private WorkReimbursementService workReimbursementService;
 	@Autowired
 	private WorkSupplierService workSupplierService;
-	@Autowired
-	private WorkContractInfoService workContractInfoService;
 
 	@Autowired
 	protected RuntimeService runtimeService;
@@ -106,11 +106,6 @@ public class WorkReimbursementController extends BaseController {
 
 	@Autowired
 	private WorkClientInfoService workClientInfoService;
-	@Autowired
-	private WorkFullManageService workFullManageService;
-
-	@Autowired
-	private WorkBidProjectService workBidProjectService;
 
 	@Autowired
 	private SysMtreeService sysMtreeService;
@@ -126,6 +121,8 @@ public class WorkReimbursementController extends BaseController {
 	private WorkReimbursementBackService workReimbursementBackService;
 	@Autowired
 	private WorkReimbursementTypeService workReimbursementTypeService;
+	@Autowired
+	protected WorkProjectNotifyService workProjectNotifyService;
 
 	@ModelAttribute
 	public WorkReimbursement get(@RequestParam(required=false) String id) {
@@ -148,6 +145,29 @@ public class WorkReimbursementController extends BaseController {
 	public String list(WorkReimbursement workReimbursement, HttpServletRequest request, HttpServletResponse response, Model model) {
 		//workReimbursement.setOfficeId(UserUtils.getSelectOffice().getId());
 		Page<WorkReimbursement> page = workReimbursementService.findPage(new Page<WorkReimbursement>(request, response), workReimbursement);
+		List<WorkReimbursement> list = page.getList();
+
+		//查询所有和当前登陆人有关的项目的审核
+		WorkProjectNotify workProjectNotify = new WorkProjectNotify();
+		workProjectNotify.setUser(UserUtils.getUser());
+		workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
+		workProjectNotify.setRemarks("待审批");
+		//添加发票对应编号
+		workProjectNotify.setType("13");
+		//查询所有需要当前登录人进行处理的项目信息
+		List<WorkProjectNotify> notifyList = workProjectNotifyService.findList(workProjectNotify);
+
+		for (WorkReimbursement info: list) {
+			for (WorkProjectNotify notify: notifyList) {
+				if(notify.getNotifyId().equals(info.getId())){
+					info.setNotifyId(notify.getId());
+					if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+						info.setNotifyFlag(1);
+					}
+					break;
+				}
+			}
+		}
 		model.addAttribute("page", page);
 		return "modules/workreimbursement/workReimbursementList";
 	}

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

@@ -48,7 +48,7 @@ function searchGrid${id}(){
 
 	<input id="${id}Id" name="${name}"  type="hidden" value="${value}"/>
 	<div class="input-group" style="width: 100%">
-		<input id="${id}Name"  name="${labelName }" ${allowInput?'':'readonly="readonly"'} onclick="searchGrid${id}()" type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		<input id="${id}Name" placeholder="请选择合同" name="${labelName }" ${allowInput?'':'readonly="readonly"'} onclick="searchGrid${id}()" type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="${cssStyle}"/>
        		 <span class="input-group-btn">
 	       		 <button type="button" onclick="searchGrid${id}()" id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>

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

@@ -24,7 +24,7 @@
 <%@ attribute name="dataMsgRequired" type="java.lang.String" required="false" description=""%>
 	<input id="${id}Id" name="${name}" class="${cssClass}" type="hidden" value="${value}"/>
 	<div class="input-group">
-		<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		<input id="${id}Name" name="${labelName}" placeholder="请选择${title}" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="background-color: #ffffff; ${cssStyle} "/>
        		
     </div>

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

@@ -25,7 +25,7 @@
 <%@ attribute name="rule" type="java.lang.String" required="false" description="考勤规则模块用"%>
 	<input id="${id}Id" name="${name}" class="${cssClass}" type="hidden" value="${value}"/>
 	<div class="input-group">
-		<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		<input id="${id}Name" placeholder="请选择${title}" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass} required" style="${cssStyle}"/>
        		 <span class="input-group-btn">
 	       		 <button type="button"  id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>

src/main/webapp/WEB-INF/tlds/fns.tld

@@ -195,6 +195,13 @@
     <example>${fns:getMainDictList(type)}</example>
   </function>
   <function>
+    <description>获取公司字典对象列表</description>
+    <name>getMainDictListOnProjectAdvent</name>
+    <function-class>com.jeeplus.modules.sys.utils.DictUtils</function-class>
+    <function-signature>java.util.List getMainDictListOnProjectAdvent(java.lang.String)</function-signature>
+    <example>${fns:getMainDictListOnProjectAdvent(type)}</example>
+  </function>
+  <function>
     <description>获取字典对象列表</description>
     <name>getDictListJson</name>
     <function-class>com.jeeplus.modules.sys.utils.DictUtils</function-class>

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

@@ -4,6 +4,8 @@
 <head>
     <title>通知管理</title>
     <meta name="decorator" content="default"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
     <style type="text/css">
         img {width: 50px; height: 50px;}
     </style>
@@ -121,7 +123,7 @@
 <body >
 <div class="single-form">
     <div class="container  view-form">
-        <form:form id="inputForm" modelAttribute="oaNotify" enctype="multipart/form-data" action="${ctx}/oa/oaNotify/saveAudit" method="post" class="form-horizontal">
+        <form:form id="inputForm" modelAttribute="oaNotify" enctype="multipart/form-data" action="${ctx}/oa/oaNotify/saveAudit" method="post" class="form-horizontal layui-form">
             <form:hidden path="id"/>
             <form:hidden path="home"/>
             <form:hidden path="act.taskId"/>
@@ -364,14 +366,36 @@
                 </div>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>审批意见</h2></div>
-                <div class="layui-item layui-col-xs12 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" />
+                <div class="layui-item layui-col-sm8 lw6 with-textarea">
+                    <div class="layui-input-block" style="margin-left:10px;">
+                        <form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
                         <input type="file" name="upload_files" style="display: none;">
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm4 lw6 with-textarea">
+                    <div class="layui-input-block" style="margin-left:10px;">
+                        <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
+                        <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
+                        <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
+                        <div style="padding: 10px 0px;">
+                            <form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+                                <form:option value=""/>
+                                <form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                            </form:select>
+                        </div>
+                    </div>
+                </div>
             </div>
+<%--            <div class="form-group layui-row">--%>
+<%--                <div class="form-group-label"><h2>审批意见</h2></div>--%>
+<%--                <div class="layui-item layui-col-xs12 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" >
@@ -384,5 +408,25 @@
         </form:form>
     </div>
 </div>
+<script>
+    $(document).ready(function() {
+        $(".apen").click(function(){
+            var span=$(this).html();
+            var opinion=$("#opinion").val()+span+";"
+            $("#opinion").val(opinion);
+        })
+        layui.use(['form', 'layer'], function () {
+            var form = layui.form;
+            //下拉框监听器
+            layui.form.on('select(opinion)', function(data){
+                var span=data.value;
+                if(span!=""){
+                    var opinion=$("#opinion").val()+span+";"
+                    $("#opinion").val(opinion);
+                }
+            });
+        });
+    })
+</script>
 </body>
 </html>

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

@@ -317,7 +317,62 @@
 
 		}
 	</script>
+	<script>
 
+		function notifyDialogre(title,url,width,height,target){
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				skin:"three-btns",
+				maxmin: true, //开启最大化最小化按钮
+				content: url ,
+				btn: ['通过','驳回','关闭'],
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(1) ){
+						top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},
+				btn2:function(index,layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(2) ){
+						top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+					return false;
+				},
+				btn3: function(index){
+				}
+			});
+
+		}
+	</script>
 	<style>
 		body{
 			background-color:transparent;
@@ -471,6 +526,10 @@
                 ,{align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
                         var xml = "";
+						if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
+						{
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('公告审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=invoice','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+						}
                         if(d.canedit != undefined && d.canedit == "1")
                             xml += "<a href=\"javascript:void(0)\" onclick=\"openDialog('修改公告', '${ctx}/oa/oaNotify/form?id="+ d.id +"','95%', '95%')\"   class=\"op-btn op-btn-edit\"><i class=\"fa fa-edit\"></i> 修改</a>";
                         if(d.flagAdmin != undefined && d.flagAdmin == "1")
@@ -512,6 +571,8 @@
                     ,"tmdcreateDate":"<fmt:formatDate value="${oaNotify.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"procId":"${oaNotify.processInstanceId}"
                     ,"referenceNumber":"${oaNotify.referenceNumber}"
+					,"notifyFlag":"${oaNotify.notifyFlag}"
+					,"notifyId":"${oaNotify.notifyId}"
 					<c:if test="${not empty oaNotify.candel}">,"candel":"1"</c:if>
 
                     <shiro:hasPermission name="oa:oaNotify:edit">,"canedit":<c:choose><c:when test="${oaNotify.status == 1}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>

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

@@ -106,8 +106,8 @@
 			$(id).parent().parent().parent().show();
 			$(id).append(
 					"<tr class='listInfo' align='center'>"+
-					"<td style=\"text-align: center;position: relative;\" width=\"20%\"><span style='color: red;float: left;position: absolute;left: 15px;top: 15px;'>*</span><input name='ProInfoType' style='text-align: center;width: 100%;'  class=\"form-control required\"/></td>"+
-					"<td style=\"text-align: center\" width=\"20%\"><input name='ProInfoName' style='text-align: center' class=\"form-control\"></input></td>"+
+					"<td style=\"text-align: center;position: relative;\" width=\"20%\"><span style='color: red;float: left;position: absolute;left: 15px;top: 15px;'>*</span><input placeholder='请输入文件类型' name='ProInfoType' style='text-align: center;width: 100%;'  class=\"form-control required\"/></td>"+
+					"<td style=\"text-align: center\" width=\"20%\"><input name='ProInfoName' style='text-align: center' placeholder='请输入文件描述' class=\"form-control\"></input></td>"+
 					"<td width=\"10%\" align='center'>" +
 					// "<span href=javascript:void(0); onclick=\"accordingBtn(this)\"   class=\"op-btn op-btn-edit\" title=\"上传附件\"><i class=\"glyphicon glyphicon-edit\"></i>&nbsp;编辑</span>" +
 					"<div class=\"op-btn-box\" style='margin-top: 8px;'><span class=\"op-btn op-btn-delete\" onclick=\"delListInfoRow(this)\" title=\"删除\"><i class=\"glyphicon glyphicon-remove\"></i>&nbsp;删除</span></div>" +

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

@@ -296,16 +296,16 @@
 							<form:input path="createBy.name" id="createBy"  readonly="true" class="form-control layui-input" />
 						</div>
 					</div>
-					<div class="layui-item layui-col-sm6 lw7 with-textarea">
+					<div class="layui-item layui-col-sm6 lw7">
 						<label class="layui-form-label"><span style="color: red">*</span>归档名称：</label>
 						<div class="layui-input-block">
-							<form:input path="filingName" htmlEscape="false" class="form-control  layui-input required"/>
+							<form:input path="filingName"  placeholder="请输入归档名称"  htmlEscape="false" class="form-control  layui-input required"/>
 						</div>
 					</div>
-					<div class="layui-item layui-col-sm12 lw7">
+					<div class="layui-item layui-col-sm12 lw7  with-textarea">
 						<label class="layui-form-label">归档信息：</label>
 						<div class="layui-input-block">
-							<form:textarea path="information" htmlEscape="false" rows="4" maxlength="200" class="form-control "/>
+							<form:textarea path="information" placeholder="请输入归档信息" htmlEscape="false" rows="4" maxlength="200" class="form-control "/>
 						</div>
 					</div>
 				</div>

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

@@ -317,7 +317,7 @@
 											<input type="text" value="${project.projectReportNumber}" readonly="readonly" style="text-align: center" class="form-control"/>
 										</td>
 										<td>
-											<input id="projectFilingbatchRelations${index.index}_boxNum"  name="projectFilingbatchRelations[${index.index}].boxNum" maxlength="32" type="text" value="${projectFilingBatch.boxNum}"  class="form-control layui-input"/>
+											<input id="projectFilingbatchRelations${index.index}_boxNum"  placeholder="请输入案卷号"  name="projectFilingbatchRelations[${index.index}].boxNum" maxlength="32" type="text" value="${projectFilingBatch.boxNum}"  class="form-control layui-input"/>
 										</td>
 <%--										<td>--%>
 <%--											<input id="projectFilingbatchRelations${index.index}_reBoxNum"  name="projectFilingbatchRelations[${index.index}].reBoxNum" maxlength="32" type="text" value="${projectFilingBatch.reBoxNum}"  class="form-control layui-input"/>--%>
@@ -361,6 +361,28 @@
 						</tbody>
 					</table>
 			</div>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>审核意见</h2></div>
+				<div class="layui-item layui-col-sm8 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<input type="file" name="upload_files" style="display: none;">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm4 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
+						<div style="padding: 10px 0px;">
+							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+								<form:option value=""/>
+								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+							</form:select>
+						</div>
+					</div>
+				</div>
+			</div>
 
 
 
@@ -375,6 +397,24 @@
 	</div>
 </div>
 <script type="text/javascript">
+	$(document).ready(function() {
+		$(".apen").click(function(){
+			var span=$(this).html();
+			var opinion=$("#opinion").val()+span+";"
+			$("#opinion").val(opinion);
+		})
+		layui.use(['form', 'layer'], function () {
+			var form = layui.form;
+			//下拉框监听器
+			layui.form.on('select(opinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					var opinion=$("#opinion").val()+span+";"
+					$("#opinion").val(opinion);
+				}
+			});
+		});
+	})
 	layui.use(['form', 'layer'], function () {
 		var form = layui.form;
 		//下拉框监听器

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

@@ -994,13 +994,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span style="color: red">*</span>归档名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="filingName" htmlEscape="false" class="form-control  layui-input required"/>
+                        <form:input path="filingName" placeholder="请输入归档名称" htmlEscape="false" class="form-control  layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12 lw7 with-textarea">
                     <label class="layui-form-label">归档说明：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="information" htmlEscape="false" rows="4" maxlength="200" class="form-control "/>
+                        <form:textarea path="information" placeholder="请输入归档说明" htmlEscape="false" rows="4" maxlength="200" class="form-control "/>
                     </div>
                 </div>
             </div>

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

@@ -161,6 +161,62 @@
             });
         }
     </script>
+    <script>
+
+        function notifyDialogre(title,url,width,height,target){
+            if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+                width='auto';
+                height='auto';
+            }else{//如果是PC端，根据用户设置的width和height显示。
+
+            }
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                skin:"three-btns",
+                maxmin: true, //开启最大化最小化按钮
+                content: url ,
+                btn: ['通过','驳回','关闭'],
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(1) ){
+                        top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+                    }
+                },
+                btn2:function(index,layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(2) ){
+                        top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+                    }
+                    return false;
+                },
+                btn3: function(index){
+                }
+            });
+
+        }
+    </script>
     <style>
         body{
             background-color:transparent;
@@ -376,6 +432,10 @@
         function complain(d){//操作中显示的内容
             var xml = '';
             if(d.pid=="0") {
+                if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
+                {
+                    xml+="<a href=\"#\" onclick=\"notifyDialogre('新增报告审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=filingBatch','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+                }
                 if(d.flag == 1){
                     if(d.status == 1){
                         xml+="<a href=\"#\" onclick=\"openDialogre('修改批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/form?id=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";

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

@@ -4,7 +4,10 @@
 <head>
 	<title>合同归档管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+
 	<%@include file="/webpage/include/treetable.jsp" %>
 	<script type="text/javascript">
         var validateForm;
@@ -62,7 +65,7 @@
 <body>
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="projectReportRecord" action="${ctx}/projectcontentinfo/projectReportRecord/auditSave" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectReportRecord" action="${ctx}/projectcontentinfo/projectReportRecord/auditSave" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 		<form:hidden path="type"/>
 		<form:hidden path="home"/>
@@ -497,14 +500,36 @@
 			</div>--%>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批意见</h2></div>
-				<div class="layui-item layui-col-xs12 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" />
+				<div class="layui-item layui-col-sm8 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
 						<input type="file" name="upload_files" style="display: none;">
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm4 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
+						<div style="padding: 10px 0px;">
+							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+								<form:option value=""/>
+								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+							</form:select>
+						</div>
+					</div>
+				</div>
 			</div>
+<%--			<div class="form-group layui-row">--%>
+<%--				<div class="form-group-label"><h2>审批意见</h2></div>--%>
+<%--				<div class="layui-item layui-col-xs12 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" >
@@ -520,6 +545,24 @@
 <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>
+	$(document).ready(function() {
+		$(".apen").click(function(){
+			var span=$(this).html();
+			var opinion=$("#opinion").val()+span+";"
+			$("#opinion").val(opinion);
+		})
+		layui.use(['form', 'layer'], function () {
+			var form = layui.form;
+			//下拉框监听器
+			layui.form.on('select(opinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					var opinion=$("#opinion").val()+span+";"
+					$("#opinion").val(opinion);
+				}
+			});
+		});
+	})
 	function openBill3(title,url,width,height,target,formId,tableId){
 		var rows = $(this).parent().prevAll().length + 1;
 		var frameIndex = parent.layer.getFrameIndex(window.name);

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

@@ -306,7 +306,7 @@
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">
-						<form:textarea path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
+						<form:textarea placeholder="请输入说明" path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
 					</div>
 				</div>
 			</div>

src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsAudit.jsp

@@ -4,6 +4,8 @@
 <head>
 	<title>项目审批管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
 	<script type="text/javascript">
 		var validateForm;
@@ -116,7 +118,7 @@
 <body >
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/project/recordChooseCheck/saveAudit" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/project/recordChooseCheck/saveAudit" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 		<form:hidden path="home"/>
 		<form:hidden path="workContractInfo.client.id" id="contractClientId" value="${projectRecords.workContractInfo.client.id}"/>
@@ -444,19 +446,58 @@
 					</table>
 				</div>
 			</div>
-
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>提交说明</h2></div>
-				<div class="layui-item layui-col-sm12 lw6 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" />
+				<div class="layui-item layui-col-sm8 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<form:textarea placeholder="请输入说明" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
 						<input type="file" name="upload_files" style="display: none;">
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm4 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
+						<div style="padding: 10px 0px;">
+							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+								<form:option value=""/>
+								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+							</form:select>
+						</div>
+					</div>
+				</div>
 			</div>
+<%--			<div class="form-group layui-row">--%>
+<%--				<div class="form-group-label"><h2>提交说明</h2></div>--%>
+<%--				<div class="layui-item layui-col-sm12 lw6 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>--%>
 
 			<script>
+				$(document).ready(function() {
+					$(".apen").click(function(){
+						var span=$(this).html();
+						var opinion=$("#opinion").val()+span+";"
+						$("#opinion").val(opinion);
+					})
+					layui.use(['form', 'layer'], function () {
+						var form = layui.form;
+						//下拉框监听器
+						layui.form.on('select(opinion)', function(data){
+							var span=data.value;
+							if(span!=""){
+								var opinion=$("#opinion").val()+span+";"
+								$("#opinion").val(opinion);
+							}
+						});
+					});
+				})
                 var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 $(document).ready(function() {
@@ -470,6 +511,7 @@
                         addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
                         workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
                     }
+
                 });
 
 			</script>

src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsDownAudit.jsp

@@ -5,6 +5,8 @@
 	<title>项目审批管理</title>
 	<meta name="decorator" content="default"/>
 	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -130,7 +132,7 @@
 <body >
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/project/recordChooseCheck/saveAudit" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/project/recordChooseCheck/saveAudit" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 		<form:hidden path="home"/>
 		<form:hidden path="workContractInfo.client.id" id="contractClientId" value="${projectRecords.workContractInfo.client.id}"/>
@@ -476,16 +478,56 @@
 			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>提交说明</h2></div>
-				<div class="layui-item layui-col-sm12 lw6 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" />
+				<div class="layui-item layui-col-sm8 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<form:textarea placeholder="请输入提交说明" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
 						<input type="file" name="upload_files" style="display: none;">
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm4 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
+						<div style="padding: 10px 0px;">
+							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+								<form:option value=""/>
+								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+							</form:select>
+						</div>
+					</div>
+				</div>
 			</div>
+<%--			<div class="form-group layui-row">--%>
+<%--				<div class="form-group-label"><h2>提交说明</h2></div>--%>
+<%--				<div class="layui-item layui-col-sm12 lw6 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>--%>
 
 			<script>
+				$(document).ready(function() {
+					$(".apen").click(function(){
+						var span=$(this).html();
+						var opinion=$("#opinion").val()+span+";"
+						$("#opinion").val(opinion);
+					})
+					layui.use(['form', 'layer'], function () {
+						var form = layui.form;
+						//下拉框监听器
+						layui.form.on('select(opinion)', function(data){
+							var span=data.value;
+							if(span!=""){
+								var opinion=$("#opinion").val()+span+";"
+								$("#opinion").val(opinion);
+							}
+						});
+					});
+				})
                 var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 $(document).ready(function() {

src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsList.jsp

@@ -185,6 +185,98 @@
 
 		}
 	</script>
+	<script>
+
+		function notifyDialogre(title,url,width,height,target){
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				skin:"three-btns",
+				maxmin: true, //开启最大化最小化按钮
+				content: url ,
+				btn: ['通过','驳回','关闭'],
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(1) ){
+						top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},
+				btn2:function(index,layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(2) ){
+						top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+					return false;
+				},
+				btn3: function(index){
+				}
+			});
+
+		}
+		function masterCheck(title,url,width,height,target){
+			parent.index = "";
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				maxmin: true, //开启最大化最小化按钮
+				content: url ,
+				skin: 'three-btns',
+				btn: ['提交审核','关闭'],
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(1,index) ){
+						top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},cancel: function(index){
+				}
+			});
+
+		}
+	</script>
 	<style>
 		body{
 			background-color:transparent;
@@ -347,6 +439,15 @@
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
                         var xml="";
+
+						if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
+						{
+							if(d.actType == 1){
+								xml+="<a href=\"javascript:void(0)\" onclick=\"masterCheck('提交线下归档', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=report','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 提交线下归档</a>";
+							}else{
+								xml+="<a href=\"#\" onclick=\"notifyDialogre('选查项目', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=report','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 线下归档审批</a>";
+							}
+						}
                         /*if(d.canAdd != undefined && d.canAdd =="1")
                         {
 							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/project/recordChooseCheck/form?id=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 检查</a>";
@@ -396,6 +497,9 @@
 					,"fileNum":"${projectRecords.fileNum}"
 					,"projectReportNumber":"${projectRecords.projectReportNumber}"
 					,"creatName":"${projectRecords.createBy.name}"
+					,"notifyFlag":"${projectRecords.checkNotifyFlag}"
+					,"notifyId":"${projectRecords.checkNotifyId}"
+					,"actType":"${projectRecords.actType}"
 
 					<shiro:hasPermission name="project:recordChooseCheck:del">,"candel":	<c:choose><c:when test="${(projectRecords.checkStatus == 1 or projectRecords.checkStatus == 3 or projectRecords.checkStatus == 4)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
 					<shiro:hasPermission name="project:recordChooseCheck:edit">

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

@@ -4,6 +4,8 @@
 <head>
 	<title>合同归档管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
 	<style>
 		label.error:nth-child(2){
@@ -175,7 +177,7 @@
 <body>
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="projectReportRecord" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectReportRecord" method="post" class="form-horizontal layui-form">
 			<form:hidden path="id"/>
 			<form:hidden path="numberCount"/>
 			<form:hidden id="reportId" path="report.id"/>
@@ -296,7 +298,7 @@
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">
-						<form:textarea path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
+						<form:textarea placeholder="请输入说明" path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
 					</div>
 				</div>
 			</div>

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

@@ -329,7 +329,7 @@
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">
-						<form:textarea path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
+						<form:textarea placeholder="请输入说明" path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
 					</div>
 				</div>
 			</div>

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

@@ -4,6 +4,8 @@
 <head>
 	<title>造价审核新增报告管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
 	<style>
 		label.error{
@@ -131,6 +133,9 @@
             return false;
         }
         $(document).ready(function() {
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+			})
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
                     loading('正在提交，请稍等...');
@@ -493,7 +498,7 @@
 <body>
 <div class="single-form">
 	<div class="container${container}">
-		<form:form id="inputForm" modelAttribute="projectcontentinfo" action="${ctx}/ruralProject/ruralCostProjectMessage/saveReport" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectcontentinfo" action="${ctx}/ruralProject/ruralCostProjectMessage/saveReport" method="post" class="layui-form">
 		<form:hidden path="id"/>
 		<form:hidden path="name"/>
 		<form:hidden path="parentIds"/>
@@ -536,7 +541,7 @@
 						<label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
 						<div class="layui-input-block">
 							<select class="form-control required editable-select layui-input" id="bzshbUserId" disabled="disabled" name="projectReportData.bzshbUserId">
-								<option value=""/>
+								<option value="请选择审核人员"/>
 								<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
 									<option value="${user.id}" <c:if test="${projectcontentinfo.projectReportData.bzshbUserId eq user.id }">selected</c:if>>${user.name}</option>
 								</c:forEach>
@@ -549,7 +554,7 @@
 						<label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
 						<div class="layui-input-block">
 							<select class="form-control required editable-select layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
-								<option value=""/>
+								<option value="请选择审核人员"/>
 								<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
 									<option value="${user.id}">${user.name}</option>
 								</c:forEach>
@@ -779,19 +784,19 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()" onblur="getAttachment()"/>
+							<form:input placeholder="请输入送审价" id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()" onblur="getAttachment()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getApprovalFee()"/>
+							<form:input placeholder="请输入审定价" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getApprovalFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>合同价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
+							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
@@ -815,13 +820,13 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">土建造价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number" onchange="getBuildingFee()"/>
+							<form:input placeholder="请输入土建造价" id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number" onchange="getBuildingFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">安装造价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number" onchange="getInstallFee()"/>
+							<form:input placeholder="请输入安装造价" id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number" onchange="getInstallFee()"/>
 						</div>
 					</div>
 				<div class="layui-item layui-col-sm6">
@@ -839,13 +844,13 @@
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label">工作开始日期：</label>
 					<div class="layui-input-block">
-						<input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="projectOnRural.startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+						<input placeholder="请输入开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="projectOnRural.startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label">工作结束日期：</label>
 					<div class="layui-input-block">
-						<input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="projectOnRural.endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+						<input placeholder="请输入结束日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="projectOnRural.endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
 			</div>
@@ -855,26 +860,26 @@
 					<label class="layui-form-label"><span class="require-item">*</span>专业咨询员：</label>
 					<div class="layui-input-block  with-icon">
 						<sys:treeselect id="consultant" name="projectReportData.consultant.id" value="${projectReportData.consultant.id}" labelName="projectReportData.consultant.name" labelValue="${projectReportData.consultant.name}"
-										title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+									 cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
 					<label class="layui-form-label double-line">专业咨询员审核意见：</label>
 					<div class="layui-input-block">
-						<form:textarea path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 					</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:treeselect id="principal" name="projectReportData.principal.id" value="${projectReportData.principal.id}" labelName="projectReportData.principal.name" labelValue="${projectReportData.principal.name}"
-										title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+									cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
 					<label class="layui-form-label double-line">项目负责人审核意见：</label>
 					<div class="layui-input-block">
-						<form:textarea path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea placeholder="请输入审核意见" path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 					</div>
 				</div>
 			</div>

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

@@ -4,6 +4,8 @@
 <head>
 	<title>报告详情管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
 	<style>
 		label.error{
@@ -128,6 +130,9 @@
             return false;
         }
         $(document).ready(function() {
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+			})
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
                     loading('正在提交，请稍等...');
@@ -479,7 +484,7 @@
 <body>
 <div class="single-form">
 	<div class="container${container}">
-		<form:form id="inputForm" modelAttribute="projectcontentinfo" action="${ctx}/ruralProject/ruralCostProjectMessage/reportAudit" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectcontentinfo" action="${ctx}/ruralProject/ruralCostProjectMessage/reportAudit" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 		<form:hidden path="name"/>
 		<form:hidden path="parentIds"/>
@@ -721,19 +726,19 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()"/>
+							<form:input placeholder="请输入送审价" id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getApprovalFee()"/>
+							<form:input placeholder="请输入审定价" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getApprovalFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>合同价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
+							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
@@ -757,13 +762,13 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">土建造价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number" onchange="getBuildingFee()"/>
+							<form:input placeholder="请输入土建造价" id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number" onchange="getBuildingFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">安装造价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number" onchange="getInstallFee()"/>
+							<form:input placeholder="请输入安装造价" id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number" onchange="getInstallFee()"/>
 						</div>
 					</div>
 				<div class="layui-item layui-col-sm6">
@@ -781,13 +786,13 @@
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label"><span class="require-item">*</span>工作开始日期：</label>
 					<div class="layui-input-block">
-						<input class="laydate-icondate form-control layui-input laydate-icon required" readonly="readonly" id="startDate" name="projectOnRural.startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+						<input placeholder="请输入开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input laydate-icon required" readonly="readonly" id="startDate" name="projectOnRural.startDate" value="<fmt:formatDate value="${projectRecords.startDate}" 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">
-						<input class="laydate-icondate form-control layui-input laydate-icon required" readonly="readonly" id="endingDate" name="projectOnRural.endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+						<input placeholder="请输入结束日期" style="background-color: #fff" class="laydate-icondate form-control layui-input laydate-icon required" readonly="readonly" id="endingDate" name="projectOnRural.endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
 			</div>
@@ -797,26 +802,26 @@
 					<label class="layui-form-label"><span class="require-item">*</span>专业咨询员：</label>
 					<div class="layui-input-block  with-icon">
 						<sys:treeselect id="consultant" name="projectReportData.consultant.id" value="${projectReportData.consultant.id}" labelName="projectReportData.consultant.name" labelValue="${projectReportData.consultant.name}"
-										title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+										cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
 					<label class="layui-form-label double-line">专业咨询员审核意见：</label>
 					<div class="layui-input-block">
-						<form:textarea path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 					</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:treeselect id="principal" name="projectReportData.principal.id" value="${projectReportData.principal.id}" labelName="projectReportData.principal.name" labelValue="${projectReportData.principal.name}"
-										title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+									cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
 					<label class="layui-form-label double-line">项目负责人审核意见：</label>
 					<div class="layui-input-block">
-						<form:textarea path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea placeholder="请输入审核意见" path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 					</div>
 				</div>
 			</div>

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

@@ -572,14 +572,14 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="ProjectName" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="ProjectName" placeholder="请输入咨询项目名称" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目负责人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:inquireselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
-                                        title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                      cssStyle="background-color:#fff"  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -610,19 +610,19 @@
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecordsReported.workContractInfo.id}"  title="选择合同" labelName="ZiXunHTBH"
-                                                labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                                           cssStyle="background-color:#fff"     labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>委托单位：</label>
                     <div class="layui-input-block">
-                        <form:input path="WeiTuoDW" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="WeiTuoDW" placeholder="请输入委托单位" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>委托单位电话：</label>
                     <div class="layui-input-block">
-                        <form:input path="LianXiDH" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="LianXiDH" placeholder="请输入委托单位电话" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <%--<div class="layui-item layui-col-sm6 lw6">
@@ -634,25 +634,25 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>项目报告号：</label>
                     <div class="layui-input-block">
-                        <form:input path="DangABH" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="DangABH" placeholder="请输入项目报告号" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>出具报告日期：</label>
                     <div class="layui-input-block">
-                        <form:input path="BaoGaoShuQianFaDate" htmlEscape="false"  class="laydate-icondate required form-control layui-input layer-date laydate-icon"/>
+                        <form:input path="BaoGaoShuQianFaDate" placeholder="请选择出报告日期" htmlEscape="false"  class="laydate-icondate required form-control layui-input layer-date laydate-icon"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询营业收入（万元）：</label>
                     <div class="layui-input-block">
-                        <form:input path="ZiXunShouRu" htmlEscape="false" onchange="zxChange()" class="form-control required layui-input"/>
+                        <form:input path="ZiXunShouRu" placeholder="请输入营业收入" htmlEscape="false" onchange="zxChange()" class="form-control required layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>造价师注册证号：</label>
                     <div class="layui-input-block">
-                        <form:input path="zaoJiaShiZhengHao" htmlEscape="false"  class="form-control required layui-input"/>
+                        <form:input path="zaoJiaShiZhengHao" placeholder="请输入造价师注册证号" htmlEscape="false"  class="form-control required layui-input"/>
                     </div>
                 </div>
             </div>
@@ -702,15 +702,15 @@
                                         <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wordnr"  name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
 
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wcyysrbl" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysrbl" value="{{row.wcyysrbl}}" class="form-control number required"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysrbl" placeholder="请输入收入比例" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysrbl" value="{{row.wcyysrbl}}" class="form-control number required"/>
                                     </td>
 
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wcyysr" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysr" value="{{row.wcyysr}}" class="form-control number required"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysr" onblur="setTaxMoney(this)" placeholder="请输入营业收入" name="reportedConsultantList[{{idx}}].wcyysr" value="{{row.wcyysr}}" class="form-control number required"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -769,7 +769,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>建筑面积或规模：</label>
                     <div class="layui-input-block">
-                        <form:input path="GCGMValue" htmlEscape="false"  class="form-control layui-input required number" onchange="ZiXunBDEChange()"/>
+                        <form:input path="GCGMValue" placeholder="请输入建筑面积或规模" htmlEscape="false"  class="form-control layui-input required number" onchange="ZiXunBDEChange()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -791,7 +791,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line" title="注：指咨询项目编审后的最终造价，&#13;其中工程结算项目填审定价，标底编制填招标控制价，&#13;工程造价全过程管理填工程投资总额或审定价。"><span class="require-item">*咨询标的额(万元)：</span></label>
                     <div class="layui-input-block">
-                        <form:input path="ZiXunBDE" htmlEscape="false" class="form-control required layui-input number" onchange="ZiXunBDEChange()"/>
+                        <form:input path="ZiXunBDE" placeholder="请输入咨询表的额" htmlEscape="false" class="form-control required layui-input number" onchange="ZiXunBDEChange()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -839,19 +839,19 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">合同价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="HeTongJia" htmlEscape="false"  class="form-control layui-input number"/>
+                        <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  class="form-control layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="SongShenJia" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
+                        <form:input path="SongShenJia" placeholder="请输入送审价" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="ShenDingJia" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
+                        <form:input path="ShenDingJia" placeholder="请输入审定价" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -956,7 +956,7 @@
                 <div class="layui-item layui-col-sm12 lw6 with-textarea">
                     <label class="layui-form-label double-line">其他专业工程咨询项目造价包含内容说明：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="QTProjec" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea placeholder="请输入说明" path="QTProjec" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
                 </div>
             </div>

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

@@ -572,14 +572,14 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="ProjectName" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="ProjectName" placeholder="请输入项目名称" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目负责人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:inquireselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
-                                        title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                               cssStyle="background-color:#fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -610,49 +610,49 @@
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecordsReported.workContractInfo.id}"  title="选择合同" labelName="ZiXunHTBH"
-                                                labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                                                cssStyle="background-color:#fff"  labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>委托单位：</label>
                     <div class="layui-input-block">
-                        <form:input path="WeiTuoDW" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="WeiTuoDW" placeholder="请输入委托单位" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>委托单位电话：</label>
                     <div class="layui-input-block">
-                        <form:input path="LianXiDH" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="LianXiDH" placeholder="请输入委托单位电话" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
-                <%--<div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
-                    <div class="layui-input-block">
-                        <form:input path="ZiXunHTBH" htmlEscape="false"  class="form-control layui-input required"/>
-                    </div>
-                </div>--%>
+                    <%--<div class="layui-item layui-col-sm6 lw6">
+                        <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
+                        <div class="layui-input-block">
+                            <form:input path="ZiXunHTBH" htmlEscape="false"  class="form-control layui-input required"/>
+                        </div>
+                    </div>--%>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>项目报告号：</label>
                     <div class="layui-input-block">
-                        <form:input path="DangABH" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="DangABH" placeholder="请输入项目报告号" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>出具报告日期：</label>
                     <div class="layui-input-block">
-                        <form:input path="BaoGaoShuQianFaDate" htmlEscape="false"  class="laydate-icondate required form-control layui-input layer-date laydate-icon"/>
+                        <form:input path="BaoGaoShuQianFaDate" placeholder="请输入出具报告日期" htmlEscape="false"  class="laydate-icondate required form-control layui-input layer-date laydate-icon"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询营业收入（万元）：</label>
                     <div class="layui-input-block">
-                        <form:input path="ZiXunShouRu" htmlEscape="false" onchange="zxChange()" class="form-control required layui-input"/>
+                        <form:input path="ZiXunShouRu" placeholder="请输入营业收入" htmlEscape="false" onchange="zxChange()" class="form-control required layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>造价师注册证号：</label>
                     <div class="layui-input-block">
-                        <form:input path="zaoJiaShiZhengHao" htmlEscape="false"  class="form-control required layui-input"/>
+                        <form:input path="zaoJiaShiZhengHao" placeholder="请输入造价师注册证号" htmlEscape="false"  class="form-control required layui-input"/>
                     </div>
                 </div>
             </div>
@@ -702,15 +702,15 @@
                                         <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wordnr"  name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
 
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wcyysrbl" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysrbl" value="{{row.wcyysrbl}}" class="form-control number required"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysrbl" placeholder="请输入营业收入比例" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysrbl" value="{{row.wcyysrbl}}" class="form-control number required"/>
                                     </td>
 
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wcyysr" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysr" value="{{row.wcyysr}}" class="form-control number required"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysr" placeholder="请输入营业收入" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysr" value="{{row.wcyysr}}" class="form-control number required"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -769,7 +769,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>建筑面积或规模：</label>
                     <div class="layui-input-block">
-                        <form:input path="GCGMValue" htmlEscape="false"  class="form-control layui-input required number" onchange="ZiXunBDEChange()"/>
+                        <form:input path="GCGMValue" placeholder="请输入建筑面积和规范" htmlEscape="false"  class="form-control layui-input required number" onchange="ZiXunBDEChange()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -791,7 +791,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line" title="注：指咨询项目编审后的最终造价，&#13;其中工程结算项目填审定价，标底编制填招标控制价，&#13;工程造价全过程管理填工程投资总额或审定价。"><span class="require-item">*咨询标的额(万元)：</span></label>
                     <div class="layui-input-block">
-                        <form:input path="ZiXunBDE" htmlEscape="false" class="form-control required layui-input number" onchange="ZiXunBDEChange()"/>
+                        <form:input path="ZiXunBDE" placeholder="请输入咨询标额" htmlEscape="false" class="form-control required layui-input number" onchange="ZiXunBDEChange()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -839,19 +839,19 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">合同价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="HeTongJia" htmlEscape="false"  class="form-control layui-input number"/>
+                        <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  class="form-control layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="SongShenJia" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
+                        <form:input path="SongShenJia" placeholder="请输入送审价" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="ShenDingJia" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
+                        <form:input path="ShenDingJia" htmlEscape="false" placeholder="请输入审定价"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -956,7 +956,7 @@
                 <div class="layui-item layui-col-sm12 lw6 with-textarea">
                     <label class="layui-form-label double-line">其他专业工程咨询项目造价包含内容说明：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="QTProjec" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea path="QTProjec" placeholder="请输入内容说明" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
                 </div>
             </div>

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

@@ -343,6 +343,62 @@
 			});
 		}
 	</script>
+	<script>
+
+		function notifyDialogre(title,url,width,height,target){
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				skin:"three-btns",
+				maxmin: true, //开启最大化最小化按钮
+				content: url ,
+				btn: ['通过','驳回','关闭'],
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(1) ){
+						top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},
+				btn2:function(index,layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(2) ){
+						top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+					return false;
+				},
+				btn3: function(index){
+				}
+			});
+
+		}
+	</script>
 	<style>
 		body{
 			background-color:transparent;
@@ -671,6 +727,18 @@
         function complain(d){//操作中显示的内容
         	var xml = '';
 			if(d.pid=="0") {
+				if(d.reportNotifyFlag != undefined && d.reportNotifyFlag !=null && "" != d.reportNotifyFlag && d.reportNotifyFlag == 1)
+				{
+					xml+="<a href=\"#\" onclick=\"notifyDialogre('新增报告审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportNotifyId +"&home=report','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+				}
+				if(d.recordNotifyFlag != undefined && d.recordNotifyFlag !=null && "" != d.recordNotifyFlag && d.recordNotifyFlag == 1)
+				{
+					xml+="<a href=\"#\" onclick=\"notifyDialogre('电子归档审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.recordNotifyId +"&home=record','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+				}
+				if(d.reportedNotifyFlag != undefined && d.reportedNotifyFlag !=null && "" != d.reportedNotifyFlag && d.reportedNotifyFlag == 1)
+				{
+					xml+="<a href=\"#\" onclick=\"notifyDialogre('上报审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportedNotifyId +"&home=reported','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+				}
 				if(d.flag == 1){
 					if(d.projectReportStatus == 0){
 						xml+="<a href=\"#\" onclick=\"openDialogre('新增报告', '${ctx}/ruralProject/ruralCostProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 新增报告</a>";

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

@@ -6,6 +6,8 @@
     <meta name="decorator" content="default"/>
     <script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
     <script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <style>
         #projectDesc-error{
@@ -75,6 +77,47 @@
             return false;
         }
         $(document).ready(function() {
+            var id;
+            var name;
+            var cname;
+            var cprice;
+            var ccname;
+            var cptype;
+            if ($("#contractIdId").val()!=null || $("#contractIdId").val()!=''){
+                id=$("#contractIdId").val();
+                name=$("#contractIdName").val();
+                cname=$("#contractName").val();
+                cprice=$("#contractPrice").val();
+                ccname=$("#contractClientName").val();
+                cptype=$("#constructionProjectType").val();
+            }
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+                //有无合同监听器
+                layui.form.on('radio(ext)', function(data){
+                    var span=data.value;
+                    if(span==0){
+                        $("#contractIdId").val(id);
+                        $("#contractIdName").val(name);
+                        $("#contractName").val(cname);
+                        $("#contractPrice").val(cprice);
+                        $("#contractClientName").val(ccname);
+                        $("#constructionProjectType").val(cptype);
+                        $("#divv").show();
+                        $("#divv3").show();
+                    }else{
+                        var h=$("#d1").html();
+                        $("#contractIdId").val("");
+                        $("#contractIdName").val("");
+                        $("#contractName").val("");
+                        $("#contractPrice").val("");
+                        $("#contractClientName").val("");
+                        $("#constructionProjectType").val("");
+                        $("#divv").hide();
+                        $("#divv3").hide();
+                    }
+                });
+            });
             var radioVal ;
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -130,14 +173,7 @@
                 }
             });
 
-            //自动选择合同状态
-            if ($("#projectName").val() != "") {
-                if ($("#contractName").val() == "") {
-                    $("#ext1").iCheck("check");
-                }else{
-                    $("#ext").iCheck("check");
-                }
-            }
+
 
 
             $('#areaId').on("change", function () {
@@ -199,7 +235,18 @@
                 type : 'date'
 , trigger: 'click'
             });
-
+            //自动选择合同状态
+            if ($("#projectName").val() != "") {
+                if ($("#contractName").val() == "") {
+                    $("#ext1").attr("checked",true);
+                    $("#divv").hide();
+                    $("#divv3").hide();
+                }else{
+                    $("#ext").attr("checked",true);
+                    $("#divv").show();
+                    $("#divv3").show();
+                }
+            }
         });
 
 
@@ -648,13 +695,14 @@
                 $("#buildingPercent").val("");
             }
         }
+
     </script>
 </head>
 <body>
 <div class="single-form">
     <div class="container">
         <sys:message content="${message}"/>
-        <form:form id="inputForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralCostProjectRecords/save" method="post" class="form-horizontal">
+        <form:form id="inputForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralCostProjectRecords/save" method="post" class="layui-form">
             <form:hidden path="id"/>
             <form:hidden path="workContractInfo.client.id" id="contractClientId" value="${workContractInfo.client.id}"/>
             <input type="hidden" id="flagFile" value="">
@@ -666,10 +714,10 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">合同情况：</label>
                         <div class="layui-input-block">
-                            <input type="radio" class="i-checks" name="ext" <c:if test="${ruralProjectRecords.id==null }">checked</c:if> id="ext" value="0">
-                            <label for="ext">有合同</label>
-                            <input type="radio" class="i-checks" name="ext" <c:if test="${ruralProjectRecords.id!=null and ruralProjectRecords.workContractInfo==null }">checked</c:if> id="ext1" value="1">
-                            <label for="ext1">无合同</label>
+                            <input type="radio" title="有合同" lay-filter="ext" name="ext" checked id="ext" value="0">
+<%--                            <label for="ext">有合同</label>--%>
+                            <input type="radio" title="无合同" lay-filter="ext" name="ext" id="ext1" value="1">
+<%--                            <label for="ext1">无合同</label>--%>
                         </div>
                     </div>
                 </div>
@@ -679,7 +727,7 @@
                            <label class="layui-form-label"><span class="require-item">*</span>选择合同：</label>
                            <div class="layui-input-block  with-icon">
                                <sys:gridselectContract url="${ctx}/ruralProject/ruralCostProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecords.workContractInfo.id}"  title="选择合同" labelName="workContractInfo.name"
-                                                       labelValue="${ruralProjectRecords.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                                        cssStyle="background-color: #fff" labelValue="${ruralProjectRecords.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                            </div>
                        </div>
                        <div class="layui-item layui-col-sm6 lw7">
@@ -691,7 +739,7 @@
                        <div class="layui-item layui-col-sm6 lw7">
                            <label class="layui-form-label double-line">合同金额(元)：</label>
                            <div class="layui-input-block">
-                               <input htmlEscape="false"  readonly="true" id="contractPrice"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.contractPrice}" onchange="formatNum(this);"/>
+                               <input htmlEscape="false" readonly="true" id="contractPrice"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.contractPrice}" onchange="formatNum(this);"/>
                            </div>
                        </div>
                        <div class="layui-item layui-col-sm6 lw7">
@@ -713,7 +761,7 @@
                        <div class="layui-item layui-col-sm6 lw7">
                            <label class="layui-form-label">工程分类：</label>
                            <div class="layui-input-block">
-                               <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.constructionProjectTypeStr}"/>
+                               <input htmlEscape="false" readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.constructionProjectTypeStr}"/>
                            </div>
                        </div>
                    </div>
@@ -725,14 +773,14 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="projectName" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="projectName" htmlEscape="false" placeholder="请输入项目名称" class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">项目编号：</label>
                     <div class="layui-input-block">
                         <div class="input-group">
-                            <form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
+                            <form:input path="projectId" htmlEscape="false" readonly="true" class="form-control layui-input"/>
                             <%--<span class="input-group-btn">
                                 <label class="form-status"><c:choose><c:when test="${not empty ruralProjectRecords.projectStatus}">${fns:getDictLabel(ruralProjectRecords.projectStatus, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
                              </span>--%>
@@ -767,13 +815,13 @@
                     <label class="layui-form-label"><span class="require-item">*</span>项目所在地：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselect id="area" name="area.id" value="${ruralProjectRecords.area.id}" labelName="area.name" labelValue="${ruralProjectRecords.area.name}"
-                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+                                       cssStyle="background-color: #fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">所在省份：</label>
                     <div class="layui-input-block">
-                        <form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
+                        <form:input path="province"  htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -791,7 +839,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">建设地点：</label>
                     <div class="layui-input-block">
-                        <form:input path="projectSite" htmlEscape="false"  class="form-control layui-input"/>
+                        <form:input path="projectSite" placeholder="请输入建设地点" htmlEscape="false"  class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -805,7 +853,7 @@
                     <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselect id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
-                                        title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                       cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -817,13 +865,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" style="background-color: #fff" readonly="readonly" id="startDate" name="startDate" placeholder="请选择开始日期" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" style="background-color: #fff" readonly="readonly" id="endingDate" name="endingDate" placeholder="请选择结束日期" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -835,7 +883,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目类别：</label>
                     <div class="layui-input-block">
-                        <form:select path="attachmentProjectSort" class="form-control required editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
+                        <form:select placeholder="请选择" path="attachmentProjectSort" class="form-control required editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictList('attachment_project_sort_cost')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
@@ -955,13 +1003,13 @@
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea placeholder="请输入工程概况" path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label ">备注：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
                 </div>
             </div>

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

@@ -193,6 +193,118 @@
 			height:100%;
 		}
 	</style>
+
+	<script>
+		function notifyDialogres(title,url,deleteUrl,width,height,target) {
+			parent.index = "";
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				maxmin: true, //开启最大化最小化按钮
+				content: url ,
+				skin: 'three-btns',
+				btn: ['重新申请','作废', '关闭'],
+				btn1: function (index, layero) {
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if (target) {
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					} else {
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target", top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if (iframeWin.contentWindow.doSubmit(3)) {
+						top.layer.close(index);//关闭对话框。
+						setTimeout(function () {
+							top.layer.close(index)
+						}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},
+				btn2:function(index,layero){
+					top.layer.confirm("项目作废", {icon: 3, title:'系统提示'}, function(index){
+						$.ajax({
+							type:'post',
+							url:deleteUrl,
+							success:function(data){
+								top.layer.closeAll();//关闭所有对话框。
+								if(data.code == 1){
+									top.layer.msg(data.msg, {icon: 1});
+								}else{
+									top.layer.msg(data.msg, {icon: 0});
+								}
+								window.location.reload();
+							}
+						})
+					});
+					return false;
+				},cancel: function(index){
+				}
+			});
+		}
+
+		function notifyDialogre(title,url,width,height,target){
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				skin:"three-btns",
+				maxmin: true, //开启最大化最小化按钮
+				content: url ,
+				btn: ['通过','驳回','关闭'],
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(1) ){
+						top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},
+				btn2:function(index,layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(2) ){
+						top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+					return false;
+				},
+				btn3: function(index){
+				}
+			});
+
+		}
+	</script>
 </head>
 <body>
 <div class="wrapper wrapper-content">
@@ -365,6 +477,10 @@
                 ,{field:'op',align:'center',title:"操作",width:150,templet:function(d){
                         ////对操作进行初始化
                         var xml="";
+						if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
+						{
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('项目审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=project','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+						}
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
                             xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/form?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
@@ -421,6 +537,8 @@
 					,"projectReportRecordStatus":"${projectRecords.projectReportRecordStatus}"
                     ,"procId":"${projectRecords.processInstanceId}"
 					,"flagAdmin":"${projectRecords.flagAdmin}"
+					,"notifyFlag":"${projectRecords.notifyFlag}"
+					,"notifyId":"${projectRecords.notifyId}"
                     <c:choose><c:when test="${flag == '1' or fns:getUser().id == projectRecords.createBy.id}">
                     <shiro:hasPermission name="ruralProject:ruralCostProjectRecords:del">,"candel":	<c:choose><c:when test="${(projectRecords.projectStatus == 1 or projectRecords.projectStatus == 3 or projectRecords.projectStatus == 4) && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
                     <shiro:hasPermission name="ruralProject:ruralCostProjectRecords:edit">,"canedit1":	<c:choose><c:when test="${projectRecords.projectStatus == 1 && fns:getUser().id == projectRecords.createBy.id }">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
@@ -445,7 +563,7 @@
 					<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:accessory">
 						,"recordStatus":
 							<c:choose>
-								<c:when test="${0 ==projectRecords.projectReportRecordStatus}">"1"</c:when>
+								<c:when test="${0 ==projectRecords.projectReportRecordStatus && projectRecords.projectStatus != 7}">"1"</c:when>
 								<c:otherwise>"0"</c:otherwise>
 							</c:choose>
 					</shiro:hasPermission>

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

@@ -4,6 +4,8 @@
 <head>
 	<title>项目管理</title>
 	<meta name="decorator" content="default"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <style>
@@ -65,6 +67,47 @@
 		  return false;
 		}
 		$(document).ready(function() {
+            var id;
+            var name;
+            var cname;
+            var cprice;
+            var ccname;
+            var cptype;
+            if ($("#contractIdId").val()!=null || $("#contractIdId").val()!=''){
+                id=$("#contractIdId").val();
+                name=$("#contractIdName").val();
+                cname=$("#contractName").val();
+                cprice=$("#contractPrice").val();
+                ccname=$("#contractClientName").val();
+                cptype=$("#constructionProjectType").val();
+            }
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+                //有无合同监听器
+                layui.form.on('radio(ext)', function(data){
+                    var span=data.value;
+                    if(span==0){
+                        $("#contractIdId").val(id);
+                        $("#contractIdName").val(name);
+                        $("#contractName").val(cname);
+                        $("#contractPrice").val(cprice);
+                        $("#contractClientName").val(ccname);
+                        $("#constructionProjectType").val(cptype);
+                        $("#divv").show();
+                        $("#divv3").show();
+                    }else{
+                        var h=$("#d1").html();
+                        $("#contractIdId").val("");
+                        $("#contractIdName").val("");
+                        $("#contractName").val("");
+                        $("#contractPrice").val("");
+                        $("#contractClientName").val("");
+                        $("#constructionProjectType").val("");
+                        $("#divv").hide();
+                        $("#divv3").hide();
+                    }
+                });
+            });
             var radioVal ;
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -121,9 +164,15 @@
             });
 
             //自动选择合同状态
-            if ($("#projectName").val() != null) {
+            if ($("#projectName").val() != "") {
                 if ($("#contractName").val() == "") {
-                    $("#ext1").iCheck("check");
+                    $("#ext1").attr("checked",true);
+                    $("#divv").hide();
+                    $("#divv3").hide();
+                }else{
+                    $("#ext").attr("checked",true);
+                    $("#divv").show();
+                    $("#divv3").show();
                 }
             }
 
@@ -641,7 +690,7 @@
 <body >
 <div class="single-form">
     <div class="container">
-		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralCostProjectRecords/saveAudit" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralCostProjectRecords/saveAudit" method="post" class="layui-form">
 		<form:hidden path="id"/>
             <form:hidden path="home"/>
             <form:hidden path="act.taskId"/>
@@ -661,10 +710,10 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">合同情况：</label>
                         <div class="layui-input-block">
-                            <input type="radio" class="i-checks" name="ext" checked id="ext" value="0">
-                            <label for="ext">有合同</label>
-                            <input type="radio" class="i-checks" name="ext" id="ext1" value="1">
-                            <label for="ext1">无合同</label>
+                            <input type="radio" title="有合同" lay-filter="ext" name="ext" checked id="ext" value="0">
+<%--                            <label for="ext">有合同</label>--%>
+                            <input type="radio" title="无合同" lay-filter="ext" name="ext" id="ext1" value="1">
+<%--                            <label for="ext1">无合同</label>--%>
                         </div>
                     </div>
                 </div>
@@ -674,7 +723,7 @@
                             <label class="layui-form-label"><span class="require-item">*</span>选择合同：</label>
                             <div class="layui-input-block  with-icon">
                                 <sys:gridselectContract url="${ctx}/project/projectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${projectRecords.workContractInfo.id}"  title="选择合同" labelName="workContractInfo.name"
-                                                        labelValue="${projectRecords.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                                                       cssStyle="background-color:#fff" labelValue="${projectRecords.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                             </div>
                         </div>
                         <div class="layui-item layui-col-sm6 lw7">
@@ -746,7 +795,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目名称</label>
                     <div class="layui-input-block">
-                        <form:input path="projectName" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="projectName" placeholder="请输入项目名称" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -788,7 +837,7 @@
                     <label class="layui-form-label">项目所在地：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselect id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
-                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                       cssStyle="background-color: #fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -812,7 +861,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">建设地点：</label>
                     <div class="layui-input-block">
-                        <form:input path="projectSite" htmlEscape="false"  class="form-control layui-input"/>
+                        <form:input path="projectSite" placeholder="请输入建设地点" htmlEscape="false"  class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -826,7 +875,7 @@
                     <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:inquireselectUser id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
-                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                       cssStyle="background-color:#fff"  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -838,13 +887,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请选择开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请选择结束日期" style="background-color: #fff;" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -937,12 +986,12 @@
                         <form:input path="buildingPercent" htmlEscape="false" id="buildingPercent" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>--%>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line">其中安装百分比(%)：</label>
-                    <div class="layui-input-block">
-                        <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
-                    </div>
-                </div>
+<%--                <div class="layui-item layui-col-sm6 lw7">--%>
+<%--                    <label class="layui-form-label double-line">其中安装百分比(%)：</label>--%>
+<%--                    <div class="layui-input-block">--%>
+<%--                        <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>--%>
+<%--                    </div>--%>
+<%--                </div>--%>
                 <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">施工单位：</label>
                     <div class="layui-input-block">
@@ -976,13 +1025,13 @@
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
+                        <form:textarea placeholder="请输入工程概况" path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label ">备注：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
                 </div>
             </div>

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

@@ -297,7 +297,7 @@
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">
-						<form:textarea path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
+						<form:textarea placeholder="请输入说明" path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
 					</div>
 				</div>
 			</div>

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

@@ -315,7 +315,7 @@
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">
-						<form:textarea path="remarks" htmlEscape="false" rows="4" maxLength="255"   class="form-control "/>
+						<form:textarea placeholder="请输入说明" path="remarks" htmlEscape="false" rows="4" maxLength="255"   class="form-control "/>
 					</div>
 				</div>
 			</div>

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

@@ -5,6 +5,10 @@
 	<title>项目审批管理</title>
 	<meta name="decorator" content="default"/>
 	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
+	<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" />
+
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -115,7 +119,7 @@
 <body >
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectRecords/saveAudit" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectRecords/saveAudit" method="post" class="layui-form">
 		<form:hidden path="id"/>
 		<form:hidden path="home"/>
 		<form:hidden path="workContractInfo.client.id" id="contractClientId" value="${projectRecords.workContractInfo.client.id}"/>
@@ -662,13 +666,25 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批意见</h2></div>
-				<div class="layui-item layui-col-sm12 lw6 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" />
+				<div class="layui-item layui-col-sm8 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
 						<input type="file" name="upload_files" style="display: none;">
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm4 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
+						<div style="padding: 10px 0px;">
+							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+								<form:option value=""/>
+								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+							</form:select>
+						</div>
+					</div>
+				</div>
 			</div>
 
 			<script>
@@ -685,8 +701,23 @@
                         addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
                         workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
                     }
+                    $(".apen").click(function(){
+                    	var span=$(this).html();
+						var opinion=$("#opinion").val()+span+";"
+						$("#opinion").val(opinion);
+					})
+					layui.use(['form', 'layer'], function () {
+						var form = layui.form;
+						//下拉框监听器
+						layui.form.on('select(opinion)', function(data){
+							var span=data.value;
+							if(span!=""){
+								var opinion=$("#opinion").val()+span+";"
+								$("#opinion").val(opinion);
+							}
+						});
+					});
                 });
-
 			</script>
 
 			<div class="form-group layui-row">

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

@@ -6,6 +6,8 @@
     <meta name="decorator" content="default"/>
     <script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
     <script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <style>
         #projectDesc-error{
@@ -84,6 +86,47 @@
             return false;
         }
         $(document).ready(function() {
+            var id;
+            var name;
+            var cname;
+            var cprice;
+            var ccname;
+            var cptype;
+            if ($("#contractIdId").val()!=null || $("#contractIdId").val()!=''){
+                id=$("#contractIdId").val();
+                name=$("#contractIdName").val();
+                cname=$("#contractName").val();
+                cprice=$("#contractPrice").val();
+                ccname=$("#contractClientName").val();
+                cptype=$("#constructionProjectType").val();
+            }
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+                //有无合同监听器
+                layui.form.on('radio(ext)', function(data){
+                    var span=data.value;
+                    if(span==0){
+                        $("#contractIdId").val(id);
+                        $("#contractIdName").val(name);
+                        $("#contractName").val(cname);
+                        $("#contractPrice").val(cprice);
+                        $("#contractClientName").val(ccname);
+                        $("#constructionProjectType").val(cptype);
+                        $("#divv").show();
+                        $("#divv3").show();
+                    }else{
+                        var h=$("#d1").html();
+                        $("#contractIdId").val("");
+                        $("#contractIdName").val("");
+                        $("#contractName").val("");
+                        $("#contractPrice").val("");
+                        $("#contractClientName").val("");
+                        $("#constructionProjectType").val("");
+                        $("#divv").hide();
+                        $("#divv3").hide();
+                    }
+                });
+            });
             var radioVal ;
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -149,11 +192,16 @@
             });
 
             //自动选择合同状态
+            var s=$("#projectName").val()
             if ($("#projectName").val() != "") {
                 if ($("#contractName").val() == "") {
-                    $("#ext1").iCheck("check");
+                    $("#ext1").attr("checked",true);
+                    $("#divv").hide();
+                    $("#divv3").hide();
                 }else{
-                    $("#ext").iCheck("check");
+                    $("#ext").attr("checked",true);
+                    $("#divv").show();
+                    $("#divv3").show();
                 }
             }
 
@@ -675,7 +723,7 @@
 <div class="single-form">
     <div class="container">
         <sys:message content="${message}"/>
-        <form:form id="inputForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralProjectRecords/save" method="post" class="form-horizontal">
+        <form:form id="inputForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralProjectRecords/save" method="post" class="form-horizontal layui-form">
             <form:hidden path="id"/>
             <form:hidden path="workContractInfo.client.id" id="contractClientId" value="${workContractInfo.client.id}"/>
             <input type="hidden" id="workClientLinkmanInfo" value="${ruralProjectRecords.workClientLinkmanList}">
@@ -687,10 +735,10 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">合同情况：</label>
                         <div class="layui-input-block">
-                            <input type="radio" class="i-checks" name="ext" checked id="ext" value="0">
-                            <label for="ext">有合同</label>
-                            <input type="radio" class="i-checks" name="ext" id="ext1" value="1">
-                            <label for="ext1">无合同</label>
+                            <input type="radio" title="有合同" lay-filter="ext" checked name="ext" id="ext" value="0">
+                                <%--                            <label for="ext">有合同</label>--%>
+                            <input type="radio" title="无合同" lay-filter="ext" name="ext" id="ext1" value="1">
+                                <%--                            <label for="ext1">无合同</label>--%>
                         </div>
                     </div>
                 </div>
@@ -700,7 +748,7 @@
                            <label class="layui-form-label"><span class="require-item">*</span>选择合同：</label>
                            <div class="layui-input-block  with-icon">
                                <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecords.workContractInfo.id}"  title="选择合同" labelName="workContractInfo.name"
-                                                       labelValue="${ruralProjectRecords.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                                                 cssStyle="background-color:#fff"      labelValue="${ruralProjectRecords.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                            </div>
                        </div>
                        <div class="layui-item layui-col-sm6 lw7">
@@ -746,7 +794,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="projectName" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="projectName" placeholder="请输入项目名称" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -788,7 +836,7 @@
                     <label class="layui-form-label"><span class="require-item">*</span>项目所在地：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselect id="area" name="area.id" value="${ruralProjectRecords.area.id}" labelName="area.name" labelValue="${ruralProjectRecords.area.name}"
-                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+                                       cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -812,7 +860,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">建设地点：</label>
                     <div class="layui-input-block">
-                        <form:input path="projectSite" htmlEscape="false"  class="form-control layui-input"/>
+                        <form:input placeholder="请输入建设地点" path="projectSite" htmlEscape="false"  class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -826,7 +874,7 @@
                     <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:inquireselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
-                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                       cssStyle="background-color:#fff"  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -838,13 +886,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请选择开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请选择结束日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -967,13 +1015,13 @@
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
+                        <form:textarea placeholder="请输入工程概况" path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label ">备注：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
                 </div>
             </div>

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

@@ -213,6 +213,62 @@
 			height:100%;
 		}
 	</style>
+	<script>
+
+		function notifyDialogre(title,url,width,height,target){
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				skin:"three-btns",
+				maxmin: true, //开启最大化最小化按钮
+				content: url ,
+				btn: ['通过','驳回','关闭'],
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(1) ){
+						top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},
+				btn2:function(index,layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(2) ){
+						top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+					return false;
+				},
+				btn3: function(index){
+				}
+			});
+
+		}
+	</script>
 </head>
 <body>
 <div class="wrapper wrapper-content">
@@ -393,6 +449,10 @@
                 ,{field:'op',align:'center',title:"操作",width:150,templet:function(d){
                         ////对操作进行初始化
                         var xml="";
+                        if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
+                        {
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('项目审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=project','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+                        }
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
                             xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/form?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
@@ -449,6 +509,8 @@
                     ,"procId":"${projectRecords.processInstanceId}"
 					,"projectReportRecordStatus":"${projectRecords.projectReportRecordStatus}"
 					,"flagAdmin":"${projectRecords.flagAdmin}"
+					,"notifyFlag":"${projectRecords.notifyFlag}"
+					,"notifyId":"${projectRecords.notifyId}"
                     <c:choose><c:when test="${flag == '1' or fns:getUser().id == projectRecords.createBy.id}">
                     <shiro:hasPermission name="ruralProject:ruralProjectRecords:del">,"candel":	<c:choose><c:when test="${(projectRecords.projectStatus == 1 or projectRecords.projectStatus == 3 or projectRecords.projectStatus == 4) && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
                     <shiro:hasPermission name="ruralProject:ruralProjectRecords:edit">,"canedit1":	<c:choose><c:when test="${projectRecords.projectStatus == 1 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
@@ -473,7 +535,7 @@
 					<shiro:hasPermission name="ruralProject:ruralProjectRecords:accessory">
 					,"recordStatus":
 					<c:choose>
-							<c:when test="${0 == projectRecords.projectReportRecordStatus}">"1"</c:when>
+							<c:when test="${0 == projectRecords.projectReportRecordStatus && projectRecords.projectStatus != 7}">"1"</c:when>
 							<c:otherwise>"0"</c:otherwise>
 					</c:choose>
 					</shiro:hasPermission>

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

@@ -5,8 +5,9 @@
 	<title>项目管理</title>
 	<meta name="decorator" content="default"/>
 	<script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
-	<script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
-	<link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <style>
         #projectDesc-error{
             left:0;
@@ -66,6 +67,47 @@
 		  return false;
 		}
 		$(document).ready(function() {
+            var id;
+            var name;
+            var cname;
+            var cprice;
+            var ccname;
+            var cptype;
+            if ($("#contractIdId").val()!=null || $("#contractIdId").val()!=''){
+                id=$("#contractIdId").val();
+                name=$("#contractIdName").val();
+                cname=$("#contractName").val();
+                cprice=$("#contractPrice").val();
+                ccname=$("#contractClientName").val();
+                cptype=$("#constructionProjectType").val();
+            }
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+                //有无合同监听器
+                layui.form.on('radio(ext)', function(data){
+                    var span=data.value;
+                    if(span==0){
+                        $("#contractIdId").val(id);
+                        $("#contractIdName").val(name);
+                        $("#contractName").val(cname);
+                        $("#contractPrice").val(cprice);
+                        $("#contractClientName").val(ccname);
+                        $("#constructionProjectType").val(cptype);
+                        $("#divv").show();
+                        $("#divv3").show();
+                    }else{
+                        var h=$("#d1").html();
+                        $("#contractIdId").val("");
+                        $("#contractIdName").val("");
+                        $("#contractName").val("");
+                        $("#contractPrice").val("");
+                        $("#contractClientName").val("");
+                        $("#constructionProjectType").val("");
+                        $("#divv").hide();
+                        $("#divv3").hide();
+                    }
+                });
+            });
             var radioVal ;
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -124,9 +166,15 @@
             });
 
             //自动选择合同状态
-            if ($("#projectName").val() != null) {
+            if ($("#projectName").val() != "") {
                 if ($("#contractName").val() == "") {
-                    $("#ext1").iCheck("check");
+                    $("#ext1").attr("checked",true);
+                    $("#divv").hide();
+                    $("#divv3").hide();
+                }else{
+                    $("#ext").attr("checked",true);
+                    $("#divv").show();
+                    $("#divv3").show();
                 }
             }
 
@@ -632,7 +680,7 @@
 <body >
 <div class="single-form">
     <div class="container">
-		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectRecords/saveAudit" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectRecords/saveAudit" method="post" class="layui-form">
 		<form:hidden path="id"/>
             <form:hidden path="home"/>
             <form:hidden path="act.taskId"/>
@@ -652,10 +700,10 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">合同情况：</label>
                         <div class="layui-input-block">
-                            <input type="radio" class="i-checks" name="ext" checked id="ext" value="0">
-                            <label for="ext">有合同</label>
-                            <input type="radio" class="i-checks" name="ext" id="ext1" value="1">
-                            <label for="ext1">无合同</label>
+                            <input type="radio" title="有合同" lay-filter="ext" name="ext" id="ext" value="0">
+<%--                            <label for="ext">有合同</label>--%>
+                            <input type="radio" title="无合同" lay-filter="ext" name="ext" id="ext1" value="1">
+<%--                            <label for="ext1">无合同</label>--%>
                         </div>
                     </div>
                 </div>
@@ -665,7 +713,7 @@
                             <label class="layui-form-label"><span class="require-item">*</span>选择合同：</label>
                             <div class="layui-input-block  with-icon">
                                 <sys:gridselectContract url="${ctx}/project/projectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${projectRecords.workContractInfo.id}"  title="选择合同" labelName="workContractInfo.name"
-                                                        labelValue="${projectRecords.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                                                       cssStyle="background-color:#fff" labelValue="${projectRecords.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                             </div>
                         </div>
                         <div class="layui-item layui-col-sm6 lw7">
@@ -737,7 +785,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目名称</label>
                     <div class="layui-input-block">
-                        <form:input path="projectName" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input placeholder="请输入项目名称" path="projectName" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -779,7 +827,7 @@
                     <label class="layui-form-label">项目所在地：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselect id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
-                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                       cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -803,7 +851,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">建设地点：</label>
                     <div class="layui-input-block">
-                        <form:input path="projectSite" htmlEscape="false"  class="form-control layui-input"/>
+                        <form:input placeholder="请输入建设地点" path="projectSite" htmlEscape="false"  class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -817,7 +865,7 @@
                     <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:inquireselectUser id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
-                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                        cssStyle="background-color:#fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -829,13 +877,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请选择开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input style="background-color: #fff" placeholder="请选择结束日期" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -967,13 +1015,13 @@
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
+                        <form:textarea placeholder="请输入工程概况" path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label ">备注：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
                 </div>
             </div>

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

@@ -5,6 +5,9 @@
 	<title>项目审批管理</title>
 	<meta name="decorator" content="default"/>
 	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
+	<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" />
 	<%@include file="/webpage/include/treetable.jsp" %>
 	<script type="text/javascript">
         var validateForm;
@@ -113,7 +116,7 @@
 <body >
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="projectcontentinfo" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectMessage/reportAudit" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectcontentinfo" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectMessage/reportAudit" method="post" class="form-horizontal layui-form">
 			<form:hidden path="id"/>
 			<form:hidden path="home"/>
 			<form:hidden path="project.id"/>
@@ -679,17 +682,38 @@
 				</div>
 			</div>
 
-
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批意见</h2></div>
-				<div class="layui-item layui-col-sm12 lw6 with-textarea">
-					<label class="layui-form-label">审批意见：</label>
-					<div class="layui-input-block">
-						<form:textarea path="projectReportData.act.comment" class="form-control" rows="4" maxlength="127" />
+				<div class="layui-item layui-col-sm8 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<form:textarea path="projectReportData.act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
 						<input type="file" name="upload_files" style="display: none;">
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm4 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
+						<div style="padding: 10px 0px;">
+							<form:select path="projectReportData.act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+								<form:option value=""/>
+								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+							</form:select>
+						</div>
+					</div>
+				</div>
 			</div>
+<%--			<div class="form-group layui-row">--%>
+<%--				<div class="form-group-label"><h2>审批意见</h2></div>--%>
+<%--				<div class="layui-item layui-col-sm12 lw6 with-textarea">--%>
+<%--					<label class="layui-form-label">审批意见：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<form:textarea path="projectReportData.act.comment" class="form-control" rows="4" maxlength="127" />--%>
+<%--						<input type="file" name="upload_files" style="display: none;">--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--			</div>--%>
 
 		</form:form>
 
@@ -703,7 +727,25 @@
 	</div>
 </div>
 <script>
-	function openBill2(title,url,width,height,target,formId,tableId){
+	$(document).ready(function() {
+		$(".apen").click(function(){
+			var span=$(this).html();
+			var opinion=$("#opinion").val()+span+";"
+			$("#opinion").val(opinion);
+		})
+		layui.use(['form', 'layer'], function () {
+			var form = layui.form;
+			//下拉框监听器
+			layui.form.on('select(opinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					var opinion=$("#opinion").val()+span+";"
+					$("#opinion").val(opinion);
+				}
+			});
+		});
+	})
+		function openBill2(title,url,width,height,target,formId,tableId){
 		var rows = $(this).parent().prevAll().length + 1;
 		var frameIndex = parent.layer.getFrameIndex(window.name);
 		var urls = url+"&index="+frameIndex;

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

@@ -4,6 +4,8 @@
 <head>
     <title>项目审批管理</title>
     <meta name="decorator" content="default"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
     <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
     <script type="text/javascript">
         function listTr(obj){
@@ -130,6 +132,9 @@
             return false;
         }
         $(document).ready(function() {
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+            })
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
                     loading('正在提交，请稍等...');
@@ -288,7 +293,7 @@
 <body >
 <div class="single-form">
     <div class="container">
-        <form:form id="inputForm" modelAttribute="projectcontentinfo" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectMessage/reportAudit" method="post" class="form-horizontal">
+        <form:form id="inputForm" modelAttribute="projectcontentinfo" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectMessage/reportAudit" method="post" class="form-horizontal layui-form">
             <form:hidden path="id"/>
             <form:hidden path="home"/>
             <form:hidden path="project.id"/>
@@ -528,19 +533,19 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input" onchange="getFee()"/>
+                        <form:input placeholder="请输入送审价" id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input" onchange="getFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input" onchange="getApprovalFee()"/>
+                        <form:input placeholder="请输入审定价" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input" onchange="getApprovalFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input"/>
+                        <form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -564,13 +569,13 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">土建造价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" onchange="getBuildingFee()"/>
+                        <form:input placeholder="请输入土建造价" id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" onchange="getBuildingFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">安装造价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" onchange="getInstallFee()"/>
+                        <form:input placeholder="请输入安装造价" id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" onchange="getInstallFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -588,13 +593,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input laydate-icon" readonly="readonly" id="startDate" name="projectOnRural.startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请输入开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input laydate-icon" readonly="readonly" id="startDate" name="projectOnRural.startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input laydate-icon" readonly="readonly" id="endingDate" name="projectOnRural.endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请输入结束日期" style="background-color: #fff" class="laydate-icondate form-control layui-input laydate-icon" readonly="readonly" id="endingDate" name="projectOnRural.endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
             </div>
@@ -604,26 +609,26 @@
                     <label class="layui-form-label"><span class="require-item">*</span>专业咨询员：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselect id="consultant" name="projectReportData.consultant.id" value="${projectReportData.consultant.id}" labelName="projectReportData.consultant.name" labelValue="${projectReportData.consultant.name}"
-                                        title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                     cssStyle="background-color:#FFF"   title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12 lw7 with-textarea">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>专业咨询员审核意见：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
+                        <form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
                     </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:treeselect id="principal" name="projectReportData.principal.id" value="${projectReportData.principal.id}" labelName="projectReportData.principal.name" labelValue="${projectReportData.principal.name}"
-                                        title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                      cssStyle="background-color:#fff"  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12 lw7 with-textarea">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>项目负责人审核意见：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
+                        <form:textarea placeholder="请输入审核意见" path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
                     </div>
                 </div>
             </div>

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

@@ -5,6 +5,8 @@
 	<title>报告详情管理</title>
 	<meta name="decorator" content="default"/>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 
 	<style>
 		label.error{
@@ -120,6 +122,9 @@
             return false;
         }
         $(document).ready(function() {
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+			})
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
                     loading('正在提交，请稍等...');
@@ -495,7 +500,7 @@
 <body>
 <div class="single-form">
 	<div class="container${container}">
-		<form:form id="inputForm" modelAttribute="projectcontentinfo" action="${ctx}/ruralProject/ruralProjectMessage/saveReport" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectcontentinfo" action="${ctx}/ruralProject/ruralProjectMessage/saveReport" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 		<form:hidden path="name"/>
 		<form:hidden path="parentIds"/>
@@ -779,19 +784,19 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()" onblur="getAttachment()"/>
+							<form:input placeholder="请输入送审价" id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()" onblur="getAttachment()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getApprovalFee()"/>
+							<form:input placeholder="请输入审定价" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getApprovalFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>合同价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
+							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
@@ -815,13 +820,13 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">土建造价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number" onchange="getBuildingFee()"/>
+							<form:input placeholder="请输入土建造价" id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number" onchange="getBuildingFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">安装造价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number" onchange="getInstallFee()"/>
+							<form:input placeholder="请输入安装造价" id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number" onchange="getInstallFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
@@ -839,13 +844,13 @@
 					<div class="layui-item layui-col-sm6 lw7">
 						<label class="layui-form-label">工作开始日期：</label>
 						<div class="layui-input-block">
-							<input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="projectOnRural.startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+							<input placeholder="请选择开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="projectOnRural.startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6 lw7">
 						<label class="layui-form-label">工作结束日期：</label>
 						<div class="layui-input-block">
-							<input class="laydate-icondate form-control layui-input layer-date laydate-icon " readonly="readonly" id="endingDate" name="projectOnRural.endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+							<input placeholder="请选择结束日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon " readonly="readonly" id="endingDate" name="projectOnRural.endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 						</div>
 					</div>
 				</div>
@@ -855,26 +860,26 @@
 					<label class="layui-form-label"><span class="require-item">*</span>专业咨询员：</label>
 					<div class="layui-input-block  with-icon">
 						<sys:treeselect id="consultant" name="projectReportData.consultant.id" value="${projectReportData.consultant.id}" labelName="projectReportData.consultant.name" labelValue="${projectReportData.consultant.name}"
-										title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+										cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>专业咨询员审核意见：</label>
 					<div class="layui-input-block">
-						<form:textarea path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
+						<form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
 					</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:treeselect id="principal" name="projectReportData.principal.id" value="${projectReportData.principal.id}" labelName="projectReportData.principal.name" labelValue="${projectReportData.principal.name}"
-										title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+									cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>项目负责人审核意见：</label>
 					<div class="layui-input-block">
-						<form:textarea path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
+						<form:textarea placeholder="请输入审核意见" path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
 					</div>
 				</div>
 			</div>

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

@@ -6,6 +6,8 @@
     <meta name="decorator" content="default"/>
     <script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
     <script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <style>
         #projectDesc-error{
@@ -600,14 +602,14 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="ProjectName" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="ProjectName" placeholder="请输入项目名称" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目负责人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:inquireselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
-                                        title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                      cssStyle="background-color:#fff"  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -638,43 +640,43 @@
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecordsReported.workContractInfo.id}"  title="选择合同" labelName="ZiXunHTBH"
-                                                labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                                           cssStyle="background-color:#fff"     labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>委托单位：</label>
                     <div class="layui-input-block">
-                        <form:input path="WeiTuoDW" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="WeiTuoDW" placeholder="请输入委托单位" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>委托单位电话：</label>
                     <div class="layui-input-block">
-                        <form:input path="LianXiDH" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="LianXiDH" placeholder="请输入委托单位电话" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>项目报告号：</label>
                     <div class="layui-input-block">
-                        <form:input path="DangABH" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="DangABH" htmlEscape="false" placeholder="请输入项目报告号" class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>出具报告日期：</label>
                     <div class="layui-input-block">
-                        <form:input path="BaoGaoShuQianFaDate" htmlEscape="false"  class="laydate-icondate required form-control layui-input layer-date laydate-icon"/>
+                        <form:input path="BaoGaoShuQianFaDate" placeholder="请选择出具报告日期" htmlEscape="false"  class="laydate-icondate required form-control layui-input layer-date laydate-icon"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询营业收入（万元）：</label>
                     <div class="layui-input-block">
-                        <form:input path="ZiXunShouRu" htmlEscape="false" onchange="zxChange()" class="form-control required layui-input"/>
+                        <form:input path="ZiXunShouRu" placeholder="请输入营业收入" htmlEscape="false" onchange="zxChange()" class="form-control required layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>造价师注册证号：</label>
                     <div class="layui-input-block">
-                        <form:input path="zaoJiaShiZhengHao" htmlEscape="false"  class="form-control required layui-input"/>
+                        <form:input path="zaoJiaShiZhengHao" placeholder="请输入造价师注册证号" htmlEscape="false"  class="form-control required layui-input"/>
                     </div>
                 </div>
             </div>
@@ -724,15 +726,15 @@
                                         <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wordnr"  name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
 
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wcyysrbl" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysrbl" value="{{row.wcyysrbl}}" class="form-control number required"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysrbl" placeholder="请输入营业收入比例" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysrbl" value="{{row.wcyysrbl}}" class="form-control number required"/>
                                     </td>
 
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wcyysr" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysr" value="{{row.wcyysr}}" class="form-control number required"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysr" placeholder="请输入营业收入" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysr" value="{{row.wcyysr}}" class="form-control number required"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -791,7 +793,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>建筑面积或规模：</label>
                     <div class="layui-input-block">
-                        <form:input path="GCGMValue" htmlEscape="false"  class="form-control layui-input required number" onchange="ZiXunBDEChange()"/>
+                        <form:input path="GCGMValue" placeholder="请输入建筑面积或规模" htmlEscape="false"  class="form-control layui-input required number" onchange="ZiXunBDEChange()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -813,7 +815,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line" title="注：指咨询项目编审后的最终造价，&#13;其中工程结算项目填审定价，标底编制填招标控制价，&#13;工程造价全过程管理填工程投资总额或审定价。"><span class="require-item">*咨询标的额(万元)：</span></label>
                     <div class="layui-input-block">
-                        <form:input path="ZiXunBDE" htmlEscape="false" class="form-control required layui-input number" onchange="ZiXunBDEChange()"/>
+                        <form:input path="ZiXunBDE" placeholder="请输入咨询标额" htmlEscape="false" class="form-control required layui-input number" onchange="ZiXunBDEChange()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -861,19 +863,19 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">合同价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="HeTongJia" htmlEscape="false"  class="form-control layui-input number"/>
+                        <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  class="form-control layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="SongShenJia" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
+                        <form:input path="SongShenJia" htmlEscape="false" placeholder="请输入送审价" class="form-control required layui-input number" onchange="JingHeJianValue()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="ShenDingJia" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
+                        <form:input path="ShenDingJia" htmlEscape="false" placeholder="请输入审定价" class="form-control required layui-input number" onchange="JingHeJianValue()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -978,21 +980,42 @@
                 <div class="layui-item layui-col-sm12 lw6 with-textarea">
                     <label class="layui-form-label double-line">其他专业工程咨询项目造价包含内容说明：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="QTProjec" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea path="QTProjec" placeholder="请输入内容说明" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
                 </div>
             </div>
-
-            <div class="form-group layui-row lw8">
+            <div class="form-group layui-row">
                 <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" />
+                <div class="layui-item layui-col-sm8 lw6 with-textarea">
+                    <div class="layui-input-block" style="margin-left:10px;">
+                        <form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
                         <input type="file" name="upload_files" style="display: none;">
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm4 lw6 with-textarea">
+                    <div class="layui-input-block" style="margin-left:10px;">
+                        <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
+                        <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
+                        <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
+                        <div style="padding: 10px 0px;">
+                            <form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+                                <form:option value=""/>
+                                <form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                            </form:select>
+                        </div>
+                    </div>
+                </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>
@@ -1008,7 +1031,24 @@
 
 <script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 <script>
-
+    $(document).ready(function() {
+        $(".apen").click(function(){
+            var span=$(this).html();
+            var opinion=$("#opinion").val()+span+";"
+            $("#opinion").val(opinion);
+        })
+        layui.use(['form', 'layer'], function () {
+            var form = layui.form;
+            //下拉框监听器
+            layui.form.on('select(opinion)', function(data){
+                var span=data.value;
+                if(span!=""){
+                    var opinion=$("#opinion").val()+span+";"
+                    $("#opinion").val(opinion);
+                }
+            });
+        });
+    })
     layui.use(['table','form'], function(){
 
         var form = layui.form;

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

@@ -588,14 +588,14 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="ProjectName" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="ProjectName" placeholder="请输入项目名称" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目负责人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:inquireselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
-                                        title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                       cssStyle="background-color:#fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -626,19 +626,19 @@
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecordsReported.workContractInfo.id}"  title="选择合同" labelName="ZiXunHTBH"
-                                                labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                                              cssStyle="background-color:#fff"  labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>委托单位：</label>
                     <div class="layui-input-block">
-                        <form:input path="WeiTuoDW" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="WeiTuoDW" placeholder="请输入委托单位" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>委托单位电话：</label>
                     <div class="layui-input-block">
-                        <form:input path="LianXiDH" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="LianXiDH" placeholder="请输入委托单位电话" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <%--<div class="layui-item layui-col-sm6 lw6">
@@ -650,25 +650,25 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>项目报告号：</label>
                     <div class="layui-input-block">
-                        <form:input path="DangABH" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="DangABH" placeholder="请输入项目报告号" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>出具报告日期：</label>
                     <div class="layui-input-block">
-                        <form:input path="BaoGaoShuQianFaDate" htmlEscape="false"  class="laydate-icondate required form-control layui-input layer-date laydate-icon"/>
+                        <form:input path="BaoGaoShuQianFaDate" placeholder="请输入出具报告日期" htmlEscape="false"  class="laydate-icondate required form-control layui-input layer-date laydate-icon"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询营业收入（万元）：</label>
                     <div class="layui-input-block">
-                        <form:input path="ZiXunShouRu" htmlEscape="false" onchange="zxChange()" class="form-control required layui-input"/>
+                        <form:input path="ZiXunShouRu" htmlEscape="false" placeholder="请输入营业收入" onchange="zxChange()" class="form-control required layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>造价师注册证号：</label>
                     <div class="layui-input-block">
-                        <form:input path="zaoJiaShiZhengHao" htmlEscape="false"  class="form-control required layui-input"/>
+                        <form:input path="zaoJiaShiZhengHao" htmlEscape="false" placeholder="请输入造价师注册证号" class="form-control required layui-input"/>
                     </div>
                 </div>
             </div>
@@ -718,15 +718,15 @@
                                         <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wordnr"  name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
 
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wcyysrbl" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysrbl" value="{{row.wcyysrbl}}" class="form-control number required"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysrbl" placeholder="请输入营业收入比例" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysrbl" value="{{row.wcyysrbl}}" class="form-control number required"/>
                                     </td>
 
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wcyysr" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysr" value="{{row.wcyysr}}" class="form-control number required"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysr" placeholder="请输入营业收入" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysr" value="{{row.wcyysr}}" class="form-control number required"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -785,7 +785,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>建筑面积或规模：</label>
                     <div class="layui-input-block">
-                        <form:input path="GCGMValue" htmlEscape="false"  class="form-control layui-input required number" onchange="ZiXunBDEChange()"/>
+                        <form:input path="GCGMValue" placeholder="请输入建筑面积或规模" htmlEscape="false"  class="form-control layui-input required number" onchange="ZiXunBDEChange()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -807,13 +807,13 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line" title="注：指咨询项目编审后的最终造价，&#13;其中工程结算项目填审定价，标底编制填招标控制价，&#13;工程造价全过程管理填工程投资总额或审定价。"><span class="require-item">*咨询标的额(万元)：</span></label>
                     <div class="layui-input-block">
-                        <form:input path="ZiXunBDE" htmlEscape="false" class="form-control required layui-input number" onchange="ZiXunBDEChange()"/>
+                        <form:input path="ZiXunBDE" placeholder="请输入咨询标额" htmlEscape="false" class="form-control required layui-input number" onchange="ZiXunBDEChange()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">其中土建造价(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="ZiXunBDETJ" htmlEscape="false" class="form-control layui-input" onchange="ZiXunBDEChange()"/>
+                        <form:input path="ZiXunBDETJ"  htmlEscape="false" class="form-control layui-input" onchange="ZiXunBDEChange()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -855,19 +855,19 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">合同价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="HeTongJia" htmlEscape="false"  class="form-control layui-input number"/>
+                        <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  class="form-control layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="SongShenJia" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
+                        <form:input path="SongShenJia" htmlEscape="false" placeholder="请输送审价" class="form-control required layui-input number" onchange="JingHeJianValue()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="ShenDingJia" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
+                        <form:input path="ShenDingJia" htmlEscape="false" placeholder="请输入审定价" class="form-control required layui-input number" onchange="JingHeJianValue()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -972,7 +972,7 @@
                 <div class="layui-item layui-col-sm12 lw6 with-textarea">
                     <label class="layui-form-label double-line">其他专业工程咨询项目造价包含内容说明：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="QTProjec" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea path="QTProjec" placeholder="请输入内容说明" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
                 </div>
             </div>

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

@@ -588,14 +588,14 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="ProjectName" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="ProjectName" placeholder="请输入项目名称" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目负责人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:inquireselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
-                                        title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                       cssStyle="background-color:#fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -626,19 +626,19 @@
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecordsReported.workContractInfo.id}"  title="选择合同" labelName="ZiXunHTBH"
-                                                labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                                              cssStyle="background-color:#fff"  labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>委托单位：</label>
                     <div class="layui-input-block">
-                        <form:input path="WeiTuoDW" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="WeiTuoDW" placeholder="请输入委托单位" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>委托单位电话：</label>
                     <div class="layui-input-block">
-                        <form:input path="LianXiDH" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="LianXiDH" placeholder="请输入委托单位电话" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <%--<div class="layui-item layui-col-sm6 lw6">
@@ -650,25 +650,25 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>项目报告号：</label>
                     <div class="layui-input-block">
-                        <form:input path="DangABH" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="DangABH" placeholder="请输入项目报告号" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>出具报告日期：</label>
                     <div class="layui-input-block">
-                        <form:input path="BaoGaoShuQianFaDate" htmlEscape="false"  class="laydate-icondate required form-control layui-input layer-date laydate-icon"/>
+                        <form:input path="BaoGaoShuQianFaDate" placeholder="请输入出具报告日期" htmlEscape="false"  class="laydate-icondate required form-control layui-input layer-date laydate-icon"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询营业收入（万元）：</label>
                     <div class="layui-input-block">
-                        <form:input path="ZiXunShouRu" htmlEscape="false" onchange="zxChange()" class="form-control required layui-input"/>
+                        <form:input path="ZiXunShouRu" placeholder="请输入营业收入" htmlEscape="false" onchange="zxChange()" class="form-control required layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>造价师注册证号：</label>
                     <div class="layui-input-block">
-                        <form:input path="zaoJiaShiZhengHao" htmlEscape="false"  class="form-control required layui-input"/>
+                        <form:input path="zaoJiaShiZhengHao" placeholder="请输入造价师注册证号" htmlEscape="false"  class="form-control required layui-input"/>
                     </div>
                 </div>
             </div>
@@ -718,15 +718,15 @@
                                         <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wordnr"  name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
 
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wcyysrbl" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysrbl" value="{{row.wcyysrbl}}" class="form-control number required"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysrbl" placeholder="请输入营业收入比例" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysrbl" value="{{row.wcyysrbl}}" class="form-control number required"/>
                                     </td>
 
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wcyysr" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysr" value="{{row.wcyysr}}" class="form-control number required"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysr" placeholder="请输入营业收入" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysr" value="{{row.wcyysr}}" class="form-control number required"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -785,7 +785,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>建筑面积或规模：</label>
                     <div class="layui-input-block">
-                        <form:input path="GCGMValue" htmlEscape="false"  class="form-control layui-input required number" onchange="ZiXunBDEChange()"/>
+                        <form:input path="GCGMValue" placeholder="请输入建筑面积和规范" htmlEscape="false"  class="form-control layui-input required number" onchange="ZiXunBDEChange()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -807,7 +807,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line" title="注：指咨询项目编审后的最终造价，&#13;其中工程结算项目填审定价，标底编制填招标控制价，&#13;工程造价全过程管理填工程投资总额或审定价。"><span class="require-item">*咨询标的额(万元)：</span></label>
                     <div class="layui-input-block">
-                        <form:input path="ZiXunBDE" htmlEscape="false" class="form-control required layui-input number" onchange="ZiXunBDEChange()"/>
+                        <form:input path="ZiXunBDE" placeholder="请输入咨询标额" htmlEscape="false" class="form-control required layui-input number" onchange="ZiXunBDEChange()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -855,19 +855,19 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">合同价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="HeTongJia" htmlEscape="false"  class="form-control layui-input number"/>
+                        <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  class="form-control layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="SongShenJia" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
+                        <form:input path="SongShenJia" placeholder="请输入送审价" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="ShenDingJia" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
+                        <form:input path="ShenDingJia" htmlEscape="false" placeholder="请输入审定价"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -972,7 +972,7 @@
                 <div class="layui-item layui-col-sm12 lw6 with-textarea">
                     <label class="layui-form-label double-line">其他专业工程咨询项目造价包含内容说明：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="QTProjec" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea path="QTProjec" placeholder="请输入内容说明" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
                 </div>
             </div>

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

@@ -593,14 +593,14 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="ProjectName" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="ProjectName" placeholder="请输入项目名称" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目负责人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:inquireselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
-                                        title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                      cssStyle="background:#fff"  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -631,43 +631,43 @@
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecordsReported.workContractInfo.id}"  title="选择合同" labelName="ZiXunHTBH"
-                                                labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                                            cssStyle="background:#fff"    labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>委托单位：</label>
                     <div class="layui-input-block">
-                        <form:input path="WeiTuoDW" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="WeiTuoDW" htmlEscape="false" placeholder="请输入委托单位" class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>委托单位电话：</label>
                     <div class="layui-input-block">
-                        <form:input path="LianXiDH" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="LianXiDH" htmlEscape="false" placeholder="请输入委托单位电话" class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>项目报告号：</label>
                     <div class="layui-input-block">
-                        <form:input path="DangABH" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="DangABH" htmlEscape="false" placeholder="请输入项目报告号"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>出具报告日期：</label>
                     <div class="layui-input-block">
-                        <form:input path="BaoGaoShuQianFaDate" htmlEscape="false"  class="laydate-icondate required form-control layui-input layer-date laydate-icon"/>
+                        <form:input path="BaoGaoShuQianFaDate" placeholder="请选择出具报告日期" htmlEscape="false"  class="laydate-icondate required form-control layui-input layer-date laydate-icon"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询营业收入（万元）：</label>
                     <div class="layui-input-block">
-                        <form:input path="ZiXunShouRu" htmlEscape="false" onchange="zxChange()" class="form-control required layui-input"/>
+                        <form:input path="ZiXunShouRu" placeholder="请输入营业收入" htmlEscape="false" onchange="zxChange()" class="form-control required layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>造价师注册证号：</label>
                     <div class="layui-input-block">
-                        <form:input path="zaoJiaShiZhengHao" htmlEscape="false"  class="form-control required layui-input"/>
+                        <form:input path="zaoJiaShiZhengHao" placeholder="请输入造价师注册证号" htmlEscape="false"  class="form-control required layui-input"/>
                     </div>
                 </div>
             </div>
@@ -714,18 +714,18 @@
                                     </td>
 
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID"  readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wordnr"  name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
 
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wcyysrbl" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysrbl" value="{{row.wcyysrbl}}" class="form-control number required"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysrbl" placeholder="请输入营业收入比例" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysrbl" value="{{row.wcyysrbl}}" class="form-control number required"/>
                                     </td>
 
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_wcyysr" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysr" value="{{row.wcyysr}}" class="form-control number required"/>
+                                        <input id="reportedConsultantList{{idx}}_wcyysr" placeholder="请输入营业收入" onblur="setTaxMoney(this)" name="reportedConsultantList[{{idx}}].wcyysr" value="{{row.wcyysr}}" class="form-control number required"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -784,7 +784,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>建筑面积或规模：</label>
                     <div class="layui-input-block">
-                        <form:input path="GCGMValue" htmlEscape="false"  class="form-control layui-input required number" onchange="ZiXunBDEChange()"/>
+                        <form:input path="GCGMValue" placeholder="请输入建筑面积或规模" htmlEscape="false"  class="form-control layui-input required number" onchange="ZiXunBDEChange()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -806,7 +806,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line" title="注：指咨询项目编审后的最终造价，&#13;其中工程结算项目填审定价，标底编制填招标控制价，&#13;工程造价全过程管理填工程投资总额或审定价。"><span class="require-item">*咨询标的额(万元)：</span></label>
                     <div class="layui-input-block">
-                        <form:input path="ZiXunBDE" htmlEscape="false" class="form-control required layui-input number" onchange="ZiXunBDEChange()"/>
+                        <form:input path="ZiXunBDE" placeholder="请输入咨询标额" htmlEscape="false" class="form-control required layui-input number" onchange="ZiXunBDEChange()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -854,19 +854,19 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">合同价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="HeTongJia" htmlEscape="false"  class="form-control layui-input number"/>
+                        <form:input path="HeTongJia" placeholder="请输入合同价" htmlEscape="false"  class="form-control layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="SongShenJia" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
+                        <form:input path="SongShenJia" htmlEscape="false" placeholder="请输入送审价" class="form-control required layui-input number" onchange="JingHeJianValue()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="ShenDingJia" htmlEscape="false"  class="form-control required layui-input number" onchange="JingHeJianValue()"/>
+                        <form:input path="ShenDingJia" htmlEscape="false" placeholder="请输入审定价" class="form-control required layui-input number" onchange="JingHeJianValue()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -971,7 +971,7 @@
                 <div class="layui-item layui-col-sm12 lw6 with-textarea">
                     <label class="layui-form-label double-line">其他专业工程咨询项目造价包含内容说明：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="QTProjec" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea path="QTProjec" placeholder="请输入内容说明" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
                 </div>
             </div>

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

@@ -343,6 +343,62 @@
 			});
 		}
 	</script>
+	<script>
+
+		function notifyDialogre(title,url,width,height,target){
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				skin:"three-btns",
+				maxmin: true, //开启最大化最小化按钮
+				content: url ,
+				btn: ['通过','驳回','关闭'],
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(1) ){
+						top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},
+				btn2:function(index,layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(2) ){
+						top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+					return false;
+				},
+				btn3: function(index){
+				}
+			});
+
+		}
+	</script>
 	<style>
 		body{
 			background-color:transparent;
@@ -673,6 +729,18 @@
         function complain(d){//操作中显示的内容
         	var xml = '';
 			if(d.pid=="0") {
+				if(d.reportNotifyFlag != undefined && d.reportNotifyFlag !=null && "" != d.reportNotifyFlag && d.reportNotifyFlag == 1)
+				{
+					xml+="<a href=\"#\" onclick=\"notifyDialogre('新增报告审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportNotifyId +"&home=report','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+				}
+				if(d.recordNotifyFlag != undefined && d.recordNotifyFlag !=null && "" != d.recordNotifyFlag && d.recordNotifyFlag == 1)
+				{
+					xml+="<a href=\"#\" onclick=\"notifyDialogre('电子归档审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.recordNotifyId +"&home=record','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+				}
+				if(d.reportedNotifyFlag != undefined && d.reportedNotifyFlag !=null && "" != d.reportedNotifyFlag && d.reportedNotifyFlag == 1)
+				{
+					xml+="<a href=\"#\" onclick=\"notifyDialogre('上报审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportedNotifyId +"&home=reported','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+				}
 				if(d.flag == 1){
 					if(d.projectReportStatus == 0){
 						xml+="<a href=\"#\" onclick=\"openDialogre('新增报告', '${ctx}/ruralProject/ruralProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 新增报告</a>";

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

@@ -37,7 +37,7 @@
             //ajax废弃
             startRequest();
         });
-        setInterval("requesting()",10000);
+        window.setInterval("requesting()",600000);
         function startRequest(){
             var url = "${ctx}/workprojectnotify/workProjectNotify/notify";
             var data = {};
@@ -60,6 +60,11 @@
             });
         }
         function requesting(){
+            var totalCount = $("#totalCount").text();
+            if(totalCount != 0){
+                refreshTabIndex();
+                startRequest();
+            }
             if (index.indexOf("审批信息")!=-1 || index.indexOf("公告消息")!=-1 || index == 'sys_me' || index.indexOf("未读邮件")!=-1){
                 refreshTabIndex();
                 startRequest();

src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowAudit.jsp

@@ -5,6 +5,8 @@
 	<title>合同归档管理</title>
 	<meta name="decorator" content="default"/>
 	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -64,7 +66,7 @@
 <body >
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="workContractBorrow" action="${ctx}/workContractBorrow/workContractBorrow/saveAudit" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="workContractBorrow" action="${ctx}/workContractBorrow/workContractBorrow/saveAudit" method="post" class="form-horizontal layui-form">
 			<form:hidden path="id"/>
 			<form:hidden path="workContractInfo.id"/>
 			<form:hidden path="home"/>
@@ -174,15 +176,37 @@
 					</table>
 				</div>
 			</div>--%>
-			<div class="form-group layui-row lw8">
+<%--			<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-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" />
+				<div class="layui-item layui-col-sm8 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<form:textarea placeholder="请输入意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
 						<input type="file" name="upload_files" style="display: none;">
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm4 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
+						<div style="padding: 10px 0px;">
+							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+								<form:option value=""/>
+								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+							</form:select>
+						</div>
+					</div>
+				</div>
 			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批流程</h2></div>
@@ -195,5 +219,25 @@
 		</form:form>
 	</div>
 </div>
+<script>
+	$(document).ready(function() {
+		$(".apen").click(function(){
+			var span=$(this).html();
+			var opinion=$("#opinion").val()+span+";"
+			$("#opinion").val(opinion);
+		})
+		layui.use(['form', 'layer'], function () {
+			var form = layui.form;
+			//下拉框监听器
+			layui.form.on('select(opinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					var opinion=$("#opinion").val()+span+";"
+					$("#opinion").val(opinion);
+				}
+			});
+		});
+	})
+</script>
 </body>
 </html>

src/main/webapp/webpage/modules/workcontractinfo/workContractAudit.jsp

@@ -211,14 +211,36 @@
                 </div>
                 <div class="form-group layui-row">
                     <div class="form-group-label"><h2>审批意见</h2></div>
-                    <div class="layui-item layui-col-xs12 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" />
+                    <div class="layui-item layui-col-sm8 lw6 with-textarea">
+                        <div class="layui-input-block" style="margin-left:10px;">
+                            <form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
                             <input type="file" name="upload_files" style="display: none;">
                         </div>
                     </div>
+                    <div class="layui-item layui-col-sm4 lw6 with-textarea">
+                        <div class="layui-input-block" style="margin-left:10px;">
+                            <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
+                            <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
+                            <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
+                            <div style="padding: 10px 0px;">
+                                <form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+                                    <form:option value=""/>
+                                    <form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                                </form:select>
+                            </div>
+                        </div>
+                    </div>
                 </div>
+<%--                <div class="form-group layui-row">--%>
+<%--                    <div class="form-group-label"><h2>审批意见</h2></div>--%>
+<%--                    <div class="layui-item layui-col-xs12 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>--%>
 
             </form:form>
         <div class="form-group layui-row">
@@ -230,6 +252,24 @@
         </div>
     </div>
     <script>
+        $(document).ready(function() {
+            $(".apen").click(function(){
+                var span=$(this).html();
+                var opinion=$("#opinion").val()+span+";"
+                $("#opinion").val(opinion);
+            })
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+                //下拉框监听器
+                layui.form.on('select(opinion)', function(data){
+                    var span=data.value;
+                    if(span!=""){
+                        var opinion=$("#opinion").val()+span+";"
+                        $("#opinion").val(opinion);
+                    }
+                });
+            });
+        })
         layui.use('form', function () {
             var form = layui.form;
             form.render();

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -460,6 +460,62 @@
 		   });
 	   }
 	</script>
+	<script>
+
+		function notifyDialogre(title,url,width,height,target){
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				skin:"three-btns",
+				maxmin: true, //开启最大化最小化按钮
+				content: url ,
+				btn: ['通过','驳回','关闭'],
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(1) ){
+						top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},
+				btn2:function(index,layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(2) ){
+						top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+					return false;
+				},
+				btn3: function(index){
+				}
+			});
+
+		}
+	</script>
 	<style>
 		body{
 			background-color:transparent;
@@ -652,6 +708,18 @@
                         ////对操作进行初始化
                         var xml="";
 
+						if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
+						{
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('合同登记审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=invoice','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+						}
+						if(d.recordNotifyFlag != undefined && d.recordNotifyFlag !=null && "" != d.recordNotifyFlag && d.recordNotifyFlag == 1)
+						{
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('合同归档审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.recordNotifyId +"&home=invoice','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+						}
+						if(d.borrowNotifyFlag != undefined && d.borrowNotifyFlag !=null && "" != d.borrowNotifyFlag && d.borrowNotifyFlag == 1)
+						{
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('合同借用审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.borrowNotifyId +"&home=invoice','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+						}
 						if(d.updateAdmin != undefined && d.updateAdmin == "1" ){
 							xml +="<a href=\"javascript:void(0)\" onclick=\"contractAdminUpdate('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/adminForm?id=" + d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改合同</a>";
 						}
@@ -766,6 +834,12 @@
                     ,"giveStatus":"${workContractInfo.giveStatus}"
                     ,"borrowId":"${workContractInfo.borrowId}"
                     ,"flagAdmin":"${workContractInfo.flagAdmin}"
+					,"notifyFlag":"${workContractInfo.notifyFlag}"
+					,"notifyId":"${workContractInfo.notifyId}"
+					,"recordNotifyFlag":"${workContractInfo.recordNotifyFlag}"
+					,"recordNotifyId":"${workContractInfo.recordNotifyId}"
+					,"borrowNotifyFlag":"${workContractInfo.borrowNotifyFlag}"
+					,"borrowNotifyId":"${workContractInfo.borrowNotifyId}"
                     <%--<c:if test="${workContractInfo.contractState == 5 && fns:getUser().id == workContractInfo.createBy.id && workContractInfo.signatureStatus == 1   }">,"signature":"1"</c:if>/*签章*/--%>
                     <%--<c:if test="${workContractInfo.contractState == 5 && fns:getUser().id == workContractInfo.createBy.id}">,"canalter":"1"</c:if>/*变更*/--%>
 					<%--<c:if test="${workContractInfo.contractState == 5 && fns:getUser().id == workContractInfo.createBy.id}">,"caninvalid":"1"</c:if>/*作废*/--%>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordAudit.jsp

@@ -5,6 +5,8 @@
 	<title>合同归档管理</title>
 	<meta name="decorator" content="default"/>
 	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -92,7 +94,7 @@
 <body >
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="workContractRecord" action="${ctx}/workcontractrecord/workContractRecord/saveAudit" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="workContractRecord" action="${ctx}/workcontractrecord/workContractRecord/saveAudit" method="post" class="form-horizontal layui-form">
 			<form:hidden path="id"/>
 			<form:hidden path="workContractInfo.id"/>
 			<form:hidden path="home"/>
@@ -219,15 +221,37 @@
 					</table>
 				</div>
 			</div>
-			<div class="form-group layui-row lw8">
+<%--			<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-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" />
+				<div class="layui-item layui-col-sm8 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
 						<input type="file" name="upload_files" style="display: none;">
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm4 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
+						<div style="padding: 10px 0px;">
+							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+								<form:option value=""/>
+								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+							</form:select>
+						</div>
+					</div>
+				</div>
 			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批流程</h2></div>
@@ -240,5 +264,25 @@
 		</form:form>
 	</div>
 </div>
+<script>
+	$(document).ready(function() {
+		$(".apen").click(function(){
+			var span=$(this).html();
+			var opinion=$("#opinion").val()+span+";"
+			$("#opinion").val(opinion);
+		})
+		layui.use(['form', 'layer'], function () {
+			var form = layui.form;
+			//下拉框监听器
+			layui.form.on('select(opinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					var opinion=$("#opinion").val()+span+";"
+					$("#opinion").val(opinion);
+				}
+			});
+		});
+	})
+</script>
 </body>
 </html>

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

@@ -4,6 +4,8 @@
 <head>
 	<title>发票审批</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script type="text/javascript">
 		var validateForm;
         var count = 0;
@@ -424,7 +426,7 @@
 <body>
 <div class="single-form">
 	<div class="container">
-	<form:form id="inputForm" modelAttribute="workInvoice" action="${ctx}/workinvoice/workInvoice/saveAudit" method="post" class="form-horizontal">
+	<form:form id="inputForm" modelAttribute="workInvoice" action="${ctx}/workinvoice/workInvoice/saveAudit" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 		<form:hidden path="home"/>
 		<form:hidden path="act.taskId"/>
@@ -561,12 +563,34 @@
 							value="${workInvoice.takeDate}" pattern="yyyy-MM-dd"/>">
 				</div>
 			</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="5" maxlength="20"/>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>审批意见</h2></div>
+				<div class="layui-item layui-col-sm8 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<input type="file" name="upload_files" style="display: none;">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm4 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;">
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
+						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
+						<div style="padding: 10px 0px;">
+							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+								<form:option value=""/>
+								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+							</form:select>
+						</div>
+					</div>
 				</div>
 			</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="5" maxlength="20"/>--%>
+<%--				</div>--%>
+<%--			</div>--%>
 		</div>
 		<div class="form-group layui-row">
 			<div class="form-group-label"><h2>发票明细</h2></div>
@@ -648,6 +672,24 @@
 							</tr>//-->
 				</script>
 				<script type="text/javascript">
+					$(document).ready(function() {
+						$(".apen").click(function(){
+							var span=$(this).html();
+							var opinion=$("#opinion").val()+span+";"
+							$("#opinion").val(opinion);
+						})
+						layui.use(['form', 'layer'], function () {
+							var form = layui.form;
+							//下拉框监听器
+							layui.form.on('select(opinion)', function(data){
+								var span=data.value;
+								if(span!=""){
+									var opinion=$("#opinion").val()+span+";"
+									$("#opinion").val(opinion);
+								}
+							});
+						});
+					})
 					var workAccountListRowIdx = 0, workAccountListTpl = $("#workAccountListTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 					$(document).ready(function() {
 						var data = ${fns:toJson(workInvoice.workAccountList)};

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

@@ -332,6 +332,62 @@
 		}
 
 	</script>
+	<script>
+
+		function notifyDialogre(title,url,width,height,target){
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				skin:"three-btns",
+				maxmin: true, //开启最大化最小化按钮
+				content: url ,
+				btn: ['通过','驳回','关闭'],
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(1) ){
+						top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},
+				btn2:function(index,layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(2) ){
+						top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+					return false;
+				},
+				btn3: function(index){
+				}
+			});
+
+		}
+	</script>
 	<style>
 		body{
 			background-color:transparent;
@@ -568,6 +624,10 @@
                 ,{field:'op',align:'center',title:"操作",fixed: 'right',width:130,templet:function(d){
                         ////对操作进行初始化
                         var xml="";
+						if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
+						{
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('发票审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=invoice','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+						}
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
                             xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改发票', '${ctx}/workinvoice/workInvoice/form?id=" + d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
@@ -647,6 +707,8 @@
                     ,"responsibleName":"${workInvoice.createBy.name}"
                     ,"receiptMoney":"${workInvoice.receiptMoney}"
                     ,"status":"${workInvoice.invoiceState}"
+					,"notifyFlag":"${workInvoice.notifyFlag}"
+					,"notifyId":"${workInvoice.notifyId}"
                     ,"money":"<fmt:formatNumber value="${workInvoice.money}" pattern="#,#0.00"/>"
                     ,"createDate":"<fmt:formatDate value="${workInvoice.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"receiptMoneyDate":"<fmt:formatDate value="${workInvoice.receiptMoneyDate}" pattern="yyyy-MM-dd"/>"

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

@@ -4,6 +4,8 @@
 <head>
 	<title>报销审核</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -68,7 +70,7 @@
 <body>
 <div class="single-form">
 	<div class="container view-form">
-	<form:form id="inputForm" modelAttribute="workReimbursement" enctype="multipart/form-data" action="${ctx}/workreimbursement/workReimbursement/saveAudit" method="post" class="form-horizontal">
+	<form:form id="inputForm" modelAttribute="workReimbursement" enctype="multipart/form-data" action="${ctx}/workreimbursement/workReimbursement/saveAudit" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 		<form:hidden path="home"/>
 		<form:hidden path="act.taskId"/>
@@ -428,14 +430,36 @@
 		</div>
 		<div class="form-group layui-row">
 			<div class="form-group-label"><h2>审批意见</h2></div>
-			<div class="layui-item layui-col-xs12 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 class="layui-item layui-col-sm8 lw6 with-textarea">
+				<div class="layui-input-block" style="margin-left:10px;">
+					<form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+					<input type="file" name="upload_files" style="display: none;">
+				</div>
+			</div>
+			<div class="layui-item layui-col-sm4 lw6 with-textarea">
+				<div class="layui-input-block" style="margin-left:10px;">
+					<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
+					<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
+					<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
+					<div style="padding: 10px 0px;">
+						<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+							<form:option value=""/>
+							<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+						</form:select>
 					</div>
+				</div>
 			</div>
 		</div>
+<%--		<div class="form-group layui-row">--%>
+<%--			<div class="form-group-label"><h2>审批意见</h2></div>--%>
+<%--			<div class="layui-item layui-col-xs12 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" >
@@ -448,6 +472,26 @@
 	</form:form>
 </div>
 </div>
+<script>
+	$(document).ready(function() {
+		$(".apen").click(function(){
+			var span=$(this).html();
+			var opinion=$("#opinion").val()+span+";"
+			$("#opinion").val(opinion);
+		})
+		layui.use(['form', 'layer'], function () {
+			var form = layui.form;
+			//下拉框监听器
+			layui.form.on('select(opinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					var opinion=$("#opinion").val()+span+";"
+					$("#opinion").val(opinion);
+				}
+			});
+		});
+	})
+</script>
 </body>
 </html>
 

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

@@ -4,6 +4,8 @@
 <head>
     <title>报销审核</title>
     <meta name="decorator" content="default"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
     <script type="text/javascript">
         var validateForm;
         var state;//考核科目显示隐藏
@@ -251,7 +253,7 @@
 <body>
 <div class="single-form">
     <div class="container view-form">
-        <form:form id="inputForm" modelAttribute="workReimbursement" enctype="multipart/form-data" action="${ctx}/workreimbursement/workReimbursement/saveAudit" method="post" class="form-horizontal">
+        <form:form id="inputForm" modelAttribute="workReimbursement" enctype="multipart/form-data" action="${ctx}/workreimbursement/workReimbursement/saveAudit" method="post" class="form-horizontal layui-form">
         <form:hidden path="id"/>
         <form:hidden path="home"/>
         <form:hidden path="ext"/>
@@ -745,16 +747,38 @@
                 </table>
             </div>
         </div>
-        <div class="form-group layui-row">
-            <div class="form-group-label"><h2>审批意见</h2></div>
-            <div class="layui-item layui-col-xs12 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 class="form-group layui-row">
+                <div class="form-group-label"><h2>审批意见</h2></div>
+                <div class="layui-item layui-col-sm8 lw6 with-textarea">
+                    <div class="layui-input-block" style="margin-left:10px;">
+                        <form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+                        <input type="file" name="upload_files" style="display: none;">
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm4 lw6 with-textarea">
+                    <div class="layui-input-block" style="margin-left:10px;">
+                        <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
+                        <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
+                        <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
+                        <div style="padding: 10px 0px;">
+                            <form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+                                <form:option value=""/>
+                                <form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                            </form:select>
+                        </div>
+                    </div>
                 </div>
             </div>
-        </div>
+<%--        <div class="form-group layui-row">--%>
+<%--            <div class="form-group-label"><h2>审批意见</h2></div>--%>
+<%--            <div class="layui-item layui-col-xs12 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" >
@@ -766,6 +790,26 @@
         </form:form>
     </div>
 </div>
+<script>
+    $(document).ready(function() {
+        $(".apen").click(function(){
+            var span=$(this).html();
+            var opinion=$("#opinion").val()+span+";"
+            $("#opinion").val(opinion);
+        })
+        layui.use(['form', 'layer'], function () {
+            var form = layui.form;
+            //下拉框监听器
+            layui.form.on('select(opinion)', function(data){
+                var span=data.value;
+                if(span!=""){
+                    var opinion=$("#opinion").val()+span+";"
+                    $("#opinion").val(opinion);
+                }
+            });
+        });
+    })
+</script>
 </body>
 </html>
 

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

@@ -24,6 +24,62 @@
             height:100%;
         }
     </style>
+    <script>
+
+        function notifyDialogre(title,url,width,height,target){
+            if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+                width='auto';
+                height='auto';
+            }else{//如果是PC端，根据用户设置的width和height显示。
+
+            }
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                skin:"three-btns",
+                maxmin: true, //开启最大化最小化按钮
+                content: url ,
+                btn: ['通过','驳回','关闭'],
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(1) ){
+                        top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+                    }
+                },
+                btn2:function(index,layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(2) ){
+                        top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+                    }
+                    return false;
+                },
+                btn3: function(index){
+                }
+            });
+
+        }
+    </script>
 </head>
 <body>
 <div class="wrapper wrapper-content">
@@ -195,6 +251,10 @@
                 ,{align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
                         var xml = "";
+                        if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
+                        {
+                            xml+="<a href=\"#\" onclick=\"notifyDialogre('报销审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=reimbursement','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+                        }
                         if(d.cancancel != undefined && d.cancancel == "1")
                             xml += "<a href=\"${ctx}/workreimbursement/workReimbursement/cancelInvalidate?id=" + d.id + "\" onclick=\"return confirmx('确认要强制撤回？', this.href)\"   class=\"op-btn op-btn-cancel\"><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
                         if(d.canedit1 != undefined && d.canedit1 == "1")
@@ -223,7 +283,6 @@
                     ,"submitterName":"<c:out value="${fns:getUserById(workReimbursement.submitterId).name}" escapeXml="true"/>"
                     ,"handleName":"<c:out value="${fns:getUserById(workReimbursement.handleId).name}" escapeXml="true"/>"
                     ,"officeId":"${fns:getOfficeById(workReimbursement.officeId).name}"
-                    ,"proId":"${workReimbursement.project.projectId}"
                     ,"projectId":
                         <c:if test="${workReimbursement.ext == 1}">
                             "<c:out value="${workReimbursement.projectName}" escapeXml="true"/>"