附件类型设置搜索栏默认展开、造价审核详情页面 项目类别字典变更

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -198,11 +198,21 @@ public class RuralCostProjectRecordsController extends BaseController {
 			projectRecords.setWorkAttachments(projectPlanAttachment);
 
 			//处理项目类别
-			List<MainDictDetail> mainDictList = DictUtils.getMainDictList("attachment_project_sort");
-			for (MainDictDetail info: mainDictList) {
-				if(projectRecords.getAttachmentProjectSort().equals(info.getValue())){
-					projectRecords.setAttachmentProjectSort(info.getLabel());
-					break;
+			List<MainDictDetail> mainDictList = Lists.newArrayList();
+			//工程咨询
+			if("1".equals(projectRecords.getProjectType())){
+				mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+				//造价审核
+			} else if("2".equals(projectRecords.getProjectType())){
+				mainDictList = DictUtils.getMainDictList("attachment_project_sort_cost");
+			}
+			if(StringUtils.isNotBlank(projectRecords.getAttachmentProjectSort())){
+				//处理项目类别
+				for (MainDictDetail info: mainDictList) {
+					if(projectRecords.getAttachmentProjectSort().equals(info.getValue())){
+						projectRecords.setAttachmentProjectSort(info.getLabel());
+						break;
+					}
 				}
 			}
 

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -175,9 +175,16 @@ public class RuralProjectRecordsController extends BaseController {
 			List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(projectRecords.getId());
 			projectRecords.setProjectPlanList(projectPlanList);
 			projectRecords.setWorkAttachments(projectPlanAttachment);
+			List<MainDictDetail> mainDictList = Lists.newArrayList();
+			//工程咨询
+			if("1".equals(projectRecords.getProjectType())){
+				mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+				//造价审核
+			} else if("2".equals(projectRecords.getProjectType())){
+				mainDictList = DictUtils.getMainDictList("attachment_project_sort_cost");
+			}
 			if(StringUtils.isNotBlank(projectRecords.getAttachmentProjectSort())){
 				//处理项目类别
-				List<MainDictDetail> mainDictList = DictUtils.getMainDictList("attachment_project_sort");
 				for (MainDictDetail info: mainDictList) {
 					if(projectRecords.getAttachmentProjectSort().equals(info.getValue())){
 						projectRecords.setAttachmentProjectSort(info.getLabel());

src/main/resources/jeeplus.properties

@@ -261,7 +261,7 @@ linuxPath = /simple/
 
 #\u6587\u4EF6\u4E0A\u4F20\u670D\u52A1\u5668\u4FE1\u606F
 #\u4E3B\u673A
-remoteServer.host = 192.168.2.4
+remoteServer.host = 127.0.0.1
 #\u7AEF\u53E3
 remoteServer.port = 22
 #\u7528\u6237\u540D
@@ -275,7 +275,7 @@ remoteServer.winDirectory =d:/attachment-file
 
 
 #\u6587\u4EF6\u5B58\u50A8\u65B9\u5F0F\uFF080\uFF1A\u672C\u5730\u670D\u52A1\u5668\u5B58\u50A8\u30021\uFF1A\u4E91\u7AEF\u5B58\u50A8\uFF09
-remoteServer.uploadMode =0
+remoteServer.uploadMode =1
 
 #\u6587\u4EF6\u670D\u52A1\u5668IP\u5730\u5740
 remoteServer.visit =

src/main/webapp/webpage/modules/projectAccessory/projectAccessoryRelation/projectAccessoryRelationList.jsp

@@ -19,17 +19,6 @@
 	<script type="text/javascript">
 		$(document).ready(function() {
 
-			//搜索框收放
-			$('#moresee').click(function(){
-				if($('#moresees').is(':visible'))
-				{
-					$('#moresees').slideUp(0,resizeListWindow2);
-					$('#moresee i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
-				}else{
-					$('#moresees').slideDown(0,resizeListWindow2);
-					$('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
-				}
-			});
 			laydate.render({
 				elem: '#beginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
 				event: 'focus', //响应事件。如果没有传入event，则按照默认的click
@@ -253,21 +242,11 @@
 	<div class="layui-row">
 		<div class="full-width fl">
 			<div class="layui-row contentShadow shadowLR" id="queryDiv">
-				<%--<form:form id="searchForm" modelAttribute="projectAccessoryRelationInfo" action="${ctx}/projectAccessoryRelation/projectAccessoryRelation/list" method="post" class="form-inline">--%>
 				<form:form id="searchForm" modelAttribute="projectAccessoryRelationInfo" action="${ctx}/projectAccessoryRelation/projectAccessoryRelation/list" method="post" class="form-horizontal layui-form">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 					<input id="attachmentProjectSortStr" name="attachmentProjectSortStr" type="hidden" value="${attachmentProjectSortStr}"/>
 					<div class="commonQuery lw6">
-						<%--<div class="layui-item query athird ">
-							<label class="layui-form-label">项目类型：</label>
-							<div class="layui-input-block">
-								<form:select path="attachmentProjectType" class=" form-control  simple-select">
-									<form:option value="" label=""/>
-									<form:options items="${fns:getMainDictList('attachment_project_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-								</form:select>
-							</div>
-						</div>--%>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">项目类型：</label>
 							<div class="layui-input-block">
@@ -283,26 +262,15 @@
 								<select id="attachmentProjectSort" name="attachmentProjectSort" value="" lay-filter="sortFilter"></select>
 							</div>
 						</div>
-
-						<%--<div class="layui-item query athird ">
-							<label class="layui-form-label">项目类别：</label>
-							<div class="layui-input-block">
-								<form:select path="attachmentProjectSort" class=" form-control  simple-select">
-									<form:option value="" label=""/>
-									<form:options items="${fns:getMainDictList('attachment_project_sort')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-								</form:select>
-							</div>
-						</div>--%>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
 								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
 								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
 							</div>
 						</div>
 						<div style="    clear:both;"></div>
 					</div>
-					<div id="moresees" style="clear:both;display:none;" class="lw6">
+					<div id="moresees" class="commonQuery lw6">
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">送审金额：</label>
 							<div class="layui-input-block">