公告左树右表修改

src/main/java/com/jeeplus/modules/identification/web/AuditTemplateController.java

@@ -26,7 +26,7 @@ import java.util.List;
  * 自定义审核模板
  */
 @Controller
-@RequestMapping(value = "${adminPath}/auditTemplate/auditTemplate")
+@RequestMapping(value = "${adminPath}/fauditTemplate/auditTemplate")
 public class AuditTemplateController extends BaseController {
     @Autowired
     private AuditTemplateService auditTemplateService;

src/main/java/com/jeeplus/modules/oa/dao/OaNotifyDao.java

@@ -36,6 +36,7 @@ public interface OaNotifyDao extends CrudDao<OaNotify> {
     //我的通告
     List<OaNotify> findListByPc(OaNotify oaNotify);
 
+
     void updateStatusById(OaNotify oaNotify);
 
     void updateProcessIdAndStatus(OaNotify oaNotify);
@@ -79,4 +80,5 @@ public interface OaNotifyDao extends CrudDao<OaNotify> {
      * @param oaNotifyView
      */
     void updateOaNotifyView(OaNotifyView oaNotifyView);
+
 }

src/main/java/com/jeeplus/modules/oa/service/OaNotifyService.java

@@ -102,6 +102,9 @@ public class OaNotifyService extends CrudService<OaNotifyDao, OaNotify> {
     @Autowired
     private WorkProjectNotifyService workProjectNotifyService;
 
+
+
+
     public OaNotify get(String id) {
         OaNotify oaNotify = dao.get(id);
         if(null != oaNotify){
@@ -115,6 +118,7 @@ public class OaNotifyService extends CrudService<OaNotifyDao, OaNotify> {
         return oaNotify;
     }
 
+
     /**
      * 获取通知发送记录
      * @param oaNotify

src/main/java/com/jeeplus/modules/oa/web/OaNotifyController.java

@@ -3,6 +3,7 @@
  */
 package com.jeeplus.modules.oa.web;
 
+import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.persistence.Page;
@@ -20,12 +21,11 @@ import com.jeeplus.modules.oa.service.OaNotifyService;
 import com.jeeplus.modules.projectAccessory.entity.CollectAccessoryInfo;
 import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
 import com.jeeplus.modules.pushinfo.service.PushinfoService;
-import com.jeeplus.modules.sys.entity.Office;
-import com.jeeplus.modules.sys.entity.SysRoleActivity;
-import com.jeeplus.modules.sys.entity.User;
-import com.jeeplus.modules.sys.entity.Workattachment;
+import com.jeeplus.modules.sys.entity.*;
+import com.jeeplus.modules.sys.service.OfficeService;
 import com.jeeplus.modules.sys.service.SystemService;
 import com.jeeplus.modules.sys.service.WorkattachmentService;
+import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
@@ -40,10 +40,7 @@ import org.java_websocket.WebSocket;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
@@ -83,6 +80,30 @@ public class OaNotifyController extends BaseController {
 		}
 		return entity;
 	}
+
+
+	@RequiresPermissions("oa:oaNotify:list")
+	@RequestMapping(value = {""})
+	public String index(OaNotify oaNotify, Model model) {
+
+		return "modules/oa/oaNotifyIndex";
+	}
+
+	@ResponseBody
+	@RequestMapping(value = "treeDataNotify")
+	public List<Map<String, Object>> treeDataNotify(){
+		List<Map<String, Object>> mapList = Lists.newArrayList();
+		List<MainDictDetail> type = DictUtils.getMainDictList("oa_notify_type");
+		for (int i = 0; i < type.size(); i++) {
+			Map<String, Object> map = new HashMap<>();
+			map.put("id",type.get(i).getValue());
+			map.put("name", type.get(i).getLabel());
+			mapList.add(map);
+		}
+		return mapList;
+	}
+
+
 	//我的通告（未过期）
 	@RequestMapping(value = {"self"})
 	public String listMyself(OaNotify oaNotify, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -135,7 +156,7 @@ public class OaNotifyController extends BaseController {
 	}
 	//通告管理
 	@RequiresPermissions("oa:oaNotify:list")
-	@RequestMapping(value = {"list", ""})
+	@RequestMapping(value = {"list"})
 	public String list(OaNotify oaNotify, HttpServletRequest request, HttpServletResponse response, Model model,RedirectAttributes redirectAttributes) {
 		//进行查询之后进行任何操作，返回还是查询之后的数据页面
 		if (StringUtils.isNotBlank(oaNotify.getToflag())){
@@ -159,6 +180,7 @@ public class OaNotifyController extends BaseController {
 		if(!user.isAdmin()){
 			oaNotify.setCompany(user.getCompany());
 		}
+
 		Page<OaNotify> page = oaNotifyService.findByPc(new Page<OaNotify>(request, response), oaNotify);
 
 		//查询所有和当前登陆人有关的项目的审核

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

@@ -1543,7 +1543,7 @@ public class RuralCostProjectMessageController extends BaseController {
         workStaffBasicInfoService.queryDetails(workStaffBasicInfo);
         WorkStaffCertificate workStaffCertificate=new WorkStaffCertificate();
         for (WorkStaffCertificate workStaff:workStaffBasicInfo.getCertificateList()){
-            //判定是否是一级造价师
+            //判定是否是一级造价师 161一级造价师 171二级造价师
             if ("161".equals( workStaff.getName()) || "171".equals( workStaff.getName())){
                 workStaffCertificate.setName(workStaff.getName());
                 workStaffCertificate.setNum(workStaff.getNum());

src/main/resources/mappings/modules/oa/OaNotifyDao.xml

@@ -88,11 +88,6 @@
 		<if test="isSelf">
 			AND a.STATUS = '5'
 		</if>
-		<if test="title != null and title != ''">
-			AND a.title like
-			<if test="dbName == 'oracle'">'%'||#{ctitle}||'%'</if>
-			<if test="dbName == 'mysql'">CONCAT('%', #{title}, '%')</if>
-		</if>
 		<if test="content != null and content != ''">
 			AND a.content like
 			<if test="dbName == 'oracle'">'%'||#{content}||'%'</if>
@@ -271,6 +266,9 @@
 		ORDER BY a.update_date DESC
 	</select>
 
+
+
+
 	<select id="findListByPc" resultType="OaNotify">
 		SELECT
 		a.ID AS "id",
@@ -310,12 +308,14 @@
 		<if test="type != null and type != ''">
 			AND a.TYPE = #{type}
 		</if>
+
 		<if test="number != null and number != ''">
 			AND a.number = #{number}
 		</if>
 		<if test="referenceNumber != null and referenceNumber != ''">
 			AND a.reference_number like concat('%',#{referenceNumber},'%')
 		</if>
+
 		<if test="status != null and status != ''">
 			AND a.STATUS = #{status}
 		</if>
@@ -323,6 +323,7 @@
 			AND a.title like
 			<if test="dbName == 'oracle'">'%'||#{ctitle}||'%'</if>
 			<if test="dbName == 'mysql'">CONCAT('%', #{title}, '%')</if>
+
 		</if>
 		<if test="content != null and content != ''">
 			AND a.content like

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -383,6 +383,7 @@
 		left join project_report_signature prs on prs.project_id = a.id
 		left join project_report_signature_info prsi on prsi.project_report_id = prd.number
 		<where>
+
 			<if test="projectId != null and projectId != ''">
 				AND a.project_id like concat('%',#{projectId},'%')
 			</if>
@@ -1670,6 +1671,7 @@
 		LEFT JOIN sys_office o ON o.id = a.office_id
 		LEFT JOIN project_plan_info pi on pi.project_id = a.id
 		<where>
+			 a.submit_scale >= 500
 			<if test="projectId != null and projectId != ''">
 				AND a.project_id like concat('%',#{projectId},'%')
 			</if>
@@ -1768,6 +1770,7 @@
 			LEFT JOIN work_client_info wct on wci.client_id = wct.id
 		</if>
 		<where>
+				a.submit_scale >= 500
 			<if test="projectId != null and projectId != ''">
 				AND a.project_id like concat('%',#{projectId},'%')
 			</if>

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

@@ -327,10 +327,10 @@
 			<if test="contrractRecordStatus != null and contrractRecordStatus != ''">
 				<choose>
 					<when test="contrractRecordStatus == 0">
-						AND a.contrract_record_status is null
+						AND a.contract_record_state is null
 					</when>
 					<otherwise>
-						AND a.contrract_record_status = #{contrractRecordStatus}
+						AND a.contract_record_state = #{contrractRecordStatus}
 					</otherwise>
 				</choose>
 			</if>
@@ -400,10 +400,10 @@
 			<if test="contrractRecordStatus != null and contrractRecordStatus != ''">
 				<choose>
 					<when test="contrractRecordStatus == 0">
-						AND a.contrract_record_status is null
+						AND a.contract_record_state is null
 					</when>
 					<otherwise>
-						AND a.contrract_record_status = #{contrractRecordStatus}
+						AND a.contract_record_state = #{contrractRecordStatus}
 					</otherwise>
 				</choose>
 			</if>

src/main/resources/spring-context-jedis.xml

@@ -20,8 +20,8 @@
 		<constructor-arg index="0" ref="jedisPoolConfig" />
 		<constructor-arg index="1" value="${redis.host}" />
 		<constructor-arg index="2" value="${redis.port}" type="int" />
-		<constructor-arg index="3" value="${redis.timeout}" type="int" />
-		<constructor-arg index="4" value="${redis.password}" />
+<!--		<constructor-arg index="3" value="${redis.timeout}" type="int" />-->
+<!--		<constructor-arg index="4" value="${redis.password}" />-->
 	</bean>
 
 </beans>

src/main/webapp/WEB-INF/tags/sys/treeselectoffices.tag

@@ -23,17 +23,17 @@
 <%@ attribute name="hideBtn" type="java.lang.Boolean" required="false" description="是否显示按钮"%>
 <%@ attribute name="disabled" type="java.lang.String" required="false" description="是否限制选择，如果限制，设置为disabled"%>
 <%@ attribute name="dataMsgRequired" type="java.lang.String" required="false" description=""%>
-	<input id="${id}Id" name="${name}" class="${cssClass}" type="hidden" value="${value}" />
-	<div class="input-group" >
-		<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="hidden" value="${labelValue}" data-msg-required="${dataMsgRequired}"
-		class="${cssClass}" "/>
-       		 <span class="input-group-btn">
+<input id="${id}Id" name="${name}" class="${cssClass}" type="hidden" value="${value}" />
+<div class="input-group" >
+	<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="hidden" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		   class="${cssClass}" "/>
+	<span class="input-group-btn">
 	       		 <button style="font-size:14px;" type="button"  id="${id}Button" class="nav-btn nav-btn-add ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>&nbsp;选择
-	             </button> 
+	             </button>
        		 </span>
-       		
-    </div>
-	 <label id="${id}Name-error" class="error" for="${id}Name" style="display:none"></label>
+
+</div>
+<label id="${id}Name-error" class="error" for="${id}Name" style="display:none"></label>
 <script type="text/javascript">
 	$("#${id}Button, #${id}Name").click(function(){
 		// 是否限制选择，如果限制，设置为disabled
@@ -41,71 +41,71 @@
 			return true;
 		}
 		var selectIds = getSelectOfficeIds();
-		// 正常打开	
+		// 正常打开
 		top.layer.open({
-		    type: 2, 
-		    area: ['300px', '420px'],
-		    title:"选择${title}",
-		    ajaxData:{selectIds: $("#${id}Id").val()},
-		    content: "${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}&flagOffice=${flagOffice}&selectIds="+selectIds ,
-		    btn: ['确定', '关闭']
-    	       ,yes: function(index, layero){ //或者使用btn1
-						var tree = layero.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents();
-						var ids = [], names = [],parentIds=[], nodes = [];
-						if ("${checked}" == "true"){
-							nodes = tree.getCheckedNodes(true);
-						}else{
-							nodes = tree.getSelectedNodes();
-						}
-						for(var i=0; i<nodes.length; i++) {//<c:if test="${checked && notAllowSelectParent}">
-							if (nodes[i].isParent){
-								continue; // 如果为复选框选择，则过滤掉父节点
-							}//</c:if><c:if test="${notAllowSelectRoot}">
-							if (nodes[i].level == 0){
-								//top.$.jBox.tip("不能选择根节点（"+nodes[i].name+"）请重新选择。");
-								top.layer.msg("不能选择根节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
-								return false;
-							}//</c:if><c:if test="${notAllowSelectParent}">
-							if (nodes[i].isParent){
-								//top.$.jBox.tip("不能选择父节点（"+nodes[i].name+"）请重新选择。");
-								//layer.msg('有表情地提示');
-								top.layer.msg("不能选择父节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
-								return false;
-							}//</c:if><c:if test="${not empty module && selectScopeModule}">
-							if (nodes[i].module == ""){
-								//top.$.jBox.tip("不能选择公共模型（"+nodes[i].name+"）请重新选择。");
-								top.layer.msg("不能选择公共模型（"+nodes[i].name+"）请重新选择。", {icon: 0});
-								return false;
-							}else if (nodes[i].module != "${module}"){
-								//top.$.jBox.tip("不能选择当前栏目以外的栏目模型，请重新选择。");
-								top.layer.msg("不能选择当前栏目以外的栏目模型，请重新选择。", {icon: 0});
-								return false;
-							}//</c:if>
-							ids.push(nodes[i].id);
-                            <c:if test="${retnParent}">
-                            var fName = '';
-                            fName = createFName(nodes[i],fName);
-                            parentIds.push(fName);
-                            </c:if>
-							names.push(nodes[i].name);//<c:if test="${!checked}">
-							break; // 如果为非复选框选择，则返回第一个选择  </c:if>
-						}
-						changeOffice(ids,names,parentIds);
-						top.layer.close(index);
-				    	       },
-    	cancel: function(index){ //或者使用btn2
-    	           //按钮【按钮二】的回调
-    	       }
-		}); 
-	
+			type: 2,
+			area: ['300px', '420px'],
+			title:"选择${title}",
+			ajaxData:{selectIds: $("#${id}Id").val()},
+			content: "${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}&flagOffice=${flagOffice}&selectIds="+selectIds ,
+			btn: ['确定', '关闭']
+			,yes: function(index, layero){ //或者使用btn1
+				var tree = layero.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents();
+				var ids = [], names = [],parentIds=[], nodes = [];
+				if ("${checked}" == "true"){
+					nodes = tree.getCheckedNodes(true);
+				}else{
+					nodes = tree.getSelectedNodes();
+				}
+				for(var i=0; i<nodes.length; i++) {//<c:if test="${checked && notAllowSelectParent}">
+					if (nodes[i].isParent){
+						continue; // 如果为复选框选择，则过滤掉父节点
+					}//</c:if><c:if test="${notAllowSelectRoot}">
+					if (nodes[i].level == 0){
+						//top.$.jBox.tip("不能选择根节点（"+nodes[i].name+"）请重新选择。");
+						top.layer.msg("不能选择根节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
+						return false;
+					}//</c:if><c:if test="${notAllowSelectParent}">
+					if (nodes[i].isParent){
+						//top.$.jBox.tip("不能选择父节点（"+nodes[i].name+"）请重新选择。");
+						//layer.msg('有表情地提示');
+						top.layer.msg("不能选择父节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
+						return false;
+					}//</c:if><c:if test="${not empty module && selectScopeModule}">
+					if (nodes[i].module == ""){
+						//top.$.jBox.tip("不能选择公共模型（"+nodes[i].name+"）请重新选择。");
+						top.layer.msg("不能选择公共模型（"+nodes[i].name+"）请重新选择。", {icon: 0});
+						return false;
+					}else if (nodes[i].module != "${module}"){
+						//top.$.jBox.tip("不能选择当前栏目以外的栏目模型，请重新选择。");
+						top.layer.msg("不能选择当前栏目以外的栏目模型，请重新选择。", {icon: 0});
+						return false;
+					}//</c:if>
+					ids.push(nodes[i].id);
+					<c:if test="${retnParent}">
+					var fName = '';
+					fName = createFName(nodes[i],fName);
+					parentIds.push(fName);
+					</c:if>
+					names.push(nodes[i].name);//<c:if test="${!checked}">
+					break; // 如果为非复选框选择，则返回第一个选择  </c:if>
+				}
+				changeOffice(ids,names,parentIds);
+				top.layer.close(index);
+			},
+			cancel: function(index){ //或者使用btn2
+				//按钮【按钮二】的回调
+			}
+		});
+
 	});
-    function createFName(node,fName) {
-        var parentNode = node.getParentNode();
-        if(parentNode!=null){
-            fName = createFName(parentNode,fName);
-            fName+="-";
-        }
-        fName+=node.name;
-        return fName;
-    }
+	function createFName(node,fName) {
+		var parentNode = node.getParentNode();
+		if(parentNode!=null){
+			fName = createFName(parentNode,fName);
+			fName+="-";
+		}
+		fName+=node.name;
+		return fName;
+	}
 </script>

src/main/webapp/static/common/css/style.css

@@ -8900,6 +8900,7 @@ th .layui-table-cell{
 }
 .form-group .nav-btns{
     padding-left: 16px;
+
 }
 .form-group-label h2{
     text-indent:12px;

src/main/webapp/webpage/modules/oa/oaNotifyForm.jsp

@@ -265,8 +265,9 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>公告范围-部门</h2></div>
+
+            <div class="layui-item layui-col-sm6" >
+                <div class="form-group-label" ><h2>公告范围-部门</h2></div>
                 <div class="layui-item nav-btns">
                     <sys:treeselectoffices id="offices" name="" value="" labelName="memberNameStr" labelValue=""
                                            retnParent="true" checked="true" notAllowSelectParent="true" title="部门" url="/sys/office/treeData?type=2"  cssClass="form-control " allowClear="true"/>
@@ -296,7 +297,8 @@
                     </tr>//-->
                 </script>
             </div>
-            <div class="form-group layui-row">
+
+            <div class="layui-item layui-col-sm6" >
                 <div class="form-group-label"><h2>公告范围-成员</h2></div>
                 <div class="layui-item nav-btns">
                     <sys:treeselectusers id="users" name="" value="" labelName="memberNameStr" labelValue=""

src/main/webapp/webpage/modules/oa/oaNotifyList.jsp

@@ -390,28 +390,42 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-row" id="queryDiv">
 
-			<form:form id="searchForm" modelAttribute="oaNotify" action="${ctx}/oa/oaNotify/${oaNotify.self?'self':''}" method="post" class="form-inline">
+			<form:form id="searchForm" modelAttribute="oaNotify" action="${ctx}/oa/oaNotify/list" method="post" class="form-inline">
 			<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 			<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-			<input id="toflag" name="toflag" type="hidden" value="1"/>
+<%--			<input id="toflag" name="toflag" type="hidden" value="1"/>--%>
 			<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
+
+
+
+
 				<div class="commonQuery">
 					<div class="layui-item query athird">
 						<label class="layui-form-label">公告标题：</label>
 						<div class="layui-input-block with-icon">
-							<form:input path="title" htmlEscape="false" maxlength="200"  class=" form-control layui-input"/>
+							<form:input path="title" htmlEscape="false" maxlength="200"  class=" form-control layui-input" />
 						</div>
 					</div>
 					<div class="layui-item query athird">
-						<label class="layui-form-label">公告类型：</label>
-						<div class="layui-input-block">
-							<form:select path="type"  class="form-control simple-select">
-								<form:option value="" label=""/>
-								<form:options items="${fns:getMainDictList('oa_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-							</form:select>
+						<label class="layui-form-label">公告文号：</label>
+						<div class="layui-input-block with-icon">
+							<form:input path="referenceNumber" htmlEscape="false" maxlength="200"  class=" form-control layui-input"/>
 						</div>
 					</div>
+
+
+
+
+<%--					<div class="layui-item query athird">--%>
+<%--						<label class="layui-form-label">公告类型：</label>--%>
+<%--						<div class="layui-input-block">--%>
+<%--							<form:select path="type"  class="form-control simple-select">--%>
+<%--								<form:option value="" label=""/>--%>
+<%--								<form:options value="${fns:getMainDictList('oa_notify_type')}" 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>
@@ -427,12 +441,7 @@
 					<div style="    clear:both;"></div>
 				</div>
 				<div id="moresees" style="clear:both;display:none;">
-					<div class="layui-item query athird">
-						<label class="layui-form-label">公告文号：</label>
-						<div class="layui-input-block with-icon">
-							<form:input path="referenceNumber" htmlEscape="false" maxlength="200"  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">
@@ -451,6 +460,15 @@
 							<form:input path="content" htmlEscape="false" maxlength="200"  class=" form-control layui-input"/>
 						</div>
 					</div>
+
+					<!-- 隐藏公告类型 可以重置 -->
+					<div class="layui-item query athird">
+						<div class="layui-input-block with-icon">
+							<input name="type" value="${oaNotify.type}" type="hidden">
+						</div>
+					</div>
+
+
 					<div class="layui-item query athird">
 						<label class="layui-form-label">创建人：</label>
 						<div class="layui-input-block with-icon">

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingList.jsp

@@ -255,6 +255,9 @@
 					}}
 				,{field:'projectReportNumber',align:'center', title: '报告号',minWidth:150}
 				,{field:'projId',align:'center', title: '项目编号',minWidth:150}
+				,{filed:'submitMoneyStr',align:'center',title: '项目等级' ,width:80,templet: function(d){
+						return "<font style = 'font-size:14px;'>"+d.submitMoneyStr+"</font>";
+					}}
 				,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
 						if(null == d.contract || '' == d.contract){
 							return "<span style=\"color:red\" title='无合同'>无合同</span>";
@@ -311,6 +314,15 @@
 					,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
 					,"projectStatus":"${projectRecords.projectStatus}"
 					,"procId":"${projectRecords.processInstanceId}"
+					,"submitMoneyStr":
+							<c:choose>
+							<c:when test="${'500'<= projectRecords.submitScale}">
+							"A级"
+					</c:when>
+					<c:otherwise>
+					"B级"
+					</c:otherwise>
+					</c:choose>
 					<shiro:hasPermission name="ruralProject:ruralProjectView:view">
 						,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					</shiro:hasPermission>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostList.jsp

@@ -198,6 +198,7 @@
 								<input type="text" input="workContractInfoClientName" name="workContractInfo.client.name" value="" 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">
@@ -255,6 +256,9 @@
 					}}
 				,{field:'projectReportNumber',align:'center', title: '报告号',minWidth:150}
 				,{field:'projId',align:'center', title: '项目编号',minWidth:150}
+				,{filed:'submitMoneyStr',align:'center',title: '项目等级' ,width:80,templet: function(d){
+                        return "<font style = 'font-size:14px;'>"+d.submitMoneyStr+"</font>";
+                    }}
 				,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
 						if(null == d.contract || '' == d.contract){
 							return "<span style=\"color:red\" title='无合同'>无合同</span>";
@@ -270,6 +274,8 @@
 						return "<span title=\"" + d.client + "\">" + d.client + "</span>";
 					}}
 				,{field:'createDate',align:'center', title: '创建日期',  width:80}
+				,{field:'beginDate',align:'center', title: '计划开始时间',  width:120}
+				,{field:'endDate',align:'center', title: '计划结束时间',  width:120}
 				,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
 						////对操作进行初始化
 						var xml="<div class=\"layui-btn-group\">";
@@ -309,8 +315,19 @@
 					,"conId":"${projectRecords.workContractInfo.id}"
 					,"client":"${projectRecords.workContractInfo.client.name}"
 					,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
+					,"beginDate":"<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"
+					,"endDate":"<fmt:formatDate value="${projectRecords.endDate}" pattern="yyyy-MM-dd"/>"
 					,"projectStatus":"${projectRecords.projectStatus}"
 					,"procId":"${projectRecords.processInstanceId}"
+					,"submitMoneyStr":
+							<c:choose>
+							<c:when test="${'500'<= projectRecords.submitScale}">
+							"A级"
+					</c:when>
+					<c:otherwise>
+					"B级"
+					</c:otherwise>
+					</c:choose>
 					<shiro:hasPermission name="ruralProject:ruralProjectView:view">
 						,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					</shiro:hasPermission>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/newReportedForm.jsp

@@ -1255,7 +1255,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedAudit.jsp

@@ -1267,7 +1267,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedModify.jsp

@@ -1249,7 +1249,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/submitReportedProvincialStandingForm.jsp

@@ -1249,7 +1249,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReportedForm.jsp

@@ -1213,7 +1213,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/adminReportEditForm.jsp

@@ -1725,9 +1725,18 @@
 											<input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center"  value="${status.index+1}" type="text" class="form-control contentDetail"/>
 										</td>
 										<td>
+											<c:choose>
+												<c:when test="${info.role == '咨询员'}">
+													<sys:reportedtreeselectUserZXY id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" value="${info.zixunyuan}" labelName="workAccountList[${status.index+1}].zixunyuan" labelValue="${info.zixunyuanName}"
+																				title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+												</c:when>
+												<c:otherwise>
+													<sys:reportedtreeselectUser id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" value="${info.zixunyuan}" labelName="workAccountList[${status.index+1}].zixunyuan" labelValue="${info.zixunyuanName}"
+																				title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+												</c:otherwise>
+											</c:choose>
 	<%--										<input id="reportedConsultantList${status.index+1}_zixunyuanName"  name="reportedConsultantList[${status.index+1}].zixunyuanName" value="${info.zixunyuanName}" class="form-control required"/>--%>
-											<sys:reportedtreeselectUser id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" value="${info.zixunyuan}" labelName="workAccountList[${status.index+1}].zixunyuan" labelValue="${info.zixunyuanName}"
-																		title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+
 										</td>
 
 										<td>
@@ -1765,7 +1774,7 @@
 											<input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
 										</td>
 										<td>
-											<sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+											<sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
 												title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 										</td>
 
@@ -2359,7 +2368,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="shangBaoList1{{idx}}_zixunyuan" name="recordsReported.reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="recordsReported.workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="shangBaoList1{{idx}}_role" readonly="true" name="recordsReported.reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

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

@@ -1276,7 +1276,7 @@
                                         <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
                                     </td>
                                     <td>
-                                        <sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+                                        <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
                                             title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 

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

@@ -1097,7 +1097,7 @@
                                         <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
                                     </td>
                                     <td>
-                                        <sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+                                        <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
                                             title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 

src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedModify.jsp

@@ -1210,7 +1210,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -105,18 +105,18 @@
                         parent.layer.msg("项目等级未填写!", {icon: 5});
                         return false;
                     }
-                    //200万以上部队或政府项目及500万以上其它项目为A级,其余为B级
-                    if(submitMoney==1){
-                        if (submitScale>500){
+                    //500万及500万以上为A及，500万以下为B及
+                    if(submitMoney==1 ){
+                        if (submitScale>=500){
                             parent.layer.msg("送审规模大于500万元,项目等级选择A级!", {icon: 5});
                             return false;
                         }
-                        if (projectProperties == 101 || projectProperties == 5){
-                            if (submitScale>200){
-                                parent.layer.msg("200万以上部队或政府项目,项目等级选择A级!", {icon: 5});
-                                return false;
-                            }
-                        }
+                        // if (projectProperties == 101 || projectProperties == 5){
+                        //     if (submitScale>200){
+                        //         parent.layer.msg("200万以上部队或政府项目,项目等级选择A级!", {icon: 5});
+                        //         return false;
+                        //     }
+                        // }
                     }
 
 
@@ -1102,7 +1102,8 @@
                         <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
                             <input type="radio" name="submitMoney" lay-filter="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
                         </c:forEach>
-                        <p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
+<%--                        <p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>--%>
+                        <p style="color: red;font-size: 12px;">500万及500万以上为A级，500万以下为B级</p>
                     </div>
                 </div>
 

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/projectReportRecordUrgentModify.jsp

@@ -561,7 +561,7 @@
                                         <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
                                     </td>
                                     <td>
-                                        <sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+                                        <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
                                             title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordUrgentModify.jsp

@@ -561,7 +561,7 @@
                                         <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
                                     </td>
                                     <td>
-                                        <sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+                                        <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
                                             title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordUrgentModifyApply.jsp

@@ -535,7 +535,7 @@
                                         <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
                                     </td>
                                     <td>
-                                        <sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+                                        <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
                                             title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordUrgentModifyApply.jsp

@@ -550,7 +550,7 @@
                                         <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
                                     </td>
                                     <td>
-                                        <sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+                                        <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
                                             title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 

src/main/webapp/webpage/modules/ruralprojectrecords/reported/import/reportedAudit.jsp

@@ -1202,7 +1202,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/reported/import/reportedForm.jsp

@@ -1194,7 +1194,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/reported/import/reportedModify.jsp

@@ -1177,7 +1177,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/reported/import/reportedView.jsp

@@ -1187,7 +1187,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/reported/reportedAudit.jsp

@@ -1259,7 +1259,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/reported/reportedForm.jsp

@@ -1251,7 +1251,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/reported/reportedModify.jsp

@@ -1235,7 +1235,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/adminReportEditFormAlls.jsp

@@ -1759,7 +1759,7 @@
 											<input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
 										</td>
 										<td>
-											<sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+											<sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
 												title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 										</td>
 
@@ -2353,7 +2353,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="shangBaoList1{{idx}}_zixunyuan" name="recordsReported.reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="recordsReported.workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="shangBaoList1{{idx}}_role" readonly="true" name="recordsReported.reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/newReported/reportedForm.jsp

@@ -1233,7 +1233,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/newReported/reportedModify.jsp

@@ -1235,7 +1235,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/adminReportEditForms.jsp

@@ -1755,7 +1755,7 @@
 											<input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
 										</td>
 										<td>
-											<sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+											<sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
 												title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 										</td>
 
@@ -2349,7 +2349,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="shangBaoList1{{idx}}_zixunyuan" name="recordsReported.reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="recordsReported.workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="shangBaoList1{{idx}}_role" readonly="true" name="recordsReported.reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementForm.jsp

@@ -1006,7 +1006,7 @@
                                         <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
                                     </td>
                                     <td>
-                                        <sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+                                        <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
                                             title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementMessageModify.jsp

@@ -873,7 +873,7 @@
                                         <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
                                     </td>
                                     <td>
-                                        <sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+                                        <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
                                             title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModify.jsp

@@ -829,7 +829,7 @@
                                         <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
                                     </td>
                                     <td>
-                                        <sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+                                        <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
                                             title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 

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

@@ -1173,7 +1173,7 @@
                                         <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
                                     </td>
                                     <td>
-                                        <sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+                                        <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
                                             title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify.jsp

@@ -799,7 +799,7 @@
                                         <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
                                     </td>
                                     <td>
-                                        <sys:reportedtreeselectUser id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+                                        <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
                                             title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedAudit.jsp

@@ -1225,7 +1225,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedForm.jsp

@@ -1199,7 +1199,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedModify.jsp

@@ -1235,7 +1235,7 @@
                                     </td>
                                     <td>
                                         <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                            title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/view/ruralProjectRecordsView.jsp

@@ -270,7 +270,8 @@
 						<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
 							<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
 						</c:forEach>
-						<p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
+<%--						<p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>--%>
+						<p style="color: red;font-size: 12px;">500万及500万以上为A级，500万以下为B级</p>
 						<%--<form:select path="submitMoney" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">
 							<form:option value=""/>
 							<form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>

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

@@ -28,11 +28,14 @@
 <div class="wrapper wrapper-content full-width" id="divId">
 	<sys:message content="${message}"/>
 	<div id="content" class="pr full-height full-width">
+
 		<div id="left"  class="contentShadow fl contents">
 			<div class="ztreeContainer">
 				<div id="ztree" class="ztree leftBox-content"></div>
 			</div>
 		</div>
+
+
 		<div id="right"  class="fl contents">
 			<div class="layui-row contentShadow full-height tran-bg">
 					<iframe id="userContent" name="userContent" src="${ctx}/sys/role/list" width="100%" height="100%" frameborder="0"></iframe>

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

@@ -877,7 +877,7 @@
             <div id="msg-bord" class="call-bord-content contentShadow">
                 <div class="bord-left">
                     <div class="bord-left-content">
-                        <div class="bord-title">公告信息(${count1})</div>
+                        <div class="bord-title" >公告信息(${count1})</div>
                         <%--<div class="bord-pic"><img src="${ctxStatic}/common/img/icon03.png" height="100%" /></div>--%>
                         <%--<div class="bord-num">${count1}</div>--%>
                     </div>

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

@@ -101,7 +101,8 @@
 			var value = $.trim(key.get(0).value);
 			
 			// 按名字查询
-			var keyType = "name";<%--
+			var keyType = "name";
+			<%--
 			if (key.hasClass("empty")) {
 				value = "";
 			}--%>
@@ -126,15 +127,15 @@
 		}
 		
 		//隐藏所有节点
-		function hideAllNode(nodes){			
+		function hideAllNode(nodes){
 			nodes = tree.transformToArray(nodes);
 			for(var i=nodes.length-1; i>=0; i--) {
 				tree.hideNode(nodes[i]);
 			}
 		}
-		
+
 		//显示所有节点
-		function showAllNode(nodes){			
+		function showAllNode(nodes){
 			nodes = tree.transformToArray(nodes);
 			for(var i=nodes.length-1; i>=0; i--) {
 				/* if(!nodes[i].isParent){
@@ -155,9 +156,9 @@
 		function updateNodes(nodeList) {
 			tree.showNodes(nodeList);
 			for(var i=0, l=nodeList.length; i<l; i++) {
-				
+
 				//展开当前节点的父节点
-				tree.showNode(nodeList[i].getParentNode()); 
+				tree.showNode(nodeList[i].getParentNode());
 				//tree.expandNode(nodeList[i].getParentNode(), true, false, false);
 				//显示展开符合条件节点的父节点
 				while(nodeList[i].getParentNode()!=null){

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

@@ -8,7 +8,7 @@
 	<script type="text/javascript">
 		var key, lastValue = "", nodeList = [], type = getQueryString("type", "${url}");
 		var tree, setting = {view:{selectedMulti:false,dblClickExpand:false},check:{enable:"${checked}",nocheckInherit:true},
-				async:{enable:(type==5),url:"${ctx}/sys/user/treeDataByNameOnReportedZXY",autoParam:["id=officeId","projectId=projectId","selectName=selectName"]},
+				async:{enable:(type==4),url:"${ctx}/sys/user/treeDataByNameOnReportedZXY",autoParam:["id=officeId","projectId=projectId","selectName=selectName"]},
 				data:{simpleData:{enable:true}},callback:{<%--
 					beforeClick: function(treeId, treeNode){
 						if("${checked}" == "true"){