合同添加合同编号查询

src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoDao.xml

@@ -630,6 +630,9 @@
 				AND a.company_id = #{companyId}
 			</if>
 			<!--新添加查询条件-->
+			<if test="contractNum != null and contractNum != ''">
+				AND a.contract_num like concat('%',#{contractNum},'%')
+			</if>
 			<if test="clientName != null and clientName != ''">
 				AND client.name like concat('%',#{clientName},'%')
 			</if>

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

@@ -72,12 +72,12 @@
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
 					<div class="commonQuery">
-<%--						<div class="layui-item query athird">--%>
-<%--							<span class="layui-form-label">合同编号：</span>--%>
-<%--							<div class="layui-input-block">--%>
-<%--								<form:input path="contractNum" 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="contractNum" 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">
@@ -91,12 +91,6 @@
 								<form:input path="clientName" 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="createName" 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>
@@ -105,6 +99,13 @@
 							</div>
 						</div>
 						<div id="moresees" style="clear:both;display:none;">
+
+							<div class="layui-item query athird" style="width:25%;">
+								<span class="layui-form-label">创建人：</span>
+								<div class="layui-input-block">
+									<form:input path="createName" 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">

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAllList.jsp

@@ -575,6 +575,12 @@
 				</div>
 				<div id="moresees" class="lw7" style="clear:both;display:none;height: 70px;">
 					<div class="layui-item query athird">
+						<label class="layui-form-label">合同编号：</label>
+						<div class="layui-input-block with-icon">
+							<form:input path="contractNum" 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 readOnlyFFF">
 							<input id="beginContractDate" name="beginContractDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -574,6 +574,13 @@
 					<div style="    clear:both;"></div>
 				</div>
 				<div id="moresees" class="lw7" style="clear:both;display:none;height: 70px;">
+
+					<div class="layui-item query athird">
+						<label class="layui-form-label">合同编号：</label>
+						<div class="layui-input-block with-icon">
+							<form:input path="contractNum" 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 readOnlyFFF">