Skip to content
GitLab
"JeeSpringCloud/jeespring-web/src/vscode:/vscode.git/clone" did not exist on "4c3d1530ffd440eefd62be41b38e4975e587709a"
Commit 08d3490a authored by qiankunpingtai's avatar qiankunpingtai
Browse files

添加选择人员的功能

parent 85d5098d
Hide whitespace changes
Inline Side-by-side
erp_web/js/easyui-1.3.5/themes/icon.css
View file @ 08d3490a
...@@ -99,4 +99,7 @@ ...@@ -99,4 +99,7 @@
} }
.icon-basket_add{ .icon-basket_add{
background:url('icons/basket_add.png') no-repeat center center; background:url('icons/basket_add.png') no-repeat center center;
}
.icon-user{
background:url('icons/user.png') no-repeat center center;
} }
\ No newline at end of file
erp_web/pages/manage/depot.html
View file @ 08d3490a
...@@ -80,8 +80,11 @@ ...@@ -80,8 +80,11 @@
<td>负责人</td> <td>负责人</td>
<td style="padding:5px"> <td style="padding:5px">
<input name="principalName" id="principalName" <input name="principalName" id="principalName"
style="width: 230px;height: 20px" readonly="readonly"/> style="width: 175px;height: 20px" readonly="readonly"/>
<a href="javascript:void(0)" class="l-btn l-btn-plain" group="" id="lookForSelectUser">
<span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left"></span></span></a>
<input name="principal" id="principal" type="hidden"/> <input name="principal" id="principal" type="hidden"/>
<input name="selectType" id="selectType" type="hidden"/>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -104,6 +107,9 @@ ...@@ -104,6 +107,9 @@
<a href="javascript:void(0)" id="cancelDepot" class="easyui-linkbutton" iconCls="icon-cancel" <a href="javascript:void(0)" id="cancelDepot" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#depotDlg').dialog('close')">取消</a> onclick="javascript:$('#depotDlg').dialog('close')">取消</a>
</div> </div>
<div id="forSelectUserDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true">
</div>
<script type="text/javascript"> <script type="text/javascript">
//初始化界面 //初始化界面
...@@ -164,7 +170,7 @@ ...@@ -164,7 +170,7 @@
formatter: function (value, rec) { formatter: function (value, rec) {
var str = ''; var str = '';
var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.sort + 'AaBb' + rec.remark + 'AaBb' var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.sort + 'AaBb' + rec.remark + 'AaBb'
+ rec.address + 'AaBb' + rec.warehousing + 'AaBb' + rec.truckage+ transferUndefined(rec.principalName)+transferUndefined(rec.principal); + rec.address + 'AaBb' + rec.warehousing + 'AaBb' + rec.truckage+'AaBb'+ transferUndefined(rec.principalName)+'AaBb'+transferUndefined(rec.principal);
str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;'; str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepot(' + rec.id + ');"/>'; str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepot(' + rec.id + ');"/>';
return str; return str;
...@@ -324,7 +330,7 @@ ...@@ -324,7 +330,7 @@
$(".window-mask").css({width: webW, height: webH}); $(".window-mask").css({width: webW, height: webH});
$('#depotFM').form('clear'); $('#depotFM').form('clear');
$("#name").focus(); $("#name").focus();
$("#selectType").val("principal");
oldDepot = ""; oldDepot = "";
depotID = 0; depotID = 0;
url = '/depot/add'; url = '/depot/add';
...@@ -370,7 +376,9 @@ ...@@ -370,7 +376,9 @@
$("#address").val(depotInfo[4]); $("#address").val(depotInfo[4]);
$("#warehousing").val(depotInfo[5]); $("#warehousing").val(depotInfo[5]);
$("#truckage").val(depotInfo[6]); $("#truckage").val(depotInfo[6]);
$("#principalName").val(depotInfo[7]);
$("#principal").val(depotInfo[8]);
$("#selectType").val("principal");
oldDepot = depotInfo[1]; oldDepot = depotInfo[1];
$('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑仓库信息'); $('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑仓库信息');
$(".window-mask").css({width: webW, height: webH}); $(".window-mask").css({width: webW, height: webH});
...@@ -486,6 +494,19 @@ ...@@ -486,6 +494,19 @@
parent.addTab(currentRow[0].id + "单元", "/pages/materials/building.jsp?ProjectId=" + currentRow[0].id, ""); parent.addTab(currentRow[0].id + "单元", "/pages/materials/building.jsp?ProjectId=" + currentRow[0].id, "");
}); });
//查询负责人信息
$("#lookForSelectUser").on("click", function () {
$('#forSelectUserDlg').dialog({
title: '负责人选择',
width: webW/2,
height: webH/2,
closed: false,
cache: false,
href: '/pages/manage/user_forselect.html',
modal: true,
resizable:true
});
});
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
erp_web/pages/manage/user_forselect.html 0 → 100644
View file @ 08d3490a
<!DOCTYPE html>
<html>
<head>
<title>机构选择</title>
<meta charset="utf-8">
<!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
<script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
<link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
<link type="text/css" rel="stylesheet" href="/css/common.css"/>
<script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 数据显示table -->
<div>
<ul id="ttForSelect"></ul>
</div>
<script type="text/javascript">
$(function () {
$('#ttForSelect').tree({
url: '/user/getOrganizationUserTree',
animate: true,
onDblClick: function (node) {
//双击修改
forSelectUser(node);
}
});
function forSelectUser(node) {
var selectType=$("#selectType").val();
console.log(node);
if(!node.attributes.type){
return;
}
if(selectType=='principal'){
$("#principalName").val(node.text);
$("#principal").val(node.id);
}else if(selectType=='org'){
$("#orgAbr").val(node.text);
$("#orgaId").val(node.id);
}
$('#forSelectUserDlg').dialog('close');
}
});
</script>
</body>
</html>
\ No newline at end of file
src/main/java/com/jsh/erp/controller/UserController.java
View file @ 08d3490a
package com.jsh.erp.controller; package com.jsh.erp.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
...@@ -10,6 +11,8 @@ import com.jsh.erp.datasource.entities.DepotEx; ...@@ -10,6 +11,8 @@ import com.jsh.erp.datasource.entities.DepotEx;
import com.jsh.erp.datasource.entities.SerialNumberEx; import com.jsh.erp.datasource.entities.SerialNumberEx;
import com.jsh.erp.datasource.entities.User; import com.jsh.erp.datasource.entities.User;
import com.jsh.erp.datasource.entities.UserEx; import com.jsh.erp.datasource.entities.UserEx;
import com.jsh.erp.datasource.vo.TreeNode;
import com.jsh.erp.datasource.vo.TreeNodeEx;
import com.jsh.erp.service.user.UserService; import com.jsh.erp.service.user.UserService;
import com.jsh.erp.utils.*; import com.jsh.erp.utils.*;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -311,5 +314,18 @@ public class UserController { ...@@ -311,5 +314,18 @@ public class UserController {
userService.batDeleteUser(ids); userService.batDeleteUser(ids);
return result; return result;
} }
@RequestMapping("/getOrganizationUserTree")
public JSONArray getOrganizationUserTree()throws Exception{
JSONArray arr=new JSONArray();
List<TreeNodeEx> organizationUserTree= userService.getOrganizationUserTree();
if(organizationUserTree!=null&&organizationUserTree.size()>0){
for(TreeNodeEx node:organizationUserTree){
String str=JSON.toJSONString(node);
JSONObject obj=JSON.parseObject(str);
arr.add(obj) ;
}
}
return arr;
}
} }
src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java
View file @ 08d3490a
...@@ -3,6 +3,8 @@ package com.jsh.erp.datasource.mappers; ...@@ -3,6 +3,8 @@ package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.User; import com.jsh.erp.datasource.entities.User;
import com.jsh.erp.datasource.entities.UserEx; import com.jsh.erp.datasource.entities.UserEx;
import com.jsh.erp.datasource.entities.UserExample; import com.jsh.erp.datasource.entities.UserExample;
import com.jsh.erp.datasource.vo.TreeNode;
import com.jsh.erp.datasource.vo.TreeNodeEx;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.Date; import java.util.Date;
...@@ -31,4 +33,7 @@ public interface UserMapperEx { ...@@ -31,4 +33,7 @@ public interface UserMapperEx {
@Param("loginame") String loginame); @Param("loginame") String loginame);
int batDeleteOrUpdateUser(@Param("ids") String ids[], @Param("status") byte status); int batDeleteOrUpdateUser(@Param("ids") String ids[], @Param("status") byte status);
List<TreeNodeEx> getNodeTree();
List<TreeNodeEx> getNextNodeTree(Map<String, Object> parameterMap);
} }
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/vo/NodeAttributes.java 0 → 100644
View file @ 08d3490a
package com.jsh.erp.datasource.vo;
/**
* Description
*
* @Author: qiankunpingtai
* @Date: 2019/3/13 18:11
*/
public class NodeAttributes {
//编号
private String no;
//类型
private Integer type;
public String getNo() {
return no;
}
public void setNo(String no) {
this.no = no;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
}
src/main/java/com/jsh/erp/datasource/vo/TreeNodeEx.java 0 → 100644
View file @ 08d3490a
package com.jsh.erp.datasource.vo;
import java.util.List;
/**
* Description
*
* @Author: qiankunpingtai
* @Date: 2019/3/13 18:10
*/
public class TreeNodeEx {
/**
* id主键
* */
private Long id;
/**
* text显示的文本
* */
private String text;
/**
*state节点状态，'open' 或 'closed'，默认：'open'。如果为'closed'的时候，将不自动展开该节点。
* */
private String state="open";
/**
*iconCls 节点图标id
* */
private String iconCls;
/**
* checked 是否被选中
* */
private boolean checked;
/**
*attributes 自定义属性
* */
private NodeAttributes attributes;
/**
* children 子节点
* */
private List<TreeNode> children;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getText() {
return text;
}
public void setText(String text) {
this.text = text;
}
public String getState() {
return state;
}
public void setState(String state) {
this.state = state;
}
public String getIconCls() {
return iconCls;
}
public void setIconCls(String iconCls) {
this.iconCls = iconCls;
}
public boolean isChecked() {
return checked;
}
public void setChecked(boolean checked) {
this.checked = checked;
}
public NodeAttributes getAttributes() {
return attributes;
}
public void setAttributes(NodeAttributes attributes) {
this.attributes = attributes;
}
public List<TreeNode> getChildren() {
return children;
}
public void setChildren(List<TreeNode> children) {
this.children = children;
}
}
src/main/java/com/jsh/erp/service/user/UserService.java
View file @ 08d3490a
...@@ -10,6 +10,8 @@ import com.jsh.erp.datasource.entities.UserEx; ...@@ -10,6 +10,8 @@ import com.jsh.erp.datasource.entities.UserEx;
import com.jsh.erp.datasource.entities.UserExample; import com.jsh.erp.datasource.entities.UserExample;
import com.jsh.erp.datasource.mappers.UserMapper; import com.jsh.erp.datasource.mappers.UserMapper;
import com.jsh.erp.datasource.mappers.UserMapperEx; import com.jsh.erp.datasource.mappers.UserMapperEx;
import com.jsh.erp.datasource.vo.TreeNode;
import com.jsh.erp.datasource.vo.TreeNodeEx;
import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.service.orgaUserRel.OrgaUserRelService; import com.jsh.erp.service.orgaUserRel.OrgaUserRelService;
import com.jsh.erp.utils.ExceptionCodeConstants; import com.jsh.erp.utils.ExceptionCodeConstants;
...@@ -398,4 +400,7 @@ public class UserService { ...@@ -398,4 +400,7 @@ public class UserService {
} }
} }
public List<TreeNodeEx> getOrganizationUserTree() {
return userMapperEx.getNodeTree();
}
} }
src/main/resources/mapper_xml/UserMapperEx.xml
View file @ 08d3490a
...@@ -132,4 +132,56 @@ ...@@ -132,4 +132,56 @@
</foreach> </foreach>
) )
</update> </update>
<resultMap id="BaseTreeResultMap" type="com.jsh.erp.datasource.vo.TreeNodeEx">
<result column="id" property="id"/>
<result column="text" property="text"/>
<association property="attributes" javaType="com.jsh.erp.datasource.vo.NodeAttributes">
<id column="orgNo" property="no"></id>
<result column="type" property="type"></result>
</association>
<collection column="{orgId=id,orgNo=orgNo}" property="children" javaType="java.util.ArrayList"
ofType="com.jsh.erp.datasource.vo.TreeNode" select="getNextNodeTree"/>
</resultMap>
<resultMap id="NextTreeResultMap" type="com.jsh.erp.datasource.vo.TreeNodeEx">
<result column="id" property="id"/>
<result column="text" property="text"/>
<result column="iconCls" property="iconCls"/>
<association property="attributes" javaType="com.jsh.erp.datasource.vo.NodeAttributes">
<id column="orgNo" property="no"></id>
<result column="type" property="type"></result>
</association>
<collection column="{orgId=id,orgNo=orgNo}" property="children" javaType="java.util.ArrayList"
ofType="com.jsh.erp.datasource.vo.TreeNode" select="getNextNodeTree"/>
</resultMap>
<select id="getNextNodeTree" resultMap="NextTreeResultMap">
select id , text,orgNo,sort ,iconCls,type from (
SELECT
org.id, org.org_abr as text,org.org_no as orgNo,org.sort as sort,null as iconCls,'0' as type
FROM jsh_organization org
WHERE org.org_parent_no = #{orgNo}
and org.org_stcd !='5'
union all
select
user.id,user.username as text, null as orgNo,rel.user_blng_orga_dspl_seq as sort,'icon-user' as iconCls,'1' as type
from jsh_user user,jsh_orga_user_rel rel
where
1=1
and user.id=rel.user_id
and rel.orga_id=#{orgId}
and rel.delete_flag !='1'
and user.status not in ('1','2')
) node
order by sort asc
</select>
<select id="getNodeTree" resultMap="BaseTreeResultMap">
SELECT
id, org_abr as text,org_no as orgNo,'0' as type
FROM jsh_organization
WHERE org_parent_no = -1
and org_stcd !='5'
order by sort asc
</select>
</mapper> </mapper>
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment