diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx index d967f264..e4a88d36 100644 Binary files a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx and b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx differ diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java index e1da9a66..2d9df268 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java @@ -142,7 +142,7 @@ public class EmpUserController extends BaseController { return renderResult(Global.FALSE, "非法操作,不能够操作此用户!"); } if (!Global.TRUE.equals(userService.checkLoginCode(oldLoginCode, empUser.getLoginCode()/*, null*/))) { - return renderResult(Global.FALSE, "保存用户'" + empUser.getLoginCode() + "'失败,登录账号已存在"); + return renderResult(Global.FALSE, text("保存用户'{0}'失败,登录账号已存在", empUser.getLoginCode())); } if (StringUtils.inString(op, Global.OP_ADD, Global.OP_EDIT)){ empUser.setUserType(User.USER_TYPE_EMPLOYEE); @@ -152,7 +152,7 @@ public class EmpUserController extends BaseController { if (StringUtils.inString(op, Global.OP_ADD, Global.OP_AUTH)){ userService.saveAuth(empUser); } - return renderResult(Global.TRUE, "保存用户'" + empUser.getUserName() + "'成功"); + return renderResult(Global.TRUE, text("保存用户''{0}''成功", empUser.getUserName())); } // /** @@ -244,11 +244,11 @@ public class EmpUserController extends BaseController { return renderResult(Global.FALSE, "非法操作,不能够操作此用户!"); } if (empUser.getCurrentUser().getUserCode().equals(empUser.getUserCode())) { - return renderResult(Global.FALSE, "停用用户失败, 不允许停用当前用户"); + return renderResult(Global.FALSE, text("停用用户失败,不允许停用当前用户")); } empUser.setStatus(User.STATUS_DISABLE); userService.updateStatus(empUser); - return renderResult(Global.TRUE, "停用用户成功"); + return renderResult(Global.TRUE, text("停用用户成功")); } /** @@ -268,7 +268,7 @@ public class EmpUserController extends BaseController { } empUser.setStatus(User.STATUS_NORMAL); userService.updateStatus(empUser); - return renderResult(Global.TRUE, "启用用户成功"); + return renderResult(Global.TRUE, text("启用用户成功")); } /** @@ -287,7 +287,7 @@ public class EmpUserController extends BaseController { return renderResult(Global.FALSE, "非法操作,不能够操作此用户!"); } userService.updatePassword(empUser.getUserCode(), null); - return renderResult(Global.TRUE, "重置用户密码成功"); + return renderResult(Global.TRUE, text("重置用户密码成功")); } /** @@ -306,10 +306,10 @@ public class EmpUserController extends BaseController { return renderResult(Global.FALSE, "非法操作,不能够操作此用户!"); } if (empUser.getCurrentUser().getUserCode().equals(empUser.getUserCode())) { - return renderResult(Global.FALSE, "删除用户失败, 不允许删除当前用户"); + return renderResult(Global.FALSE, text("删除用户失败,不允许删除当前用户")); } empUserService.delete(empUser); - return renderResult(Global.TRUE, "删除用户'" + empUser.getUserName() + "'成功!"); + return renderResult(Global.TRUE, text("删除用户'{0}'成功", empUser.getUserName())); } /** @@ -341,7 +341,7 @@ public class EmpUserController extends BaseController { return renderResult(Global.FALSE, "非法操作,不能够操作此用户!"); } userService.saveAuthDataScope(empUser); - return renderResult(Global.TRUE, "角色授权数据权限成功"); + return renderResult(Global.TRUE, text("用户分配数据权限成功")); } /** diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index 77cd54cc..ef7998dc 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -167,6 +167,7 @@ user: moduleCode: "core", ctrlPermi: "0", ctrlName: "机构权限", + ctrlName_en: "Office", ctrlType: "Office", ctrlDataUrl: "/sys/office/treeData", chkboxType: {"Y":"ps","N":"ps"}, @@ -175,6 +176,7 @@ user: },{ moduleCode: "core", ctrlName: "公司权限", + ctrlName_en: "Company", ctrlType: "Company", ctrlPermi: "0", ctrlDataUrl: "/sys/company/treeData", @@ -184,6 +186,7 @@ user: },{ moduleCode: "core", ctrlName: "角色权限", + ctrlName_en: "Role", ctrlType: "Role", ctrlPermi: "2", ctrlDataUrl: "/sys/role/treeData", diff --git a/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties b/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties index 53e787ed..9ace6d21 100644 --- a/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties +++ b/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties @@ -17,7 +17,10 @@ 折叠全部=Collapse all 操作=Actions 更多操作=More action -状态=Status + +基本信息=Basic information +详细信息=Detail information +扩展字段=Extension field # =========== imageclip =========== diff --git a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties index 1b62a483..6cfd94a1 100644 --- a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties +++ b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties @@ -1,5 +1,5 @@ -# =========== sysLogin =========== +# =========== 登录页 =========== 英语=English @@ -24,7 +24,7 @@ 注册账号=Registered account 忘记密码=Forgot password -# =========== sysIndex =========== +# =========== 主框架页 =========== 仪表盘=Dashboard 全屏=Full screen @@ -38,7 +38,7 @@ 在线=Online 注销=Logout -# =========== userInfo =========== +# =========== 个人中心 =========== 修改密保=Security question 个人信息=User info @@ -66,7 +66,7 @@ 新保密问题=New secret questions 新保密问题答案=New secret answers -# =========== 通用字典列表 =========== +# =========== 通用字典 =========== 是=Yes 否=No @@ -80,7 +80,16 @@ 驳回=Rejected 草稿=Draft -# =========== 核心功能名称 =========== +# =========== 通用字段 =========== + +状态=Status +备注信息=Remarks +创建者=Create by +创建时间=Create date +更新者=Update by +更新时间=Update date + +# =========== 功能标题 =========== 系统管理=System mgt 组织管理=Organization @@ -89,14 +98,14 @@ 公司管理=Company manage 岗位管理=Position manage -组织机构=Office - 用户选择=User select 机构选择=Office select +公司选择=Company select 区域选择=Area select -# =========== empUserList =========== +# =========== 用户管理 =========== +组织机构=Office 新增用户=New user 编辑用户=Edit user @@ -114,7 +123,46 @@ 确认要将该用户密码重置到初始状态吗?=Are you sure want to reset the user password to the initial state? 重置密码=Reset password -# =========== officeList =========== +保存用户''{0}''成功=Save the user ''{0}'' success +保存用户''{0}''失败,登录账号已存在=Save user ''{0}'' failed, login account already exists +停用用户失败,不允许停用当前用户=Disable user failed. Not disable current user +停用用户成功=Disable user success +启用用户成功=Enable user success +重置用户密码成功=Reset user password success +删除用户失败,不允许删除当前用户=Delete user failed. Not delete current user +删除用户''{0}''成功=Delete user ''{0}'' success +用户分配数据权限成功=User assign data scopes success + +账号=Account +昵称=Nick name +邮箱=Email +手机=Mobile +电话=Phone +姓名=Name +机构=Office +公司=Company +岗位=Position + +归属机构=Office +归属公司=Company +登录账号=Account +登录账号已存在=Login account already exists +用户昵称=Nick name +电子邮箱=Email +手机号码=Mobile +办公电话=Phone +权重(排序)=Weight(Sort) +权重越大排名越靠前,请填写数字。=Weight big, ranking the front, fill Numbers. + +员工编号=Work No +员工姓名=Name +所在岗位=Position +英文名=English name + +角色名称=Role name +角色编码=Role code + +# =========== 机构管理 =========== 新增机构=New office 编辑机构=Edit office @@ -127,7 +175,7 @@ 确认要删除该机构及所有子机构吗?=Are you sure want to delete this office and sub office? 新增下级机构=New sub office -# =========== companyList =========== +# =========== 公司管理 =========== 新增公司=New company 编辑公司=Edit company @@ -140,7 +188,7 @@ 确认要删除该公司及所有子公司吗?=Are you sure want to delete this company and sub company? 新增下级公司=New sub company -# =========== empUserList =========== +# =========== 岗位管理 =========== 新增岗位=New position 编辑岗位=Edit position diff --git a/modules/core/src/main/resources/views/modules/sys/dictDataForm.html b/modules/core/src/main/resources/views/modules/sys/dictDataForm.html index c7ad9485..4127653b 100644 --- a/modules/core/src/main/resources/views/modules/sys/dictDataForm.html +++ b/modules/core/src/main/resources/views/modules/sys/dictDataForm.html @@ -78,7 +78,7 @@ -
扩展信息
+
其它信息
diff --git a/modules/core/src/main/resources/views/modules/sys/officeForm.html b/modules/core/src/main/resources/views/modules/sys/officeForm.html index f82f3d99..f5247339 100644 --- a/modules/core/src/main/resources/views/modules/sys/officeForm.html +++ b/modules/core/src/main/resources/views/modules/sys/officeForm.html @@ -78,7 +78,7 @@
-
扩展信息
+
详细信息
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html b/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html index ba899f6f..3dbca1ee 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html @@ -16,14 +16,14 @@
<% if(op=='auth'){ %>
<% } %> <% if(op == 'add' || op == 'edit') { %> -
基本信息
+
${text('基本信息')}
+ * ${text('归属机构')}:
- <#form:treeselect id="office" title="机构选择" + <#form:treeselect id="office" title="${text('机构选择')}" path="employee.office.officeCode" labelPath="employee.office.officeName" url="${ctx}/sys/office/treeData" class="required" allowClear="false"/>
@@ -32,9 +32,9 @@
+ * ${text('归属公司')}:
- <#form:treeselect id="company" title="公司选择" + <#form:treeselect id="company" title="${text('公司选择')}" path="employee.company.companyCode" labelPath="employee.company.companyName" url="${ctx}/sys/company/treeData" btnClass="" allowClear="true"/>
@@ -46,20 +46,20 @@
+ * ${text('登录账号')}:
<#form:hidden name="oldLoginCode" value="${empUser.loginCode}"/> <#form:input path="loginCode" minlength="4" maxlength="20" readonly="${op=='auth'}" class="form-control required userName" remote="${ctx}/sys/user/checkLoginCode?oldLoginCode=${empUser.loginCode}" - data-msg-remote="登录账号已存在"/> + data-msg-remote="${text('登录账号已存在')}"/>
+ * ${text('用户昵称')}:
<#form:input path="userName" maxlength="32" readonly="${op=='auth'}" class="form-control required "/>
@@ -71,7 +71,7 @@
+ * ${text('电子邮箱')}:
<#form:input path="email" maxlength="300" class="form-control email"/> @@ -83,7 +83,7 @@
+ * ${text('手机号码')}:
<#form:input path="mobile" maxlength="100" class="form-control mobile"/> @@ -97,7 +97,7 @@
+ * ${text('办公电话')}:
<#form:input path="phone" maxlength="100" class="form-control phone"/> @@ -109,19 +109,19 @@
+ * ${text('权重(排序)')}:
- <#form:input path="userWeight" maxlength="8" class="form-control digits" placeholder="权重越大排名越靠前,请填写数字。"/> + <#form:input path="userWeight" maxlength="8" class="form-control digits" placeholder="${text('权重越大排名越靠前,请填写数字。')}"/>
-
详细信息
+
${text('详细信息')}
+ * ${text('员工编号')}:
<#form:input path="employee.empCode" maxlength="32" readonly="${!empUser.isNewRecord}" class="form-control abc"/>
@@ -130,7 +130,7 @@
+ * ${text('员工姓名')}:
<#form:input path="employee.empName" maxlength="32" class="form-control "/>
@@ -141,7 +141,7 @@
+ * ${text('所在岗位')}:
<#form:select multiple="true" path="employee.employeePosts" items="${postList}" itemLabel="postName" itemValue="postCode" class="form-control"/> @@ -151,7 +151,7 @@
+ * ${text('英文名')}:
<#form:input path="employee.empNameEn" maxlength="32" class="form-control "/>
@@ -162,7 +162,7 @@
+ * ${text('备注信息')}:
<#form:textarea path="remarks" rows="4" maxlength="500" class="form-control "/>
@@ -171,7 +171,7 @@
<% } %> <% if(op == 'add' || op == 'auth') { %> -
授权角色
+
${text('分配角色')}
<#form:hidden name="userRoleString"/> @@ -221,8 +221,8 @@ var roleGrid = $("#roleGrid").dataGrid({ {name:'ctrlPermi',value:'2'} ], columnModel: [ - {header:'角色名称', name:'name', sortable:false, width:100, align:"center"}, - {header:'角色编码', name:'id', sortable:false, width:100, align:"center"} + {header:'${text('角色名称')}', name:'name', sortable:false, width:100, align:"center"}, + {header:'${text('角色编码')}', name:'id', sortable:false, width:100, align:"center"} ], showCheckbox: true, autoGridHeight: function(){ diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html b/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html index 8ac3ef61..d3139ce1 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html @@ -16,7 +16,7 @@
+ * ${text('登录账号')}:
<#form:input path="loginCode" maxlength="32" readonly="${!empUser.isNewRecord}" class="form-control required "/>
@@ -25,14 +25,14 @@
+ * ${text('用户昵称')}:
<#form:input path="userName" maxlength="32" readonly="${!empUser.isNewRecord}" class="form-control required "/>
-
授权数据权限
+
${text('数据权限')}