manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完成国际化组织管理功能和代码生成模板

Browse Source
This commit is contained in:
thinkgem
2018-04-22 18:56:53 +08:00
parent 44df274845
commit 4fc7a6869b
31 changed files with 332 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/core/src/main/resources/db/upgrade/core/versions
View File

@@ -1,2 +1,3 @@
4.0.0
4.0.1
4.0.1
4.0.2

2
modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties
View File

@@ -1,6 +1,8 @@
# =========== common ===========
英语=English
保\ 存=Save
关\ 闭=Close
确定=Ok

129
modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
View File

@@ -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

24
modules/core/src/main/resources/views/modules/sys/companyForm.html
View File

@@ -11,13 +11,13 @@
</div>
<#form:form id="inputForm" model="${company}" action="${ctx}/sys/company/save" method="post" class="form-horizontal">
<div class="box-body">
<div class="form-unit">基本信息</div>
<div class="form-unit">${text('基本信息')}</div>
<div class="row">
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4">上级公司：</label>
<label class="control-label col-sm-4">${text('上级公司')}：</label>
<div class="col-sm-8">
<#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 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required ">*</span> 公司名称：<i class="fa icon-question hide"></i></label>
<span class="required ">*</span> ${text('公司名称')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="companyName" maxlength="200" class="form-control required "/>
</div>
@@ -38,7 +38,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required ">*</span> 公司编码：<i class="fa icon-question hide"></i></label>
<span class="required ">*</span> ${text('公司编码')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:hidden path="isNewRecord"/>
<#form:hidden path="companyCode"/>
@@ -51,7 +51,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required ">*</span> 公司全称：<i class="fa icon-question hide"></i></label>
<span class="required ">*</span> ${text('公司全称')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="fullName" maxlength="200" class="form-control required "/>
</div>
@@ -60,7 +60,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required ">*</span> 排序号：<i class="fa icon-question hide"></i></label>
<span class="required ">*</span> ${text('排序号')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="treeSort" maxlength="10" class="form-control required digits"/>
</div>
@@ -71,9 +71,9 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 归属区域：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('归属区域')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#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 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 包含机构：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('包含机构')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#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 @@
<div class="col-xs-12">
<div class="form-group">
<label class="control-label col-sm-2" title="">
<span class="required hide">*</span> 备注信息：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('备注信息')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-10">
<#form:textarea path="remarks" rows="4" maxlength="500" class="form-control "/>
</div>

18
modules/core/src/main/resources/views/modules/sys/companyList.html
View File

@@ -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}">
<div class="form-group">
<label class="control-label">公司代码：</label>
<label class="control-label">${text('公司代码')}：</label>
<div class="control-inline">
<#form:input path="viewCode" maxlength="100" class="form-control width-120"/>
</div>
</div>
<div class="form-group">
<label class="control-label">公司名称：</label>
<label class="control-label">${text('公司名称')}：</label>
<div class="control-inline">
<#form:input path="companyName" maxlength="200" class="form-control width-120"/>
</div>
</div>
<div class="form-group">
<label class="control-label">公司全称：</label>
<label class="control-label">${text('公司全称')}：</label>
<div class="control-inline">
<#form:input path="fullName" maxlength="200" class="form-control width-120"/>
</div>
@@ -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+' ) '+'<a href="${ctx}/sys/company/form?companyCode='+row.companyCode+'" class="btnList" data-title="${text('编辑公司')}">'+(val||row.id)+'</a>';
}},
{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);
}},

30
modules/core/src/main/resources/views/modules/sys/officeForm.html
View File

@@ -11,13 +11,13 @@
</div>
<#form:form id="inputForm" model="${office}" action="${ctx}/sys/office/save" method="post" class="form-horizontal">
<div class="box-body">
<div class="form-unit">基本信息</div>
<div class="form-unit">${text('基本信息')}</div>
<div class="row">
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4">上级机构：</label>
<label class="control-label col-sm-4">${text('上级机构')}：</label>
<div class="col-sm-8">
<#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 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required ">*</span> 机构名称：<i class="fa icon-question hide"></i></label>
<span class="required ">*</span> ${text('机构名称')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="officeName" maxlength="100" class="form-control required "/>
</div>
@@ -38,7 +38,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required ">*</span> 机构代码：<i class="fa icon-question hide"></i></label>
<span class="required ">*</span> ${text('机构代码')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:hidden path="isNewRecord"/>
<#form:hidden path="officeCode"/>
@@ -51,7 +51,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required ">*</span> 机构全称：<i class="fa icon-question hide"></i></label>
<span class="required ">*</span> ${text('机构全称')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="fullName" maxlength="200" class="form-control required "/>
</div>
@@ -60,7 +60,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required ">*</span> 排序号：<i class="fa icon-question hide"></i></label>
<span class="required ">*</span> ${text('排序号')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="treeSort" maxlength="10" class="form-control required digits"/>
</div>
@@ -71,19 +71,19 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required ">*</span> 机构类型：<i class="fa icon-question hide"></i></label>
<span class="required ">*</span> ${text('机构类型')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:select path="officeType" dictType="sys_office_type" class="form-control required " />
</div>
</div>
</div>
</div>
<div class="form-unit">详细信息</div>
<div class="form-unit">${text('详细信息')}</div>
<div class="row">
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 负责人：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('负责人')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="leader" maxlength="100" class="form-control "/>
</div>
@@ -92,7 +92,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 办公电话：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('办公电话')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="phone" maxlength="100" class="form-control phone"/>
</div>
@@ -103,7 +103,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 联系地址：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('联系地址')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="address" maxlength="255" class="form-control "/>
</div>
@@ -112,7 +112,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 邮政编码：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('邮政编码')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="zipCode" maxlength="100" class="form-control zipCode"/>
</div>
@@ -123,7 +123,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 电子邮箱：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('电子邮箱')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="email" maxlength="300" class="form-control email"/>
</div>
@@ -132,7 +132,7 @@
<div class="col-xs-12">
<div class="form-group">
<label class="control-label col-sm-2" title="">
<span class="required hide">*</span> 备注信息：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('备注信息')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-10">
<#form:textarea path="remarks" rows="4" maxlength="500" class="form-control "/>
</div>

24
modules/core/src/main/resources/views/modules/sys/officeList.html
View File

@@ -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}">
<div class="form-group">
<label class="control-label">机构代码：</label>
<label class="control-label">${text('机构代码')}：</label>
<div class="control-inline">
<#form:input path="viewCode" maxlength="100" class="form-control width-120"/>
</div>
</div>
<div class="form-group">
<label class="control-label">机构名称：</label>
<label class="control-label">${text('机构名称')}：</label>
<div class="control-inline">
<#form:input path="officeName" maxlength="100" class="form-control width-120"/>
</div>
</div>
<div class="form-group">
<label class="control-label">机构全称：</label>
<label class="control-label">${text('机构全称')}：</label>
<div class="control-inline">
<#form:input path="fullName" maxlength="200" class="form-control width-120"/>
</div>
</div>
<div class="form-group">
<label class="control-label">机构类型：</label>
<label class="control-label">${text('机构类型')}：</label>
<div class="control-inline width-90">
<#form:select path="officeType" dictType="sys_office_type" blankOption="true" class="form-control"/>
</div>
@@ -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+' ) '+'<a href="${ctx}/sys/office/form?officeCode='+row.officeCode+'" class="btnList" data-title="${text('编辑机构')}">'+(val||row.id)+'</a>';
}},
{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 = [];

14
modules/core/src/main/resources/views/modules/sys/postForm.html
View File

@@ -11,24 +11,24 @@
</div>
<#form:form id="inputForm" model="${post}" action="${ctx}/sys/post/save" method="post" class="form-horizontal">
<div class="box-body">
<div class="form-unit">基本信息</div>
<div class="form-unit">${text('基本信息')}</div>
<div class="row">
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required ">*</span> 岗位名称：<i class="fa icon-question hide"></i></label>
<span class="required ">*</span> ${text('岗位名称')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#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('岗位名称已存在')}"/>
</div>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required ">*</span> 岗位编码：<i class="fa icon-question hide"></i></label>
<span class="required ">*</span> ${text('岗位编码')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:hidden path="isNewRecord"/>
<#form:input path="postCode" maxlength="64" readonly="${!post.isNewRecord}" class="form-control required abc"/>
@@ -40,7 +40,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 岗位分类：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('岗位分类')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:select path="postType" dictType="sys_post_type" blankOption="true" class="form-control " />
</div>
@@ -49,7 +49,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 岗位排序：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('排序号')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="postSort" maxlength="10" class="form-control digits"/>
</div>
@@ -60,7 +60,7 @@
<div class="col-xs-12">
<div class="form-group">
<label class="control-label col-sm-2" title="">
<span class="required hide">*</span> 备注信息：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('备注信息')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-10">
<#form:textarea path="remarks" rows="4" maxlength="500" class="form-control "/>
</div>

18
modules/core/src/main/resources/views/modules/sys/postList.html
View File

@@ -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}">
<div class="form-group">
<label class="control-label">岗位编码：</label>
<label class="control-label">${text('岗位编码')}：</label>
<div class="control-inline">
<#form:input path="postCode" maxlength="64" class="form-control width-120"/>
</div>
</div>
<div class="form-group">
<label class="control-label">岗位名称：</label>
<label class="control-label">${text('岗位名称')}：</label>
<div class="control-inline">
<#form:input path="postName" maxlength="100" class="form-control width-120"/>
</div>
</div>
<div class="form-group">
<label class="control-label">岗位分类：</label>
<label class="control-label">${text('岗位分类')}：</label>
<div class="control-inline width-90">
<#form:select path="postType" dictType="sys_post_type" blankOption="true" class="form-control"/>
</div>
@@ -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 '<a href="${ctx}/sys/post/form?postCode='+row.postCode+'" class="btnList" data-title="${text('编辑岗位')}">'+(val||row.id)+'</a>';
}},
{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);
}},

2
modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html
View File

@@ -29,7 +29,7 @@
<script>
// 初始化布局
$('body').layout({
west__size: 185
west__size: 180
});
// 主页框架
var win = $("#mainFrame")[0].contentWindow;