Explorar el Código

人员查询选择框修改

user5 hace 4 años
padre
commit
c243aa1518
Se han modificado 24 ficheros con 596 adiciones y 23 borrados
  1. 1 1
      src/main/java/com/jeeplus/common/utils/excel/ExportExcel.java
  2. 4 4
      src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java
  3. 4 0
      src/main/java/com/jeeplus/modules/workclientinfo/web/WorkClientInfoController.java
  4. 3 0
      src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java
  5. 246 0
      src/main/resources/mappings/modules/projectrecord/ProjectImplementEarlyDao.xml
  6. 104 0
      src/main/webapp/WEB-INF/tags/sys/inquireselectUser.tag
  7. 104 0
      src/main/webapp/WEB-INF/tags/sys/inquireselectUserNotReadolny.tag
  8. 111 0
      src/main/webapp/WEB-INF/tags/sys/inquiretreeselectusers.tag
  9. 1 1
      src/main/webapp/webpage/modules/projectrecord/projectRecordUsersForm.jsp
  10. 2 2
      src/main/webapp/webpage/modules/projectrecord/projectRecordsAudit.jsp
  11. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedForm.jsp
  12. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedFormPerson.jsp
  13. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedModify.jsp
  14. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp
  15. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsModify.jsp
  16. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp
  17. 2 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsModify.jsp
  18. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedAudit.jsp
  19. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedForm.jsp
  20. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedFormPerson.jsp
  21. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedModify.jsp
  22. 1 1
      src/main/webapp/webpage/modules/workclientinfo/workClientInfoList.jsp
  23. 1 1
      src/main/webapp/webpage/modules/workinvoice/workInvoiceList.jsp
  24. 2 2
      src/main/webapp/webpage/modules/workreimbursement/workReimbursementList.jsp

+ 1 - 1
src/main/java/com/jeeplus/common/utils/excel/ExportExcel.java

@@ -453,7 +453,7 @@ public class ExportExcel {
 			}else{
 				cell.setCellValue(headerList.get(i));
 			}
-			sheet.autoSizeColumn(i);
+			//sheet.autoSizeColumn(i);
 		}
 		for (int i = 0; i < headerList.size(); i++) {  
 			int colWidth = sheet.getColumnWidth(i)*2;

+ 4 - 4
src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -320,15 +320,15 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 		this.workClientLinkmanList = workClientLinkmanList;
 	}
 
-	@ExcelField(title="工程概况", align=2, sort=16)
+	@ExcelField(title="工程概况", align=2, sort=14)
 	public String getProjectDesc() {
 		return projectDesc;
 	}
-	@ExcelField(title="特殊要求", align=2, sort=17)
+	@ExcelField(title="特殊要求", align=2, sort=15)
 	public String getRemarks() {
 		return remarks;
 	}
-	@ExcelField(title="创建日期", align=2, sort=18)
+	@ExcelField(title="创建日期", align=2, sort=16)
 	public Date getCreateDate() {
 		return createDate;
 	}
@@ -361,7 +361,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 		this.workConstructionLinkmanList = workConstructionLinkmanList;
 	}
 
-    @ExcelField(title="项目状态", align=2, sort=19,dictType = "audit_state")
+    @ExcelField(title="项目状态", align=2, sort=17,dictType = "audit_state")
 	public Integer getProjectStatus() {
 		return projectStatus;
 	}

+ 4 - 0
src/main/java/com/jeeplus/modules/workclientinfo/web/WorkClientInfoController.java

@@ -89,6 +89,10 @@ public class WorkClientInfoController extends BaseController {
 		if(StringUtils.isNotBlank(workClientInfo.getCreateId())){
 			User selectUser = UserUtils.get(workClientInfo.getCreateId());
 			model.addAttribute("createName", selectUser.getName());
+		}else{
+			if(StringUtils.isNotBlank(workClientInfo.getCreateNameStr())){
+				model.addAttribute("createName", workClientInfo.getCreateNameStr());
+			}
 		}
 		WorkClientLinkman workClientLinkman = workClientInfo.getWorkClientLinkman();
 		if(workClientLinkman != null){

+ 3 - 0
src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -903,6 +903,9 @@ public class WorkFullManageController extends BaseController {
 				data.put("entrustUnit","");
 			}
 			data.put("contractNumber",workContractInfo.getContractNum());
+		}else{
+			data.put("entrustUnit","");
+			data.put("contractNumber","");
 		}
 		//约定作业期
 		data.put("promiseTime",promiseTime);

+ 246 - 0
src/main/resources/mappings/modules/projectrecord/ProjectImplementEarlyDao.xml

@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.projectrecord.dao.ProjectImplementEarlyDao">
+
+	<sql id="projectRecordsColumns">
+		a.id AS "id",
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.del_flag AS "delFlag",
+		a.contract_id AS "workContractInfo.id",
+		a.project_id AS "projectId",
+		a.project_name AS "projectName",
+		a.scale_type AS "scaleType",
+		a.scale_unit AS "scaleUnit",
+		a.scale_quantity AS "scaleQuantity",
+		a.area_id AS "area.id",
+		a.project_site AS "projectSite",
+		a.project_desc AS "projectDesc",
+		a.remarks AS "remarks",
+		a.status AS "projectStatus",
+		a.process_instance_id AS "processInstanceId",
+		a.company_id AS "company.id",
+		a.office_id AS "office.id",
+		a.alter_process_id AS "alterProcessId",
+		area.name AS "area.name",
+		a.province,
+		a.city,
+		a.area_name AS "county",
+		a.project_structure AS "projectStructure",
+		a.on_ground_num AS "onGroundNum",
+		a.under_ground_num AS "underGroundNum",
+		a.building_scale AS "buildingScale",
+		a.measuring_unit AS "measuringUnit",
+		a.project_use AS "projectUse",
+		a.install_fees AS "installFees",
+		a.building_fees AS "buildingFees",
+		a.building_percent AS "buildingPercent",
+		a.install_percent AS "installPercent",
+		a.unit_fees AS "unitFees",
+		a.building_unit_fees AS "buildingUnitFees",
+		a.install_unit_fees AS "installUnitFees",
+		a.total_fees AS "totalFees",
+		a.type_id As "projectTypeId"
+	</sql>
+	
+	<sql id="projectRecordsJoins">
+		LEFT JOIN sys_area area ON area.id = a.area_id
+	</sql>
+	
+	<select id="getProjectRecodesList" resultType="ProjectImplementEarly" >
+		SELECT
+			<include refid="projectRecordsColumns"/>
+		,
+		wci.name AS "workContractInfo.name",
+		wct.id AS "workContractInfo.client.id",
+		wct.name AS "workContractInfo.client.name",
+		o.top_company AS "office.name",
+		dsu.name as "projectRegistrant",
+		pci.id as projectContentId
+		FROM rural_project_records a
+		<include refid="projectRecordsJoins"/>
+		LEFT JOIN work_project_user w on a.id = w.project_id
+		LEFT JOIN project_content_info pci on pci.project_id = a.id
+		LEFT JOIN sys_user su on w.user_id = su.id
+		LEFT JOIN sys_user dsu on a.create_by = dsu.id
+        LEFT JOIN work_project_user w1 on a.id = w1.project_id
+		LEFT JOIN work_contract_info wci on a.contract_id = wci.id
+		LEFT JOIN work_client_info wct on wci.client_id = wct.id
+        LEFT JOIN sys_office o ON o.id = a.office_id
+		<where>
+			a.status = 5
+            AND a.del_flag = 0
+			<if test="projectId != null and projectId != ''">
+				AND a.project_id like concat('%',#{projectId},'%')
+			</if>
+			<if test="projectName != null and projectName != ''">
+				AND a.project_name like concat(concat('%',#{projectName}),'%')
+			</if>
+			<if test="scaleType != null and scaleType != ''">
+				AND a.scale_type = #{scaleType}
+			</if>
+			<if test="scaleUnit != null and scaleUnit != ''">
+				AND a.scale_unit = #{scaleUnit}
+			</if>
+			<if test="scaleQuantity != null and scaleQuantity != ''">
+				AND a.scale_quantity = #{scaleQuantity}
+			</if>
+			<if test="projectSite != null and projectSite != ''">
+				AND a.project_site LIKE concat('%',#{projectSite},'%')
+			</if>
+			<if test="remarks != null and remarks != ''">
+				AND a.remarks LIKE concat('%',#{remarks},'%')
+			</if>
+			<if test="projectDesc != null and projectDesc != ''">
+				AND a.project_desc LIKE concat('%',#{projectDesc},'%')
+			</if>
+			<if test="area != null and area.id != null and area.id != ''">
+				AND a.area_id = #{area.id}
+			</if>
+			<if test="workContractInfo !=null and workContractInfo.name !=null and workContractInfo.name !=''">
+				AND wci.name like concat(concat('%',#{workContractInfo.name}),'%')
+			</if>
+			<if test="workContractInfo !=null and workContractInfo.contractNum !=null and workContractInfo.contractNum !=''">
+				AND wci.contract_num like concat(concat('%',#{workContractInfo.contractNum}),'%')
+			</if>
+			<if test="workContractInfo !=null and workContractInfo.contractPrice !=null and workContractInfo.contractPrice !=''">
+				AND wci.contract_price = #{workContractInfo.contractPrice}
+			</if>
+			<if test="workContractInfo !=null and workContractInfo.contractType !=null and workContractInfo.contractType !=''">
+				AND wci.contract_type = #{workContractInfo.contractType}
+			</if>
+			<if test="workContractInfo!=null and workContractInfo.client !=null and workContractInfo.client.name !=null and workContractInfo.client.name !=''">
+				AND wct.name like concat(concat('%',#{workContractInfo.client.name}),'%')
+			</if>
+			<if test="leaderNameStr !=null and leaderNameStr !=''">
+				AND su.name like concat(concat('%',#{leaderNameStr}),'%') AND w.is_master = '1' AND w.del_flag='0'
+			</if>
+			<if test="beginDate !=null">
+				AND a.create_date >= #{beginDate}
+			</if>
+			<if test="endDate !=null">
+				AND a.create_date &lt; #{endDate}
+			</if>
+			<if test="projectType !=null and projectType !=''">
+				AND a.project_type = #{projectType}
+			</if>
+            <if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
+               AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id} )${sqlMap.dsf} )
+            </if>
+		</where>
+            GROUP BY a.id
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+
+    <select id="getProjectRecodesCount" resultType="int" >
+        SELECT count(DISTINCT a.id)
+        FROM rural_project_records a
+        <if test="leaderNameStr !=null and leaderNameStr !=''">
+            LEFT JOIN work_project_user w on a.id = w.project_id
+            LEFT JOIN sys_user su on w.user_id = su.id
+        </if>
+        LEFT JOIN work_project_user w1 on a.id = w1.project_id
+        <if test="workContractInfo !=null">
+            LEFT JOIN work_contract_info wci on a.contract_id = wci.id
+        </if>
+        <if test="workContractInfo!=null and workContractInfo.client !=null and workContractInfo.client.name !=null and workContractInfo.client.name !=''">
+            LEFT JOIN work_client_info wct on wci.client_id = wct.id
+        </if>
+        <where>
+			a.status = 5
+            AND a.del_flag = 0
+			<if test="projectId != null and projectId != ''">
+				AND a.project_id like concat('%',#{projectId},'%')
+			</if>
+			<if test="projectName != null and projectName != ''">
+				AND a.project_name like concat(concat('%',#{projectName}),'%')
+			</if>
+			<if test="scaleType != null and scaleType != ''">
+				AND a.scale_type = #{scaleType}
+			</if>
+			<if test="scaleUnit != null and scaleUnit != ''">
+				AND a.scale_unit = #{scaleUnit}
+			</if>
+			<if test="scaleQuantity != null and scaleQuantity != ''">
+				AND a.scale_quantity = #{scaleQuantity}
+			</if>
+			<if test="projectSite != null and projectSite != ''">
+				AND a.project_site LIKE concat('%',#{projectSite},'%')
+			</if>
+			<if test="remarks != null and remarks != ''">
+				AND a.remarks LIKE concat('%',#{remarks},'%')
+			</if>
+			<if test="projectDesc != null and projectDesc != ''">
+				AND a.project_desc LIKE concat('%',#{projectDesc},'%')
+			</if>
+			<if test="area != null and area.id != null and area.id != ''">
+				AND a.area_id = #{area.id}
+			</if>
+			<if test="workContractInfo !=null and workContractInfo.name !=null and workContractInfo.name !=''">
+				AND wci.name like concat(concat('%',#{workContractInfo.name}),'%')
+			</if>
+			<if test="workContractInfo !=null and workContractInfo.contractNum !=null and workContractInfo.contractNum !=''">
+				AND wci.contract_num like concat(concat('%',#{workContractInfo.contractNum}),'%')
+			</if>
+			<if test="workContractInfo !=null and workContractInfo.contractPrice !=null and workContractInfo.contractPrice !=''">
+				AND wci.contract_price = #{workContractInfo.contractPrice}
+			</if>
+			<if test="workContractInfo !=null and workContractInfo.contractType !=null and workContractInfo.contractType !=''">
+				AND wci.contract_type = #{workContractInfo.contractType}
+			</if>
+			<if test="workContractInfo!=null and workContractInfo.client !=null and workContractInfo.client.name !=null and workContractInfo.client.name !=''">
+				AND wct.name like concat(concat('%',#{workContractInfo.client.name}),'%')
+			</if>
+			<if test="leaderNameStr !=null and leaderNameStr !=''">
+				AND su.name like concat(concat('%',#{leaderNameStr}),'%') AND w.is_master = '1' AND w.del_flag='0'
+			</if>
+			<if test="beginDate !=null">
+				AND a.create_date >= #{beginDate}
+			</if>
+			<if test="endDate !=null">
+				AND a.create_date &lt; #{endDate}
+			</if>
+			<if test="projectType !=null and projectType !=''">
+				AND a.project_type = #{projectType}
+			</if>
+            <if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
+                AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id})${sqlMap.dsf} )
+            </if>
+        </where>
+    </select>
+
+	<insert id="saveProjectAndAttachmentContact">
+		insert into project_attachment_info (project_id, attachment_id)
+		values
+  		(#{projectId}, #{attachmentId})
+	</insert>
+
+	<insert id="saveProjectContrntAndReport">
+		insert into project_content_report (content_id, report_id)
+		values
+  		(#{contentId}, #{reportId})
+	</insert>
+
+	<select id="getProjectContrntAndReport" resultType="java.lang.Integer">
+		select count(1) as count from project_content_report where content_id = #{contentId} and report_id = #{reportId}
+	</select>
+
+	<insert id="saveProjectContrntAndBasedId">
+		insert into project_content_based_relation (content_id, based_id)
+		values
+  		(#{contentId}, #{basedId})
+	</insert>
+
+	<delete id="delProjectContrntAndBasedId">
+		delete from project_content_based_relation where content_id = #{contentId} and based_id = #{basedId}
+	</delete>
+</mapper>

+ 104 - 0
src/main/webapp/WEB-INF/tags/sys/inquireselectUser.tag

@@ -0,0 +1,104 @@
+<%@ tag language="java" pageEncoding="UTF-8"%>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ attribute name="id" type="java.lang.String" required="true" description="编号"%>
+<%@ attribute name="name" type="java.lang.String" required="true" description="隐藏域名称(ID)"%>
+<%@ attribute name="value" type="java.lang.String" required="true" description="隐藏域值(ID)"%>
+<%@ attribute name="labelName" type="java.lang.String" required="true" description="输入框名称(Name)"%>
+<%@ attribute name="labelValue" type="java.lang.String" required="true" description="输入框值(Name)"%>
+<%@ attribute name="title" type="java.lang.String" required="true" description="选择框标题"%>
+<%@ attribute name="url" type="java.lang.String" required="true" description="树结构数据地址"%>
+<%@ attribute name="checked" type="java.lang.Boolean" required="false" description="是否显示复选框,如果不需要返回父节点,请设置notAllowSelectParent为true"%>
+<%@ attribute name="extId" type="java.lang.String" required="false" description="排除掉的编号(不能选择的编号)"%>
+<%@ attribute name="isAll" type="java.lang.Boolean" required="false" description="是否列出全部数据,设置true则不进行数据权限过滤(目前仅对Office有效)"%>
+<%@ attribute name="notAllowSelectRoot" type="java.lang.Boolean" required="false" description="不允许选择根节点"%>
+<%@ attribute name="notAllowSelectParent" type="java.lang.Boolean" required="false" description="不允许选择父节点"%>
+<%@ attribute name="module" type="java.lang.String" required="false" description="过滤栏目模型(只显示指定模型,仅针对CMS的Category树)"%>
+<%@ attribute name="selectScopeModule" type="java.lang.Boolean" required="false" description="选择范围内的模型(控制不能选择公共模型,不能选择本栏目外的模型)(仅针对CMS的Category树)"%>
+<%@ attribute name="allowClear" type="java.lang.Boolean" required="false" description="是否允许清除"%>
+<%@ attribute name="allowInput" type="java.lang.Boolean" required="false" description="文本框可填写"%>
+<%@ attribute name="cssClass" type="java.lang.String" required="false" description="css样式"%>
+<%@ attribute name="cssStyle" type="java.lang.String" required="false" description="css样式"%>
+<%@ attribute name="smallBtn" type="java.lang.Boolean" required="false" description="缩小按钮显示"%>
+<%@ 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="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		class="${cssClass}" style="${cssStyle}"/>
+		<span class="input-group-btn">
+	       		 <button type="button"  id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>
+	             </button>
+       		 </span>
+    </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
+		if ($("#${id}Button").hasClass("disabled")){
+			return true;
+		}
+		// 正常打开	
+		top.layer.open({
+		    type: 2, 
+		    area: ['300px', '420px'],
+		    title:"选择${title}",
+		    ajaxData:{selectIds: $("#${id}Id").val()},
+		    content: "${ctx}/tag/treeselectReimbur?url="+encodeURIComponent("${url}")+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}" ,
+		    btn: ['确定', '关闭']
+    	       ,yes: function(index, layero){ //或者使用btn1
+						var tree = layero.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents();
+						var ids = [], names = [],officeIds = [], 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);
+							names.push(nodes[i].name);
+							officeIds.push(nodes[i].officeId);
+							//<c:if test="${!checked}">
+							break; // 如果为非复选框选择,则返回第一个选择  </c:if>
+						}
+						/*if(ids.length>1){
+							top.layer.msg("不能进行多选,请重新选择。", {icon: 0});
+							return false;
+						}*/
+						$("#${id}Id").val(ids.join(",").replace(/u_/ig,""));
+						$("#${id}Name").val(names.join(","));
+						$("#${id}officeId").val(officeIds.join(","));
+						console.log(officeIds)
+						$("#${id}Name").focus();
+						top.layer.close(index);
+				    	       },
+    	cancel: function(index){ //或者使用btn2
+    	           //按钮【按钮二】的回调
+    	       }
+		}); 
+	
+	});
+</script>

+ 104 - 0
src/main/webapp/WEB-INF/tags/sys/inquireselectUserNotReadolny.tag

@@ -0,0 +1,104 @@
+<%@ tag language="java" pageEncoding="UTF-8"%>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ attribute name="id" type="java.lang.String" required="true" description="编号"%>
+<%@ attribute name="name" type="java.lang.String" required="true" description="隐藏域名称(ID)"%>
+<%@ attribute name="value" type="java.lang.String" required="true" description="隐藏域值(ID)"%>
+<%@ attribute name="labelName" type="java.lang.String" required="true" description="输入框名称(Name)"%>
+<%@ attribute name="labelValue" type="java.lang.String" required="true" description="输入框值(Name)"%>
+<%@ attribute name="title" type="java.lang.String" required="true" description="选择框标题"%>
+<%@ attribute name="url" type="java.lang.String" required="true" description="树结构数据地址"%>
+<%@ attribute name="checked" type="java.lang.Boolean" required="false" description="是否显示复选框,如果不需要返回父节点,请设置notAllowSelectParent为true"%>
+<%@ attribute name="extId" type="java.lang.String" required="false" description="排除掉的编号(不能选择的编号)"%>
+<%@ attribute name="isAll" type="java.lang.Boolean" required="false" description="是否列出全部数据,设置true则不进行数据权限过滤(目前仅对Office有效)"%>
+<%@ attribute name="notAllowSelectRoot" type="java.lang.Boolean" required="false" description="不允许选择根节点"%>
+<%@ attribute name="notAllowSelectParent" type="java.lang.Boolean" required="false" description="不允许选择父节点"%>
+<%@ attribute name="module" type="java.lang.String" required="false" description="过滤栏目模型(只显示指定模型,仅针对CMS的Category树)"%>
+<%@ attribute name="selectScopeModule" type="java.lang.Boolean" required="false" description="选择范围内的模型(控制不能选择公共模型,不能选择本栏目外的模型)(仅针对CMS的Category树)"%>
+<%@ attribute name="allowClear" type="java.lang.Boolean" required="false" description="是否允许清除"%>
+<%@ attribute name="allowInput" type="java.lang.Boolean" required="false" description="文本框可填写"%>
+<%@ attribute name="cssClass" type="java.lang.String" required="false" description="css样式"%>
+<%@ attribute name="cssStyle" type="java.lang.String" required="false" description="css样式"%>
+<%@ attribute name="smallBtn" type="java.lang.Boolean" required="false" description="缩小按钮显示"%>
+<%@ 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}" type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		class="${cssClass}" style="${cssStyle}"/>
+		<span class="input-group-btn">
+	       		 <button type="button"  id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>
+	             </button>
+       		 </span>
+    </div>
+	 <label id="${id}Name-error" class="error" for="${id}Name" style="display:none"></label>
+<script type="text/javascript">
+	$("#${id}Button").click(function(){
+		// 是否限制选择,如果限制,设置为disabled
+		if ($("#${id}Button").hasClass("disabled")){
+			return true;
+		}
+		// 正常打开	
+		top.layer.open({
+		    type: 2, 
+		    area: ['300px', '420px'],
+		    title:"选择${title}",
+		    ajaxData:{selectIds: $("#${id}Id").val()},
+		    content: "${ctx}/tag/treeselectReimbur?url="+encodeURIComponent("${url}")+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}" ,
+		    btn: ['确定', '关闭']
+    	       ,yes: function(index, layero){ //或者使用btn1
+						var tree = layero.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents();
+						var ids = [], names = [],officeIds = [], 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);
+							names.push(nodes[i].name);
+							officeIds.push(nodes[i].officeId);
+							//<c:if test="${!checked}">
+							break; // 如果为非复选框选择,则返回第一个选择  </c:if>
+						}
+						if(ids.length>1){
+							top.layer.msg("不能进行多选,请重新选择。", {icon: 0});
+							return false;
+						}
+						$("#${id}Id").val(ids.join(",").replace(/u_/ig,""));
+						$("#${id}Name").val(names.join(","));
+						$("#${id}officeId").val(officeIds.join(","));
+						console.log(officeIds)
+						$("#${id}Name").focus();
+						top.layer.close(index);
+				    	       },
+    	cancel: function(index){ //或者使用btn2
+    	           //按钮【按钮二】的回调
+    	       }
+		}); 
+	
+	});
+</script>

+ 111 - 0
src/main/webapp/WEB-INF/tags/sys/inquiretreeselectusers.tag

@@ -0,0 +1,111 @@
+<%@ tag language="java" pageEncoding="UTF-8"%>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ attribute name="id" type="java.lang.String" required="true" description="编号"%>
+<%@ attribute name="name" type="java.lang.String" required="true" description="隐藏域名称(ID)"%>
+<%@ attribute name="value" type="java.lang.String" required="true" description="隐藏域值(ID)"%>
+<%@ attribute name="labelName" type="java.lang.String" required="true" description="输入框名称(Name)"%>
+<%@ attribute name="labelValue" type="java.lang.String" required="true" description="输入框值(Name)"%>
+<%@ attribute name="title" type="java.lang.String" required="true" description="选择框标题"%>
+<%@ attribute name="url" type="java.lang.String" required="true" description="树结构数据地址"%>
+<%@ attribute name="checked" type="java.lang.Boolean" required="false" description="是否显示复选框,如果不需要返回父节点,请设置notAllowSelectParent为true"%>
+<%@ attribute name="extId" type="java.lang.String" required="false" description="排除掉的编号(不能选择的编号)"%>
+<%@ attribute name="isAll" type="java.lang.Boolean" required="false" description="是否列出全部数据,设置true则不进行数据权限过滤(目前仅对Office有效)"%>
+<%@ attribute name="notAllowSelectRoot" type="java.lang.Boolean" required="false" description="不允许选择根节点"%>
+<%@ attribute name="notAllowSelectParent" type="java.lang.Boolean" required="false" description="不允许选择父节点"%>
+<%@ attribute name="retnParent" type="java.lang.Boolean" required="false" description="是否带回父节点"%>
+<%@ attribute name="module" type="java.lang.String" required="false" description="过滤栏目模型(只显示指定模型,仅针对CMS的Category树)"%>
+<%@ attribute name="selectScopeModule" type="java.lang.Boolean" required="false" description="选择范围内的模型(控制不能选择公共模型,不能选择本栏目外的模型)(仅针对CMS的Category树)"%>
+<%@ attribute name="allowClear" type="java.lang.Boolean" required="false" description="是否允许清除"%>
+<%@ attribute name="allowInput" type="java.lang.Boolean" required="false" description="文本框可填写"%>
+<%@ attribute name="cssClass" type="java.lang.String" required="false" description="css样式"%>
+<%@ attribute name="cssStyle" type="java.lang.String" required="false" description="css样式"%>
+<%@ attribute name="smallBtn" type="java.lang.Boolean" required="false" description="缩小按钮显示"%>
+<%@ 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}" />
+		<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="hidden" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		class="${cssClass}" "/>
+	       		 <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>
+
+	 <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
+		if ($("#${id}Button").hasClass("disabled")){
+			return true;
+		}
+        var selectIds = getSelectUserIds();
+		// 正常打开	
+		top.layer.open({
+		    type: 2, 
+		    area: ['300px', '420px'],
+		    title:"选择${title}",
+		    ajaxData:{selectIds: $("#${id}Id").val()},
+		    content: "${ctx}/tag/treeselectReimbur?url="+encodeURIComponent("${url}")+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}&selectIds="+selectIds ,
+		    btn: ['确定', '关闭']
+    	       ,yes: function(index, layero){ //或者使用btn1
+						var tree = layero.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents();
+						var ids = [], names = [],parents=[], 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 pName = "";
+                            pName = createPName(nodes[i],pName);
+                            pName = pName.substring(1) ;
+                            parents.push(pName);
+                            </c:if>
+							names.push(nodes[i].name);//<c:if test="${!checked}">
+							break; // 如果为非复选框选择,则返回第一个选择  </c:if>
+						}
+						$("#${id}Name").focus();
+						var ids = ids.join(",").replace(/u_/ig,"");
+						var names = names.join(",");
+						changeUser(ids,names,parents);
+						top.layer.close(index);
+				    	       },
+    	cancel: function(index){ //或者使用btn2
+    	           //按钮【按钮二】的回调
+    	       }
+		}); 
+	
+	});
+    function createPName(node,pName) {
+        var parentNode = node.getParentNode();
+        if(parentNode!=null){
+            pName = createPName(parentNode,pName);
+            pName+="-";
+            pName+=parentNode.name;
+        }
+        return pName;
+    }
+</script>

+ 1 - 1
src/main/webapp/webpage/modules/projectrecord/projectRecordUsersForm.jsp

@@ -179,7 +179,7 @@
 	<div class="form-group layui-row">
 		<div class="form-group-label"><h2>成员明细</h2></div>
 		<div class="layui-item nav-btns">
-			<sys:treeselectusers id="members" name="projectMembers" value="${projectRecords.memberIds}" labelName="memberNameStr" labelValue="${projectRecords.memberNameStr}"
+			<sys:inquiretreeselectusers id="members" name="projectMembers" value="${projectRecords.memberIds}" labelName="memberNameStr" labelValue="${projectRecords.memberNameStr}"
 								 title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required" allowClear="true" notAllowSelectParent="true"/>
 			<%--<a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增</a>--%>
 		</div>

+ 2 - 2
src/main/webapp/webpage/modules/projectrecord/projectRecordsAudit.jsp

@@ -220,9 +220,9 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label"><span class="require-item">*</span>项目负责人:</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>项目负责人:</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselectt id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
+                        <sys:inquireselectUser id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
                                          title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
 				</div>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedForm.jsp

@@ -578,7 +578,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目负责人:</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselect id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
+                        <sys:inquireselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedFormPerson.jsp

@@ -578,7 +578,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目负责人:</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselect id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
+                        <sys:inquireselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedModify.jsp

@@ -600,7 +600,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目负责人:</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselect id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
+                        <sys:inquireselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -802,7 +802,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  with-icon">
-                        <sys:treeselect id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
+                        <sys:inquireselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsModify.jsp

@@ -825,7 +825,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  with-icon">
-                        <sys:treeselect id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
+                        <sys:inquireselectUser id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
                                          title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -823,7 +823,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  with-icon">
-                        <sys:treeselect id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
+                        <sys:inquireselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
                                          title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>

+ 2 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsModify.jsp

@@ -5,6 +5,7 @@
 	<title>项目管理</title>
 	<meta name="decorator" content="default"/>
 	<script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
+	<script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <style>
         #projectDesc-error{
@@ -815,7 +816,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  with-icon">
-                        <sys:treeselect id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
+                        <sys:inquireselectUser id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
                                          title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedAudit.jsp

@@ -606,7 +606,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目负责人:</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselect id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
+                        <sys:inquireselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedForm.jsp

@@ -594,7 +594,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目负责人:</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselect id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
+                        <sys:inquireselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedFormPerson.jsp

@@ -594,7 +594,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目负责人:</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselect id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
+                        <sys:inquireselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedModify.jsp

@@ -599,7 +599,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询项目负责人:</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselect id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
+                        <sys:inquireselectUser id="master" name="xmFZR" value="${ruralProjectRecordsReported.xmFZR}" labelName="leaderNameStr" labelValue="${ruralProjectRecordsReported.leaderNameStr}"
                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>

+ 1 - 1
src/main/webapp/webpage/modules/workclientinfo/workClientInfoList.jsp

@@ -190,7 +190,7 @@
 						<div class="layui-item query athird">
 							<label class="layui-form-label">创建人:</label>
 							<div class="layui-input-block  with-icon">
-								<sys:clienttreeselect id="create" name="createId" value="${createId}" labelName="createNameStr" labelValue="${createName}"
+								<sys:inquireselectUserNotReadolny id="create" name="createId" value="${createId}" labelName="createNameStr" labelValue="${createName}"
 													  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 							</div>
 						</div>

+ 1 - 1
src/main/webapp/webpage/modules/workinvoice/workInvoiceList.jsp

@@ -418,7 +418,7 @@
 						<div class="layui-item query athird">
 							<label class="layui-form-label">经办人:</label>
 							<div class="layui-input-block with-icon">
-								<sys:treeselect id="submitterId" name="submitterId" value="${workInvoice.submitterId}" labelName="submitterName" labelValue="${workInvoice.submitterName}"
+								<sys:inquireselectUser id="submitterId" name="submitterId" value="${workInvoice.submitterId}" labelName="submitterName" labelValue="${workInvoice.submitterName}"
 												title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
 							</div>
 						</div>

+ 2 - 2
src/main/webapp/webpage/modules/workreimbursement/workReimbursementList.jsp

@@ -87,14 +87,14 @@
                         <div class="layui-item query athird">
                             <label class="layui-form-label">经办人:</label>
                             <div class="layui-input-block with-icon">
-                                <sys:treeselect id="handleId" name="handleId" value="${workReimbursement.handleId}" labelName="handleName" labelValue="${workReimbursement.handleName}"
+                                <sys:inquireselectUser id="handleId" name="handleId" value="${workReimbursement.handleId}" labelName="handleName" labelValue="${workReimbursement.handleName}"
                                                 title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
                             </div>
                         </div>
                         <div class="layui-item query athird">
                             <label class="layui-form-label">报销人:</label>
                             <div class="layui-input-block with-icon">
-                                <sys:treeselect id="submitterId" name="submitterId" value="${workReimbursement.submitterId}" labelName="submitterName" labelValue="${workReimbursement.submitterName}"
+                                <sys:inquireselectUser id="submitterId" name="submitterId" value="${workReimbursement.submitterId}" labelName="submitterName" labelValue="${workReimbursement.submitterName}"
                                                 title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
                             </div>
                         </div>