筛选，项目负责人改为项目责任人；筛选顺序

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingList.jsp

@@ -145,18 +145,19 @@
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
-							<div class="layui-item query athird">
-                                <label class="layui-form-label">项目编号：</label>
-                                <div class="layui-input-block with-icon">
-                                    <form:input path="projectId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
-                                </div>
-                            </div>
 						<div class="layui-item query athird">
 							<label class="layui-form-label">项目名称：</label>
 							<div class="layui-input-block">
 								<form:input path="projectName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
 							</div>
 						</div>
+							<div class="layui-item query athird">
+                                <label class="layui-form-label">项目编号：</label>
+                                <div class="layui-input-block with-icon">
+                                    <form:input path="projectId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+                                </div>
+                            </div>
+
 						<div class="layui-item athird">
 							<div class="input-group">
 								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
@@ -173,7 +174,7 @@
 					</div>
 					<div id="moresees" style="clear:both;display:none;" class="lw6">
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">项目负责人：</label>
+							<label class="layui-form-label">项目责任人：</label>
 							<div class="layui-input-block">
 								<form:input path="leaderNameStr" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostList.jsp

@@ -145,18 +145,19 @@
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
-							<div class="layui-item query athird">
-                                <label class="layui-form-label">项目编号：</label>
-                                <div class="layui-input-block with-icon">
-                                    <form:input path="projectId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
-                                </div>
-                            </div>
 						<div class="layui-item query athird">
 							<label class="layui-form-label">项目名称：</label>
 							<div class="layui-input-block">
 								<form:input path="projectName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
 							</div>
 						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">项目编号：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="projectId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
+
 						<div class="layui-item athird">
 							<div class="input-group">
 								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
@@ -173,7 +174,7 @@
 					</div>
 					<div id="moresees" style="clear:both;display:none;" class="lw6">
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">项目负责人：</label>
+							<label class="layui-form-label">项目责任人：</label>
 							<div class="layui-input-block">
 								<form:input path="leaderNameStr" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>

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

@@ -422,10 +422,10 @@
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
-						<div class="layui-item query athird">
-							<label class="layui-form-label">项目编号：</label>
-							<div class="layui-input-block with-icon">
-								<form:input path="projectId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">报告号：</label>
+							<div class="layui-input-block">
+								<form:input id="reportDataNumber" path="reportData.number" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">
@@ -434,7 +434,7 @@
 								<form:input path="projectName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
 							</div>
 						</div>
-						<div class="layui-item athird">
+												<div class="layui-item athird">
 							<div class="input-group">
 								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
 								<div class="layui-btn-group search-spacing">
@@ -449,12 +449,32 @@
 						<div style="    clear:both;"></div>
 					</div>
 					<div id="moresees" style="clear:both;display:none;" class="lw6">
+						<div class="layui-item query athird">
+							<label class="layui-form-label">项目编号：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="projectId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">项目负责人：</label>
+							<label class="layui-form-label">登记人：</label>
+							<div class="layui-input-block with-icon">
+								<sys:inquireselectUser id="createBy" name="createBy.id" value="${ruralProjectRecords.createBy.id}" labelName="userId" labelValue="${ruralProjectRecords.createBy.name}" cssStyle="background-color: #fff"
+													   title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">项目责任人：</label>
 							<div class="layui-input-block">
 								<form:input path="leaderNameStr" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
 						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">部门：</label>
+							<div class="layui-input-block with-icon">
+								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+							</div>
+						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">合同名称：</label>
 							<div class="layui-input-block">
@@ -489,35 +509,6 @@
 							</div>
 						</div>
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">上报状态：</label>
-							<div class="layui-input-block">
-								<form:select path="reportedState" class=" form-control  simple-select">
-									<form:option value="" label=""/>
-									<form:options items="${fns:getDictList('reported_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-								</form:select>
-							</div>
-						</div>
-						<div class="layui-item query athird ">
-							<label class="layui-form-label">登记人：</label>
-							<div class="layui-input-block with-icon">
-								<sys:inquireselectUser id="createBy" name="createBy.id" value="${ruralProjectRecords.createBy.id}" labelName="userId" labelValue="${ruralProjectRecords.createBy.name}" cssStyle="background-color: #fff"
-													   title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
-							</div>
-						</div>
-						<div class="layui-item query athird">
-							<label class="layui-form-label">部门:</label>
-							<div class="layui-input-block with-icon">
-								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												 cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
-							</div>
-						</div>
-						<div class="layui-item query athird ">
-							<label class="layui-form-label">报告号：</label>
-							<div class="layui-input-block">
-								<form:input id="reportDataNumber" path="reportData.number" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
-							</div>
-						</div>
-						<div class="layui-item query athird ">
 							<label class="layui-form-label">电子归档：</label>
 							<div class="layui-input-block">
 								<form:select id="projectReportRecordStatus" path="projectReportRecordStatus" class=" form-control  simple-select">
@@ -534,7 +525,16 @@
 									<form:option value="0" label="未归档"/>
 									<form:option value="2" label="归档中"/>
 									<form:option value="5" label="已归档"/>
-<%--									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+									<%--									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+								</form:select>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">上报状态：</label>
+							<div class="layui-input-block">
+								<form:select path="reportedState" class=" form-control  simple-select">
+									<form:option value="" label=""/>
+									<form:options items="${fns:getDictList('reported_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
 							</div>
 						</div>

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

@@ -349,10 +349,10 @@
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
-						<div class="layui-item query athird">
-							<label class="layui-form-label">项目编号：</label>
-							<div class="layui-input-block with-icon">
-								<form:input path="projectId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">报告号：</label>
+							<div class="layui-input-block">
+								<form:input path="reportData.number" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">
@@ -376,12 +376,37 @@
 						<div style="    clear:both;"></div>
 					</div>
 					<div id="moresees" style="clear:both;display:none;" class="lw6">
+						<div class="layui-item query athird">
+							<label class="layui-form-label">项目编号：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="projectId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">项目负责人：</label>
+							<label class="layui-form-label">项目责任人：</label>
 							<div class="layui-input-block">
 								<form:input path="leaderNameStr" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
 						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">部门：</label>
+							<div class="layui-input-block with-icon">
+								<sys:treeselect id="officeId" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
+												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+							</div>
+						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">工程类别：</label>
+							<div class="layui-input-block">
+								<input id="demo100" value="${engineeringInfo.engineeringName}" readonly="true" style="background-color: #fff" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+								<form:input id="demo101" path="engineeringType" readonly="true" cssStyle="background-color: #fff;display: none"  htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+									<%--								<button type="button" class="layui-btn layui-btn-primary" style="width: 100%;text-align: left" id="demo100">--%>
+									<%--									<span>${engineeringInfo.engineeringName}</span>--%>
+									<%--									<input type="hidden" name="engineeringType" id="engineeringType" value="${engineeringInfo.engineeringName}"/>--%>
+									<%--									<i class="layui-icon layui-icon-down layui-font-12" style="float: right"></i>--%>
+									<%--								</button>--%>
+							</div>
+						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">合同名称：</label>
 							<div class="layui-input-block">
@@ -415,31 +440,9 @@
 								</form:select>
 							</div>
 						</div>
-						<div class="layui-item query athird">
-							<label class="layui-form-label">工程类型：</label>
-							<div class="layui-input-block">
-								<input id="demo100" value="${engineeringInfo.engineeringName}" readonly="true" style="background-color: #fff" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
-								<form:input id="demo101" path="engineeringType" readonly="true" cssStyle="background-color: #fff;display: none"  htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
-<%--								<button type="button" class="layui-btn layui-btn-primary" style="width: 100%;text-align: left" id="demo100">--%>
-<%--									<span>${engineeringInfo.engineeringName}</span>--%>
-<%--									<input type="hidden" name="engineeringType" id="engineeringType" value="${engineeringInfo.engineeringName}"/>--%>
-<%--									<i class="layui-icon layui-icon-down layui-font-12" style="float: right"></i>--%>
-<%--								</button>--%>
-							</div>
-						</div>
-						<div class="layui-item query athird ">
-							<label class="layui-form-label">报告号：</label>
-							<div class="layui-input-block">
-								<form:input path="reportData.number" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
-							</div>
-						</div>
-						<div class="layui-item query athird">
-							<label class="layui-form-label">部门:</label>
-							<div class="layui-input-block with-icon">
-								<sys:treeselect id="officeId" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
-							</div>
-						</div>
+
+
+
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>

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

@@ -320,10 +320,10 @@
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
-						<div class="layui-item query athird">
-							<label class="layui-form-label">项目编号：</label>
-							<div class="layui-input-block with-icon">
-								<form:input path="projectId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">报告号：</label>
+							<div class="layui-input-block">
+								<form:input path="reportData.number" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">
@@ -332,6 +332,8 @@
 								<form:input path="projectName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
 							</div>
 						</div>
+
+
 						<div class="layui-item athird">
 							<div class="input-group">
 								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
@@ -347,12 +349,37 @@
 						<div style="    clear:both;"></div>
 					</div>
 					<div id="moresees" style="clear:both;display:none;" class="lw6">
+						<div class="layui-item query athird">
+							<label class="layui-form-label">项目编号：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="projectId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">项目负责人：</label>
+							<label class="layui-form-label">项目责任人：</label>
 							<div class="layui-input-block">
 								<form:input path="leaderNameStr" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
 						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">部门:</label>
+							<div class="layui-input-block with-icon">
+								<sys:treeselect id="officeId" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
+												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+							</div>
+						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">工程类别：</label>
+							<div class="layui-input-block">
+								<input id="demo100" value="${engineeringInfo.engineeringName}" readonly="true" style="background-color: #fff" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+								<form:input id="demo101" path="engineeringType" readonly="true" cssStyle="background-color: #fff;display: none"  htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+									<%--								<button type="button" class="layui-btn layui-btn-primary" style="width: 100%;text-align: left" id="demo100">--%>
+									<%--									<span>${engineeringInfo.engineeringName}</span>--%>
+									<%--									<input type="hidden" name="engineeringType" id="engineeringType" value="${engineeringInfo.engineeringName}"/>--%>
+									<%--									<i class="layui-icon layui-icon-down layui-font-12" style="float: right"></i>--%>
+									<%--								</button>--%>
+							</div>
+						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">合同名称：</label>
 							<div class="layui-input-block">
@@ -386,31 +413,6 @@
 								</form:select>
 							</div>
 						</div>
-						<div class="layui-item query athird">
-							<label class="layui-form-label">工程类型：</label>
-							<div class="layui-input-block">
-								<input id="demo100" value="${engineeringInfo.engineeringName}" readonly="true" style="background-color: #fff" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
-								<form:input id="demo101" path="engineeringType" readonly="true" cssStyle="background-color: #fff;display: none"  htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
-									<%--								<button type="button" class="layui-btn layui-btn-primary" style="width: 100%;text-align: left" id="demo100">--%>
-									<%--									<span>${engineeringInfo.engineeringName}</span>--%>
-									<%--									<input type="hidden" name="engineeringType" id="engineeringType" value="${engineeringInfo.engineeringName}"/>--%>
-									<%--									<i class="layui-icon layui-icon-down layui-font-12" style="float: right"></i>--%>
-									<%--								</button>--%>
-							</div>
-						</div>
-						<div class="layui-item query athird ">
-							<label class="layui-form-label">报告号：</label>
-							<div class="layui-input-block">
-								<form:input path="reportData.number" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
-							</div>
-						</div>
-						<div class="layui-item query athird">
-							<label class="layui-form-label">部门:</label>
-							<div class="layui-input-block with-icon">
-								<sys:treeselect id="officeId" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
-							</div>
-						</div>
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>

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

@@ -420,10 +420,10 @@
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
-						<div class="layui-item query athird">
-							<label class="layui-form-label">项目编号：</label>
-							<div class="layui-input-block with-icon">
-								<form:input path="projectId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">报告号：</label>
+							<div class="layui-input-block">
+								<form:input id="reportDataNumber" path="reportData.number" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">
@@ -432,6 +432,7 @@
 								<form:input path="projectName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
 							</div>
 						</div>
+
 						<div class="layui-item athird">
 							<div class="input-group">
 								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
@@ -447,12 +448,32 @@
 						<div style="    clear:both;"></div>
 					</div>
 					<div id="moresees" style="clear:both;display:none;" class="lw6">
+						<div class="layui-item query athird">
+							<label class="layui-form-label">项目编号：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="projectId" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">登记人：</label>
+							<div class="layui-input-block with-icon">
+								<sys:inquireselectUser id="createBy" name="createBy.id" value="${ruralProjectRecords.createBy.id}" labelName="userId" labelValue="${ruralProjectRecords.createBy.name}" cssStyle="background-color: #fff"
+													   title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+							</div>
+						</div>
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">项目负责人：</label>
+							<label class="layui-form-label">项目责任人：</label>
 							<div class="layui-input-block">
 								<form:input path="leaderNameStr" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
 						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">部门:</label>
+							<div class="layui-input-block with-icon">
+								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+							</div>
+						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">合同名称：</label>
 							<div class="layui-input-block">
@@ -487,35 +508,6 @@
 							</div>
 						</div>
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">上报状态：</label>
-							<div class="layui-input-block">
-								<form:select path="reportedState" class=" form-control  simple-select">
-									<form:option value="" label=""/>
-									<form:options items="${fns:getDictList('reported_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-								</form:select>
-							</div>
-						</div>
-						<div class="layui-item query athird ">
-							<label class="layui-form-label">登记人：</label>
-							<div class="layui-input-block with-icon">
-								<sys:inquireselectUser id="createBy" name="createBy.id" value="${ruralProjectRecords.createBy.id}" labelName="userId" labelValue="${ruralProjectRecords.createBy.name}" cssStyle="background-color: #fff"
-													   title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
-							</div>
-						</div>
-						<div class="layui-item query athird">
-							<label class="layui-form-label">部门:</label>
-							<div class="layui-input-block with-icon">
-								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
-							</div>
-						</div>
-						<div class="layui-item query athird ">
-							<label class="layui-form-label">报告号：</label>
-							<div class="layui-input-block">
-								<form:input id="reportDataNumber" path="reportData.number" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
-							</div>
-						</div>
-						<div class="layui-item query athird ">
 							<label class="layui-form-label">电子归档：</label>
 							<div class="layui-input-block">
 								<form:select id="projectReportRecordStatus" path="projectReportRecordStatus" class=" form-control  simple-select">
@@ -536,6 +528,15 @@
 								</form:select>
 							</div>
 						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">上报状态：</label>
+							<div class="layui-input-block">
+								<form:select path="reportedState" class=" form-control  simple-select">
+									<form:option value="" label=""/>
+									<form:options items="${fns:getDictList('reported_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								</form:select>
+							</div>
+						</div>
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>