From c97359eba9e157c2e4f40cae4f275356fbc38d67 Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 4 Aug 2022 11:40:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20-=E6=93=8D=E4=BD=9C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/LessonInfoController.cs | 4 ++-- .../Areas/EducationalAdministration/Views/LessonInfo/Index.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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/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(); From 56cea2230d6bb6646831e96504fcc71ea049153e Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 4 Aug 2022 14:41:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A4=B1=E8=AF=AF=E6=8B=9B=E9=A2=86-?= =?UTF-8?q?=E5=A4=9A=E9=80=89=E5=88=A0=E9=99=A4=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LostArticleInfo/LostArticleInfoService.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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..82a922556 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) { From c9e876babb5ae9c5c0afbb5d458ed9332c0d256a Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 4 Aug 2022 14:49:48 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A4=B1=E7=89=A9=E6=8B=9B=E9=A2=86?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20-=E5=8F=91=E5=B8=83=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/LR_OAModule/Views/LostArticleInfo/Index.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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) { From 4a93e7f59fb279a0b5bf791fffb5b925b3bcf8d4 Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 4 Aug 2022 15:09:55 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A4=B1=E8=AF=AF=E6=8B=9B=E9=A2=86-?= =?UTF-8?q?=E6=92=A4=E9=94=80=E6=B8=85=E7=A9=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LostArticleInfo/LostArticleInfoService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 82a922556..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 @@ -213,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) From 8a1fe9cf14aaa55ee31c57c48d69a676c6335409 Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 4 Aug 2022 15:14:29 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=95=99=E5=AE=A4=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=A0=A1=E9=AA=8C=E9=9D=9E=E8=B4=9F?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EducationalAdministration/Views/ClassroomInfo/Form.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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")