若依开源1.1.3发布

This commit is contained in:
RuoYi
2018-05-13 15:10:15 +08:00
parent 20070163c2
commit 784c020fbd
154 changed files with 2243 additions and 2155 deletions

View File

@ -25,10 +25,8 @@ function loading() {
}
},
{
title : '创建时间',
formatter : function(row, index) {
return formatDate(row.createTime,"yyyy-MM-dd");
}
field: 'createTimeStr',
title : '创建时间'
},
{
title : '操作',

View File

@ -37,7 +37,7 @@ $(function() {
title: '备注'
},
{
field: 'createTime',
field: 'createDateTimeStr',
title: '创建时间'
},
{

View File

@ -33,7 +33,7 @@ $(function() {
title: '备注'
},
{
field: 'createTime',
field: 'createDateTimeStr',
title: '创建时间'
},
{

View File

@ -32,7 +32,7 @@ $(function() {
}
},
{
field: 'createTime',
field: 'createDateTimeStr',
title: '创建时间'
},
{

View File

@ -33,7 +33,7 @@ $(function() {
}
},
{
field: 'createTime',
field: 'createDateTimeStr',
title: '创建时间'
},
{

View File

@ -44,7 +44,7 @@ function queryUserList() {
}
},
{
field: 'createTime',
field: 'createDateTimeStr',
title: '创建时间'
},
{
@ -63,7 +63,20 @@ function queryUserList() {
}
}];
var url = prefix + "/list";
$.initTable(columns, url);
$.initTableParams(columns, url, queryParams);
}
function queryParams(params) {
return {
// 传递参数查询参数
pageSize: params.limit,
pageNum: params.offset / params.limit + 1,
searchValue: params.search,
orderByColumn: params.sort,
isAsc: params.order,
deptId: $("#deptId").val(),
parentId: $("#parentId").val()
};
}
function queryDeptTreeDaTa()
@ -72,8 +85,9 @@ function queryDeptTreeDaTa()
var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{enable:true}},
callback:{onClick:function(event, treeId, treeNode){
tree.expandNode(treeNode);
var opt = { query : { deptId : treeNode.id, parentId : treeNode.pId, } };
$('.bootstrap-table').bootstrapTable('refresh', opt);
$("#deptId").val(treeNode.id);
$("#parentId").val(treeNode.pId);
$('.bootstrap-table').bootstrapTable('refresh', queryParams);
}}
}, tree, loadTree = function(){
$.get(ctx + "system/dept/treeData", function(data) {