项目归档页面调整、档案管理员选择驳回时，无需填写案卷号

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

@@ -479,7 +479,7 @@ public class RuralCostProjectMessageController extends BaseController {
         model.addAttribute("projectReportRecord", projectReportRecord);
         model.addAttribute("project", projectReportRecord.getReport().getProject());
         if(null != projectContractInfo){
-            if(null != projectContractInfo.getWorkClientInfoList()){
+            if(projectContractInfo.getWorkClientInfoList().size()>0){
                 model.addAttribute("workClientInfoName", projectContractInfo.getWorkClientInfoList().get(0).getName());
             }
         }

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

@@ -478,7 +478,7 @@ public class RuralProjectMessageController extends BaseController {
         model.addAttribute("projectReportRecord", projectReportRecord);
         model.addAttribute("project", projectReportRecord.getReport().getProject());
         if(null != projectContractInfo){
-            if(null != projectContractInfo.getWorkClientInfoList()){
+            if(projectContractInfo.getWorkClientInfoList().size()>0){
                 model.addAttribute("workClientInfoName", projectContractInfo.getWorkClientInfoList().get(0).getName());
             }
         }

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

@@ -7,8 +7,22 @@
 	<script type="text/javascript">
         var validateForm;
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+        	var fileNum =  $("#fileNum").val();
+			var fileNumTow =  $("#fileNumTow").val();
             if(validateForm.form()){
                 if(obj == 1){
+					if(fileNum == ''|| fileNum == undefined){
+						top.layer.msg('填写案卷号！', {icon: 0});
+						return;
+					}
+					if(fileNumTow == ''|| fileNumTow == undefined){
+						top.layer.msg('请再次填写案卷号！', {icon: 0});
+						return;
+					}
+					if(fileNum != fileNumTow){
+						top.layer.msg('两次案卷号填写不同，请重新输入！', {icon: 0});
+						return;
+					}
                     $('#flag').val('yes');
                 }else{
                     $('#flag').val('no');
@@ -69,7 +83,7 @@
 					<label class="layui-form-label"><span class="require-item">*</span>案卷号：</label>
 					<div class="layui-input-block">
 						<div class="input-group">
-							<input htmlEscape="false" id="fileNum" name="fileNum"  class="form-control required layui-input" value="${projectReportRecord.fileNum}"/>
+							<input htmlEscape="false" id="fileNum" name="fileNum"  class="form-control layui-input" value="${projectReportRecord.fileNum}"/>
 							<span class="input-group-btn">
 								<label class="form-status">
 									<c:choose>
@@ -84,7 +98,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>确认案卷号：</label>
 					<div class="layui-input-block">
-						<input id="fileNumTow" name="fileNumTow" type="text"  class="layui-input required form-control" equalTo="#fileNum"/>
+						<input id="fileNumTow" name="fileNumTow" type="text"  class="layui-input form-control" equalTo="#fileNum"/>
 					</div>
 				</div>
 				<%--<div class="layui-item layui-col-sm6">
@@ -115,12 +129,12 @@
 						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${projectReportRecord.signCostTwo.name}"/>
 					</div>
 				</div>--%>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">报告名称：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.report.name}"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">报告日期：</label>
 					<div class="layui-input-block">

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

@@ -93,6 +93,7 @@
 			<form:hidden path="act.procInsId"/>
 			<form:hidden path="act.procDefId"/>
 			<form:hidden id="flag" path="act.flag"/>
+			<form:hidden path="report.name"/>
 
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>
@@ -133,12 +134,12 @@
 										title="签字造价师二" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>--%>
-				<div class="layui-item layui-col-sm6">
+				<%--<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="reportName" path="report.name" htmlEscape="false"   readonly="true" class="form-control layui-input required"/>
 					</div>
-				</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">

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

@@ -69,12 +69,12 @@
 					<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${projectReportRecord.signCostTwo.name}"/>
 				</div>
 			</div>--%>
-			<div class="layui-item layui-col-sm6">
+			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">报告名称：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.report.name}"/>
 				</div>
-			</div>
+			</div>--%>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">报告日期：</label>
 				<div class="layui-input-block">

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

@@ -86,6 +86,7 @@
 			<form:hidden path="id"/>
 			<form:hidden path="numberCount"/>
 			<form:hidden id="reportId" path="report.id"/>
+			<form:hidden path="report.name"/>
 
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>
@@ -117,12 +118,12 @@
 										title="签字造价师二" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>--%>
-				<div class="layui-item layui-col-sm6">
+				<%--<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="reportName" path="report.name" htmlEscape="false"   readonly="true" class="form-control layui-input required"/>
 					</div>
-				</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">
@@ -191,13 +192,13 @@
 							   value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档完成日期：</label>
 					<div class="layui-input-block">
 						<input id="accomplishDate" name="accomplishDate"  htmlEscape="false" readonly="true" class="laydate-icondate form-control layer-date layui-input laydate-icon"
 							   value="<fmt:formatDate value="${projectReportRecord.accomplishDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">

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

@@ -111,6 +111,7 @@
 			<form:hidden path="view"/>
 			<form:hidden path="numberCount"/>
 			<form:hidden id="reportId" path="report.id"/>
+			<form:hidden path="report.name"/>
 
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>
@@ -120,7 +121,7 @@
 						<form:input id="reportNumber" path="report.number" htmlEscape="false"   readonly="true" class="form-control layui-input required"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>归档申请编号：</label>
 					<div class="layui-input-block">
 						<div class="input-group">
@@ -135,7 +136,7 @@
 							 </span>
 						</div>
 					</div>
-				</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">
@@ -149,12 +150,12 @@
 										title="签字造价师二" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>--%>
-				<div class="layui-item layui-col-sm6">
+				<%--<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="reportName" path="report.name" htmlEscape="false"   readonly="true" class="form-control layui-input required"/>
 					</div>
-				</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">
@@ -163,21 +164,21 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
+					<label class="layui-form-label">合同编号：</label>
 					<div class="layui-input-block">
-						<form:input id="contractNum" path="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"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
+					<label class="layui-form-label">合同名称：</label>
 					<div class="layui-input-block">
-						<form:input id="contractName" path="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"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
-						<form:input id="clientName" path="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"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -198,13 +199,13 @@
 						<form:input id="cBName" path="createBy.name" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>申请日期：</label>
 					<div class="layui-input-block">
 						<input id="createDate" name="createDate"  htmlEscape="false" readonly="true" class="laydate-icondate form-control layer-date required layui-input laydate-icon"
 							   value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
-				</div>
+				</div>--%>
 					<%--<div class="layui-item layui-col-sm6">
                         <label class="layui-form-label">档案号：</label>
                         <div class="layui-input-block">
@@ -218,18 +219,18 @@
                         </div>
                     </div>--%>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">提交归档时间：</label>
+					<label class="layui-form-label">归档时间：</label>
 					<div class="layui-input-block">
 						<input id="recordDate" name="recordDate"  htmlEscape="false" readonly="true" class="form-control  layui-input" value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档完成日期：</label>
 					<div class="layui-input-block">
 						<input id="accomplishDate" name="accomplishDate"  htmlEscape="false" readonly="true" class="form-control  layui-input"
 							   value="<fmt:formatDate value="${projectReportRecord.accomplishDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">

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

@@ -72,12 +72,12 @@
 					<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${projectReportRecord.signCostTwo.name}"/>
 				</div>
 			</div>--%>
-			<div class="layui-item layui-col-sm6">
+			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">报告名称：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.report.name}"/>
 				</div>
-			</div>
+			</div>--%>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">报告日期：</label>
 				<div class="layui-input-block">

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

@@ -87,6 +87,7 @@
 			<form:hidden path="id"/>
 			<form:hidden path="numberCount"/>
 			<form:hidden id="reportId" path="report.id"/>
+			<form:hidden path="report.name"/>
 
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>
@@ -118,12 +119,12 @@
 										title="签字造价师二" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>--%>
-				<div class="layui-item layui-col-sm6">
+				<%--<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="reportName" path="report.name" htmlEscape="false"   readonly="true" class="form-control layui-input required"/>
 					</div>
-				</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">
@@ -192,13 +193,13 @@
 							   value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档完成日期：</label>
 					<div class="layui-input-block">
 						<input id="accomplishDate" name="accomplishDate"  htmlEscape="false" readonly="true" class="laydate-icondate form-control layer-date layui-input laydate-icon"
 							   value="<fmt:formatDate value="${projectReportRecord.accomplishDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">

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

@@ -111,6 +111,7 @@
 			<form:hidden path="view"/>
 			<form:hidden path="numberCount"/>
 			<form:hidden id="reportId" path="report.id"/>
+			<form:hidden path="report.name"/>
 
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>
@@ -120,7 +121,7 @@
 						<form:input id="reportNumber" path="report.number" htmlEscape="false"   readonly="true" class="form-control layui-input required"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>归档申请编号：</label>
 					<div class="layui-input-block">
 						<div class="input-group">
@@ -135,7 +136,7 @@
 							 </span>
 						</div>
 					</div>
-				</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">
@@ -149,12 +150,12 @@
 										title="签字造价师二" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>--%>
-				<div class="layui-item layui-col-sm6">
+				<%--<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="reportName" path="report.name" htmlEscape="false"   readonly="true" class="form-control layui-input required"/>
 					</div>
-				</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">
@@ -163,21 +164,21 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
+					<label class="layui-form-label">合同编号：</label>
 					<div class="layui-input-block">
-						<form:input id="contractNum" path="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"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
+					<label class="layui-form-label">合同名称：</label>
 					<div class="layui-input-block">
-						<form:input id="contractName" path="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"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>委托方：</label>
+					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
-						<form:input id="clientName" path="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"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -198,13 +199,13 @@
 						<form:input id="cBName" path="createBy.name" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>申请日期：</label>
 					<div class="layui-input-block">
 						<input id="createDate" name="createDate"  htmlEscape="false" readonly="true" class="laydate-icondate form-control layer-date required layui-input laydate-icon"
 							   value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
-				</div>
+				</div>--%>
 					<%--<div class="layui-item layui-col-sm6">
                         <label class="layui-form-label">档案号：</label>
                         <div class="layui-input-block">
@@ -218,18 +219,18 @@
                         </div>
                     </div>--%>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">提交归档时间：</label>
+					<label class="layui-form-label">归档时间：</label>
 					<div class="layui-input-block">
 						<input id="recordDate" name="recordDate"  htmlEscape="false" readonly="true" class="form-control  layui-input" value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档完成日期：</label>
 					<div class="layui-input-block">
 						<input id="accomplishDate" name="accomplishDate"  htmlEscape="false" readonly="true" class="form-control  layui-input"
 							   value="<fmt:formatDate value="${projectReportRecord.accomplishDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">