diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js index 8ad0f64b7..eea0daac0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js @@ -199,7 +199,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { var CheckMark = $('#gridtable').jfGridValue('CheckMark'); if (CheckMark.indexOf('true') != -1) { - learun.alert.warning("选中记录中包含已启用项目!"); + learun.alert.warning("选中记录中包含已审核项目!"); return; } learun.layerForm({ @@ -220,7 +220,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { var CheckMark = $('#gridtable').jfGridValue('CheckMark'); if (CheckMark.indexOf('true') != -1) { - learun.alert.warning("选中记录中包含已启用项目,已启用不能删除!"); + learun.alert.warning("选中记录中包含已审核项目,已审核不能删除!"); return; } //if (CheckMark === true) { @@ -242,7 +242,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { var CheckMark = $('#gridtable').jfGridValue('CheckMark'); if (CheckMark.indexOf('true') != -1) { - learun.alert.warning("选中记录中包含已启用项目!"); + learun.alert.warning("选中记录中包含已审核项目!"); return; } //if (CheckMark === true) { @@ -264,7 +264,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { var CheckMark = $('#gridtable').jfGridValue('CheckMark'); if (CheckMark.indexOf('false') != -1) { - learun.alert.warning("选中记录中包含已停用项目!"); + learun.alert.warning("选中记录中包含未审核项目!"); return; } //if (CheckMark === false) { @@ -433,9 +433,9 @@ var bootstrap = function ($, learun) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata', key: value, - keyId: 'f_departmentid', + keyId: 'id', callback: function (_data) { - callback(_data['f_fullname']); + callback(_data['name']); } }); }