发票管理，筛选顺序调整

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllList.jsp

@@ -410,23 +410,18 @@
 
 					<div class="commonQuery lw9">
 						<div class="layui-item query athird">
-							<label class="layui-form-label">发票申请编号：</label>
-							<div class="layui-input-block">
-								<form:input path="number" htmlEscape="false" maxlength="64"  class=" form-control layui-input"/>
+							<label class="layui-form-label">发票号：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="widNumber" htmlEscape="false"  class=" form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">
-							<label class="layui-form-label">开票日期：</label>
-							<div class="layui-input-block">
-								<input id="beginContractDate" name="beginContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group" style="background-color: #fff"
-									   value="<fmt:formatDate value="${workInvoice.beginContractDate}" pattern="yyyy-MM-dd"/>"/>
-								</input>
-								<span class="group-sep">-</span>
-								<input id="endContractDate" name="endContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group" style="background-color: #fff"
-									   value="<fmt:formatDate value="${workInvoice.endContractDate}" pattern="yyyy-MM-dd"/>"/>
-								</input>
+							<label class="layui-form-label">开票金额：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="money" htmlEscape="false"  class=" form-control layui-input"/>
 							</div>
 						</div>
+
 						<%--<div class="layui-item query athird">
 							<label class="layui-form-label">项目编号：</label>
 							<div class="layui-input-block">
@@ -457,6 +452,38 @@
                                     <form:input path="project.reportData.number" 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:inquireselectUserNotReadolny id="accountCheckingUser" name="accountCheckingUserId" value="${workInvoice.accountCheckingUserId}" labelName="accountCheckingUserName" labelValue="${workInvoice.accountCheckingUserName}" 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:treeselectArae id="area" name="area.id" value="${workInvoice.area.id}" labelName="area.name" labelValue="${workInvoice.area.name}"
+															cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" isAll="true"/>
+									</div>
+								</div>
+								<div class="layui-item query athird">
+									<label class="layui-form-label">发票申请编号：</label>
+									<div class="layui-input-block">
+										<form:input path="number" 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">
+										<input id="beginContractDate" name="beginContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group" style="background-color: #fff"
+											   value="<fmt:formatDate value="${workInvoice.beginContractDate}" pattern="yyyy-MM-dd"/>"/>
+										</input>
+										<span class="group-sep">-</span>
+										<input id="endContractDate" name="endContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group" style="background-color: #fff"
+											   value="<fmt:formatDate value="${workInvoice.endContractDate}" pattern="yyyy-MM-dd"/>"/>
+										</input>
+									</div>
+								</div>
 						<div class="layui-item query athird">
 							<label class="layui-form-label">经办人部门：</label>
 							<div class="layui-input-block with-icon">
@@ -523,32 +550,8 @@
 								</form:select>
 							</div>
 						</div>
-						<div class="layui-item query athird">
-							<label class="layui-form-label">对账人：</label>
-							<div class="layui-input-block with-icon">
-								<sys:inquireselectUserNotReadolny id="accountCheckingUser" name="accountCheckingUserId" value="${workInvoice.accountCheckingUserId}" labelName="accountCheckingUserName" labelValue="${workInvoice.accountCheckingUserName}" 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:treeselectArae id="area" name="area.id" value="${workInvoice.area.id}" labelName="area.name" labelValue="${workInvoice.area.name}"
-													cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" isAll="true"/>
-							</div>
-						</div>
-						<div class="layui-item query athird">
-							<label class="layui-form-label">发票号：</label>
-							<div class="layui-input-block with-icon">
-								<form:input path="widNumber" htmlEscape="false"  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="money" htmlEscape="false"  class=" form-control layui-input"/>
-							</div>
-						</div>
+
+
 					</div>
 				</form:form>
 			</div>

src/main/webapp/webpage/modules/workinvoice/workInvoiceList.jsp

@@ -467,23 +467,18 @@
 
 					<div class="commonQuery lw9">
 						<div class="layui-item query athird">
-							<label class="layui-form-label">发票申请编号：</label>
-							<div class="layui-input-block">
-								<form:input path="number" htmlEscape="false" maxlength="64"  class=" form-control layui-input"/>
+							<label class="layui-form-label">发票号：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="widNumber" htmlEscape="false"  class=" form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">
-							<label class="layui-form-label">开票日期：</label>
-							<div class="layui-input-block">
-								<input id="beginContractDate" name="beginContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group" style="background-color: #fff"
-									   value="<fmt:formatDate value="${workInvoice.beginContractDate}" pattern="yyyy-MM-dd"/>"/>
-								</input>
-								<span class="group-sep">-</span>
-								<input id="endContractDate" name="endContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group" style="background-color: #fff"
-									   value="<fmt:formatDate value="${workInvoice.endContractDate}" pattern="yyyy-MM-dd"/>"/>
-								</input>
+							<label class="layui-form-label">开票金额：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="money" htmlEscape="false"  class=" form-control layui-input"/>
 							</div>
 						</div>
+
 						<%--<div class="layui-item query athird">
 							<label class="layui-form-label">项目编号：</label>
 							<div class="layui-input-block">
@@ -514,6 +509,38 @@
 								<form:input path="project.reportData.number" 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:inquireselectUserNotReadolny id="accountCheckingUser" name="accountCheckingUserId" value="${workInvoice.accountCheckingUserId}" labelName="accountCheckingUserName" labelValue="${workInvoice.accountCheckingUserName}" 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:treeselectArae id="area" name="area.id" value="${workInvoice.area.id}" labelName="area.name" labelValue="${workInvoice.area.name}"
+														cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" isAll="true"/>
+								</div>
+							</div>
+							<div class="layui-item query athird">
+								<label class="layui-form-label">发票申请编号：</label>
+								<div class="layui-input-block">
+									<form:input path="number" 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">
+									<input id="beginContractDate" name="beginContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group" style="background-color: #fff"
+										   value="<fmt:formatDate value="${workInvoice.beginContractDate}" pattern="yyyy-MM-dd"/>"/>
+									</input>
+									<span class="group-sep">-</span>
+									<input id="endContractDate" name="endContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group" style="background-color: #fff"
+										   value="<fmt:formatDate value="${workInvoice.endContractDate}" pattern="yyyy-MM-dd"/>"/>
+									</input>
+								</div>
+							</div>
 						<div class="layui-item query athird">
 							<label class="layui-form-label">经办人部门：</label>
 							<div class="layui-input-block with-icon">
@@ -580,32 +607,6 @@
 								</form:select>
 							</div>
 						</div>
-						<div class="layui-item query athird">
-							<label class="layui-form-label">对账人：</label>
-							<div class="layui-input-block with-icon">
-								<sys:inquireselectUserNotReadolny id="accountCheckingUser" name="accountCheckingUserId" value="${workInvoice.accountCheckingUserId}" labelName="accountCheckingUserName" labelValue="${workInvoice.accountCheckingUserName}" 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:treeselectArae id="area" name="area.id" value="${workInvoice.area.id}" labelName="area.name" labelValue="${workInvoice.area.name}"
-													cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" isAll="true"/>
-							</div>
-						</div>
-						<div class="layui-item query athird">
-							<label class="layui-form-label">发票号：</label>
-							<div class="layui-input-block with-icon">
-								<form:input path="widNumber" htmlEscape="false"  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="money" htmlEscape="false"  class=" form-control layui-input"/>
-							</div>
-						</div>
 					</div>
 				</form:form>
 			</div>