diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs index d99e78b0a..ffe2dd6c8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs @@ -124,14 +124,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public ActionResult Lock(string keyValue) { lessonInfoIBLL.Lock(keyValue); - return Success("审核成功!"); + return Success("操作成功!"); } [HttpPost] [AjaxOnly] public ActionResult UnLock(string keyValue) { lessonInfoIBLL.UnLock(keyValue); - return Success("去审成功!"); + return Success("操作成功!"); } /// /// 删除实体数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassroomInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassroomInfo/Form.cshtml index 2b6b66503..2c92e8724 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassroomInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassroomInfo/Form.cshtml @@ -29,11 +29,11 @@
容纳人数*
- +
考试人数*
- +
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ClassroomInfo/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js index 9cc59a33a..fa811388b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js @@ -99,7 +99,7 @@ var bootstrap = function ($, learun) { // learun.alert.warning("当前项目已审核无需再审!"); // return; //} - learun.layerConfirm('是否确认审核该项!', function (res) { + learun.layerConfirm('是否确认启用该项!', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/LessonInfo/Lock', { keyValue: keyValue }, function () { refreshGirdData(); @@ -121,7 +121,7 @@ var bootstrap = function ($, learun) { // learun.alert.warning("当前项目还未审核不需要去审核!"); // return; //} - learun.layerConfirm('是否确认去审核该项!', function (res) { + learun.layerConfirm('是否确认停用该项!', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/LessonInfo/UnLock', { keyValue: keyValue }, function () { refreshGirdData(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/LostArticleInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/LostArticleInfo/Index.js index a9277eb47..d763aa36d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/LostArticleInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/LostArticleInfo/Index.js @@ -109,13 +109,16 @@ var bootstrap = function ($, learun) { //  发布 $('#lr-publish').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('F_LId'); + if (keyValue.indexOf(',') != -1) { + learun.alert.warning("只能选择一条记录进行发布!"); + return; + } var F_State = $('#gridtable').jfGridValue('F_State'); if (F_State != "0") { learun.alert.warning("当前项目已提交不能发布!"); return; } - - var keyValue = $('#gridtable').jfGridValue('F_LId'); if (learun.checkrow(keyValue)) { learun.layerConfirm('是否确认发布!', function (res) { if (res) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LostArticleInfo/LostArticleInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LostArticleInfo/LostArticleInfoService.cs index 8c0047cfb..4dda49caf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LostArticleInfo/LostArticleInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/LostArticleInfo/LostArticleInfoService.cs @@ -98,7 +98,12 @@ namespace Learun.Application.OA { try { - this.BaseRepository().Delete(t => t.F_LId == keyValue); + //多个删除 + var keyValueArr = keyValue.Split(','); + foreach (var item in keyValueArr) + { + this.BaseRepository().Delete(t => t.F_LId == item); + } } catch (Exception ex) { @@ -208,7 +213,7 @@ namespace Learun.Application.OA try { //草稿0、待认领1、已认领2 - string sql = $"update LostArticleInfo set F_State=0 where F_LId='{keyValue}'"; + string sql = $"update LostArticleInfo set F_State=0,F_User='',F_UserTime=null,F_ClaimImage='' where F_LId='{keyValue}'"; this.BaseRepository().ExecuteBySql(sql); } catch (Exception ex)