From 3a12d4fa69acd35d64105e001262d8e383c95f84 Mon Sep 17 00:00:00 2001 From: tamguo Date: Thu, 26 Jul 2018 19:07:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/sys/model/SysUserEntity.java | 11 ++++ .../modules/sys/web/SysUserController.java | 8 +-- .../templates/modules/sys/user/list.html | 2 +- .../sys/user/{detail.html => update.html} | 58 ++++++++++--------- 4 files changed, 47 insertions(+), 32 deletions(-) rename tamguo-oms/src/main/resources/templates/modules/sys/user/{detail.html => update.html} (84%) diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java index 93cbc54..e9ce539 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java @@ -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; + } + } \ No newline at end of file diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java index 24a5237..cf7d4ba 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java @@ -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; } diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/user/list.html b/tamguo-oms/src/main/resources/templates/modules/sys/user/list.html index acc5095..0782db7 100644 --- a/tamguo-oms/src/main/resources/templates/modules/sys/user/list.html +++ b/tamguo-oms/src/main/resources/templates/modules/sys/user/list.html @@ -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(' '); + actions.push(' '); if (row.status == Global.STATUS_NORMAL){ actions.push(' '); } diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/user/detail.html b/tamguo-oms/src/main/resources/templates/modules/sys/user/update.html similarity index 84% rename from tamguo-oms/src/main/resources/templates/modules/sys/user/detail.html rename to tamguo-oms/src/main/resources/templates/modules/sys/user/update.html index ad63ed8..e1faab9 100644 --- a/tamguo-oms/src/main/resources/templates/modules/sys/user/detail.html +++ b/tamguo-oms/src/main/resources/templates/modules/sys/user/update.html @@ -40,8 +40,8 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/> * 归属机构：
- - + @@ -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(){ * 登录账号：
- +
@@ -230,7 +230,7 @@ $("#companyButton,#companyName").click(function(){
- +
@@ -242,7 +242,7 @@ $("#companyButton,#companyName").click(function(){ * 电子邮箱：
- +
@@ -254,7 +254,7 @@ $("#companyButton,#companyName").click(function(){ * 手机号码：
- +
@@ -268,7 +268,7 @@ $("#companyButton,#companyName").click(function(){ * 办公电话：
- +
@@ -278,9 +278,9 @@ $("#companyButton,#companyName").click(function(){
-
- -
+
+ +
@@ -290,18 +290,18 @@ $("#companyButton,#companyName").click(function(){
-
- -
+
+ +
-
- -
+
+ +
@@ -310,20 +310,24 @@ $("#companyButton,#companyName").click(function(){
-
- - -
-
+
+ + +
+
-
- -
+
+ +
@@ -333,7 +337,7 @@ $("#companyButton,#companyName").click(function(){
- +