Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectreportnum/service/ProjectReportNumService.java

@@ -58,9 +58,9 @@ public class ProjectReportNumService extends CrudService<ProjectReportNumDao, Re
 	public String  save(String type) {
 		ReportNum reportNum = null;
 		int count = projectReportNumDao.countNum(UserUtils.getUser().getId());
-		if(count>=10){
+		/*if(count>=10){
 			return "最多领取10个报告号";
-		}
+		}*/
 		if(type.equals("one")){
 			String num = serialNumTplService.genSerialNum(UserUtils.getUser().getCompany(), "92");
 			reportNum = new ReportNum();
@@ -102,9 +102,9 @@ public class ProjectReportNumService extends CrudService<ProjectReportNumDao, Re
 	@Transactional(readOnly = false)
 	public String  saveReportNumOnStage(ReportNum reportNum) {
 		int count = projectReportNumDao.getCountNum(UserUtils.getUser().getId(),reportNum.getNum());
-		if(count>=10){
+		/*if(count>=10){
 			return "最多领取10个报告号";
-		}
+		}*/
 		reportNum.setNum(reportNum.getNum()+"-"+reportNum.getStageId()+"-");
 		reportNum.setCreateBy(UserUtils.getUser());
 		//获取最后一个报告号数据信息

src/main/webapp/webpage/modules/projectreportnum/projectReportNumSel.jsp

@@ -122,7 +122,7 @@
 		function complain(d){//操作中显示的内容
 			if(0 == d.pid){
 				return [
-					"<a href=\"javascript:void(0)\" onclick=\"reportNumOnStage('阶段报告号新增','${ctx}/projectreportnum/projectReportNum/getProjectReportNumStageForm?num="+d.num+"&parentId="+d.id+"projectId=${projectId}&reportType=${reportType}','70%', '50%');\" class=\"op-btn op-btn-edit\"><i class=\"fa fa-edit\"></i> 添加阶段报告号</a>"
+					"<a href=\"javascript:void(0)\" onclick=\"reportNumOnStage('阶段报告号新增','${ctx}/projectreportnum/projectReportNum/getProjectReportNumStageForm?num="+d.num+"&parentId="+d.id+"&projectId=${projectId}&reportType=${reportType}','70%', '50%');\" class=\"op-btn op-btn-edit\"><i class=\"fa fa-edit\"></i> 添加阶段报告号</a>"
 				].join('');
 			}else{