项目前期归档信息变更

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

@@ -109,6 +109,9 @@ public class ProjectReportRecordController extends BaseController {
 			}
 			return "modules/projectcontentinfo/projectReportRecordModiftApply";
 		}
+		if("earlyArchive".equals(projectReportRecord.getCondition())){
+			return "modules/projectrecord/workContentFromAndView/projectEarlyForm";
+		}
 		if("completionArchive".equals(projectReportRecord.getCondition())){
 			return "modules/projectrecord/workContentFromAndView/projectReportRecordForm";
 		}
@@ -233,6 +236,9 @@ public class ProjectReportRecordController extends BaseController {
 		}catch (Exception e){
 			addMessage(redirectAttributes, "保存报告归档失败");
 		}
+		if("earlyArchive".equals(projectReportRecord.getCondition())){
+			return "redirect:"+Global.getAdminPath()+"/project/projectEarlyPigeonhole/?repage";
+		}
 		if("completionArchive".equals(projectReportRecord.getCondition())){
 			return "redirect:"+Global.getAdminPath()+"/project/projectCompletionPigeonhole/?repage";
 		}
@@ -334,6 +340,9 @@ public class ProjectReportRecordController extends BaseController {
 		}catch (Exception e){
 				addMessage(redirectAttributes, "删除报告归档失败");
 		}
+		if("earlyArchive".equals(projectReportRecord.getCondition())){
+			return "redirect:"+Global.getAdminPath()+"/project/projectEarlyPigeonhole/?repage";
+		}
 		if("completionArchive".equals(projectReportRecord.getCondition())){
 			return "redirect:"+Global.getAdminPath()+"/project/projectCompletionPigeonhole/?repage";
 		}
@@ -355,6 +364,9 @@ public class ProjectReportRecordController extends BaseController {
 		}catch (Exception e){
 			addMessage(redirectAttributes, "强制撤回报告归档失败");
 		}
+		if("earlyArchive".equals(projectReportRecord.getCondition())){
+			return "redirect:"+Global.getAdminPath()+"/project/projectEarlyPigeonhole/?repage";
+		}
 		if("completionArchive".equals(projectReportRecord.getCondition())){
 			return "redirect:"+Global.getAdminPath()+"/project/projectCompletionPigeonhole/?repage";
 		}

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

@@ -296,13 +296,13 @@
 								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&dictType=&id="+d.contentPId+"&parentIds="+d.parentIds+"&infoId="+d.id+"','95%', '95%')\">" + d.projectName + "</a>";
 							}
 						}},
-					/*{field: 'clientName', align:'center', title: '委托方/当前阶段',templet: function(d){
+					{field: 'clientName', align:'center', title: '归档名称',templet: function(d){
 							if(0 == d.pid){
-								return "<font style = 'font-size:14px;font-weight:500;'>"+d.clientName+"</font>";
+								return "";
 							}else{
-								return "<font>"+d.clientName+"</font>";
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看归档信息', '${ctx}/projectcontentinfo/projectReportRecord/form?view=view&id="+d.recordId+"','95%', '95%')\">" + d.reportRecordName + "</a>";
 							}
-						}},*/
+						}},
 					{field: 'projectLeader', align:'center', title: '项目负责人',templet: function(d){
 							if(0 == d.pid){
 								return "<font style = 'font-size:14px;font-weight:500;'>"+d.projectLeader+"</font>";
@@ -379,22 +379,22 @@
 
 				if(d.status == 1){
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改归档信息\', \'${ctx}/projectcontentinfo/projectReportRecord/form?condition=completionArchive&id='+d.recordId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-						'<a href="${ctx}/projectcontentinfo/projectReportRecord/delete?condition=completionArchive&id='+d.recordId+'" onclick="return confirmx(\'确认要删除该归档信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改归档信息\', \'${ctx}/projectcontentinfo/projectReportRecord/form?condition=earlyArchive&id='+d.recordId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
+						'<a href="${ctx}/projectcontentinfo/projectReportRecord/delete?condition=earlyArchive&id='+d.recordId+'" onclick="return confirmx(\'确认要删除该归档信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
 					].join('');
 				}else if(d.status == 2){
 					return [
-						'<a href="${ctx}/projectcontentinfo/projectReportRecord/cancelInvalidate?condition=completionArchive&id='+d.recordId+'" onclick="return confirmx(\'确认要撤回该归档信息吗？\', this.href)"   class="op-btn op-btn-cancel"><i class="glyphicon glyphicon-share-alt"></i> 撤回</a>',
+						'<a href="${ctx}/projectcontentinfo/projectReportRecord/cancelInvalidate?condition=earlyArchive&id='+d.recordId+'" onclick="return confirmx(\'确认要撤回该归档信息吗？\', this.href)"   class="op-btn op-btn-cancel"><i class="glyphicon glyphicon-share-alt"></i> 撤回</a>',
 					].join('');
 				}else if(d.status == 3){
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改归档信息\', \'${ctx}/projectcontentinfo/projectReportRecord/form?condition=completionArchive&id='+d.recordId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-						'<a href="${ctx}/projectcontentinfo/projectReportRecord/delete?condition=completionArchive&id='+d.recordId+'" onclick="return confirmx(\'确认要删除该归档信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改归档信息\', \'${ctx}/projectcontentinfo/projectReportRecord/form?condition=earlyArchive&id='+d.recordId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
+						'<a href="${ctx}/projectcontentinfo/projectReportRecord/delete?condition=earlyArchive&id='+d.recordId+'" onclick="return confirmx(\'确认要删除该归档信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
 					].join('');
 				}else if(d.status == 4){
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改归档信息\', \'${ctx}/projectcontentinfo/projectReportRecord/form?condition=completionArchive&id='+d.recordId+'\'\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-						'<a href="${ctx}/projectcontentinfo/projectReportRecord/delete?condition=completionArchive&id='+d.recordId+'" onclick="return confirmx(\'确认要删除该归档信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改归档信息\', \'${ctx}/projectcontentinfo/projectReportRecord/form?condition=earlyArchive&id='+d.recordId+'\'\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
+						'<a href="${ctx}/projectcontentinfo/projectReportRecord/delete?condition=earlyArchive&id='+d.recordId+'" onclick="return confirmx(\'确认要删除该归档信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
 					].join('');
 				}else if(d.status == null || d.status == '' || d.status == 10){
 					return [

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/projectEarlyForm.jsp

@@ -96,6 +96,8 @@
 			<form:hidden path="id"/>
 			<form:hidden path="numberCount"/>
 			<form:hidden id="reportId" path="report.id"/>
+			<%-- 全过程中实施前期进行归档则添加判定字符 方便调转 --%>
+			<input type="hidden" input="condition" name="condition" value="earlyArchive">
 
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>
@@ -108,7 +110,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>归档申请编号：</label>
 					<div class="layui-input-block">
-						<form:input id="reportRecordNum" path="report.recordNum" htmlEscape="false"   readonly="true" class="form-control layui-input required"/>
+						<form:input id="reportRecordNum" path="recordNum" htmlEscape="false"   readonly="true" class="form-control layui-input required"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -140,31 +142,31 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
 					<div class="layui-input-block">
-						<form:input id="contractNum" path="report.contractNum" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
+						<form:input id="contractNum" path="contractNum" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
 					</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">
-						<form:input id="contractName" path="report.contractName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
+						<form:input id="contractName" path="contractName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
 					</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">
-						<form:input id="clientName" path="report.clientName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
+						<form:input id="clientName" path="clientName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">项目编号：</label>
 					<div class="layui-input-block">
-						<form:input id="projectNum" path="report.projectNum" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+						<form:input id="projectNum" path="projectNum" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
 					</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">
-						<form:input id="projectName" path="report.projectName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
+						<form:input id="projectName" path="projectName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">