Skip to content

B
bpm
Commit abcb2e34 by caowenda
Options

组织添加编辑部门 部门下添加人员 添加简单页面效果 添加样式

parent fad630ee
Showing with 660 additions and 228 deletions
src/main/java/com/bbd/bpm/controller/user/userController.java
...@@ -3,14 +3,18 @@ package com.bbd.bpm.controller.user; ...@@ -3,14 +3,18 @@ package com.bbd.bpm.controller.user;
import com.bbd.bpm.base.PageBean; import com.bbd.bpm.base.PageBean;
import com.bbd.bpm.result.Result; import com.bbd.bpm.result.Result;
import com.bbd.bpm.service.UserInfoService; import com.bbd.bpm.service.UserInfoService;
import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@Controller @Controller
@RequestMapping(value = "/bpm/user") @RequestMapping(value = "bpm/user")
public class userController { public class userController {
...@@ -38,20 +42,35 @@ public class userController { ...@@ -38,20 +42,35 @@ public class userController {
* @Param: * @Param:
* @return * @return
**/ **/
@RequestMapping(value = "getOrganizationInfo")
@ResponseBody
public Result getOrganizationInfo(Integer id){
Result result= userInfoService.getOrganizationInfo(id);
return result;
}
/**
* @Author:cwd
* @Description:获取组织列表
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@RequestMapping(value = "getOrganization") @RequestMapping(value = "getOrganization")
@ResponseBody @ResponseBody
public Result getOrganization(Model model, PageBean pageBean){ public Result getOrganization(PageBean pageBean,Integer id,Integer pId){
if(pageBean.getPageNum()==0){ if(pageBean.getPageNum()==0){
pageBean.setPageNum(1); pageBean.setPageNum(1);
} }
if (pageBean.getPageSize()==0) { if (pageBean.getPageSize()==0) {
pageBean.setPageSize(10); pageBean.setPageSize(10);
} }
Result result= userInfoService.getOrganization(pageBean); Result result= userInfoService.getOrganization(pageBean,id,pId);
return result; return result;
} }
/** /**
* @Author:cwd * @Author:cwd
* @Description:加载ztree * @Description:加载ztree
...@@ -66,6 +85,50 @@ public class userController { ...@@ -66,6 +85,50 @@ public class userController {
return result; return result;
} }
/**
* @Author:cwd
* @Description:添加组织
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@RequestMapping(value = "addOrganization")
@ResponseBody
public Result addOrganization(String name, String abbreviationName, Long pId, Integer id){
//获取session中的值
Result result = userInfoService.addOrganization(name,abbreviationName,pId,id);
return result;
}
/**
* @Author:cwd
* @Description:添加部门人员
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@RequestMapping(value = "addOrganizationMember")
@ResponseBody
public Result addOrganizationMember(String name, String position, Long pId, Integer id){
//获取session中的值
Result result = userInfoService.addOrganizationMember(name,position,pId,id);
return result;
}
/**
* @Author:cwd
* @Description:修改组织
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@RequestMapping(value = "editOrganization")
@ResponseBody
public Result editOrganization(String name, String abbreviationName,Integer id){
Result result = userInfoService.editOrganization(name,abbreviationName,id);
return result;
}
} }
src/main/java/com/bbd/bpm/dao/MemberMapper.java 0 → 100644
package com.bbd.bpm.dao;
import com.bbd.bpm.base.BaseMapper;
import com.bbd.bpm.domain.BpmCompany;
import com.bbd.bpm.domain.BpmEmployee;
import com.bbd.bpm.vo.BpmCompanyVo;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Map;
@Repository
public interface MemberMapper extends BaseMapper<BpmEmployee>{
List<BpmCompanyVo> getMemberList(@Param("id") Integer id);
}
src/main/java/com/bbd/bpm/dao/MemberMapper.xml 0 → 100644
<?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.bbd.bpm.dao.MemberMapper">
<select id="getMemberList" resultType="com.bbd.bpm.vo.BpmEmployeeVo">
SELECT
a.id,
a.created_time createdTime,
a.update_time updateTime,
a.`name`,
a.position,
b.`name` department,
c.`code`
FROM
bpm_employee a
LEFT JOIN bpm_company b ON b.id = a.department
LEFT JOIN bpm_company c ON c.id = a.code_id
WHERE
a.`status` = 0 and department=#{id}
</select>
</mapper>
\ No newline at end of file
src/main/java/com/bbd/bpm/dao/UserInfoMapper.java
...@@ -4,6 +4,7 @@ package com.bbd.bpm.dao; ...@@ -4,6 +4,7 @@ package com.bbd.bpm.dao;
import com.bbd.bpm.base.BaseMapper; import com.bbd.bpm.base.BaseMapper;
import com.bbd.bpm.domain.BpmCompany; import com.bbd.bpm.domain.BpmCompany;
import com.bbd.bpm.vo.BpmCompanyVo; import com.bbd.bpm.vo.BpmCompanyVo;
import io.swagger.models.auth.In;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
...@@ -13,9 +14,13 @@ import java.util.Map; ...@@ -13,9 +14,13 @@ import java.util.Map;
@Repository @Repository
public interface UserInfoMapper extends BaseMapper<BpmCompany>{ public interface UserInfoMapper extends BaseMapper<BpmCompany>{
List<BpmCompanyVo> getOrganization(); List<BpmCompanyVo> getOrganization(@Param("id") Integer id);
List<Map<String,Object>> getOrganizationList(); List<Map<String,Object>> getOrganizationList();
BpmCompanyVo getParentName(@Param("pId") Integer pId); BpmCompanyVo getParentName(@Param("pId") Integer pId);
String getOrganizationRelation(@Param("id") Integer id);
Map<String,Object> getOrganizationInfo(@Param("id") Integer id);
} }
src/main/java/com/bbd/bpm/dao/UserInfoMapper.xml
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
bpm_company bpm_company
WHERE WHERE
STATUS = 0 and parent_id!=0 STATUS = 0 and parent_id!=0
<if test="id!=null">
and parent_id=#{id}
</if>
</select> </select>
<!--组织架构菜单--> <!--组织架构菜单-->
...@@ -41,4 +44,23 @@ ...@@ -41,4 +44,23 @@
id=#{pId} id=#{pId}
</select> </select>
<select id="getOrganizationRelation" resultType="String">
SELECT
organization_relation
FROM
bpm_company
WHERE
id = #{id}
</select>
<select id="getOrganizationInfo" resultType="map">
SELECT
`name`,
abbreviation_name abbreviationName
FROM
bpm_company
WHERE
id = #{id}
</select>
</mapper> </mapper>
\ No newline at end of file
src/main/java/com/bbd/bpm/domain/BpmCompany.java
...@@ -27,6 +27,10 @@ public class BpmCompany extends BaseEntity{ ...@@ -27,6 +27,10 @@ public class BpmCompany extends BaseEntity{
@Column(name = "status") @Column(name = "status")
private Integer status; private Integer status;
//上级id
@Column(name = "parent_id")
private Integer pId;
} }
src/main/java/com/bbd/bpm/domain/BpmEmployee.java
...@@ -15,10 +15,10 @@ public class BpmEmployee extends BaseEntity { ...@@ -15,10 +15,10 @@ public class BpmEmployee extends BaseEntity {
private String name; private String name;
//编码id //编码id
@Column(name = "code_id") @Column(name = "code_id")
private String codeId; private Integer codeId;
//部门 //部门
@Column(name = "department") @Column(name = "department")
private String department; private Integer department;
//职位 //职位
@Column(name = "position") @Column(name = "position")
private String position; private String position;
......
src/main/java/com/bbd/bpm/service/UserInfoService.java
package com.bbd.bpm.service; package com.bbd.bpm.service;
import com.bbd.bpm.BpmResponse;
import com.bbd.bpm.base.PageBean; import com.bbd.bpm.base.PageBean;
import com.bbd.bpm.result.Result; import com.bbd.bpm.result.Result;
public interface UserInfoService { public interface UserInfoService {
/**
Result getOrganization(PageBean pageBean); * @Author:cwd
* @Description:获取组织列表
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
Result getOrganization(PageBean pageBean, Integer id, Integer pId);
/**
* @Author:cwd
* @Description:加载ztree
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
Result getOrganizationList(); Result getOrganizationList();
/**
* @Author:cwd
* @Description:添加组织
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
Result addOrganization(String name, String abbreviationName, Long pId, Integer id);
/**
* @Author:cwd
* @Description:添加部门人员
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
Result addOrganizationMember(String name, String position, Long pId, Integer id);
/**
* @Author:cwd
* @Description:获取组织详情
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
Result getOrganizationInfo(Integer id);
/**
* @Author:cwd
* @Description:修改组织
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
Result editOrganization(String name, String abbreviationName, Integer id);
} }
src/main/java/com/bbd/bpm/serviceImpl/UserInfoServiceImpl.java
package com.bbd.bpm.serviceImpl; package com.bbd.bpm.serviceImpl;
import com.bbd.bpm.base.PageBean; import com.bbd.bpm.base.PageBean;
import com.bbd.bpm.domain.BpmCompany; import com.bbd.bpm.dao.MemberMapper;
import com.bbd.bpm.dao.UserInfoMapper; import com.bbd.bpm.dao.UserInfoMapper;
import com.bbd.bpm.domain.BpmCompany;
import com.bbd.bpm.domain.BpmEmployee;
import com.bbd.bpm.result.RespCode; import com.bbd.bpm.result.RespCode;
import com.bbd.bpm.result.Result; import com.bbd.bpm.result.Result;
import com.bbd.bpm.result.ResultUtil; import com.bbd.bpm.result.ResultUtil;
...@@ -13,8 +15,7 @@ import com.github.pagehelper.PageInfo; ...@@ -13,8 +15,7 @@ import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.*;
import java.util.Map;
@Service @Service
public class UserInfoServiceImpl implements UserInfoService{ public class UserInfoServiceImpl implements UserInfoService{
...@@ -22,27 +23,74 @@ public class UserInfoServiceImpl implements UserInfoService{ ...@@ -22,27 +23,74 @@ public class UserInfoServiceImpl implements UserInfoService{
@Autowired @Autowired
private UserInfoMapper userInfoMapper; private UserInfoMapper userInfoMapper;
@Autowired
private MemberMapper memberMapper;
/**
* @Author:cwd
* @Description:获取组织列表
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@Override @Override
public Result getOrganization(PageBean pageBean) { public Result getOrganization(PageBean pageBean, Integer id, Integer pId) {
try{ try{
PageHelper.startPage(pageBean.getPageNum(), pageBean.getPageSize());
List<BpmCompanyVo> list = userInfoMapper.getOrganization(); if(pId==null){
BpmCompanyVo bpmCompanyVo; PageHelper.startPage(pageBean.getPageNum(), pageBean.getPageSize());
for (int i=0;i<list.size();i++){ if(id==null){
Integer pId = list.get(i).getPId(); id=1;
bpmCompanyVo=userInfoMapper.getParentName(pId); }
//根据pid获取上级组织名称 List<BpmCompanyVo> list = userInfoMapper.getOrganization(id);
list.get(i).setParentName(bpmCompanyVo.getName()); BpmCompanyVo bpmCompanyVo;
for (int i=0;i<list.size();i++){
Integer pIds = list.get(i).getPId();
bpmCompanyVo=userInfoMapper.getParentName(pIds);
//根据pid获取上级组织名称
list.get(i).setParentName(bpmCompanyVo.getName());
}
PageInfo<BpmCompanyVo> pageInfo = new PageInfo<>(list);
Map<String, Object> map = new HashMap<>(16);
map.put("pageInfo", pageInfo);
map.put("type", 1);
return ResultUtil.getResult(RespCode.Code.SUCCESS, map);
}else if(pId==1){
PageHelper.startPage(pageBean.getPageNum(), pageBean.getPageSize());
List<BpmCompanyVo> list = userInfoMapper.getOrganization(id);
BpmCompanyVo bpmCompanyVo;
for (int i=0;i<list.size();i++){
Integer pIds = list.get(i).getPId();
bpmCompanyVo=userInfoMapper.getParentName(pIds);
//根据pid获取上级组织名称
list.get(i).setParentName(bpmCompanyVo.getName());
}
PageInfo<BpmCompanyVo> pageInfo = new PageInfo<>(list);
Map<String, Object> map = new HashMap<>(16);
map.put("pageInfo", pageInfo);
map.put("type", 1);
return ResultUtil.getResult(RespCode.Code.SUCCESS, map);
}else{
PageHelper.startPage(pageBean.getPageNum(), pageBean.getPageSize());
List<BpmCompanyVo> list = memberMapper.getMemberList(id);
PageInfo<BpmCompanyVo> pageInfo = new PageInfo<>(list);
Map<String, Object> map = new HashMap<>(16);
map.put("pageInfo", pageInfo);
map.put("type", 2);
return ResultUtil.getResult(RespCode.Code.SUCCESS, map);
} }
PageInfo<BpmCompanyVo> pageInfo = new PageInfo<>(list);
return ResultUtil.getResult(RespCode.Code.SUCCESS, pageInfo);
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return ResultUtil.getResult(RespCode.Code.INTERNAL_SERVER_ERROR); return ResultUtil.getResult(RespCode.Code.INTERNAL_SERVER_ERROR);
} }
} }
/**
* @Author:cwd
* @Description:加载ztree
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@Override @Override
public Result getOrganizationList() { public Result getOrganizationList() {
try { try {
...@@ -53,4 +101,110 @@ public class UserInfoServiceImpl implements UserInfoService{ ...@@ -53,4 +101,110 @@ public class UserInfoServiceImpl implements UserInfoService{
return ResultUtil.getResult(RespCode.Code.INTERNAL_SERVER_ERROR); return ResultUtil.getResult(RespCode.Code.INTERNAL_SERVER_ERROR);
} }
} }
/**
* @Author:cwd
* @Description:添加组织
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@Override
public Result addOrganization(String name, String abbreviationName, Long pId, Integer id) {
try{
BpmCompany bpmCompany=new BpmCompany();
//组织编号
StringBuilder str=new StringBuilder();//定义变长字符串
Random random=new Random();
//随机生成数字，并添加到字符串
for(int i=0;i<8;i++){
str.append(random.nextInt(6));
}
String number = "zz"+str.toString();
//通过pid获取上一级的组织关系
String relation=userInfoMapper.getOrganizationRelation(id);
//拼接
String a=relation+"/"+number;
bpmCompany.setName(name);
bpmCompany.setCreateTime(new Date());
bpmCompany.setUpdateTime(new Date());
bpmCompany.setAbbreviationName(abbreviationName);
bpmCompany.setCode(number);
bpmCompany.setOrganizationRelation(a);
if(pId==null){
pId=1L;
}
bpmCompany.setPId(id);
bpmCompany.setStatus(0);
userInfoMapper.insertSelective(bpmCompany);
return ResultUtil.getResult(RespCode.Code.SUCCESS);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.getResult(RespCode.Code.INTERNAL_SERVER_ERROR);
}
}
/**
* @Author:cwd
* @Description:部门下添加人员信息
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@Override
public Result addOrganizationMember(String name, String position, Long pId, Integer id) {
try {
BpmEmployee bpmEmployee=new BpmEmployee();
bpmEmployee.setCreateTime(new Date());
bpmEmployee.setUpdateTime(new Date());
bpmEmployee.setName(name);
bpmEmployee.setCodeId(pId.intValue());
bpmEmployee.setDepartment(id);
bpmEmployee.setPosition(position);
bpmEmployee.setStatus(0);
memberMapper.insert(bpmEmployee);
return ResultUtil.getResult(RespCode.Code.SUCCESS);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.getResult(RespCode.Code.INTERNAL_SERVER_ERROR);
}
}
/**
* @Author:cwd
* @Description:获取组织详情
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@Override
public Result getOrganizationInfo(Integer id) {
try {
Map<String,Object> map = userInfoMapper.getOrganizationInfo(id);
return ResultUtil.getResult(RespCode.Code.SUCCESS,map);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.getResult(RespCode.Code.INTERNAL_SERVER_ERROR);
}
}
/**
* @Author:cwd
* @Description:修改组织信息
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@Override
public Result editOrganization(String name, String abbreviationName, Integer id) {
try {
BpmCompany bpmCompany=new BpmCompany();
bpmCompany.setName(name);
bpmCompany.setAbbreviationName(abbreviationName);
bpmCompany.setId(id.longValue());
userInfoMapper.updateByPrimaryKeySelective(bpmCompany);
return ResultUtil.getResult(RespCode.Code.SUCCESS);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.getResult(RespCode.Code.INTERNAL_SERVER_ERROR);
}
}
} }
src/main/java/com/bbd/bpm/vo/BpmEmployeeVo.java 0 → 100644
package com.bbd.bpm.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
import java.util.Date;
@Data
@JsonInclude(JsonInclude.Include.NON_NULL)
public class BpmEmployeeVo {
/**
* 人员id
*/
private Integer id;
/**
* 人员名称
*/
private String name;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createdTime;
/**
* 修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
/**
* 所属组织编码
*/
private String code;
/**
* 部门名称
*/
private String department;
/**
* 状态0.在职 1.离职 2删除
*/
private Integer status;
/**
*职位
*/
private String position;
}
src/main/resources/templates/user/organizationList.html
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
<body style="width: 100%;"> <body style="width: 100%;">
<input type="hidden" id="pages"> <input type="hidden" id="pages">
<input type="hidden" id="pid"> <input type="hidden" id="pid">
<input type="hidden" id="id">
<input type="hidden" id="pids" value="a"> <input type="hidden" id="pids" value="a">
<input type="hidden" id="type" value="2"> <input type="hidden" id="type" value="2">
<div class="centent" style="height:auto;position: fixed;float:left;width: 15%!important;box-sizing: border-box;"> <div class="centent" style="height:auto;position: fixed;float:left;width: 15%!important;box-sizing: border-box;">
...@@ -82,6 +83,8 @@ ...@@ -82,6 +83,8 @@
<span ><b id="spanB">组织名称：</b><input type="text" value="" placeholder="请输入" name="name" style="color: black"/></span> <span ><b id="spanB">组织名称：</b><input type="text" value="" placeholder="请输入" name="name" style="color: black"/></span>
<span style="width: 200px;"><button style=" border: 1px solid #000000;background-color: #2b2b2b;width: 64px;height: 35px;color: white;border-radius: 0px;text-align: center;line-height: 30px;" onclick="queryDeviceRecords()">查询</button></span><span style="width: 67px;float: right" id="add"> <span style="width: 200px;"><button style=" border: 1px solid #000000;background-color: #2b2b2b;width: 64px;height: 35px;color: white;border-radius: 0px;text-align: center;line-height: 30px;" onclick="queryDeviceRecords()">查询</button></span><span style="width: 67px;float: right" id="add">
<button id="addOr" style=" border: 1px solid #000000;background-color: #2b2b2b;width: 64px;height: 35px;color: white;border-radius: 0px;text-align: center;line-height: 30px;" onclick="add()">添加</button></span> <button id="addOr" style=" border: 1px solid #000000;background-color: #2b2b2b;width: 64px;height: 35px;color: white;border-radius: 0px;text-align: center;line-height: 30px;" onclick="add()">添加</button></span>
<button id="addMe" style="float: right;margin-top: 7px; border: 1px solid #000000;background-color: #2b2b2b;width: 64px;height: 35px;color: white;border-radius: 0px;text-align: center;line-height: 30px;" onclick="add()">添加</button></span>
</p> </p>
</div> </div>
<div class="content"> <div class="content">
...@@ -132,15 +135,14 @@ ...@@ -132,15 +135,14 @@
{ {
pageSize:10, pageSize:10,
pageNum:1, pageNum:1,
name:""
}, },
function (data) { function (data) {
$("#add").hide(); $("#add").hide();
var size = data.data.pages; var size = data.data.pageInfo.pages;
if (!data.data.pages){ if (!data.data.pageInfo.pages){
size = 0; size = 0;
} }
var current = data.data.pageNum; var current = data.data.pageInfo.pageNum;
/*分页*/ /*分页*/
$(".pagediv").createPage({ $(".pagediv").createPage({
pageNum: size,//总页码 pageNum: size,//总页码
...@@ -149,10 +151,10 @@ ...@@ -149,10 +151,10 @@
showPageNum: true, //显示总页数 showPageNum: true, //显示总页数
showToPage: true, //显示跳转页码 showToPage: true, //显示跳转页码
backfun: function (page) { backfun: function (page) {
flushHtml(page.current,id); flushHtml(page.current);
} }
}); });
flushHtml(1); flushHtml(1);
},"json" },"json"
) )
var setting = { var setting = {
...@@ -189,27 +191,11 @@ ...@@ -189,27 +191,11 @@
return !treeNode.isParent; return !treeNode.isParent;
}; };
var zNodes =[ var zNodes =[];
{ id:1, pId:0, name:"父节点1 - 展开"},
{ id:11, pId:1, name:"父节点11 - 折叠"},
{ id:111, pId:11, name:"叶子节点111"},
{ id:112, pId:11, name:"叶子节点112"},
{ id:113, pId:11, name:"叶子节点113"},
{ id:114, pId:11, name:"叶子节点114"},
{ id:12, pId:1, name:"父节点12 - 折叠"},
// {id: 1,name: "组织管理",pId: 0},
// {id: 2,name: "人人易动移动科技",pId: 1},
// {id: 3,name: "组织管理",pId: 1}
];
//加载zTree //加载zTree
var treeObj ; var treeObj ;
$.post( $.post(
"/bpm/user/getOrganizationList", function (data) { "getOrganizationList", function (data) {
zNodes = data.data; zNodes = data.data;
treeObj = $.fn.zTree.init($("#treeDemo"), setting, zNodes); treeObj = $.fn.zTree.init($("#treeDemo"), setting, zNodes);
fuzzySearch('treeDemo','#key',null,true); //initialize fuzzysearch function fuzzySearch('treeDemo','#key',null,true); //initialize fuzzysearch function
...@@ -231,8 +217,8 @@ ...@@ -231,8 +217,8 @@
} }
function beforeClick(treeId, treeNode) { function beforeClick(treeId, treeNode) {
$("#pid").val(treeNode.id); $("#pid").val(treeNode.pId);
$("#pids").val(treeNode.pId); $("#id").val(treeNode.id);
if (treeNode.pId==null){ if (treeNode.pId==null){
$("#add").show(); $("#add").show();
}else if (treeNode.pId==1){ }else if (treeNode.pId==1){
...@@ -246,15 +232,15 @@ ...@@ -246,15 +232,15 @@
pageSize:10, pageSize:10,
pageNum:1, pageNum:1,
id:treeNode.id, id:treeNode.id,
name:"" pId:treeNode.pId
}, },
function (data) { function (data) {
$("[name='name']").val(""); $("[name='name']").val("");
var size = data.data.pages; var size = data.data.pageInfo.pages;
if (!data.data.pages){ if (!data.data.pageInfo.pages){
size = 0; size = 0;
} }
var current = data.data.pageNum; var current = data.data.pageInfo.pageNum;
/*分页*/ /*分页*/
$(".pagediv").createPage({ $(".pagediv").createPage({
pageNum: size,//总页码 pageNum: size,//总页码
...@@ -263,17 +249,17 @@ ...@@ -263,17 +249,17 @@
showPageNum: true, //显示总页数 showPageNum: true, //显示总页数
showToPage: true, //显示跳转页码 showToPage: true, //显示跳转页码
backfun: function (page) { backfun: function (page) {
flushHtml(page.current,treeNode.id); flushHtml(page.current,treeNode.id,treeNode.pId);
} }
}); });
flushHtml(1,treeNode.id); flushHtml(1,treeNode.id,treeNode.pId);
},"json" },"json"
) )
} }
}) })
function flushHtml(current,id) { function flushHtml(current,id,pId) {
var pageNum = 1; var pageNum = 1;
if(current){ if(current){
pageNum = current; pageNum = current;
...@@ -285,10 +271,11 @@ ...@@ -285,10 +271,11 @@
pageSize:10, pageSize:10,
pageNum:pageNum, pageNum:pageNum,
id:id, id:id,
pId:pId,
name:name, name:name,
}, },
function (data) { function (data) {
selectListAll(data.data,data.data.type); selectListAll(data.data.pageInfo,data.data.type);
},'json' },'json'
); );
} }
...@@ -298,21 +285,23 @@ ...@@ -298,21 +285,23 @@
var pageNum = data.pageNum; var pageNum = data.pageNum;
data = data.list; data = data.list;
var content = ''; var content = '';
if (type == 1){ if (type == 2){
$("#addMe").show();
$("#addOr").hide(); $("#addOr").hide();
$("#spanB").html("团队名称：") $("#spanB").html("人员信息：")
$("#type").val(1); $("#type").val(1);
content += "<tr><th>团队编号</th><th>团队名称</th><th>联系人</th><th>联系电话</th><th>申请时间</th><th >操作</th></tr>"; content += "<tr><th>人员编号</th><th>人员名称</th><th>职位</th><th>部门</th><th>所属组织编码</th><th>加入时间</th><th >操作</th></tr>";
}else { }else {
$("#addOr").show(); $("#addOr").show();
$("#addMe").hide();
$("#spanB").html("组织名称：") $("#spanB").html("组织名称：")
$("#type").val(2); $("#type").val(2);
content += "<tr><th>序号</th><th>组织名称</th><th>上级组织</th><th >操作</th></tr>"; content += "<tr><th>序号</th><th>组织名称</th><th>上级组织</th><th >操作</th></tr>";
} }
if(data!=null){ if(data!=null){
if (type==1) { if (type==2) {
for (var i in data) { for (var i in data) {
content += "<tr><td>"+ data[i].number + "</td><td>" + data[i].name + "</td><td>" + data[i].linkName + "</td><td>" + data[i].phone + "</td><td>" + data[i].createTime + "</td><td><a href='#' onclick='toTeamInfo(" + data[i].id + ")'>查看</a></td></tr>"; content += "<tr><td>"+ data[i].id + "</td><td>" + data[i].name + "</td><td>" + data[i].position + "</td><td>" + data[i].department + "</td><td>" + data[i].code +"</td><td>" + data[i].createdTime + "</td><td><a href='#' onclick='toTeamInfo(" + data[i].id + ")'>查看</a></td></tr>";
} }
}else{ }else{
for (var i in data) { for (var i in data) {
...@@ -338,6 +327,7 @@ ...@@ -338,6 +327,7 @@
} }
/*条件查询砍价商品*/ /*条件查询砍价商品*/
/*
function queryDeviceRecords() { function queryDeviceRecords() {
var id = $("#pid").val(); var id = $("#pid").val();
var type = $("#type").val(); var type = $("#type").val();
...@@ -356,7 +346,7 @@ ...@@ -356,7 +346,7 @@
if (!data.data.pageInfo.pages){ if (!data.data.pageInfo.pages){
size = 0; size = 0;
} }
/*分页*/ /!*分页*!/
$(".pagediv").createPage({ $(".pagediv").createPage({
pageNum: size,//总页码 pageNum: size,//总页码
current: 1,//当前页 current: 1,//当前页
...@@ -369,8 +359,11 @@ ...@@ -369,8 +359,11 @@
}); });
},'json') },'json')
} }
*/
function dele(id,name) { function dele(id,name) {
var pId = $("#pid").val();
alert(pId)
layer.open({ layer.open({
id:1, id:1,
type: 1, type: 1,
...@@ -382,7 +375,7 @@ ...@@ -382,7 +375,7 @@
btn:['保存','取消'], btn:['保存','取消'],
btn1: function (index,layero) { btn1: function (index,layero) {
$.post( $.post(
"deleteOrganization", "/bpm/user/deleteOrganization",
{"id":id}, {"id":id},
function (data) { function (data) {
if (data.code==200){ if (data.code==200){
...@@ -403,192 +396,241 @@ ...@@ -403,192 +396,241 @@
function edit(id) { function edit(id) {
var pId = $("#pid").val(); var pId = $("#pid").val();
if (pId==1||pId==0){ if (pId==1||pId==''){
var content = '<div style="margin-top: 13px;margin-left: 27px;"><span ><b>组织名称：</b><input type="text" value="" placeholder="请输入组织名称" name="oName" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;margin-left: 16px;"/></span><br>\n' + var content = '<div style="margin-top: 13px;margin-left: 27px;"><span ><b>组织名称：</b><input type="text" value="" placeholder="请输入组织名称" name="oName" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;margin-left: 16px;"/></span><br>\n' +
'\t\t<span ><b>联系人姓名：</b><input type="text" value="" placeholder="请输入联系人姓名" name="memberName" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;"/></span><br>\n' + '\t\t<span ><b>组织简写(英)：</b><input type="text" value="" placeholder="请输入组织简写" name="abbreviationName" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;"/></span><br>\n';
'\t\t<span ><b>统一社会<br>信用代码：</b><input type="text" value="" placeholder="请输入统一社会信用代码" name="code" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;margin-left: 16px;"/></span><br>\n' +
'\t\t<span ><b>联系人<br>手机号：</b><input type="text" value="" placeholder="请输入联系人手机号" name="phone" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;margin-left: 33px;"/></span><br></div>';
}else { }else {
var content = '<div style="margin-top: 13px;margin-left: 27px;"><span ><b>组织名称：</b><input type="text" value="" placeholder="请输入组织名称" name="oName" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;margin-left: 16px;"/></span><br>\n' + var content = '<div style="margin-top: 13px;margin-left: 27px;"><span ><b>人员名称：</b><input type="text" value="" placeholder="请输入人员名称" name="oName" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;margin-left: 16px;"/></span><br>\n' +
'\t\t<span ><b>所在街道：</b><select name="areaId" id="areaId" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;margin-left: 16px;width: 159px;"></select></span><br>\n' + '\t\t<span ><b style="margin-left: 32px;">职位：</b><input type="text" value="" placeholder="请输入职位" name="position" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px; margin-left: 16px;"/></span><br>\n';
'\t\t<span ><b>联系人姓名：</b><input type="text" value="" placeholder="请输入联系人姓名" name="memberName" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;"/></span><br>\n' +
'\t\t<span ><b>统一社会<br>信用代码：</b><input type="text" value="" placeholder="请输入统一社会信用代码" name="code" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;margin-left: 16px;"/></span><br>\n' +
'\t\t<span ><b>联系人<br>手机号：</b><input type="text" value="" placeholder="请输入联系人手机号" name="phone" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;margin-left: 33px;"/></span><br></div>';
} }
//联系方式验证规则 //联系方式验证规则
var tel=/^[1][3,4,5,6,7,8,9][0-9]{9}$/; var tel=/^[1][3,4,5,6,7,8,9][0-9]{9}$/;
var phones=/^(\d3,4\d3,4|\d{3,4}-)?\d{7,8}$/; var phones=/^(\d3,4\d3,4|\d{3,4}-)?\d{7,8}$/;
layer.open({ if(pId==1 || pId==''){
id:1, layer.open({
type: 1, id:1,
title:'添加组织', type: 1,
skin:'layui-layer-rim', title:'添加组织',
area:['360px', '330px'], skin:'layui-layer-rim',
area:['360px', '330px'],
content: content
, content: content
btn:['保存','取消'], ,
btn1: function (index,layero) { btn:['保存','取消'],
var name = $("[name='oName']").val(); btn1: function (index,layero) {
var memberName = $("[name='memberName']").val(); var name = $("[name='oName']").val();
var code = $("[name='code']").val(); var abbreviationName = $("[name='abbreviationName']").val();
var phone = $("[name='phone']").val(); if (name==''){
var areaId = $("[name='areaId']").val(); layer.msg("组织名称不能为空");
if (name==''){ }else if (abbreviationName==''){
layer.msg("组织名称不能为空"); layer.msg("组织简写不可为空");
}else if (memberName==''){ }else {
layer.msg("联系人姓名不能为空"); $.post(
}else if (code==''){ "editOrganization",
layer.msg("统一社会信用代码不能为空"); {
}else if (phone==''){ "name":name,
layer.msg("联系人手机号不能为空"); "abbreviationName":abbreviationName,
}else if(!tel.test(phone)&& !phones.test(phone)){ "id":id
layer.msg("手机号格式错误"); },
}else { function (data) {
$.post( if (data.code==200){
"editOrganization", layer.msg('操作成功',{icon:1,time:1000},function () {
{ location.reload();
"name":name, })
"memberName":memberName, }else{
"code":code, layer.msg(data.message,{icon:2,time:1000});
"phone":phone, }
"id":id, },'json'
"areaId":areaId )
}, }
function (data) { },
if (data.code==200){ btn2:function (index,layero) {
layer.msg('操作成功',{icon:1,time:1000},function () { layer.close(index);
location.reload();
})
}else{
layer.msg(data.message,{icon:2,time:1000});
}
},'json'
)
} }
}, });
btn2:function (index,layero) {
layer.close(index);
}
});
var areaId = '';
$.post(
"getOrganizationInfo",
{"id":id},
function (data) {
data = data.data;
$("[name='oName']").val(data.name);
$("[name='memberName']").val(data.memberName);
$("[name='code']").val(data.code);
$("[name='phone']").val(data.phone);
areaId = data.areaId;
},'json'
)
if (pId!=1){
var desc = "";
$.post( $.post(
"/member/getAreaAll", "getOrganizationInfo",
{"id":id},
function (data) { function (data) {
data = data.data; data = data.data;
for(var i in data){ $("[name='oName']").val(data.name);
if (data[i].id==areaId){ $("[name='abbreviationName']").val(data.abbreviationName);
desc += "<option selected value='" + data[i].id + "'>" + data[i].name + "</option>"; },'json'
}else { )
desc += "<option value='" + data[i].id + "'>" + data[i].name + "</option>"; }else {
} layer.open({
id:1,
type: 1,
title:'添加组织',
skin:'layui-layer-rim',
area:['360px', '330px'],
content: content
,
btn:['保存','取消'],
btn1: function (index,layero) {
var name = $("[name='oName']").val();
var memberName = $("[name='memberName']").val();
var code = $("[name='code']").val();
var phone = $("[name='phone']").val();
var areaId = $("[name='areaId']").val();
if (name==''){
layer.msg("组织名称不能为空");
}else if (memberName==''){
layer.msg("联系人姓名不能为空");
}else if (code==''){
layer.msg("统一社会信用代码不能为空");
}else if (phone==''){
layer.msg("联系人手机号不能为空");
}else if(!tel.test(phone)&& !phones.test(phone)){
layer.msg("手机号格式错误");
}else {
$.post(
"editOrganization",
{
"name":name,
"memberName":memberName,
"code":code,
"phone":phone,
"id":id,
"areaId":areaId
},
function (data) {
if (data.code==200){
layer.msg('操作成功',{icon:1,time:1000},function () {
location.reload();
})
}else{
layer.msg(data.message,{icon:2,time:1000});
}
},'json'
)
} }
$("#areaId").html(desc) },
btn2:function (index,layero) {
layer.close(index);
}
});
$.post(
"getOrganizationInfo",
{"id":id},
function (data) {
data = data.data;
$("[name='oName']").val(data.name);
$("[name='abbreviationName']").val(data.abbreviationName);
},'json' },'json'
) )
} }
} }
function add() { function add() {
alert()
var pId = $("#pid").val(); var pId = $("#pid").val();
if (pId==1){ var id = $("#id").val();
var content = '<div style="margin-top: 13px;margin-left: 27px;"><span ><b>组织名称：</b><input type="text" value="" placeholder="请输入组织名称" name="oName" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;margin-left: 16px;"/></span><br>\n' + alert(id);
'\t\t<span ><b>联系人姓名：</b><input type="text" value="" placeholder="请输入联系人姓名" name="memberName" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;"/></span><br>\n' + alert(pId)
'\t\t<span ><b>统一社会<br>信用代码：</b><input type="text" value="" placeholder="请输入统一社会信用代码" name="code" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;margin-left: 16px;"/></span><br>\n' + if (pId==1 || pId==''){
'\t\t<span ><b>联系人<br>手机号：</b><input type="text" value="" placeholder="请输入联系人手机号" name="phone" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;margin-left: 33px;"/></span><br></div>'; var content = '<div style="margin-top: 13px;margin-left: 27px;"><span ><b>组织名称：</b><input type="text" value="" placeholder="请输入组织名称" name="oName" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;margin-left: 26px;"/></span><br>\n' +
'\t\t<span ><b>组织简写(英)：</b><input type="text" value="" placeholder="请输入组织简写" name="abbreviationName" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;"/></span><br>\n';
}else { }else {
var content = '<div style="margin-top: 13px;margin-left: 27px;"><span ><b>组织名称：</b><input type="text" value="" placeholder="请输入组织名称" name="oName" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;margin-left: 16px;"/></span><br>\n' + var content = '<div style="margin-top: 13px;margin-left: 27px;"><span ><b>人员名称：</b><input type="text" value="" placeholder="请输入人员名称" name="oName" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;margin-left: 16px;"/></span><br>\n' +
'\t\t<span ><b>所在街道：</b><select name="areaId" id="areaId" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;margin-left: 16px;width: 159px;"></select></span><br>\n' + '\t\t<span ><b style="margin-left: 32px;">职位：</b><input type="text" value="" placeholder="请输入职位" name="position" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px; margin-left: 16px;"/></span><br>\n';
'\t\t<span ><b>联系人姓名：</b><input type="text" value="" placeholder="请输入联系人姓名" name="memberName" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;"/></span><br>\n' +
'\t\t<span ><b>统一社会<br>信用代码：</b><input type="text" value="" placeholder="请输入统一社会信用代码" name="code" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;margin-left: 16px;"/></span><br>\n' +
'\t\t<span ><b>联系人<br>手机号：</b><input type="text" value="" placeholder="请输入联系人手机号" name="phone" style="color: black;height: 30px;border: 1px solid #EEEEEE;text-indent: 5px;margin-left: 33px;"/></span><br></div>';
} }
//联系方式验证规则 //联系方式验证规则
var tel=/^[1][3,4,5,6,7,8,9][0-9]{9}$/; var tel=/^[1][3,4,5,6,7,8,9][0-9]{9}$/;
var phones=/^(\d3,4\d3,4|\d{3,4}-)?\d{7,8}$/; var phones=/^(\d3,4\d3,4|\d{3,4}-)?\d{7,8}$/;
layer.open({ if(pId==1 || pId==''){
id:1, layer.open({
type: 1, id:1,
title:'添加组织', type: 1,
skin:'layui-layer-rim', title:'添加组织',
area:['360px', '330px'], skin:'layui-layer-rim',
area:['360px', '330px'],
content: content
, content: content
btn:['保存','取消'], ,
btn1: function (index,layero) { btn:['保存','取消'],
var name = $("[name='oName']").val(); btn1: function (index,layero) {
var memberName = $("[name='memberName']").val(); var name = $("[name='oName']").val();
var code = $("[name='code']").val(); var abbreviationName = $("[name='abbreviationName']").val();
var phone = $("[name='phone']").val(); if (name==''){
var areaId = $("[name='areaId']").val(); layer.msg("组织名称不能为空");
if (name==''){ }else if (abbreviationName==''){
layer.msg("组织名称不能为空"); layer.msg("组织简称不可为空");
}else if (memberName==''){ }else {
layer.msg("联系人姓名不能为空"); $.post(
}else if (code==''){ "/bpm/user/addOrganization",
layer.msg("统一社会信用代码不能为空"); {
}else if (phone==''){ "name":name,
layer.msg("联系人手机号不能为空"); "abbreviationName":abbreviationName,
}else if(!tel.test(phone)&& !phones.test(phone)){ "pId":pId,
layer.msg("手机号格式错误"); "id":id
}else { },
$.post( function (data) {
"addOrganization", if (data.code==200){
{ layer.msg('操作成功',{icon:1,time:1000},function () {
"name":name, location.reload();
"memberName":memberName, })
"code":code, }else{
"phone":phone, layer.msg(data.message,{icon:2,time:1000});
"pId":pId, }
"areaId":areaId },'json'
}, )
function (data) {
if (data.code==200){
layer.msg('操作成功',{icon:1,time:1000},function () {
location.reload();
})
}else{
layer.msg(data.message,{icon:2,time:1000});
}
},'json'
)
}
},
btn2:function (index,layero) {
layer.close(index);
}
});
if (pId!=1){
var desc = "";
$.post(
"/member/getAreaAll",
function (data) {
data = data.data;
for(var i in data){
desc+="<option value='"+data[i].id+"'>"+data[i].name+"</option>";
} }
$("#areaId").html(desc) },
},'json' btn2:function (index,layero) {
) layer.close(index);
}
});
}else{
layer.open({
id:1,
type: 1,
title:'添加部门人员',
skin:'layui-layer-rim',
area:['360px', '330px'],
content: content
,
btn:['保存','取消'],
btn1: function (index,layero) {
var name = $("[name='oName']").val();
var position = $("[name='position']").val();
if (name==''){
layer.msg("人员名称不能为空");
}else if (position==''){
layer.msg("职位");
}else {
$.post(
"/bpm/user/addOrganizationMember",
{
"name":name,
"position":position,
"pId":pId,
"id":id
},
function (data) {
if (data.code==200){
layer.msg('操作成功',{icon:1,time:1000},function () {
location.reload();
})
}else{
layer.msg(data.message,{icon:2,time:1000});
}
},'json'
)
}
},
btn2:function (index,layero) {
layer.close(index);
}
});
} }
} }
function reload() { function reload() {
location.reload(); location.reload();
......
Markdown is supported
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