Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp

src/main/java/com/jeeplus/modules/workclientinfo/service/WorkClientInfoService.java

@@ -722,7 +722,8 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
      */
     public Page<WorkClientLinkman> queryLinkManPageByCompany(Page<WorkClientLinkman> page, WorkClientLinkman linkman){
         linkman.setPage(page);
-        page.setList(workClientLinkmanDao.queryLinkManByCompany(linkman));
+        List<WorkClientLinkman> linkmen=workClientLinkmanDao.queryLinkManByCompany(linkman);
+        page.setList(linkmen);
         return page;
     }
 

src/main/java/com/jeeplus/modules/workclientinfo/web/WorkClientInfoController.java

@@ -834,6 +834,11 @@ public class WorkClientInfoController extends BaseController {
 	public String queryLinkManByCompany(WorkClientLinkman linkman, String url, String fieldLabels, String fieldKeys, String searchLabel, String searchKey, String searchLabel1, String searchKey1, HttpServletRequest request, HttpServletResponse response, Model model){
 		WorkClientInfo clientInfo = new WorkClientInfo();
 		clientInfo.setCompanyId(UserUtils.getUser().getCompany().getId());
+		if(null !=linkman.getClientId()){
+			if (StringUtils.isNotBlank(linkman.getClientId().getName())){
+				clientInfo.setName(linkman.getClientId().getName());
+			}
+		}
 		linkman.setClientId(clientInfo);
 		Page<WorkClientLinkman> page = workClientInfoService.queryLinkManPageByCompany(new Page<WorkClientLinkman>(request, response), linkman);
 		//Page<WorkClientInfo> page = workClientInfoService.findPageUnit(new Page<WorkClientInfo>(request, response), clientInfo);

src/main/resources/mappings/modules/workclientinfo/WorkClientInfoDao.xml

@@ -643,6 +643,15 @@
 			<if test="clientType != null and clientType != ''">
 				AND c.job_type_id=#{clientType}
 			</if>
+			<if test="clientType != null and clientType != ''">
+				AND c.job_type_id=#{clientType}
+			</if>
+			<if test="createName != null and createName != ''">
+				AND su.name LIKE
+				<if test="dbName == 'oracle'">'%'||#{createName}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{createName}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{createName},'%')</if>
+			</if>
 			AND a.company_id = #{currentUser.company.id}
 		</where>
 		<choose>

src/main/resources/mappings/modules/workclientinfo/WorkClientLinkmanDao.xml

@@ -331,6 +331,12 @@
 			<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
 			<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>
 		</if>
+		<if test="createName !=null and createName!=''">
+			AND su.name like concat('%',#{createName},'%')
+		</if>
+		<if test="clientId.name !=null and clientId.name!=''">
+			AND b.name like concat('%',#{clientId.name},'%')
+		</if>
 		AND c.job_type_id = '1'
 		order by a.update_date desc
 	</select>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp

@@ -7,6 +7,7 @@
 	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<script src="${ctxStatic}/common/html/js/script.js"></script>
 	<%@include file="/webpage/include/treetable.jsp" %>
 
 	<style>
@@ -34,125 +35,131 @@
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
 				var projectId = '${projectRecords.id}';
-				var leng = $("#file_attachment tr").length;
-				var leng1 = $("#reportedConsultantList tr").length;
 				var boolFlag = true;
-				var startDate = new Date($("#startDate").val());
-				var endingDate = new Date($("#endingDate").val());
-				var bzshbUserId = $("#bzshbUserId").val();
-				if(bzshbUserId == undefined || bzshbUserId ==null || bzshbUserId ==''){
-					parent.layer.msg("请选择审核人员!", {icon: 5});
-					return false;
-				}
-				if(startDate.getTime() > endingDate.getTime()){
-					parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
-					return false;
-				}
-				for(var i=0; i<leng; i++) {
-					var numberStr = $("#file_attachment tr").eq(i).find("td:first").find(".faid").html();
-					var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
-					var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
-					if(second == 1){
-						if(numberStr != undefined && numberStr !=null && numberStr !=''){
-							if (fileFlag==1){
+				if(boolFlag){
+					if(obj == 1){
+						var leng = $("#file_attachment tr").length;
+						var leng1 = $("#reportedConsultantList tr").length;
+						var startDate = new Date($("#startDate").val());
+						var endingDate = new Date($("#endingDate").val());
+						var bzshbUserId = $("#bzshbUserId").val();
+						if(bzshbUserId == undefined || bzshbUserId ==null || bzshbUserId ==''){
+							parent.layer.msg("请选择审核人员!", {icon: 5});
+							return false;
+						}
+						if(startDate.getTime() > endingDate.getTime()){
+							parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
+							return false;
+						}
+						for(var i=0; i<leng; i++) {
+							var numberStr = $("#file_attachment tr").eq(i).find("td:first").find(".faid").html();
+							var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
+							var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
+							if(second == 1){
+								if(numberStr != undefined && numberStr !=null && numberStr !=''){
+									if (fileFlag==1){
 
-							}else{
-								top.layer.msg("请上传成果文件！", {icon: 0});
-								return false;
+									}else{
+										top.layer.msg("请上传成果文件！", {icon: 0});
+										return false;
+									}
+									<%--$.ajax({--%>
+									<%--	type: 'post',--%>
+									<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
+									<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
+									<%--	dataType: "json",--%>
+									<%--	async: false--%>
+									<%--}).success(function (result) {--%>
+									<%--	if(result == 0){--%>
+									<%--		boolFlag = false;--%>
+									<%--		top.layer.msg("请上传成果文件！", {icon: 0});--%>
+									<%--		return false;--%>
+									<%--	}--%>
+									<%--}).error(function () {--%>
+									<%--	top.layer.msg("文件载入失败！");--%>
+									<%--});--%>
+								}
 							}
-							<%--$.ajax({--%>
-							<%--	type: 'post',--%>
-							<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-							<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-							<%--	dataType: "json",--%>
-							<%--	async: false--%>
-							<%--}).success(function (result) {--%>
-							<%--	if(result == 0){--%>
-							<%--		boolFlag = false;--%>
-							<%--		top.layer.msg("请上传成果文件！", {icon: 0});--%>
-							<%--		return false;--%>
-							<%--	}--%>
-							<%--}).error(function () {--%>
-							<%--	top.layer.msg("文件载入失败！");--%>
-							<%--});--%>
 						}
-					}
-				}
-				if (leng1==0){
-					top.layer.msg("请添加咨询员信息！", {icon: 0});
-					return false;
-				}
-				if(boolFlag){
-					var gistdata = $("#file_gistdata tr").length;
-					for(var i=0; i<gistdata; i++) {
-						var numberStr = $("#file_gistdata tr").eq(i).find("td:first").find(".fgid").html();
-						var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
-						var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
+						if (leng1==0){
+							top.layer.msg("请添加咨询员信息！", {icon: 0});
+							return false;
+						}
+						if(boolFlag){
+							var gistdata = $("#file_gistdata tr").length;
+							for(var i=0; i<gistdata; i++) {
+								var numberStr = $("#file_gistdata tr").eq(i).find("td:first").find(".fgid").html();
+								var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
+								var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
 
-						if(second == 1){
-							if(numberStr != undefined && numberStr !=null && numberStr !=''){
-								if (fileFlag==1){
+								if(second == 1){
+									if(numberStr != undefined && numberStr !=null && numberStr !=''){
+										if (fileFlag==1){
 
-								}else{
-									top.layer.msg("请上传依据性文件！", {icon: 0});
-									return false;
+										}else{
+											top.layer.msg("请上传依据性文件！", {icon: 0});
+											return false;
+										}
+										<%--$.ajax({--%>
+										<%--	type: 'post',--%>
+										<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
+										<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
+										<%--	dataType: "json",--%>
+										<%--	async: false--%>
+										<%--}).success(function (result) {--%>
+										<%--	if(result == 0){--%>
+										<%--		boolFlag = false;--%>
+										<%--		top.layer.msg("请上传依据性文件！", {icon: 0});--%>
+										<%--		return false;--%>
+										<%--	}--%>
+										<%--}).error(function () {--%>
+										<%--	top.layer.msg("文件载入失败！");--%>
+										<%--});--%>
+									}
 								}
-								<%--$.ajax({--%>
-								<%--	type: 'post',--%>
-								<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-								<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-								<%--	dataType: "json",--%>
-								<%--	async: false--%>
-								<%--}).success(function (result) {--%>
-								<%--	if(result == 0){--%>
-								<%--		boolFlag = false;--%>
-								<%--		top.layer.msg("请上传依据性文件！", {icon: 0});--%>
-								<%--		return false;--%>
-								<%--	}--%>
-								<%--}).error(function () {--%>
-								<%--	top.layer.msg("文件载入失败！");--%>
-								<%--});--%>
 							}
 						}
-					}
-				}
-				if(boolFlag){
-					var other = $("#file_other tr").length;
-					for(var i=0; i<other; i++) {
-						var numberStr = $("#file_other tr").eq(i).find("td:first").find(".foid").html();
-						var second = $("#file_other tr").eq(i).find("td:eq(1)").html();
-						var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
+						if(boolFlag){
+							var other = $("#file_other tr").length;
+							for(var i=0; i<other; i++) {
+								var numberStr = $("#file_other tr").eq(i).find("td:first").find(".foid").html();
+								var second = $("#file_other tr").eq(i).find("td:eq(1)").html();
+								var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
 
-						if(second == 1){
-							if(numberStr != undefined && numberStr !=null && numberStr !=''){
-								if (fileFlag==1){
+								if(second == 1){
+									if(numberStr != undefined && numberStr !=null && numberStr !=''){
+										if (fileFlag==1){
 
-								}else{
-									top.layer.msg("请上传其它文件！", {icon: 0});
-									return false;
+										}else{
+											top.layer.msg("请上传其它文件！", {icon: 0});
+											return false;
+										}
+										<%--$.ajax({--%>
+										<%--	type: 'post',--%>
+										<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
+										<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
+										<%--	dataType: "json",--%>
+										<%--	async: false--%>
+										<%--}).success(function (result) {--%>
+										<%--	if(result == 0){--%>
+										<%--		boolFlag = false;--%>
+										<%--		top.layer.msg("请上传其他文件！", {icon: 0});--%>
+										<%--		return false;--%>
+										<%--	}--%>
+										<%--}).error(function () {--%>
+										<%--	top.layer.msg("文件载入失败！");--%>
+										<%--});--%>
+									}
 								}
-								<%--$.ajax({--%>
-								<%--	type: 'post',--%>
-								<%--	url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',--%>
-								<%--	data: {"attachmentId":numberStr,"projectId":projectId},--%>
-								<%--	dataType: "json",--%>
-								<%--	async: false--%>
-								<%--}).success(function (result) {--%>
-								<%--	if(result == 0){--%>
-								<%--		boolFlag = false;--%>
-								<%--		top.layer.msg("请上传其他文件！", {icon: 0});--%>
-								<%--		return false;--%>
-								<%--	}--%>
-								<%--}).error(function () {--%>
-								<%--	top.layer.msg("文件载入失败！");--%>
-								<%--});--%>
 							}
 						}
-					}
-				}
-				if(boolFlag){
-					if(obj == 1){
-						$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessageNew/saveReport");
+						var flags=judgment();
+						if (flags){
+							$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessageNew/saveReport");
+						}else{
+							return flags;
+						}
+						<%--$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessageNew/saveReport");--%>
 					}else{
 						//$("#inputForm").attr("action","${ctx}/projectcontentinfo/projectcontentinfo/save?view=report");
 						$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessageNew/holdSaveReport");
@@ -854,19 +861,19 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input placeholder="请输入送审价" id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()" onblur="getAttachment()"/>
+							<form:input placeholder="请输入送审价" id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control judgment layui-input number" onchange="getFee()" onblur="getAttachment()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input placeholder="请输入审定价" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getApprovalFee()"/>
+							<form:input placeholder="请输入审定价" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control judgment layui-input number" onchange="getApprovalFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label"><span class="require-item">*</span>合同价(元)：</label>
+						<label class="layui-form-label">合同价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
+							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>
 						</div>
 					</div>
 					<%--<c:choose>
@@ -900,7 +907,7 @@
 					<div class="layui-item layui-col-sm6 lw7">
 						<label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
 						<div class="layui-input-block">
-							<select class="form-control required layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
+							<select class="form-control judgment layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
 								<option value=""/>
 								<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
 									<option value="${user.id}" <c:if test="${projectcontentinfo.projectReportData.bzshbUserId eq user.id }">selected</c:if>>${user.name}</option>
@@ -1212,7 +1219,7 @@
 
 							</tr>
 							<c:forEach items="${fileAttachment.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_attachment_tr">
+								<tr class="file_attachment_${fileAttachment.id}_tr_fu">
 									<td></td>
 										<c:choose>
 										<c:when test="${projectcontentinfo.uploadMode == 2}">
@@ -1354,7 +1361,7 @@
 
 							</tr>
 							<c:forEach items="${fileGistdata.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_gistdata_tr">
+								<tr class="file_gistdata_${fileGistdata.id}_tr">
 									<td></td>
 									<c:choose>
 										<c:when test="${projectcontentinfo.uploadMode == 2}">
@@ -1495,7 +1502,7 @@
 								<td style="display:none">${fileOther.fileFlag}</td>
 							</tr>
 							<c:forEach items="${fileOther.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_other_tr">
+								<tr class="file_other_${fileOther.id}_tr">
 									<td></td>
 									<c:choose>
 										<c:when test="${projectcontentinfo.uploadMode == 2}">

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

@@ -1180,7 +1180,7 @@
                 <div class="form-group-label"><h2>施工方信息</h2></div>
                 <div class="layui-item nav-btns" style="float: left;width: 155px">
                     <sys:gridselectConstruction url="${ctx}/workclientinfo/workClientInfo/clientInfolist" id="constructionOrgList" title="选择施工单位"
-                                                cssClass="form-control required" fieldLabels="${fns:urlEncode('客户编号')}" fieldKeys="name" searchLabel="${fns:urlEncode('客户名称')}" searchKey="name"></sys:gridselectConstruction>
+                                                cssClass="form-control required" fieldLabels="${fns:urlEncode('客户编号')}" fieldKeys="name" searchLabel="${fns:urlEncode('施工方单位')}" searchKey="name"></sys:gridselectConstruction>
                 </div>
                 <div class="layui-item nav-btns" >
                     <a href="javascript:void(0)"

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

@@ -66,19 +66,19 @@
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
 					<div class="commonQuery">
-						<div class="layui-item query athird">
+						<div class="layui-item query athird" style="width: 300px;">
 							<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: 300px;">
 							<span class="layui-form-label">委托单位：</span>
 							<div class="layui-input-block">
 								<form:input path="clientId.name" 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: 300px;">
 							<span class="layui-form-label">创建者：</span>
 							<div class="layui-input-block">
 								<form:input path="createName" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>

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

@@ -53,7 +53,7 @@
 	<div class="layui-row">
 		<div class="full-width fl">
 			<div class="layui-row" id="queryDiv">
-				<form:form id="searchForm" modelAttribute="obj" action="${url}" method="post" class="form-inline">
+				<form:form id="searchForm" modelAttribute="obj" action="${url}" method="post" class="layui-form">
 					<input type="hidden" name="url" value="${url}"/>
 					<input type="hidden" name="fieldLabels" value="${fieldLabels}"/>
 					<input type="hidden" name="fieldKeys" value="${fieldKeys}"/>
@@ -64,12 +64,24 @@
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
 					<div class="commonQuery">
-						<div class="layui-item query athird lw9">
+						<div class="layui-item query athird" style="width: 300px;">
+							<span class="layui-form-label">联系人：</span>
+							<div class="layui-input-block">
+								<form:input path="workClientLinkman.name" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird lw9"  style="width: 300px;">
 							<span class="layui-form-label">${searchLabel}：</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" style="width: 300px;">
+							<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">
 							<div class="input-group">
 								<button id="searchReset" class="fixed-btn searchReset fr" style="margin-right: 0px;" onclick="resetSearch()">重置</button>