Quellcode durchsuchen

报销申请(选择报销项目添加筛选条件)

[user3] vor 4 Jahren
Ursprung
Commit
067af856a1

+ 14 - 1
src/main/resources/mappings/modules/projectrecord/ProjectRecordsDao.xml

@@ -736,10 +736,23 @@
 		LEFT JOIN project_report_data prd ON a.id = prd.project_id
 		where a.status='5'  and a.del_flag='0' and w.del_flag='0'
 		/*and prd.number is not null*/
-		and wci.del_flag='0' and (wci.completion_status!='5' or wci.completion_status is null)
+		/*and wci.del_flag='0' and (wci.completion_status!='5' or wci.completion_status is null)*/
 		<if test="projectName != null and projectName != ''">
 			AND a.project_name like concat(concat('%',#{projectName}),'%')
 		</if>
+		<if test="projectId != null and projectId != ''">
+			AND a.project_Id like concat(concat('%',#{projectId}),'%')
+		</if>
+		<if test="workContractInfo != null and workContractInfo != ''">
+			<if test="workContractInfo.name != null and workContractInfo.name != ''">
+				AND wci.name like concat(concat('%',#{workContractInfo.name}),'%')
+			</if>
+		</if>
+		<if test="reportData != null and reportData != ''">
+			<if test="reportData.number != null and reportData.number != ''">
+				AND prd.number like concat(concat('%',#{reportData.number}),'%')
+			</if>
+		</if>
 		GROUP BY a.id
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">

+ 1 - 1
src/main/webapp/webpage/modules/sys/collectSelect.jsp

@@ -162,7 +162,7 @@
 					</c:when>
 						<c:otherwise>
 							<tr>
-								<td colspan="3" align="center">
+								<td colspan="4" align="center">
 									暂无数据
 								</td>
 							</tr>

+ 38 - 2
src/main/webapp/webpage/modules/sys/gridselectcallprojectOnReimbur.jsp

@@ -35,6 +35,17 @@
 					$("#td4").removeClass("hide");
 					$("#tr1").hide()
 				}
+				//搜索框收放
+				$('#moresee').click(function(){
+					if($('#moresees').is(':visible'))
+					{
+						$('#moresees').slideUp(0,resizeListWindow1);
+						$('#moresee i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
+					}else{
+						$('#moresees').slideDown(0,resizeListWindow1);
+						$('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
+					}
+				});
 			});
 		// });
 
@@ -73,6 +84,7 @@
 			$("#searchForm").submit();
 			return false;
 		}
+
 	</script>
 </head>
 <body>
@@ -108,14 +120,38 @@
 								<form:input path="${searchKey}" 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">
+								<form:input path="projectId" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
+							</div>
+						</div>
 						<div class="layui-item athird fr">
 							<div class="input-group">
-								<button id="searchReset" class="fixed-btn searchReset fr" style="margin-right: 0px;" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
+								</div>
 							</div>
 						</div>
 						<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="workContractInfo.name" 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">
+								<form:input path="reportData.number" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div style="clear:both;"></div>
+					</div>
 					<div id="td4" class="commonQuery">
 						<div class="layui-item layui-col-sm12 with-textarea">
 							<label class="layui-form-label"><span class="require-item">*</span>报销详情:</label>