From 4fc7a6869b9c673722c9400ecf8a518bb318b017 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sun, 22 Apr 2018 18:56:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=E5=92=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jquery-ztree/3.5/css/metro/zTreeStyle.css | 2 +- .../modules/sys/web/CompanyController.java | 10 +- .../modules/sys/web/OfficeController.java | 10 +- .../modules/sys/web/PostController.java | 10 +- .../sys/web/user/EmpUserController.java | 8 +- .../main/resources/db/upgrade/core/versions | 3 +- .../i18n/core/common_view/i18n_en.properties | 2 + .../i18n/core/sys/i18n_en.properties | 129 +++++++++++------- .../views/modules/sys/companyForm.html | 24 ++-- .../views/modules/sys/companyList.html | 18 +-- .../views/modules/sys/officeForm.html | 30 ++-- .../views/modules/sys/officeList.html | 24 ++-- .../resources/views/modules/sys/postForm.html | 14 +- .../resources/views/modules/sys/postList.html | 18 +-- .../views/modules/sys/user/empUserIndex.html | 2 +- web/db/mysql/create_user.sql | 2 + .../modules/test/dao/TestDataChildDao.java | 2 +- .../jeesite/modules/test/dao/TestDataDao.java | 2 +- .../jeesite/modules/test/dao/TestTreeDao.java | 2 +- .../jeesite/modules/test/entity/TestData.java | 5 +- .../modules/test/entity/TestDataChild.java | 5 +- .../jeesite/modules/test/entity/TestTree.java | 2 +- .../modules/test/service/TestDataService.java | 10 +- .../modules/test/service/TestTreeService.java | 7 +- .../modules/test/web/TestDataController.java | 10 +- .../modules/test/web/TestTreeController.java | 12 +- web/src/main/resources/config/application.yml | 17 ++- .../views/modules/test/testDataForm.html | 91 ++++++------ .../views/modules/test/testDataList.html | 94 ++++++------- .../views/modules/test/testTreeForm.html | 20 +-- .../views/modules/test/testTreeList.html | 50 +++---- 31 files changed, 332 insertions(+), 303 deletions(-) diff --git a/common/src/main/resources/static/jquery-ztree/3.5/css/metro/zTreeStyle.css b/common/src/main/resources/static/jquery-ztree/3.5/css/metro/zTreeStyle.css index 468de52b..faa887fe 100644 --- a/common/src/main/resources/static/jquery-ztree/3.5/css/metro/zTreeStyle.css +++ b/common/src/main/resources/static/jquery-ztree/3.5/css/metro/zTreeStyle.css @@ -98,7 +98,7 @@ ul.ztree.zTreeDragUL {margin:0; padding:0; position:absolute; width:auto; height /* 树搜索相关 */ .treeSearchInput {padding:13px 0 0 20px;} .treeSearchInput label {padding:5px 0 3px 0;font-size:13px;font-weight:normal;vertical-align:middle;} -.treeSearchInput input {width:145px;vertical-align:middle;line-height:24px;height:26px;border:1px solid #bbb;padding:0 4px;} +.treeSearchInput input {width:140px;vertical-align:middle;line-height:24px;height:26px;border:1px solid #bbb;padding:0 4px;} .treeSearchInput button {border:1px solid #bbb;vertical-align:middle;height:26px;height:26px\9;font-size:13px;background:#efefef;padding:0 8px;} .treeShowHideButton {position:absolute;right:8px;top:-3px;font-size:12px;color:#333;z-index:3;} .treeShowHideButton label {cursor:pointer;} diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java index 73980342..e4b7315d 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java @@ -144,7 +144,7 @@ public class CompanyController extends BaseController { @ResponseBody public String save(@Validated Company company) { companyService.save(company); - return renderResult(Global.TRUE, "保存公司'" + company.getCompanyName() + "'成功！"); + return renderResult(Global.TRUE, text("保存公司''{0}''成功", company.getCompanyName())); } /** @@ -160,11 +160,11 @@ public class CompanyController extends BaseController { where.setParentCodes("," + company.getId() + ","); long count = companyService.findCount(where); if (count > 0) { - return renderResult(Global.FALSE, "该公司包含未停用的子公司！"); + return renderResult(Global.FALSE, text("该公司包含未停用的子公司！")); } company.setStatus(Company.STATUS_DISABLE); companyService.updateStatus(company); - return renderResult(Global.TRUE, "停用公司" + company.getCompanyName() + "成功"); + return renderResult(Global.TRUE, text("停用公司''{0}''成功", company.getCompanyName())); } /** @@ -177,7 +177,7 @@ public class CompanyController extends BaseController { public String enable(Company company) { company.setStatus(Company.STATUS_NORMAL); companyService.updateStatus(company); - return renderResult(Global.TRUE, "启用公司" + company.getCompanyName() + "成功"); + return renderResult(Global.TRUE, text("启用公司''{0}''成功", company.getCompanyName())); } /** @@ -189,7 +189,7 @@ public class CompanyController extends BaseController { @ResponseBody public String delete(Company company) { companyService.delete(company); - return renderResult(Global.TRUE, "删除公司成功！"); + return renderResult(Global.TRUE, text("删除公司''{0}''成功", company.getCompanyName())); } /** diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java index 62c01faf..ce8db414 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java @@ -149,7 +149,7 @@ public class OfficeController extends BaseController { @ResponseBody public String save(@Validated Office office, String cmd, Model model) { officeService.save(office); - return renderResult(Global.TRUE, "保存机构'" + office.getOfficeName() + "'成功"); + return renderResult(Global.TRUE, text("保存机构''{0}''成功", office.getOfficeName())); } /** @@ -165,11 +165,11 @@ public class OfficeController extends BaseController { where.setParentCodes("," + office.getId() + ","); long count = officeService.findCount(where); if (count > 0) { - return renderResult(Global.FALSE, "该机构包含未停用的子机构！"); + return renderResult(Global.FALSE, text("该机构包含未停用的子机构！")); } office.setStatus(Office.STATUS_DISABLE); officeService.updateStatus(office); - return renderResult(Global.TRUE, "停用机构" + office.getOfficeName() + "成功"); + return renderResult(Global.TRUE, text("停用机构''{0}''成功", office.getOfficeName())); } /** @@ -182,7 +182,7 @@ public class OfficeController extends BaseController { public String enable(Office office) { office.setStatus(Office.STATUS_NORMAL); officeService.updateStatus(office); - return renderResult(Global.TRUE, "启用机构" + office.getOfficeName() + "成功"); + return renderResult(Global.TRUE, text("启用机构''{0}''成功", office.getOfficeName())); } /** @@ -194,7 +194,7 @@ public class OfficeController extends BaseController { @ResponseBody public String delete(Office office) { officeService.delete(office); - return renderResult(Global.TRUE, "删除机构"+office.getOfficeName()+"成功"); + return renderResult(Global.TRUE, text("删除机构''{0}''成功", office.getOfficeName())); } /** diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java index fab68065..e83f2d30 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java @@ -68,10 +68,10 @@ public class PostController extends BaseController { @ResponseBody public String save(@Validated Post post, String oldRoleName, Model model) { if (!"true".equals(checkPostName(oldRoleName, post.getPostName()))) { - return renderResult(Global.FALSE, "保存岗位'" + post.getPostName() + "'失败, 岗位名已存在"); + return renderResult(Global.FALSE, text("保存岗位失败，岗位名称''{0}''已存在", post.getPostName())); } postService.save(post); - return renderResult(Global.TRUE, "保存岗位'" + post.getPostName() + "'成功！"); + return renderResult(Global.TRUE, text("保存岗位''{0}''成功", post.getPostName())); } @RequiresPermissions("sys:post:edit") @@ -80,7 +80,7 @@ public class PostController extends BaseController { public String disable(Post post, HttpServletRequest request, HttpServletResponse response, Model model) { post.setStatus(Post.STATUS_DISABLE); postService.updateStatus(post); - return renderResult(Global.TRUE, "停用岗位'" + post.getPostName() + "'成功！"); + return renderResult(Global.TRUE, text("停用岗位''{0}''成功", post.getPostName())); } @RequiresPermissions("sys:post:edit") @@ -89,7 +89,7 @@ public class PostController extends BaseController { public String enable(Post post, HttpServletRequest request, HttpServletResponse response, Model model) { post.setStatus(Post.STATUS_NORMAL); postService.updateStatus(post); - return renderResult(Global.TRUE, "启用岗位'" + post.getPostName() + "'成功！"); + return renderResult(Global.TRUE, text("启用岗位''{0}''成功", post.getPostName())); } @RequiresPermissions("sys:post:edit") @@ -97,7 +97,7 @@ public class PostController extends BaseController { @ResponseBody public String delete(Post post) { postService.delete(post); - return renderResult(Global.TRUE, "删除岗位成功"); + return renderResult(Global.TRUE, text("删除岗位''{0}''成功", post.getPostName())); } /** 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 2d9df268..4c3587f0 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, text("保存用户'{0}'失败，登录账号已存在", 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); @@ -248,7 +248,7 @@ public class EmpUserController extends BaseController { } empUser.setStatus(User.STATUS_DISABLE); userService.updateStatus(empUser); - return renderResult(Global.TRUE, text("停用用户成功")); + return renderResult(Global.TRUE, text("停用用户''{0}''成功", empUser.getUserName())); } /** @@ -268,7 +268,7 @@ public class EmpUserController extends BaseController { } empUser.setStatus(User.STATUS_NORMAL); userService.updateStatus(empUser); - return renderResult(Global.TRUE, text("启用用户成功")); + return renderResult(Global.TRUE, text("启用用户''{0}''成功", empUser.getUserName())); } /** @@ -287,7 +287,7 @@ public class EmpUserController extends BaseController { return renderResult(Global.FALSE, "非法操作，不能够操作此用户！"); } userService.updatePassword(empUser.getUserCode(), null); - return renderResult(Global.TRUE, text("重置用户密码成功")); + return renderResult(Global.TRUE, text("重置用户''{0}''密码成功", empUser.getUserName())); } /** diff --git a/modules/core/src/main/resources/db/upgrade/core/versions b/modules/core/src/main/resources/db/upgrade/core/versions index b648b3bb..dd57ee08 100644 --- a/modules/core/src/main/resources/db/upgrade/core/versions +++ b/modules/core/src/main/resources/db/upgrade/core/versions @@ -1,2 +1,3 @@ 4.0.0 -4.0.1 \ No newline at end of file +4.0.1 +4.0.2 \ No newline at end of file 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 9ace6d21..749c28dc 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 @@ -1,6 +1,8 @@ # =========== common =========== +英语=English + 保\ 存=Save 关\ 闭=Close 确定=Ok 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 6cfd94a1..57f236d8 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,8 +1,45 @@ +# =========== 通用字典 =========== + +是=Yes +否=No +男=Man +女=Woman +正常=Normal +删除=Delete +停用=Disable +冻结=Freeze +待审=Audit +驳回=Rejected +草稿=Draft + +# =========== 通用字段 =========== + +状态=Status +备注信息=Remarks +创建者=Create by +创建时间=Create date +更新者=Update by +更新时间=Update date +排序号=Sort + +# =========== 功能标题 =========== + +系统管理=System mgt +组织管理=Organization +用户管理=User manage +机构管理=Office manage +公司管理=Company manage +岗位管理=Position manage + +用户选择=User select +机构选择=Office select +公司选择=Company select +区域选择=Area select +日期选择=Date select +日期时间=Date time # =========== 登录页 =========== -英语=English - 登录=Login 请填写登录账号.=Please enter login account. @@ -45,10 +82,6 @@ 修改头像=Change Avatar -用户昵称=Nickname -电子邮箱=Email -手机号码=Mobile -办公电话=Phone 个性签名=Signature 上次登录=Last Login 时间=Time @@ -66,43 +99,6 @@ 新保密问题=New secret questions 新保密问题答案=New secret answers -# =========== 通用字典 =========== - -是=Yes -否=No -男=Man -女=Woman -正常=Normal -删除=Delete -停用=Disable -冻结=Freeze -待审=Audit -驳回=Rejected -草稿=Draft - -# =========== 通用字段 =========== - -状态=Status -备注信息=Remarks -创建者=Create by -创建时间=Create date -更新者=Update by -更新时间=Update date - -# =========== 功能标题 =========== - -系统管理=System mgt -组织管理=Organization -用户管理=User manage -机构管理=Office manage -公司管理=Company manage -岗位管理=Position manage - -用户选择=User select -机构选择=Office select -公司选择=Company select -区域选择=Area select - # =========== 用户管理 =========== 组织机构=Office @@ -123,12 +119,12 @@ 确认要将该用户密码重置到初始状态吗？=Are you sure want to reset the user password to the initial state? 重置密码=Reset password +保存用户失败，登录账号''{0}''已存在=Save user failed, login account ''{0}'' already exists 保存用户''{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 +停用用户''{0}''成功=Disable user ''{0}'' success +启用用户''{0}''成功=Enable user ''{0}'' success +重置用户''{0}''密码成功=Reset user ''{0}'' password success 删除用户失败，不允许删除当前用户=Delete user failed. Not delete current user 删除用户''{0}''成功=Delete user ''{0}'' success 用户分配数据权限成功=User assign data scopes success @@ -175,6 +171,21 @@ 确认要删除该机构及所有子机构吗？=Are you sure want to delete this office and sub office? 新增下级机构=New sub office +保存机构''{0}''成功=Save the office ''{0}'' success +该机构包含未停用的子机构！=The office contains enable sub office! +停用机构''{0}''成功=Disable office ''{0}'' success +启用机构''{0}''成功=Enable office ''{0}'' success +删除机构''{0}''成功=Delete office ''{0}'' success + +上级机构=Parent Office +机构名称=Office name +机构代码=Office code +机构全称=Office full name +机构类型=Office type +负责人=Principal +联系地址=Address +邮政编码=Zip code + # =========== 公司管理 =========== 新增公司=New company @@ -188,6 +199,19 @@ 确认要删除该公司及所有子公司吗？=Are you sure want to delete this company and sub company? 新增下级公司=New sub company +保存公司''{0}''成功=Save the company ''{0}'' success +该公司包含未停用的子公司！=The company contains enable sub company! +停用公司''{0}''成功=Disable company ''{0}'' success +启用公司''{0}''成功=Enable company ''{0}'' success +删除公司''{0}''成功=Delete company ''{0}'' success + +上级公司=Parent company +公司名称=Company name +公司编码=Company code +公司全称=Company full name +归属区域=Area +包含机构=Office + # =========== 岗位管理 =========== 新增岗位=New position @@ -199,3 +223,14 @@ 确认要启用该岗位吗？=Are you sure want to enable this position? 删除岗位=Delete position 确认要删除该岗位吗？=Are you sure want to delete this position? + +保存岗位失败，岗位名称''{0}''已存在=Save position failed, position name ''{0}'' already exists +保存岗位''{0}''成功=Save the position ''{0}'' success +停用岗位''{0}''成功=Disable position ''{0}'' success +启用岗位''{0}''成功=Enable position ''{0}'' success +删除岗位''{0}''成功=Delete position ''{0}'' success + +岗位名称=Position name +岗位名称已存在=Position already exists +岗位编码=Position code +岗位分类=Position type diff --git a/modules/core/src/main/resources/views/modules/sys/companyForm.html b/modules/core/src/main/resources/views/modules/sys/companyForm.html index 49c3d2e0..4cf2de14 100644 --- a/modules/core/src/main/resources/views/modules/sys/companyForm.html +++ b/modules/core/src/main/resources/views/modules/sys/companyForm.html @@ -11,13 +11,13 @@ <#form:form id="inputForm" model="${company}" action="${ctx}/sys/company/save" method="post" class="form-horizontal">
-
基本信息
+
${text('基本信息')}
- +
- <#form:treeselect id="parent" title="上级公司" + <#form:treeselect id="parent" title="${text('上级公司')}" path="parent.id" labelPath="parent.companyName" url="${ctx}/sys/company/treeData?excludeCode=${company.id}" class="" allowClear="true" canSelectRoot="true" canSelectParent="true"/> @@ -29,7 +29,7 @@
+ * ${text('公司名称')}：
<#form:input path="companyName" maxlength="200" class="form-control required "/>
@@ -38,7 +38,7 @@
+ * ${text('公司编码')}：
<#form:hidden path="isNewRecord"/> <#form:hidden path="companyCode"/> @@ -51,7 +51,7 @@
+ * ${text('公司全称')}：
<#form:input path="fullName" maxlength="200" class="form-control required "/>
@@ -60,7 +60,7 @@
+ * ${text('排序号')}：
<#form:input path="treeSort" maxlength="10" class="form-control required digits"/>
@@ -71,9 +71,9 @@
+ * ${text('归属区域')}：
- <#form:treeselect id="area" title="区域选择" + <#form:treeselect id="area" title="${text('区域选择')}" path="area.areaCode" labelName="area.areaName" labelValue="${company.area.treeNames!}" url="${ctx}/sys/area/treeData" returnFullName="true" class=" " allowClear="true"/> @@ -83,9 +83,9 @@
+ * ${text('包含机构')}：
- <#form:treeselect id="companyOfficeList" title="机构选择" + <#form:treeselect id="companyOfficeList" title="${text('机构选择')}" value="${@ListUtils.extractToString(officeList!, 'officeCode', ',')}" labelValue="${@ListUtils.extractToString(officeList!, 'officeName', ',')}" url="${ctx}/sys/office/treeData" checkbox="true" @@ -99,7 +99,7 @@
+ * ${text('备注信息')}：
<#form:textarea path="remarks" rows="4" maxlength="500" class="form-control "/>
diff --git a/modules/core/src/main/resources/views/modules/sys/companyList.html b/modules/core/src/main/resources/views/modules/sys/companyList.html index 0ad62ac7..f9708ffe 100644 --- a/modules/core/src/main/resources/views/modules/sys/companyList.html +++ b/modules/core/src/main/resources/views/modules/sys/companyList.html @@ -19,19 +19,19 @@ <#form:form id="searchForm" model="${company}" action="${ctx}/sys/company/listData" method="post" class="form-inline hide" data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
- +
<#form:input path="viewCode" maxlength="100" class="form-control width-120"/>
- +
<#form:input path="companyName" maxlength="200" class="form-control width-120"/>
- +
<#form:input path="fullName" maxlength="200" class="form-control width-120"/>
@@ -57,14 +57,14 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ - {header:'公司名称', name:'companyName', index:'a.company_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){ + {header:'${text('公司名称')}', name:'companyName', index:'a.company_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){ return '( '+row.viewCode+' ) '+''+(val||row.id)+''; }}, - {header:'公司全称', name:'fullName', index:'a.full_name', width:200, align:"left"}, - {header:'排序号', name:'treeSort', index:'a.tree_sort', width:80, align:"center"}, - {header:'归属区域', name:'area.treeNames', index:'a.areaCode', width:200, align:"center"}, - {header:'更新时间', name:'updateDate', index:'a.update_date', width:200, align:"center"}, - {header:'备注信息', name:'remarks', index:'a.remarks', width:200, align:"left"}, + {header:'${text('公司全称')}', name:'fullName', index:'a.full_name', width:200, align:"left"}, + {header:'${text('排序号')}', name:'treeSort', index:'a.tree_sort', width:80, align:"center"}, + {header:'${text('归属区域')}', name:'area.treeNames', index:'a.areaCode', width:200, align:"center"}, + {header:'${text('更新时间')}', name:'updateDate', index:'a.update_date', width:200, align:"center"}, + {header:'${text('备注信息')}', name:'remarks', index:'a.remarks', width:200, align:"left"}, {header:'${text('状态')}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '未知', true); }}, 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 f5247339..8a98a175 100644 --- a/modules/core/src/main/resources/views/modules/sys/officeForm.html +++ b/modules/core/src/main/resources/views/modules/sys/officeForm.html @@ -11,13 +11,13 @@
<#form:form id="inputForm" model="${office}" action="${ctx}/sys/office/save" method="post" class="form-horizontal">
-
基本信息
+
${text('基本信息')}
- +
- <#form:treeselect id="parent" title="上级机构" + <#form:treeselect id="parent" title="${text('上级机构')}" path="parent.id" labelPath="parent.officeName" url="${ctx}/sys/office/treeData?excludeCode=${office.id}" class="" allowClear="true" canSelectRoot="true" canSelectParent="true"/> @@ -29,7 +29,7 @@
+ * ${text('机构名称')}：
<#form:input path="officeName" maxlength="100" class="form-control required "/>
@@ -38,7 +38,7 @@
+ * ${text('机构代码')}：
<#form:hidden path="isNewRecord"/> <#form:hidden path="officeCode"/> @@ -51,7 +51,7 @@
+ * ${text('机构全称')}：
<#form:input path="fullName" maxlength="200" class="form-control required "/>
@@ -60,7 +60,7 @@
+ * ${text('排序号')}：
<#form:input path="treeSort" maxlength="10" class="form-control required digits"/>
@@ -71,19 +71,19 @@
+ * ${text('机构类型')}：
<#form:select path="officeType" dictType="sys_office_type" class="form-control required " />
-
详细信息
+
${text('详细信息')}
+ * ${text('负责人')}：
<#form:input path="leader" maxlength="100" class="form-control "/>
@@ -92,7 +92,7 @@
+ * ${text('办公电话')}：
<#form:input path="phone" maxlength="100" class="form-control phone"/>
@@ -103,7 +103,7 @@
+ * ${text('联系地址')}：
<#form:input path="address" maxlength="255" class="form-control "/>
@@ -112,7 +112,7 @@
+ * ${text('邮政编码')}：
<#form:input path="zipCode" maxlength="100" class="form-control zipCode"/>
@@ -123,7 +123,7 @@
+ * ${text('电子邮箱')}：
<#form:input path="email" maxlength="300" class="form-control email"/>
@@ -132,7 +132,7 @@
+ * ${text('备注信息')}：
<#form:textarea path="remarks" rows="4" maxlength="500" class="form-control "/>
diff --git a/modules/core/src/main/resources/views/modules/sys/officeList.html b/modules/core/src/main/resources/views/modules/sys/officeList.html index 20e36317..ded1c21e 100644 --- a/modules/core/src/main/resources/views/modules/sys/officeList.html +++ b/modules/core/src/main/resources/views/modules/sys/officeList.html @@ -19,25 +19,25 @@ <#form:form id="searchForm" model="${office}" action="${ctx}/sys/office/listData" method="post" class="form-inline hide" data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
- +
<#form:input path="viewCode" maxlength="100" class="form-control width-120"/>
- +
<#form:input path="officeName" maxlength="100" class="form-control width-120"/>
- +
<#form:input path="fullName" maxlength="200" class="form-control width-120"/>
- +
<#form:select path="officeType" dictType="sys_office_type" blankOption="true" class="form-control"/>
@@ -63,18 +63,18 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ - {header:'机构名称', name:'officeName', index:'a.office_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){ + {header:'${text('机构名称')}', name:'officeName', index:'a.office_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){ return '( '+row.viewCode+' ) '+''+(val||row.id)+''; }}, - {header:'机构全称', name:'fullName', index:'a.full_name', width:200, align:"left"}, - {header:'排序号', name:'treeSort', index:'a.tree_sort', width:80, align:"center"}, - {header:'机构类型', name:'officeType', index:'a.office_type', width:100, align:"center", formatter: function(val, obj, row, act){ - return js.getDictLabel(${@DictUtils.getDictListJson('sys_office_type')}, val, '未知', true); + {header:'${text('机构全称')}', name:'fullName', index:'a.full_name', width:200, align:"left"}, + {header:'${text('排序号')}', name:'treeSort', index:'a.tree_sort', width:80, align:"center"}, + {header:'${text('机构类型')}', name:'officeType', index:'a.office_type', width:100, align:"center", formatter: function(val, obj, row, act){ + return js.getDictLabel(${@DictUtils.getDictListJson('sys_office_type')}, val, '${text('未知')}', true); }}, - {header:'更新时间', name:'updateDate', index:'a.update_date', width:150, align:"center"}, - {header:'备注信息', name:'remarks', index:'a.remarks', width:200, align:"left"}, + {header:'${text('更新时间')}', name:'updateDate', index:'a.update_date', width:150, align:"center"}, + {header:'${text('备注信息')}', name:'remarks', index:'a.remarks', width:200, align:"left"}, {header:'${text('状态')}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){ - return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '未知', true); + return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '${text('未知')}', true); }}, {header:'${text('操作')}', name:'actions', width:150, sortable:false, title:false, formatter: function(val, obj, row, act){ var actions = []; diff --git a/modules/core/src/main/resources/views/modules/sys/postForm.html b/modules/core/src/main/resources/views/modules/sys/postForm.html index aa2202c3..d7cb9b75 100644 --- a/modules/core/src/main/resources/views/modules/sys/postForm.html +++ b/modules/core/src/main/resources/views/modules/sys/postForm.html @@ -11,24 +11,24 @@
<#form:form id="inputForm" model="${post}" action="${ctx}/sys/post/save" method="post" class="form-horizontal">
-
基本信息
+
${text('基本信息')}
+ * ${text('岗位名称')}：
<#form:hidden name="oldRoleName" value="${post.postName}"/> <#form:input path="postName" maxlength="100" class="form-control required " remote="${ctx}/sys/post/checkPostName?oldPostName=${post.postName}" - data-msg-remote="岗位名称已存在"/> + data-msg-remote="${text('岗位名称已存在')}"/>
+ * ${text('岗位编码')}：
<#form:hidden path="isNewRecord"/> <#form:input path="postCode" maxlength="64" readonly="${!post.isNewRecord}" class="form-control required abc"/> @@ -40,7 +40,7 @@
+ * ${text('岗位分类')}：
<#form:select path="postType" dictType="sys_post_type" blankOption="true" class="form-control " />
@@ -49,7 +49,7 @@
+ * ${text('排序号')}：
<#form:input path="postSort" maxlength="10" class="form-control digits"/>
@@ -60,7 +60,7 @@
+ * ${text('备注信息')}：
<#form:textarea path="remarks" rows="4" maxlength="500" class="form-control "/>
diff --git a/modules/core/src/main/resources/views/modules/sys/postList.html b/modules/core/src/main/resources/views/modules/sys/postList.html index 4201cb3e..d6742fe5 100644 --- a/modules/core/src/main/resources/views/modules/sys/postList.html +++ b/modules/core/src/main/resources/views/modules/sys/postList.html @@ -16,19 +16,19 @@ <#form:form id="searchForm" model="${post}" action="${ctx}/sys/post/listData" method="post" class="form-inline hide" data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
- +
<#form:input path="postCode" maxlength="64" class="form-control width-120"/>
- +
<#form:input path="postName" maxlength="100" class="form-control width-120"/>
- +
<#form:select path="postType" dictType="sys_post_type" blankOption="true" class="form-control"/>
@@ -55,16 +55,16 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ - {header:'岗位名称', name:'postName', index:'a.post_name', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){ + {header:'${text('岗位名称')}', name:'postName', index:'a.post_name', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){ return ''+(val||row.id)+''; }}, - {header:'岗位编码', name:'postCode', index:'a.post_code', width:200, align:"center"}, - {header:'排序号', name:'postSort', index:'a.post_sort', width:80, align:"center"}, - {header:'岗位分类', name:'postType', index:'a.post_type', width:100, align:"center", formatter: function(val, obj, row, act){ + {header:'${text('岗位编码')}', name:'postCode', index:'a.post_code', width:200, align:"center"}, + {header:'${text('排序号')}', name:'postSort', index:'a.post_sort', width:80, align:"center"}, + {header:'${text('岗位分类')}', name:'postType', index:'a.post_type', width:100, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_post_type')}, val, '未知', true); }}, - {header:'更新时间', name:'updateDate', index:'a.update_date', width:150, align:"center"}, - {header:'备注信息', name:'remarks', index:'a.remarks', width:200, align:"left"}, + {header:'${text('更新时间')}', name:'updateDate', index:'a.update_date', width:150, align:"center"}, + {header:'${text('备注信息')}', name:'remarks', index:'a.remarks', width:200, align:"left"}, {header:'${text('状态')}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '未知', true); }}, diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html index c74d6aa1..f53315a4 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html @@ -29,7 +29,7 @@