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 70f12d569..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 @@ -2,7 +2,7 @@ ViewBag.Title = "学业成绩考核记录表"; Layout = "~/Views/Shared/_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 b8098fbb9..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: 100, 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]); @@ -116,7 +113,6 @@ var bootstrap = function ($, learun) { var postData = { strEntity: JSON.stringify($('body').lrGetFormData()) }; - console.log(postData,"postData") $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { 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..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,8 +8,8 @@
-
备注
- +
审核意见
+
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js") 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.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..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') != -1) { - learun.alert.warning("选中记录中包含已审核项目，已审核不能删除！"); + if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) { + learun.alert.warning("选中记录中包含已审核项目,不可删除！"); return; } learun.layerConfirm('是否确认删除该项！', function (res) { @@ -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') > -1 || CheckMark.indexOf('2') > -1) { + learun.alert.warning("选中记录中包含已审核项目,请勿重复提交！"); return; } learun.layerForm({ @@ -182,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({ @@ -217,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) { @@ -295,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.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' }); 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 f02370456..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 @@ -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) { @@ -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 @@ -270,7 +295,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; 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 @@ + + + +