pbn32vpxk
/
tamguo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化。

Browse Source
main
tamguo 7 years ago
parent 043aa723d9
commit 3a12d4fa69
4 changed files with 47 additions and 32 deletions
Show Stats Download Patch File Download Diff File

11
tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java
Unescape View File

@ -5,6 +5,7 @@ import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.tamguo.modules.sys.model.enums.SysUserStatusEnum;
@ -17,6 +18,7 @@ import com.tamguo.modules.sys.model.enums.SysUserStatusEnum;
public class SysUserEntity implements Serializable {
private static final long serialVersionUID = 1L;
@TableId
private String userCode;
private String officeCode;
private String officeName;
@ -64,6 +66,7 @@ public class SysUserEntity implements Serializable {
private String userType;
private BigDecimal userWeight;
private String wxOpenid;
private String userNameEn;
public SysUserEntity() {
}
@ -412,5 +415,13 @@ public class SysUserEntity implements Serializable {
this.mgrType = mgrType;
}
public String getUserNameEn() {
return userNameEn;
}
public void setUserNameEn(String userNameEn) {
this.userNameEn = userNameEn;
}
}

8
tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java
Unescape View File

@ -21,7 +21,7 @@ import com.tamguo.modules.sys.utils.Result;
public class SysUserController {
private final String USER_LIST_PAGE = "modules/sys/user/list";
private final String USER_DETAIL_PAGE = "modules/sys/user/detail";
private final String USER_DETAIL_PAGE = "modules/sys/user/update";
@Autowired
private ISysUserService iSysUserService;
@ -36,10 +36,10 @@ public class SysUserController {
return model;
}
@RequestMapping(path="detail")
public ModelAndView detail(String userCode , ModelAndView model) {
@RequestMapping(path="update")
public ModelAndView update(String userCode , ModelAndView model) {
model.setViewName(USER_DETAIL_PAGE);
model.addObject("userCode", userCode);
model.addObject("user", iSysUserService.selectById(userCode));
return model;
}

2
tamguo-oms/src/main/resources/templates/modules/sys/user/list.html
Unescape View File

@ -310,7 +310,7 @@ $('#dataGrid').dataGrid({
}},
{header:'操作', name:'actions', width:260, sortable:false, title:false, formatter: function(val, obj, row, act){
var actions = [];
actions.push('<a href="sys/user/detail?userCode='+row.userCode+'&op=edit" class="btnList" title="编辑用户"><i class="fa fa-pencil"></i></a>&nbsp;');
actions.push('<a href="sys/user/update?userCode='+row.userCode+'&op=edit" class="btnList" title="编辑用户"><i class="fa fa-pencil"></i></a>&nbsp;');
if (row.status == Global.STATUS_NORMAL){
actions.push('<a href="/js/a/sys/empUser/disable?userCode='+row.userCode+'" class="btnList" title="停用用户" data-confirm="确认要停用该用户吗？"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
}

34
tamguo-oms/src/main/resources/templates/modules/sys/user/detail.html → tamguo-oms/src/main/resources/templates/modules/sys/user/update.html
Unescape View File

@ -40,8 +40,8 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
<span class="required ">*</span> 归属机构：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<div class="input-group treeselect" id="officeDiv" data-url="/js/a/sys/office/treeData">
<input id="officeCode" type="hidden" name="employee.office.officeCode" value="SDQD01" class="isReset"/>
<input id="officeName" type="text" name="employee.office.officeName" value="企管部"
<input id="officeCode" type="hidden" name="employee.office.officeCode" th:value="${user.officeCode}" class="isReset"/>
<input id="officeName" type="text" name="employee.office.officeName" th:value="${user.officeName}"
class="form-control required " readonly="readonly"
/><span class="input-group-btn"><a id="officeButton" href="javascript:"
class="btn btn-default "><i class="fa fa-search"></i></a>
@ -58,7 +58,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
shadeClose: true,
title: '机构选择',
area: ['300px', '400px'],
content: '/js/tags/treeselect',
content: 'sys/treeselect',
contentFormData: {
url: $('#officeDiv').attr('data-url'),
checkbox: 'false',
@ -221,7 +221,7 @@ $("#companyButton,#companyName").click(function(){
<span class="required ">*</span> 登录账号：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<input type="hidden" id="oldLoginCode" name="oldLoginCode" value="TEST01"/>
<input type="text" id="loginCode" name="loginCode" value="TEST01" minlength="4" maxlength="20" class="form-control required userName" remote="/js/a/sys/user/checkLoginCode?oldLoginCode=TEST01" data-msg-remote="登录账号已存在"/>
<input type="text" id="loginCode" name="loginCode" th:value="${user.loginCode}" minlength="4" maxlength="20" class="form-control required userName" remote="/js/a/sys/user/checkLoginCode?oldLoginCode=TEST01" data-msg-remote="登录账号已存在"/>
</div>
</div>
</div>
@ -230,7 +230,7 @@ $("#companyButton,#companyName").click(function(){
<label class="control-label col-sm-4" title="">
<span class="required ">*</span> 用户昵称：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<input type="text" id="userName" name="userName" value="TEST01" maxlength="32" class="form-control required "/>
<input type="text" id="userName" name="userName" th:value="${user.userName}" maxlength="32" class="form-control required "/>
</div>
</div>
</div>
@ -242,7 +242,7 @@ $("#companyButton,#companyName").click(function(){
<span class="required hide">*</span> 电子邮箱：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<div class="input-group">
<input type="text" id="email" name="email" value="123123@QQ.COM" maxlength="300" class="form-control email"/>
<input type="text" id="email" name="email" th:value="${user.email}" maxlength="300" class="form-control email"/>
<span class="input-group-addon"><i class="fa fa-fw fa-envelope" style="margin-top:-2px;display:block;"></i></span>
</div>
</div>
@ -254,7 +254,7 @@ $("#companyButton,#companyName").click(function(){
<span class="required hide">*</span> 手机号码：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<div class="input-group">
<input type="text" id="mobile" name="mobile" value="15618910786" maxlength="100" class="form-control mobile"/>
<input type="text" id="mobile" name="mobile" th:value="${user.mobile}" maxlength="100" class="form-control mobile"/>
<span class="input-group-addon"><i class="fa fa-fw fa-mobile" style="margin-top:-2px;display:block;"></i></span>
</div>
</div>
@ -268,7 +268,7 @@ $("#companyButton,#companyName").click(function(){
<span class="required hide">*</span> 办公电话：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<div class="input-group">
<input type="text" id="phone" name="phone" value="" maxlength="100" class="form-control phone"/>
<input type="text" id="phone" name="phone" th:value="${user.phone}" maxlength="100" class="form-control phone"/>
<span class="input-group-addon"><i class="fa fa-fw fa-phone"></i></span>
</div>
</div>
@ -279,7 +279,7 @@ $("#companyButton,#companyName").click(function(){
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 权重(排序)：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<input type="text" id="userWeight" name="userWeight" value="1" maxlength="8" class="form-control digits" placeholder="权重越大排名越靠前，请填写数字。"/>
<input type="text" id="userWeight" name="userWeight" th:value="${user.userWeight}" maxlength="8" class="form-control digits" placeholder="权重越大排名越靠前，请填写数字。"/>
</div>
</div>
</div>
@ -291,7 +291,7 @@ $("#companyButton,#companyName").click(function(){
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 员工编号：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<input type="text" id="employee_empCode" name="employee.empCode" value="TEST01_miom" maxlength="32" readonly="true" class="form-control userName"/>
<input type="text" id="employee_empCode" name="employee.empCode" th:value="${user.userCode}" maxlength="32" readonly="true" class="form-control userName"/>
</div>
</div>
</div>
@ -300,7 +300,7 @@ $("#companyButton,#companyName").click(function(){
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 员工姓名：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<input type="text" id="employee_empName" name="employee.empName" value="TEST01" maxlength="32" class="form-control "/>
<input type="text" id="employee_empName" name="employee.empName" th:value="${user.userName}" maxlength="32" class="form-control "/>
</div>
</div>
</div>
@ -312,9 +312,13 @@ $("#companyButton,#companyName").click(function(){
<span class="required hide">*</span> 所在岗位：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<input type="hidden" name="!employee.employeePosts" value=""/>
<select id="employee_employeePosts" name="employee.employeePosts" class="form-control" multiple="true">
<option value="cfo">财务经理</option><option value="hrm">人力经理</option><option value="dept">部门经理</option><option value="user">普通员工</option></select> </div>
<option value="cfo">财务经理</option>
<option value="hrm">人力经理</option>
<option value="dept">部门经理</option>
<option value="user">普通员工</option>
</select>
</div>
</div>
</div>
<div class="col-xs-6">
@ -322,7 +326,7 @@ $("#companyButton,#companyName").click(function(){
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 英文名：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<input type="text" id="employee_empNameEn" name="employee.empNameEn" value="" maxlength="32" class="form-control "/>
<input type="text" id="employee_empNameEn" name="employee.userNameEn" th:value="${user.userNameEn}" maxlength="32" class="form-control "/>
</div>
</div>
</div>
@ -333,7 +337,7 @@ $("#companyButton,#companyName").click(function(){
<label class="control-label col-sm-2" title="">
<span class="required hide">*</span> 备注信息：<i class="fa icon-question hide"></i></label>
<div class="col-sm-10">
<textarea id="remarks" name="remarks" rows="4" maxlength="500" class="form-control "></textarea>
<textarea id="remarks" name="remarks" rows="4" maxlength="500" class="form-control " th:utext="${user.remarks}"></textarea>
</div>
</div>
</div>
Write Preview
Loading…
Cancel
Save