发票添加报告号筛选项

src/main/webapp/webpage/modules/sys/gridinvoiceproject.jsp

@@ -128,18 +128,24 @@
 					</div>
 					<div class="project">
 						<div class="commonQuery">
-							<div class="layui-item query athird">
+							<div class="layui-item query athird" style="width: 25%">
 								<span class="layui-form-label">项目名称：</span>
 								<div class="layui-input-block">
 									<form:input path="${searchKey}" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
 								</div>
 							</div>
-							<div class="layui-item query athird">
+							<div class="layui-item query athird" style="width: 25%">
 								<span class="layui-form-label">项目编号：</span>
 								<div class="layui-input-block">
 									<form:input path="projectId" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
 								</div>
 							</div>
+							<div class="layui-item query athird" style="width: 25%">
+								<span class="layui-form-label">报告号：</span>
+								<div class="layui-input-block">
+									<form:input path="reportData.number" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
+								</div>
+							</div>
 							<div class="layui-item athird fr">
 								<div class="input-group">
 									<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
@@ -152,12 +158,6 @@
 							<div style="    clear:both;"></div>
 						</div>
 						<div id="moresees" style="clear:both;display:none;">
-							<div class="layui-item query athird">
-								<span class="layui-form-label">报告号：</span>
-								<div class="layui-input-block">
-									<form:input path="reportData.number" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
-								</div>
-							</div>
 							 <div class="layui-item query athird">
 								<span class="layui-form-label">是否开票：</span>
 								<div class="layui-input-block readOnlyFFF">
@@ -317,6 +317,7 @@
 										<input type="hidden" name="fieldKeys" value="${fieldKeys}"/>
 										<input type="hidden" name="searchLabel" value="${searchLabel}"/>
 										<input type="hidden" name="searchKey" value="${searchKey}"/>
+										<input type="hidden" name="reportNumberKey" value="${reportNumberKey}"/>
 										<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 										<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 										<input id="projectFlag" name="projectFlag" type="hidden" value=""/>
@@ -327,19 +328,25 @@
 										</div>
 										<div class="project">
 											<div class="commonQuery">
-												<div class="layui-item query athird">
+												<div class="layui-item query athird " style="width: 25%">
 													<span class="layui-form-label">项目名称：</span>
 													<div class="layui-input-block">
 														<form:input path="${searchKey}" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
 													</div>
 												</div>
-												<div class="layui-item query athird">
+												<div class="layui-item query athird" style="width: 25%">
 													<span class="layui-form-label">项目编号：</span>
 													<div class="layui-input-block">
 														<form:input path="projectId" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
 													</div>
 												</div>
-												<div class="layui-item athird fr">
+												<div class="layui-item query athird" style="width: 25%">
+													<span class="layui-form-label">报告号：</span>
+													<div class="layui-input-block">
+														<form:input path="reportData.number" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
+													</div>
+												</div>
+												<div class="layui-item athird fr" style="width: 25%">
 													<div class="input-group">
 														<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
 														<div class="layui-btn-group search-spacing">
@@ -352,12 +359,6 @@
 											</div>
 											<div id="moresees" style="clear:both;display:none;">
 												<div class="layui-item query athird">
-													<span class="layui-form-label">报告号：</span>
-													<div class="layui-input-block">
-														<form:input path="reportData.number" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
-													</div>
-												</div>
-												<div class="layui-item query athird">
 													<span class="layui-form-label">是否开票：</span>
 													<div class="layui-input-block readOnlyFFF">
 														<form:select path="invoiceStatus">