Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectrecord/web/Early/ProjectEarlyReviewController.java

@@ -67,6 +67,7 @@ public class ProjectEarlyReviewController extends BaseController {
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
         model.addAttribute("page", page);
+        model.addAttribute("reportType","2");
         return "modules/projectrecord/implementEarly/projectEarlyReviewList";
     }
 
@@ -169,6 +170,7 @@ public class ProjectEarlyReviewController extends BaseController {
             projectRecordTreeDataList.addAll(reportDataList);
 
         }
+
         map.put("data",projectRecordTreeDataList);
         return map;
     }

src/main/java/com/jeeplus/modules/projectrecord/web/completion/ProjectCompletionReviewController.java

@@ -67,6 +67,7 @@ public class ProjectCompletionReviewController extends BaseController {
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
         model.addAttribute("page", page);
+        model.addAttribute("reportType","5");
         return "modules/projectrecord/implementCompletion/projectCompletionReviewList";
     }
 

src/main/java/com/jeeplus/modules/projectreportnum/web/ProjectReportNumController.java

@@ -61,8 +61,9 @@ public class ProjectReportNumController extends BaseController {
 
 
 	@RequestMapping(value = "skipMethod")
-	public String skipMethod(ReportNum reportNum, HttpServletRequest request, HttpServletResponse response, Model model) {
+	public String skipMethod(ReportNum reportNum, HttpServletRequest request, HttpServletResponse response, Model model,String reportType) {
 		model.addAttribute("projectId",reportNum.getProjectId());
+		model.addAttribute("reportType",reportType);
 		return "modules/projectreportnum/projectReportNumList";
 	}
 	
@@ -240,7 +241,7 @@ public class ProjectReportNumController extends BaseController {
 	 * 跳转新增页面
 	 */
 	@RequestMapping(value = "getProjectReportNumStageForm")
-	public String getProjectReportNumStageForm(ReportNum reportNum,Model model, HttpServletRequest request) {
+	public String getProjectReportNumStageForm(ReportNum reportNum,Model model, HttpServletRequest request,String reportType) {
 		String view = request.getParameter("view");
 		String company = request.getParameter("company");
 		if("view".equals(view)){
@@ -249,6 +250,10 @@ public class ProjectReportNumController extends BaseController {
 			view = "modules/projectreportnum/projectReportNumStageForm";
 		}
 		model.addAttribute("reportNum",reportNum);
+		if(StringUtils.isNotEmpty(reportType)){
+			model.addAttribute("reportType",reportType);
+		}
+
 		return view;
 	}
 

src/main/webapp/webpage/modules/projectrecord/implementCompletion/projectCompletionReviewList.jsp

@@ -373,7 +373,7 @@
         function complain(d){//操作中显示的内容
 			if(1 == d.operationSign) {
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
+						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectId='+d.id+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
 					].join('');
 			} else if (d.pid!="0"){
 

src/main/webapp/webpage/modules/projectrecord/implementEarly/projectEarlyReviewList.jsp

@@ -394,7 +394,7 @@
         function complain(d){//操作中显示的内容
 			if(1 == d.operationSign) {
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?projectId='+d.id+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
+						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectId='+d.id+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
 					].join('');
 			} else if (d.pid!="0"){
 

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

@@ -125,7 +125,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+"','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+"&reportType=${reportType}&parentId="+d.id+"','70%', '50%');\" class=\"op-btn op-btn-edit\"><i class=\"fa fa-edit\"></i> 添加阶段报告号</a>"
 				].join('');
 			}else{
 				if(d.count ==1){

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

@@ -120,7 +120,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}','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+"&reportType=${reportType}','70%', '50%');\" class=\"op-btn op-btn-edit\"><i class=\"fa fa-edit\"></i> 添加阶段报告号</a>"
 				].join('');
 			}else{
 				return[

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

@@ -74,14 +74,23 @@
 				<div class="layui-item layui-col-sm6" style="width:50%">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>选择阶段信息：</label>
 					<div class="layui-input-block">
-						<form:select id="stageId" path="stageId"  htmlEscape="false" class="form-control simple-select required">
+						<form:select id="stageId" path="stageId"  htmlEscape="false"   onchange="changeContentDetail(this)"  class="form-control simple-select required">
 							<form:option value=""></form:option>
-							<optgroup label="项目实施前期"/>
-							<form:options items="${fns:getContentTypeByProjectType('2')}" itemLabel="typeName" itemValue="typeId"></form:options>
-							<optgroup label="项目实施阶段"/>
-							<form:options items="${fns:getContentTypeByProjectType('3')}" itemLabel="typeName" itemValue="typeId"></form:options>
-							<optgroup label="项目竣工阶段"/>
-							<form:options items="${fns:getContentTypeByProjectType('5')}" itemLabel="typeName" itemValue="typeId"></form:options>
+							<c:choose>
+								<c:when test="${reportType != null and reportType !=''}">
+									<optgroup label=${fns:getProjectTypeName(reportType,'' )}>
+									<form:options items="${fns:getContentTypeByProjectType(reportType)}" itemLabel="typeName" itemValue="typeId"></form:options>
+								</c:when>
+									<c:otherwise>
+
+									<optgroup label="项目实施前期"/>
+										<form:options items="${fns:getContentTypeByProjectType('2')}" itemLabel="typeName" itemValue="typeId"></form:options>
+									<optgroup label="项目实施阶段"/>
+										<form:options items="${fns:getContentTypeByProjectType('3')}" itemLabel="typeName" itemValue="typeId"></form:options>
+									<optgroup label="项目竣工阶段"/>
+										<form:options items="${fns:getContentTypeByProjectType('4')}" itemLabel="typeName" itemValue="typeId"></form:options>
+									</c:otherwise>
+							</c:choose>
 						</form:select>
 						<%--<form:select id="stageId" path="stageId"  htmlEscape="false" class="form-control simple-select required">
 							<form:option value=""></form:option>