Pre Merge pull request !345 from Guanbostart/master
This commit is contained in:
commit
a219fdd5f1
|
|
@ -107,7 +107,6 @@
|
||||||
{
|
{
|
||||||
field: 'status',
|
field: 'status',
|
||||||
title: '登录状态',
|
title: '登录状态',
|
||||||
align: 'center',
|
|
||||||
formatter: function(value, row, index) {
|
formatter: function(value, row, index) {
|
||||||
return $.table.selectDictLabel(datas, value);
|
return $.table.selectDictLabel(datas, value);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,6 @@
|
||||||
{
|
{
|
||||||
field: 'businessType',
|
field: 'businessType',
|
||||||
title: '操作类型',
|
title: '操作类型',
|
||||||
align: 'center',
|
|
||||||
formatter: function(value, row, index) {
|
formatter: function(value, row, index) {
|
||||||
return $.table.selectDictLabel(datas, value);
|
return $.table.selectDictLabel(datas, value);
|
||||||
}
|
}
|
||||||
|
|
@ -122,7 +121,6 @@
|
||||||
{
|
{
|
||||||
field: 'status',
|
field: 'status',
|
||||||
title: '操作状态',
|
title: '操作状态',
|
||||||
align: 'center',
|
|
||||||
formatter: function(value, row, index) {
|
formatter: function(value, row, index) {
|
||||||
if (value == 0) {
|
if (value == 0) {
|
||||||
return '<span class="badge badge-primary">成功</span>';
|
return '<span class="badge badge-primary">成功</span>';
|
||||||
|
|
@ -138,7 +136,6 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '操作',
|
title: '操作',
|
||||||
align: 'center',
|
|
||||||
formatter: function(value, row, index) {
|
formatter: function(value, row, index) {
|
||||||
var actions = [];
|
var actions = [];
|
||||||
actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.operId + '\')"><i class="fa fa-search"></i>详细</a>');
|
actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.operId + '\')"><i class="fa fa-search"></i>详细</a>');
|
||||||
|
|
|
||||||
|
|
@ -104,7 +104,6 @@
|
||||||
{
|
{
|
||||||
field: 'configType',
|
field: 'configType',
|
||||||
title: '系统内置',
|
title: '系统内置',
|
||||||
align: 'center',
|
|
||||||
formatter: function(value, row, index) {
|
formatter: function(value, row, index) {
|
||||||
return $.table.selectDictLabel(datas, value);
|
return $.table.selectDictLabel(datas, value);
|
||||||
}
|
}
|
||||||
|
|
@ -112,7 +111,6 @@
|
||||||
{
|
{
|
||||||
field: 'remark',
|
field: 'remark',
|
||||||
title: '备注',
|
title: '备注',
|
||||||
align: 'center',
|
|
||||||
formatter: function(value, row, index) {
|
formatter: function(value, row, index) {
|
||||||
return $.table.tooltip(value, 10, "open");
|
return $.table.tooltip(value, 10, "open");
|
||||||
}
|
}
|
||||||
|
|
@ -123,7 +121,6 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '操作',
|
title: '操作',
|
||||||
align: 'center',
|
|
||||||
formatter: function(value, row, index) {
|
formatter: function(value, row, index) {
|
||||||
var actions = [];
|
var actions = [];
|
||||||
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.configId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
|
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.configId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,6 @@
|
||||||
{
|
{
|
||||||
field: 'noticeType',
|
field: 'noticeType',
|
||||||
title: '公告类型',
|
title: '公告类型',
|
||||||
align: 'center',
|
|
||||||
formatter: function(value, row, index) {
|
formatter: function(value, row, index) {
|
||||||
return $.table.selectDictLabel(types, value);
|
return $.table.selectDictLabel(types, value);
|
||||||
}
|
}
|
||||||
|
|
@ -85,7 +84,6 @@
|
||||||
{
|
{
|
||||||
field: 'status',
|
field: 'status',
|
||||||
title: '状态',
|
title: '状态',
|
||||||
align: 'center',
|
|
||||||
formatter: function(value, row, index) {
|
formatter: function(value, row, index) {
|
||||||
return $.table.selectDictLabel(datas, value);
|
return $.table.selectDictLabel(datas, value);
|
||||||
}
|
}
|
||||||
|
|
@ -101,7 +99,6 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '操作',
|
title: '操作',
|
||||||
align: 'center',
|
|
||||||
formatter: function(value, row, index) {
|
formatter: function(value, row, index) {
|
||||||
var actions = [];
|
var actions = [];
|
||||||
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editFull(\'' + row.noticeId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
|
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editFull(\'' + row.noticeId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
|
||||||
|
|
|
||||||
|
|
@ -92,7 +92,6 @@
|
||||||
{
|
{
|
||||||
field: 'status',
|
field: 'status',
|
||||||
title: '状态',
|
title: '状态',
|
||||||
align: 'center',
|
|
||||||
formatter: function(value, row, index) {
|
formatter: function(value, row, index) {
|
||||||
return $.table.selectDictLabel(datas, value);
|
return $.table.selectDictLabel(datas, value);
|
||||||
}
|
}
|
||||||
|
|
@ -104,7 +103,6 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '操作',
|
title: '操作',
|
||||||
align: 'center',
|
|
||||||
formatter: function(value, row, index) {
|
formatter: function(value, row, index) {
|
||||||
var actions = [];
|
var actions = [];
|
||||||
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.postId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
|
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.postId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
|
||||||
|
|
|
||||||
|
|
@ -98,7 +98,6 @@
|
||||||
{
|
{
|
||||||
visible: editFlag == 'hidden' ? false : true,
|
visible: editFlag == 'hidden' ? false : true,
|
||||||
title: '角色状态',
|
title: '角色状态',
|
||||||
align: 'center',
|
|
||||||
formatter: function (value, row, index) {
|
formatter: function (value, row, index) {
|
||||||
return statusTools(row);
|
return statusTools(row);
|
||||||
}
|
}
|
||||||
|
|
@ -110,7 +109,6 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '操作',
|
title: '操作',
|
||||||
align: 'center',
|
|
||||||
formatter: function(value, row, index) {
|
formatter: function(value, row, index) {
|
||||||
if (row.roleId != 1) {
|
if (row.roleId != 1) {
|
||||||
var actions = [];
|
var actions = [];
|
||||||
|
|
|
||||||
|
|
@ -157,7 +157,6 @@
|
||||||
{
|
{
|
||||||
visible: editFlag == 'hidden' ? false : true,
|
visible: editFlag == 'hidden' ? false : true,
|
||||||
title: '用户状态',
|
title: '用户状态',
|
||||||
align: 'center',
|
|
||||||
formatter: function (value, row, index) {
|
formatter: function (value, row, index) {
|
||||||
return statusTools(row);
|
return statusTools(row);
|
||||||
}
|
}
|
||||||
|
|
@ -169,7 +168,6 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '操作',
|
title: '操作',
|
||||||
align: 'center',
|
|
||||||
formatter: function(value, row, index) {
|
formatter: function(value, row, index) {
|
||||||
if (row.userId != 1) {
|
if (row.userId != 1) {
|
||||||
var actions = [];
|
var actions = [];
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue