From 59f52333e443288d401aff3d791dcf2adc8d17b7 Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 20 Sep 2022 18:15:30 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=99=90=E5=88=B6=E5=9B=BE=E7=89=87=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/LR_OAModule/Views/Notice/FormFlow.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js index 21eed58c4..157c9d654 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js @@ -42,7 +42,7 @@ var bootstrap = function ($, learun) { } } }); - $('#F_NewsImage').lrUploader(); + $('#F_NewsImage').lrUploader({ extensions:'gif,jpeg,jpg,png,bmp'}); $('#F_IsSendFX').lrDataItemSelect({ code: 'YesOrNoBit' }); $('#F_SendDeptId').lrDepartmentSelect({ type: 'treemultiple' }); $('#F_SendPostId').lrPostSelect({ type: 'treemultiple' }); From d9656fea37742c2c03a29836ce1b6bcf361a6741 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 20 Sep 2022 18:17:41 +0800 Subject: [PATCH 2/5] --- .../Views/ScoreCheckInfo/Form.cshtml | 2 +- .../Views/ScoreCheckInfo/Form.js | 19 ++++++++++--------- .../Views/ScoreCheckInfo/FormAudit.cshtml | 2 +- .../Views/ScoreCheckInfo/Index.cshtml | 4 ++-- .../Views/ScoreCheckInfo/Index.js | 10 +++------- .../ScoreCheckInfo/ScoreCheckInfoService.cs | 4 ++-- 6 files changed, 19 insertions(+), 22 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.cshtml index 70f12d569..7552d614d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.cshtml @@ -2,7 +2,7 @@ ViewBag.Title = "学业成绩考核记录表"; Layout = "~/Views/Shared/_Form.cshtml"; } -
+
学年*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.js index b8098fbb9..7d70a1a52 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.js @@ -41,7 +41,7 @@ var bootstrap = function ($, learun) { text: 'stuname', headData: [ - { label: "学号", name: "stuno", width: 100, align: "left" }, + { label: "学号", name: "stuno", width: 140, align: "left" }, { label: "姓名", name: "stuname", width: 100, align: "left" }, { label: "班级", name: "classno", width: 100, align: "left", @@ -110,19 +110,20 @@ var bootstrap = function ($, learun) { }; // 保存数据 acceptClick = function (callBack) { - if (!$('body').lrValidform()) { + if (!$('form').lrValidform()) { return false; } var postData = { - strEntity: JSON.stringify($('body').lrGetFormData()) + //postData.StuName= + strEntity: JSON.stringify($('form').lrGetFormData()) }; console.log(postData,"postData") - $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SaveForm?keyValue=' + keyValue, postData, function (res) { - // 保存成功后才回调 - if (!!callBack) { - callBack(); - } - }); + //$.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SaveForm?keyValue=' + keyValue, postData, function (res) { + // // 保存成功后才回调 + // if (!!callBack) { + // callBack(); + // } + //}); }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml index ee2059da1..7439b013e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml @@ -9,7 +9,7 @@
备注
- +
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.cshtml index 2fb2091b1..3150c036e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.cshtml @@ -50,14 +50,14 @@  新增  编辑  删除 -  打印
  一键生成   教师评语   提交   审核 -   去审核 +  打印 + @*  去审核*@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js index c57fd3c74..ef753c8f1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js @@ -131,7 +131,7 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { var CheckMark = $('#gridtable').jfGridValue('CheckStatus'); - if (CheckMark.indexOf('1') != -1) { + if (CheckMark.indexOf(',') != -1) { learun.alert.warning("选中记录中包含已审核项目，已审核不能删除！"); return; } @@ -152,13 +152,9 @@ var bootstrap = function ($, learun) { $('#lr_lock').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { - //if (keyValue.indexOf(',') != -1) { - // learun.alert.warning("只能选择一条记录进行编辑！"); - // return; - //} var CheckMark = $('#gridtable').jfGridValue('CheckStatus'); - if (CheckMark != "1") { - learun.alert.warning("当前项不可审核！"); + if (CheckMark.indexOf(',') != "-1") { + learun.alert.warning("选中项不可审核！"); return; } learun.layerForm({ diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs index f02370456..7cfcd9cfb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs @@ -114,7 +114,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - return this.BaseRepository("CollegeMIS").FindEntity(x => x.StuName == keyValue && x.Semester == Semester && x.AcademicYearNo == AcademicYearNo); + return this.BaseRepository("CollegeMIS").FindEntity(x => x.StuNo == keyValue && x.Semester == Semester && x.AcademicYearNo == AcademicYearNo); } catch (Exception ex) { @@ -270,7 +270,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration foreach (var item in keyValueArr) { var model = db.FindEntity(x => x.ID == item); - model.CheckStatus = "2"; + model.CheckStatus = entity.CheckStatus; model.CheckTime = DateTime.Now; model.CheckUser = userlogin.userId; model.UpdateTime = DateTime.Now; From c6bb61bfcc08ace3851d60e64df26b4b21fab280 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 20 Sep 2022 18:23:05 +0800 Subject: [PATCH 3/5] =?UTF-8?q?app2.0=E9=80=9A=E8=AE=AF=E5=BD=95=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/components/learun-app/organize-tree.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue index d1f65275a..1a25c8b3c 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue @@ -29,7 +29,7 @@ {{ tagName }} - + 复制 From 86fe374c7f6f058b27e2b1cdc477bc9d7fcb5973 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Wed, 21 Sep 2022 15:30:10 +0800 Subject: [PATCH 4/5] =?UTF-8?q?jobservice=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=AE=8C=E5=96=84=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Quanjiang.DigitalScholl.JobService/App.config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/App.config b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/App.config index 68331840b..3c93e65ef 100644 --- a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/App.config +++ b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/App.config @@ -13,7 +13,11 @@ + + + + From e586a60fc584c62ee3d2a80e81314244a7513546 Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 21 Sep 2022 18:19:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AD=A6=E4=B8=9A=E6=88=90=E7=BB=A9?= =?UTF-8?q?=E8=80=83=E6=A0=B8=E8=AE=B0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ScoreCheckInfoController.cs | 14 +++ .../Views/ScoreCheckInfo/Form.cshtml | 6 +- .../Views/ScoreCheckInfo/Form.js | 103 +++++++++--------- .../Views/ScoreCheckInfo/FormAudit.cshtml | 2 +- .../Views/ScoreCheckInfo/FormAudit.js | 1 - .../Views/ScoreCheckInfo/FormTeach.js | 2 +- .../Views/ScoreCheckInfo/Index.js | 26 ++--- .../ScoreCheckInfo/ScoreCheckInfoBLL.cs | 27 ++++- .../ScoreCheckInfo/ScoreCheckInfoIBLL.cs | 1 + .../ScoreCheckInfo/ScoreCheckInfoService.cs | 27 ++++- 10 files changed, 133 insertions(+), 76 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScoreCheckInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScoreCheckInfoController.cs index d0dcc98bb..09f0aecbc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScoreCheckInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScoreCheckInfoController.cs @@ -165,6 +165,20 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success("本次生成" + res + "条数据！"); } /// + /// 评教 + /// + /// + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult SaveTeachForm(string keyValue, string strEntity) + { + ScoreCheckInfoEntity entity = strEntity.ToObject(); + scoreCheckInfoIBLL.SaveTeachEntity(keyValue, entity); + return Success("评教成功！"); + } + /// /// 提交 /// /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.cshtml index 7552d614d..0b9bfa2b4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.cshtml @@ -15,9 +15,9 @@
姓名*
- - - + + + @Html.AppendJsFile("/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.js index 7d70a1a52..e395aa9c0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.js @@ -31,65 +31,62 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); - $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); - $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorno' }); - $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); $('#StuNo').lrGirdSelect({ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic', selectWord: 'stuname', value: 'stuno', text: 'stuname', headData: - [ - { label: "学号", name: "stuno", width: 140, align: "left" }, - { label: "姓名", name: "stuname", width: 100, align: "left" }, - { - label: "班级", name: "classno", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', - key: value, - keyId: 'classno', - callback: function (_data) { - callback(_data['classname']); - } - }); - } - }, - { - label: "专业", name: "majorno", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', - key: value, - keyId: 'majorno', - callback: function (_data) { - callback(_data['majorname']); - } - }); - } + [ + { label: "学号", name: "stuno", width: 140, align: "left" }, + { label: "姓名", name: "stuname", width: 100, align: "left" }, + { + label: "班级", name: "classno", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + key: value, + keyId: 'classno', + callback: function (_data) { + callback(_data['classname']); + } + }); + } }, - { - label: "专业部",name: "deptno",width: 100,align: "left", - formatterAsync: function(callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', - { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + { + label: "专业", name: "majorno", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', key: value, - keyId: 'deptno', - callback: function(_data) { - callback(_data['deptname']); + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); } }); + } + }, + { + label: "专业部", name: "deptno", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', + { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + key: value, + keyId: 'deptno', + callback: function (_data) { + callback(_data['deptname']); + } + }); + } } - } - ], + ], select: function (item) { $("#StuNo").val(item.stuno); $("#StuName").val(item.stuname); + $("#ClassNo").val(item.classno); $("#MajorNo").val(item.majorno); $("#DeptNo").val(item.deptno); - $("#ClassNo").val(item.classno); } }); }, @@ -98,7 +95,7 @@ var bootstrap = function ($, learun) { $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/GetFormData?keyValue=' + keyValue, function (data) { for (var id in data) { if (!!data[id].length && data[id].length > 0) { - $('#' + id ).jfGridSet('refreshdata', data[id]); + $('#' + id).jfGridSet('refreshdata', data[id]); } else { $('[data-table="' + id + '"]').lrSetFormData(data[id]); @@ -110,20 +107,18 @@ var bootstrap = function ($, learun) { }; // 保存数据 acceptClick = function (callBack) { - if (!$('form').lrValidform()) { + if (!$('body').lrValidform()) { return false; } var postData = { - //postData.StuName= - strEntity: JSON.stringify($('form').lrGetFormData()) + strEntity: JSON.stringify($('body').lrGetFormData()) }; - console.log(postData,"postData") - //$.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SaveForm?keyValue=' + keyValue, postData, function (res) { - // // 保存成功后才回调 - // if (!!callBack) { - // callBack(); - // } - //}); + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml index 7439b013e..2ceef9f8a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml @@ -8,7 +8,7 @@
-
备注
+
审核意见
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js index c791a6203..7b69b0b28 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js @@ -43,7 +43,6 @@ var bootstrap = function ($, learun) { var postData = { strEntity: JSON.stringify($('body').lrGetFormData()) }; - console.log(keyValue,"keyValue") $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/AuditFrom?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.js index 0d427dbe0..ee1dcfda5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.js @@ -58,7 +58,7 @@ var bootstrap = function ($, learun) { var postData = { strEntity: JSON.stringify($('body').lrGetFormData()) }; - $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SaveForm?keyValue=' + keyValue, postData, function (res) { + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SaveTeachForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { callBack(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js index ef753c8f1..9a5fe66f4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js @@ -110,8 +110,8 @@ var bootstrap = function ($, learun) { return; } var CheckMark = $('#gridtable').jfGridValue('CheckStatus'); - if (CheckMark === "1") { - learun.alert.warning("当前项目已审核不能编辑！"); + if (CheckMark == "1" || CheckMark == "2") { + learun.alert.warning("当前项目已提交不能编辑！"); return; } learun.layerForm({ @@ -131,8 +131,8 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { var CheckMark = $('#gridtable').jfGridValue('CheckStatus'); - if (CheckMark.indexOf(',') != -1) { - learun.alert.warning("选中记录中包含已审核项目，已审核不能删除！"); + if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) { + learun.alert.warning("选中记录中包含已审核项目,不可删除！"); return; } learun.layerConfirm('是否确认删除该项！', function (res) { @@ -153,8 +153,8 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { var CheckMark = $('#gridtable').jfGridValue('CheckStatus'); - if (CheckMark.indexOf(',') != "-1") { - learun.alert.warning("选中项不可审核！"); + if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) { + learun.alert.warning("选中记录中包含已审核项目,请勿重复提交！"); return; } learun.layerForm({ @@ -178,8 +178,8 @@ var bootstrap = function ($, learun) { return; } var CheckMark = $('#gridtable').jfGridValue('CheckStatus'); - if (CheckMark === "1") { - learun.alert.warning("当前项目已审核不能编辑！"); + if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) { + learun.alert.warning("选中记录中包含已审核项目,请勿重复提交！"); return; } learun.layerForm({ @@ -213,8 +213,8 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { var CheckMark = $('#gridtable').jfGridValue('CheckStatus'); - if (CheckMark.indexOf('1') != -1) { - learun.alert.warning("选中记录中包含已提交项目，不可重复提交！"); + if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) { + learun.alert.warning("选中记录中包含已审核项目,请勿重复提交！"); return; } learun.layerConfirm('是否确认提交选择项！', function (res) { @@ -291,11 +291,11 @@ var bootstrap = function ($, learun) { label: "评语填写人", name: "Signed", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo', key: value, - keyId: 'classno', + keyId: 'empno', callback: function (_data) { - callback(_data['classname']); + callback(_data['empname']); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoBLL.cs index 68f4674af..690e778ba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoBLL.cs @@ -113,7 +113,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } - + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + public void SaveTeachEntity(string keyValue, ScoreCheckInfoEntity entity) + { + try + { + scoreCheckInfoService.SaveTeachEntity(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } /// /// 保存实体数据（新增、修改） /// @@ -138,7 +162,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } - /// /// 一键生成 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoIBLL.cs index 8dc5a6ed0..06485c722 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoIBLL.cs @@ -43,6 +43,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 主键 /// 实体 void SaveEntity(string keyValue, ScoreCheckInfoEntity entity); + void SaveTeachEntity(string keyValue, ScoreCheckInfoEntity entity); /// /// 一键生成 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs index 7cfcd9cfb..c22d79983 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs @@ -202,7 +202,32 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } - + public void SaveTeachEntity(string keyValue, ScoreCheckInfoEntity entity) + { + try + { + var userlogin = LoginUserInfo.Get(); + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + entity.UpdateTime = DateTime.Now; + entity.UpdateUser = userlogin.userId; + entity.Signed = userlogin.account; + this.BaseRepository("CollegeMIS").Update(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } public int SaveGeneEntity(string AcademicYearNo, string Semester) { try