diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java index dd256592b..076868b36 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java @@ -146,6 +146,13 @@ public interface CommonConstant { */ public static final Integer USER_UNFREEZE = 1; public static final Integer USER_FREEZE = 2; + + /** + * 员工种类(1-正式工,2-临时工) + */ + public static final String WORKER_TYPE_1 = "1"; + public static final String WORKER_TYPE_2 = "2"; + /**字典翻译文本后缀*/ public static final String DICT_TEXT_SUFFIX = "_dictText"; diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformField.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformField.java index 793130043..4e916ce16 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformField.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformField.java @@ -47,6 +47,7 @@ public class OnlCgformField implements Serializable { private Integer orderNum; private String updateBy; private String showArea; + private String dictId; @JsonFormat( timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss" @@ -75,6 +76,14 @@ public class OnlCgformField implements Serializable { private String queryMustInput; private String sortFlag; + public String getDictId() { + return dictId; + } + + public void setDictId(String dictId) { + this.dictId = dictId; + } + public String getShowArea() { return showArea; } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index 0e9f50e82..c3c877bc2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -48,7 +48,7 @@ import java.util.stream.Collectors; public class SysCategoryController { @Autowired private ISysCategoryService sysCategoryService; - + /** * 分页列表查询 * @param sysCategory @@ -67,7 +67,7 @@ public class SysCategoryController { sysCategory.setPid("0"); } Result> result = new Result>(); - + //--author:os_chengtgen---date:20190804 -----for: 分类字典页面显示错误,issues:377--------start //QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysCategory, req.getParameterMap()); QueryWrapper queryWrapper = new QueryWrapper(); @@ -126,7 +126,7 @@ public class SysCategoryController { } return result; } - + /** * 编辑 * @param sysCategory @@ -145,7 +145,7 @@ public class SysCategoryController { } return result; } - + /** * 通过id删除 * @param id @@ -162,10 +162,10 @@ public class SysCategoryController { this.sysCategoryService.deleteSysCategory(id); result.success("删除成功!"); } - + return result; } - + /** * 批量删除 * @param ids @@ -183,7 +183,7 @@ public class SysCategoryController { } return result; } - + /** * 通过id查询 * @param id @@ -285,9 +285,9 @@ public class SysCategoryController { } return Result.error("文件导入失败！"); } - - - + + + /** * 加载单个数据 用于回显 */ @@ -296,7 +296,7 @@ public class SysCategoryController { public Result loadOne(@RequestParam(name="field") String field,@RequestParam(name="val") String val) { Result result = new Result(); try { - + QueryWrapper query = new QueryWrapper(); query.eq(field, val); List ls = this.sysCategoryService.list(query); @@ -317,7 +317,7 @@ public class SysCategoryController { } return result; } - + /** * 加载节点的子数据 */ @@ -336,7 +336,7 @@ public class SysCategoryController { } return result; } - + /** * 加载一级节点/如果是同步 则所有数据 */ @@ -358,7 +358,7 @@ public class SysCategoryController { } return result; } - + /** * 递归求子节点 同步加载用到 */ @@ -518,7 +518,7 @@ public class SysCategoryController { @GetMapping("/getSysCategoryTree") public Result getSysCategoryTree() { - return sysCategoryService.getSysCategoryTree(); + return Result.OK(sysCategoryService.getSysCategoryTree()); } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index 745b00719..1cccab9d7 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -1,20 +1,14 @@ package com.jero.modules.system.controller; -import java.io.IOException; -import java.util.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.jero.common.system.vo.SysDepartTreeModel; -import org.apache.shiro.SecurityUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CommonConstant; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.util.JwtUtil; import com.jero.common.system.vo.LoginUser; +import com.jero.common.system.vo.SysDepartTreeModel; import com.jero.common.util.ImportExcelUtil; import com.jero.common.util.YouBianCodeUtil; import com.jero.common.util.oConvertUtils; @@ -24,6 +18,9 @@ import com.jero.modules.system.model.DepartIdModel; import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.service.ISysUserDepartService; import com.jero.modules.system.service.ISysUserService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; @@ -38,9 +35,10 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.*; /** *

@@ -299,6 +297,12 @@ public class SysDepartController { //Step.2 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); List pageList = sysDepartService.list(queryWrapper); + for(SysDepart depart : pageList){ + if(StringUtils.isNotBlank(depart.getParentId())){ + SysDepart parentDepart = sysDepartService.getById(depart.getParentId()); + depart.setParentName(parentDepart.getDepartName()); + } + } //按字典排序 Collections.sort(pageList, new Comparator() { @Override diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 57dac6ae4..43f7d86c3 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -335,7 +335,7 @@ public class SysDictController { return result; } /** - * 查询选项内容--数据字典名称 + * 查询被删除的列表 * @return */ @GetMapping(value = "/deleteList") @@ -602,9 +602,10 @@ public class SysDictController { } + /** - * 查询被删除的列表 - * @return + * 查询选项内容 + * */ @GetMapping(value = "/queryDictName") public Result> queryDictName(SysDict sysDict) { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 8a6c035c8..cf4401c5d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -3,35 +3,36 @@ package com.jero.modules.system.controller; import cn.hutool.core.util.RandomUtil; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; -import org.apache.shiro.SecurityUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.authz.annotation.RequiresRoles; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.PermissionData; import com.jero.common.constant.CommonConstant; import com.jero.common.system.api.ISysBaseAPI; -import com.jero.modules.base.service.BaseCommonService; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.util.JwtUtil; import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.*; +import com.jero.common.util.ImportExcelUtil; +import com.jero.common.util.PasswordUtil; +import com.jero.common.util.RedisUtil; +import com.jero.common.util.oConvertUtils; +import com.jero.modules.base.service.BaseCommonService; import com.jero.modules.system.entity.*; import com.jero.modules.system.model.DepartIdModel; import com.jero.modules.system.model.SysUserSysDepartModel; import com.jero.modules.system.service.*; import com.jero.modules.system.vo.SysDepartUsersVO; import com.jero.modules.system.vo.SysUserRoleVO; -import org.apache.shiro.subject.Subject; -import org.checkerframework.framework.qual.RequiresQualifier; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -61,6 +62,7 @@ import java.util.stream.Collectors; */ @Slf4j @RestController +@Api(tags = "用户管理") @RequestMapping("/sys/user") public class SysUserController { @Autowired @@ -104,6 +106,7 @@ public class SysUserController { * @param req * @return */ + @ApiOperation(value = "用户管理-分页查询") @RequiresPermissions("sys:user:list") @PermissionData(pageComponent = "system/UserList") @RequestMapping(value = "/page", method = RequestMethod.GET) @@ -647,6 +650,7 @@ public class SysUserController { /** * 部门用户列表 */ + @ApiOperation(value = "用户管理-查询组织下的用户列表") @RequestMapping(value = "/departUserList", method = RequestMethod.GET) @RequiresPermissions("sys:user:list") public Result> departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -654,16 +658,20 @@ public class SysUserController { Result> result = new Result>(); Page page = new Page(pageNo, pageSize); String depId = req.getParameter("depId"); - String username = req.getParameter("username"); +// String username = req.getParameter("username"); + String username = null; //根据部门ID查询,当前和下级所有的部门IDS List subDepids = new ArrayList<>(); //部门id为空时，查询我的部门下所有用户 if(oConvertUtils.isEmpty(depId)){ - LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - int userIdentity = user.getUserIdentity() != null?user.getUserIdentity():CommonConstant.USER_IDENTITY_1; - if(oConvertUtils.isNotEmpty(userIdentity) && userIdentity == CommonConstant.USER_IDENTITY_2 ){ - subDepids = sysDepartService.getMySubDepIdsByDepId(user.getDepartIds()); - } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0); + subDepids = sysDepartService.list(queryWrapper).stream().map(SysDepart::getId).collect(Collectors.toList()); +// LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// int userIdentity = user.getUserIdentity() != null?user.getUserIdentity():CommonConstant.USER_IDENTITY_1; +// if(oConvertUtils.isNotEmpty(userIdentity) && userIdentity == CommonConstant.USER_IDENTITY_2 ){ +// subDepids = sysDepartService.getMySubDepIdsByDepId(user.getDepartIds()); +// } }else{ subDepids = sysDepartService.getSubDepIdsByDepId(depId); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategoryTreeVO.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategoryTreeVO.java index 791df3339..1425ad344 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategoryTreeVO.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategoryTreeVO.java @@ -13,10 +13,14 @@ public class SysCategoryTreeVO { private String id; + private String key; + private String parentId; private String title; + private String dictId; + private List children; } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java index 21c627b1c..894fd5410 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java @@ -1,11 +1,11 @@ package com.jero.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import com.jero.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; @@ -32,46 +32,49 @@ public class SysDepart implements Serializable { /**父机构ID*/ private String parentId; /**机构/部门名称*/ - @Excel(name="机构/部门名称",width=15) + @Excel(name="机构名称",width=15) private String departName; /**英文名*/ - @Excel(name="英文名",width=15) +// @Excel(name="英文名",width=15) private String departNameEn; /**缩写*/ private String departNameAbbr; - /**排序*/ - @Excel(name="排序",width=15) - private Integer departOrder; /**描述*/ - @Excel(name="描述",width=15) +// @Excel(name="描述",width=15) private String description; - /**机构类别 1公司，2组织机构，2岗位*/ - @Excel(name="机构类别",width=15,dicCode="org_category") - private String orgCategory; /**机构类型*/ private String orgType; + @Excel(name = "上级部门", width = 15) + @TableField(exist = false) + private String parentName; /**机构编码*/ @Excel(name="机构编码",width=15) private String orgCode; + /**机构类别 1公司，2组织机构，2岗位*/ + @Excel(name="机构类型",width=15,dicCode="org_category") + private String orgCategory; + /**排序*/ + @Excel(name="排序",width=15) + private Integer departOrder; /**父级机构编码*/ private String parentCode; /**手机号*/ - @Excel(name="手机号",width=15) +// @Excel(name="手机号",width=15) private String mobile; /**传真*/ - @Excel(name="传真",width=15) +// @Excel(name="传真",width=15) private String fax; /**地址*/ - @Excel(name="地址",width=15) +// @Excel(name="地址",width=15) private String address; /**备注*/ - @Excel(name="备注",width=15) +// @Excel(name="备注",width=15) private String memo; /**状态（1启用，0不启用）*/ - @Dict(dicCode = "depart_status") +// @Dict(dicCode = "depart_status") private String status; /**删除状态（0，正常，1已删除）*/ - @Dict(dicCode = "del_flag") +// @Dict(dicCode = "del_flag") private String delFlag; /**创建人*/ private String createBy; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java index c30b861c7..7dc0983b3 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java @@ -106,7 +106,7 @@ public class SysDict implements Serializable { /** * 表单控件类型 */ - @Excel(name = "标签类型 1下拉选择 2树形结构", width = 15) + @Excel(name = "标签类型 1下拉选择 2树形结构", width = 15,dicCode = "attribute_type") @ApiModelProperty(value = "标签类型 1下拉选择 2树形结构") @Dict(dicCode = "attribute_type") private java.lang.String attributeType; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java index 9151c3163..ef358a6cd 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java @@ -1,23 +1,19 @@ package com.jero.modules.system.entity; -import java.util.Date; - -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.jero.common.aspect.annotation.Dict; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.annotation.JsonFormat; - -import java.io.Serializable; - +import com.fasterxml.jackson.annotation.JsonProperty; +import com.jero.common.aspect.annotation.Dict; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; /** *

@@ -43,13 +39,13 @@ public class SysUser implements Serializable { /** * 登录账号 */ - @Excel(name = "登录账号", width = 15) + @Excel(name = "账号", width = 15) private String username; /** * 真实姓名 */ - @Excel(name = "真实姓名", width = 15) + @Excel(name = "姓名", width = 15) private String realname; /** @@ -67,13 +63,13 @@ public class SysUser implements Serializable { /** * 头像 */ - @Excel(name = "头像", width = 15,type = 2) +// @Excel(name = "头像", width = 15,type = 2) private String avatar; /** * 生日 */ - @Excel(name = "生日", width = 15, format = "yyyy-MM-dd") +// @Excel(name = "生日", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date birthday; @@ -81,20 +77,20 @@ public class SysUser implements Serializable { /** * 性别（1：男 2：女） */ - @Excel(name = "性别", width = 15,dicCode="sex") +// @Excel(name = "性别", width = 15,dicCode="sex") @Dict(dicCode = "sex") private Integer sex; /** * 电子邮件 */ - @Excel(name = "电子邮件", width = 15) +// @Excel(name = "电子邮件", width = 15) private String email; /** * 电话 */ - @Excel(name = "电话", width = 15) +// @Excel(name = "电话", width = 15) private String phone; /** @@ -103,32 +99,26 @@ public class SysUser implements Serializable { private String orgCode; /**部门名称*/ + @Excel(name = "部门", width = 15) private transient String orgCodeTxt; - /** - * 状态(1：正常 2：冻结 ） - */ - @Excel(name = "状态", width = 15,dicCode="user_status") - @Dict(dicCode = "user_status") - private Integer status; - /** * 删除状态（0，正常，1已删除） */ - @Excel(name = "删除状态", width = 15,dicCode="del_flag") +// @Excel(name = "删除状态", width = 15,dicCode="del_flag") @TableLogic private Integer delFlag; /** * 工号，唯一键 */ - @Excel(name = "工号", width = 15) + @Excel(name = "员工号", width = 15) private String workNo; /** * 座机号 */ - @Excel(name = "座机号", width = 15) +// @Excel(name = "座机号", width = 15) private String telephone; /** @@ -158,13 +148,13 @@ public class SysUser implements Serializable { /** * 身份（0 普通成员 1 上级） */ - @Excel(name="（1普通成员 2上级）",width = 15) +// @Excel(name="（1普通成员 2上级）",width = 15) private Integer userIdentity; /** * 负责部门 */ - @Excel(name="负责部门",width = 15,dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") +// @Excel(name="负责部门",width = 15,dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") private String departIds; @@ -177,4 +167,15 @@ public class SysUser implements Serializable { private String clientId; private String thirdId;//用户域账号 + + @Excel(name = "员工类型", width = 15, dicCode = "worker_type") + @Dict(dicCode = "worker_type") + private String workerType;//员工种类(1-正式工,2-临时工) + + /** + * 状态(1：正常 2：冻结 ） + */ + @Excel(name = "状态", width = 15,dicCode="user_status") + @Dict(dicCode = "user_status") + private Integer status; } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartMapper.java index 4da1ed424..3f7de8951 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartMapper.java @@ -55,6 +55,6 @@ public interface SysDepartMapper extends BaseMapper { * @return */ @Select("UPDATE sys_depart t1 JOIN sys_depart t2 ON t1.parent_code = t2.org_code SET t1.parent_id = t2.id") - int updateAllParentId(); + void updateAllParentId(); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartMapper.xml index 960893dd5..372352fee 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartMapper.xml @@ -3,28 +3,34 @@ + SELECT sd.id + FROM sys_depart sd,( SELECT ( @nodes := queryChildrenTempNode (#{departId})) AS pids ) t + WHERE + FIND_IN_SET( sd.id, t.pids ) + AND del_flag = 0 + select * from sys_user where del_flag = 0 - and id in (select user_id from sys_user_depart where dep_id in + and id in (select dru.user_id from sys_depart_role dr, sys_depart_role_user dru where dr.id = dru.drole_id and dr.depart_id in #{id} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java index c28a7a6cd..083e178db 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java @@ -1,9 +1,9 @@ package com.jero.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; import com.jero.modules.system.entity.SysCategory; +import com.jero.modules.system.entity.SysCategoryTreeVO; import com.jero.modules.system.model.TreeSelectModel; import java.util.List; @@ -21,16 +21,16 @@ public interface ISysCategoryService extends IService { public static final String ROOT_PID_VALUE = "0"; void addSysCategory(SysCategory sysCategory); - + void updateSysCategory(SysCategory sysCategory); - + /** * 根据父级编码加载分类字典的数据 * @param pcode * @return */ public List queryListByCode(String pcode) throws JeroBootException; - + /** * 根据pid查询子节点集合 * @param pid @@ -70,5 +70,5 @@ public interface ISysCategoryService extends IService { * 获取树形结构 * @return */ - Result getSysCategoryTree(); + List getSysCategoryTree(); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java index a516ee25b..f3ceb8923 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java @@ -135,5 +135,5 @@ public interface ISysDepartService extends IService{ * 更新所有组织的父节点id * @return */ - int updateAllParentId(); + void updateAllParentId(); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java index 4c727ae32..16d89736f 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.jero.common.constant.CommonConstant; -import com.jero.common.system.util.JwtUtil; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; import com.jero.common.util.oConvertUtils; @@ -20,11 +19,12 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.io.IOException; -import java.io.PipedOutputStream; -import java.net.MalformedURLException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -245,6 +245,7 @@ public class SyncDataServiceImpl implements ISyncDataService{ sysUser.setThirdId(employee.getWorker_user_id()); sysUser.setActivitiSync(CommonConstant.ACT_SYNC_1); sysUser.setWorkNo(employee.getEmployee_id()); + sysUser.setWorkerType("Employee".equals(employee.getWorker_type())? CommonConstant.WORKER_TYPE_1 : CommonConstant.WORKER_TYPE_2); // sysUser.setUpdateTime(employee.getUpdate_time()); sysUser.setCreateTime(new Date()); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index 37ebe7271..db051dbcd 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -62,7 +62,7 @@ public class SysCategoryServiceImpl extends ServiceImpl getSysCategoryTree() { try { List list = super.baseMapper.selectList(new QueryWrapper<>()); List tree = new ArrayList<>(); if(CollectionUtils.isNotEmpty(list)){ tree = TreeUtils.getSysCategoryTree(list); } - return Result.OK(tree); + return tree; }catch (Exception ex){ log.error("查询树形结构失败： " + ex.getMessage()); throw new JeroBootException("查询树形结构失败！"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java index 7d5842fc4..115c0da5a 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java @@ -1,13 +1,12 @@ package com.jero.modules.system.service.impl; -import java.util.*; - import com.alibaba.fastjson.JSONObject; -import com.jero.common.system.vo.SysDepartTreeModel; -import org.apache.commons.lang.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.FillRuleConstant; +import com.jero.common.system.vo.SysDepartTreeModel; import com.jero.common.util.FillRuleUtil; import com.jero.common.util.YouBianCodeUtil; import com.jero.modules.system.entity.*; @@ -15,15 +14,14 @@ import com.jero.modules.system.mapper.*; import com.jero.modules.system.model.DepartIdModel; import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.util.FindsDepartsChildrenUtil; +import io.netty.util.internal.StringUtil; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import io.netty.util.internal.StringUtil; +import java.util.*; /** *

@@ -535,8 +533,10 @@ public class SysDepartServiceImpl extends ServiceImpl impl @Override public List queryDictName(SysDict sysDict) { QueryWrapper QueryWrapper = new QueryWrapper<>(); - QueryWrapper.select("id", "dict_name").eq("is_tag_dict",1); + QueryWrapper.select("id", "dict_name","attribute_type").eq("is_tag_dict",1); return list(QueryWrapper); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java index 3574683c7..8bb6a79d0 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java @@ -25,6 +25,8 @@ public class TreeUtils { if (TREE_ROOT_CODE.equals(sysCategory.getPid())) { SysCategoryTreeVO sysCategoryTreeVO = new SysCategoryTreeVO(); sysCategoryTreeVO.setId(sysCategory.getId()); + sysCategoryTreeVO.setKey(sysCategory.getId()); + sysCategoryTreeVO.setDictId(sysCategory.getSysDictId()); sysCategoryTreeVO.setTitle(sysCategory.getName()); sysCategoryTreeVO.setParentId(sysCategory.getPid()); sysCategoryTreeVO.setChildren(getSysCategoryTreeChild(sysCategory.getId(), sysCategoryList)); @@ -39,7 +41,9 @@ public class TreeUtils { for (SysCategory sysCategory : sysCategoryList) { if (id.equals(sysCategory.getPid())) { SysCategoryTreeVO sysCategoryTreeVO = new SysCategoryTreeVO(); + sysCategoryTreeVO.setDictId(sysCategory.getSysDictId()); sysCategoryTreeVO.setId(sysCategory.getId()); + sysCategoryTreeVO.setKey(sysCategory.getId()); sysCategoryTreeVO.setTitle(sysCategory.getName()); sysCategoryTreeVO.setParentId(sysCategory.getPid()); sysCategoryTreeVO.setChildren(getSysCategoryTreeChild(sysCategory.getId(), sysCategoryList)); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/FieldTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/FieldTypeEnum.java index 9868a1b7f..885b25b39 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/FieldTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/FieldTypeEnum.java @@ -12,6 +12,7 @@ public enum FieldTypeEnum { // FILE("文件","file"), // DATE("日期","date"); //属性类型 1输入框（字符串），2输入框（数字），3单选下拉框，4多选下拉框，5单日期选择，6多日期选择，7文件，8文本框，9人员选择，10标准选择 + TREE("树形结构","0"), TEXT_STRING("输入框(字符串)","1"), TEXT_NUMBER("输入框(数字)","2"), PULL_SINGLE("单选下拉框","3"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 7b6a7e9b2..fff99d211 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -29,13 +29,12 @@ import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.subscribe.entity.OnlCgformSubscribe; import com.jero.modules.subscribe.service.IOnlCgformSubscribeService; import com.jero.modules.system.entity.SysAnnouncement; -import com.jero.modules.system.entity.SysAnnouncementSend; +import com.jero.modules.system.entity.SysCategoryTreeVO; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysUserMapper; -import com.jero.modules.system.service.ISysAnnouncementSendService; import com.jero.modules.system.service.ISysAnnouncementService; -import com.jero.modules.system.service.impl.SysBaseApiImpl; +import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.service.impl.OnlCgformAreaServiceImpl; @@ -112,6 +111,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl areaList = onlCgformAreaServiceImpl.queryList(onlCgformArea); //字段属性 List fieldList = onlCgformFieldService.getFieldList(flag); + //过滤出字段为树形结构的 + List onlCgformFieldTree = fieldList.stream().filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); if (fieldList.size() != 0) { //过滤出表单字段(is_show_form-->表单是否显示0否 1是) if ("add".equals(type)) { - //新增时,被代替标准在表单中不显示 + //新增时,被代替标准在表单中不显示. fieldList = fieldList.stream() - .filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm())) && !e.getDbFieldName().equals("replaced_standard")) + .filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm())) && !"replaced_standard" .equals(e.getDbFieldName())) .collect(Collectors.toList()); } else { fieldList = fieldList.stream() @@ -273,6 +276,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysCategoryTree = sysCategoryService.getSysCategoryTree(); List> result = new ArrayList<>(); for (OnlCgformArea onlCgformAreaTemp : areaList) { String areaName = ""; @@ -283,8 +288,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList()); for (OnlCgformField onlCgformField : fieldListTemp) { + String dictId = onlCgformField.getDictId(); + List sysCategoryTreeVOList = new ArrayList<>(); + if(StringUtils.isNotBlank(dictId)){ + sysCategoryTreeVOList = sysCategoryTree.stream().filter(e -> dictId.equals(e.getDictId())).collect(Collectors.toList()); + } Map map = new HashMap<>(); - mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName); + mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName,sysCategoryTreeVOList); map.put("field_must_input", onlCgformField.getFieldMustInput());//区域 result.add(map); } @@ -479,14 +489,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl mapNew = new HashMap<>(); mapNew.put("value", fileInfo); - mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName); + mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName,null); resultTemp.add(mapNew); } } } else if (fileInfos.size() == 1) { //单个文件处理 map.put("value", fileInfos.get(0)); - mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName); + mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName,null); resultTemp.add(map); } } @@ -513,7 +523,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map, String field_show_type, String fieldShowType2, String dict_field, String dictField, String db_field_name, String dbFieldName2, String db_field_txt, String dbFieldTxt, String db_field_en_name, String dbFieldEnName, String area, String showArea) { + private void mapPut(String cut, Map map, String field_show_type, + String fieldShowType2, String dict_field, String dictField, + String db_field_name, String dbFieldName2, String db_field_txt, + String dbFieldTxt, String db_field_en_name, String dbFieldEnName, + String area, String showArea,List sysCategoryTreeVOS) { map.put(field_show_type, fieldShowType2);//类型(判断是下拉还是输入框,等等) map.put(dict_field, dictField); map.put(db_field_name, dbFieldName2);//字段 @@ -545,6 +559,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(onlCgformTag, req.getParameterMap()); Page page = new Page(pageNo, pageSize); if(StringUtils.isNotBlank("create_time")) { - queryWrapper.orderByDesc("create_time"); + queryWrapper.orderByDesc("create_time").eq("is_show_list",1) + .eq("cgform_head_id","48308196e7b04761b533dc31bc899707");//筛选文档库数据 } IPage pageList = onlCgformTagService.page(page, queryWrapper); return Result.OK(pageList); @@ -125,6 +126,7 @@ public class OnlCgformTagController extends JeroController - 人员选择 + {{this.$t('PersonnelSelection')}}

{ if (res.success) { - this.$message.success(res.message) + this.$message.success(this.$t('OperationSuccessful')) eventBUs.$emit('searchReset') this.$emit('addFormClick') } else { - this.$message.warning(res.message) + this.$message.warning(this.$t('operationFailed')) } }) } else { @@ -295,7 +295,6 @@ }, /** 上传文件的回调 */ uploadSuccess(data) { - console.log(data) let attIdList = [] data.map(item => { attIdList.push(item.id || data.name) @@ -319,7 +318,7 @@ if (res.field_show_type === '1') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'blur' }) } else if (res.field_show_type === '4' || res.field_show_type === '6' || @@ -327,25 +326,25 @@ ) { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'change' }) } else if (res.field_show_type === '2') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'blur' }) } else if (res.field_show_type === '8' || res.field_show_type === '9' || res.field_show_type === '10') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'blur' }) } else if (res.field_show_type === '3') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'change' }) } diff --git a/jero-web/src/components/dict/JDictSelectTag.vue b/jero-web/src/components/dict/JDictSelectTag.vue index a7917a1b6..7971bb87e 100644 --- a/jero-web/src/components/dict/JDictSelectTag.vue +++ b/jero-web/src/components/dict/JDictSelectTag.vue @@ -105,6 +105,5 @@ } } - \ No newline at end of file diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index 746280a3f..c86127a46 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -463,4 +463,7 @@ .ant-table-placeholder { background: transparent !important; } + .ant-input-number{ + background: transparent !important; + } diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index a824dbe75..1e1e0398a 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -180,7 +180,7 @@
- +
* @@ -191,9 +191,9 @@ v-model="formInline[item.db_field_name]" style="width: 100%" :maxTagCount="1" - :tree-data="treeData" + :tree-data="item.tree" tree-checkable - placeholder="Please select" + :placeholder="$t('PleaseSelect')+item.db_field_txt" />
@@ -283,50 +283,6 @@ content: [] } ], - treeData: [ - { - title: 'Node1', - value: '0-0', - key: '0-0', - children: [ - { - title: 'Child Node1', - value: '0-0-0', - key: '0-0-0', - children: [ - { - title: 'Child Node1', - value: '0-0-0-0', - key: '0-0-0-0' - } - ] - } - ] - }, - { - title: 'Node2', - value: '0-1', - key: '0-1', - children: [ - { - title: 'Child Node3', - value: '0-1-0', - key: '0-1-0', - disabled: true - }, - { - title: 'Child Node4', - value: '0-1-1', - key: '0-1-1' - }, - { - title: 'Child Node5', - value: '0-1-2', - key: '0-1-2' - } - ] - } - ] } }, mounted() { @@ -350,11 +306,11 @@ }) postAction(url, formInline).then((res) => { if (res.success) { - this.$message.success(res.message) + this.$message.success(this.$t('OperationSuccessful')) eventBUs.$emit('searchReset') this.$emit('addFormClick') } else { - this.$message.warning(res.message) + this.$message.warning(this.$t('operationFailed')) } }) } else { @@ -410,7 +366,7 @@ if (res.field_show_type === '1') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'blur' }) } else if (res.field_show_type === '4' || res.field_show_type === '6' || @@ -418,25 +374,25 @@ ) { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'change' }) } else if (res.field_show_type === '2') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'blur' }) } else if (res.field_show_type === '8' || res.field_show_type === '9' || res.field_show_type === '10') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'blur' }) } else if (res.field_show_type === '3') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'change' }) } diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index e9bcba633..95013b3a9 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -17,7 +17,7 @@
-
+
{{item.db_field_txt}}
@@ -42,7 +42,7 @@ @change="dateChange(item.db_field_name)" v-model="queryParam[item.db_field_name]"/>
-
+
{{item.db_field_txt}}
diff --git a/jero-web/src/components/tableDate/index.vue b/jero-web/src/components/tableDate/index.vue index 0345280ac..7d83774ed 100644 --- a/jero-web/src/components/tableDate/index.vue +++ b/jero-web/src/components/tableDate/index.vue @@ -39,7 +39,7 @@
-
-

{{ record.titile }}

-

{{ record.createTime }} 发布

+ - - - - -
- 查看更多 + {{this.$t('SeeMore')}}
- - - - - - - - - - - - - - - - - - @@ -54,14 +32,12 @@ - @@ -659,4 +666,8 @@ background: #fff; border-radius: 0 0 2px 2px; } + + .box-ant { + margin-right: 0 !important; + } \ No newline at end of file diff --git a/jero-web/src/views/system/DictList.vue b/jero-web/src/views/system/DictList.vue index 2279a9eef..baa7b612f 100644 --- a/jero-web/src/views/system/DictList.vue +++ b/jero-web/src/views/system/DictList.vue @@ -4,40 +4,59 @@
- - - - - + + +
+
+ {{$t('DictionaryName')}} +
+ +
- - - - + +
+
+ {{$t('DictionaryEnName')}} +
+ +
- - - - - - - - {{$t('query')}} - {{$t('reset')}} - + +
+
+ {{$t('DictionaryNumber')}} +
+ +
+ + + {{$t('query')}} + {{$t('reset')}} + + -
- {{$t('addTo')}} - {{$t('export')}} - - {{$t('import')}} - - {{$t('RefreshCache')}}} +
+ +
+ + {{$t('addTo')}} +
+ + + + + + + + - {{$t('recycleBin')}} +
- {{$t('edit')}} - {{$t('DictionaryConfiguration')}} + {{$t('DictionaryConfiguration')}} {{$t('delete')}} @@ -71,27 +89,27 @@ \ No newline at end of file diff --git a/jero-web/src/views/system/RoleUserList.vue b/jero-web/src/views/system/RoleUserList.vue index b595ee862..a8e3f4f5b 100644 --- a/jero-web/src/views/system/RoleUserList.vue +++ b/jero-web/src/views/system/RoleUserList.vue @@ -6,18 +6,20 @@ - - - +
+
+ {{$t('roleName')}} +
+ +
- - - {{$t('query')}} - {{$t('reset')}} - - + + + {{$t('query')}} + {{$t('reset')}} + +
@@ -28,7 +30,10 @@ - +
+ + {{$t('export')}} +
@@ -40,6 +45,7 @@
{ - return moment(text).format('YYYY-MM-DD') - } + columns: [ + { + title: this.$t('serialNumber'), + dataIndex: '', + key: 'rowIndex', + width: 20, + align: 'center', + customRender: function(t, r, index) { + return parseInt(index) + 1 } - // { - // title: this.$t('operation'), - // dataIndex: 'action', - // align: 'center', - // scopedSlots: { customRender: 'action' } - // } - ], + }, + { + title: this.$t('RoleCode'), + align: 'center', + dataIndex: 'roleCode', + width: 180 + }, + { + title: this.$t('roleName'), + align: 'center', + dataIndex: 'roleName', + width: 180 + }, + { + title: this.$t('createTime'), + dataIndex: 'createTime', + align: 'center', + width: 180, + sorter: true, + customRender: (text) => { + return moment(text).format('YYYY-MM-DD') + } + } + // { + // title: this.$t('operation'), + // dataIndex: 'action', + // align: 'center', + // scopedSlots: { customRender: 'action' } + // } + ], // 高级查询拼接条件 superQueryMatchType2: 'and', url: { @@ -351,4 +369,37 @@ .ant-btn { margin-left: 8px } + .box-title-text { + line-height: 1.4; + display: flex; + align-items: center; + margin-bottom: 10px; + } + + .title-text { + width: 20%; + min-width: 90px; + color: #000F16; + display: inline-block; + font-weight: 500; + font-size: 14px; + margin-right: 16px; + margin-top: 3px; + text-align: right; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + .box-input { + display: inline-block; + width: 70%; + height: 38px; + margin-top: 2px; + } + + .box-button { + height: 38px; + /*margin-top: 2px;*/ + } \ No newline at end of file diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue index d58610a74..718770312 100644 --- a/jero-web/src/views/system/UserAnnouncementList.vue +++ b/jero-web/src/views/system/UserAnnouncementList.vue @@ -135,10 +135,6 @@ } }, methods: { - handleDetail: function(record) { - this.$refs.sysAnnouncementModal.detail(record) - this.$refs.sysAnnouncementModal.title = '查看' - }, showAnnouncement(record) { putAction(this.url.editCementSend, { anntId: record.anntId }).then((res) => { if (res.success) { @@ -164,8 +160,10 @@ getAction(that.url.readAllMsg, { ids: selectedRowKeys.join(',') }).then((res) => { if (res.success) { that.selectedRowKeys = [] - that.$message.success(res.message) + that.$message.success(this.$t('OperationSuccessful')) that.loadData() + }else{ + that.$message.success(this.$t('operationFailed')) } }) } @@ -195,8 +193,10 @@ deleteAction(that.url.deleteUrl, { ids: selectedRowKeys.join(',') }).then((res) => { if (res.success) { that.selectedRowKeys = [] - that.$message.success(res.message) + that.$message.success(this.$t('OperationSuccessful')) that.loadData() + }else{ + that.$message.success(this.$t('operationFailed')) } }) } diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue index c7d982999..436f5110b 100644 --- a/jero-web/src/views/system/UserList.vue +++ b/jero-web/src/views/system/UserList.vue @@ -5,75 +5,84 @@
- - - - - - - - - +
+
+ {{$t('account')}} +
+ +
+ + +
+
+ {{$t('RealName')}} +
+ +
+ + +
+
+ {{$t('EmployeeNumber')}} +
+ +
+ + +
+
+ {{$t('EmployeeType')}} +
+ +
+ + +
+
+ {{$t('status')}} +
+ {{$t('pleaseSelect')}} - {{$t('male')}} - {{$t('female')}} + {{$t('normal')}} + {{$t('frozen')}} - +
- - - - - - - {{$t('query')}} - {{$t('reset')}} - - {{ toggleSearchStatus ? $t('putAway') : $t('open') }} - - - - - + + + {{$t('query')}} + {{$t('reset')}} + +
-
- - - - - - +
+ + + + + + +
+ + {{$t('export')}} +
+