diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWorkController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWorkController.cs index e3b57712b..f5b691096 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWorkController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/SRWorkController.cs @@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers [HttpGet] public ActionResult Index() { - return View(); + return View(); } /// /// 表单页 @@ -35,7 +35,12 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers [HttpGet] public ActionResult Form() { - return View(); + return View(); + } + + public ActionResult CheckForm() + { + return View(); } #endregion @@ -69,8 +74,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers [AjaxOnly] public ActionResult GetFormData(string keyValue) { - var SRWorkData = sRWorkIBLL.GetSRWorkEntity( keyValue ); - var jsonData = new { + var SRWorkData = sRWorkIBLL.GetSRWorkEntity(keyValue); + var jsonData = new + { SRWork = SRWorkData, }; return Success(jsonData); @@ -102,7 +108,16 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers public ActionResult SaveForm(string keyValue, string strEntity) { SRWorkEntity entity = strEntity.ToObject(); - sRWorkIBLL.SaveEntity(keyValue,entity); + sRWorkIBLL.SaveEntity(keyValue, entity); + return Success("保存成功！"); + } + + [HttpPost] + [AjaxOnly] + public ActionResult CheckForm(string keyValue, string strEntity) + { + SRWorkEntity entity = strEntity.ToObject(); + sRWorkIBLL.CheckEntity(keyValue, entity); return Success("保存成功！"); } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/CheckForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/CheckForm.cshtml new file mode 100644 index 000000000..7e9b31cea --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/CheckForm.cshtml @@ -0,0 +1,19 @@ +@{ + ViewBag.Title = "SRWork"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
等次*
+
+
+
+
评价教师*
+ +
+
+
备注
+ +
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/SRWork/CheckForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/CheckForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/CheckForm.js new file mode 100644 index 000000000..c0c302507 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/CheckForm.js @@ -0,0 +1,53 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2023-06-12 11:42 + * 描 述：TeachingCompetition + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + //page.initData(); + }, + bind: function () { + $('#AuditUser')[0].lrvalue = learun.clientdata.get(['userinfo']).userId; + $('#AuditUser').val(learun.clientdata.get(['userinfo']).realName); + $('#Grade').lrDataItemSelect({ code: 'EncouragementDegree' }); + }, + //initData: function () { + //if (!!keyValue) { + // $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/TeachingCompetition/GetFormData?keyValue=' + keyValue, function (data) { + // for (var id in data) { + // if (!!data[id].length && data[id].length > 0) { + // $('#' + id).jfGridSet('refreshdata', data[id]); + // } + // else { + // $('[data-table="' + id + '"]').lrSetFormData(data[id]); + // } + // } + // }); + //} + //} + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/SRWork/CheckForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Form.cshtml index 308f7692c..d1c6a77a0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Form.cshtml @@ -3,21 +3,41 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+
+
部门*
+
+
+
名称
- +
-
-
内容
- +
+
论文论著题目
+
-
-
备注
- +
+
发表刊物
+ +
+
+
发表时间*
+ +
+
+
级别
+
-
-
参与人
- +
+
著作职称
+
+
+
+
奖励金额
+ +
+
+
备注
+
@Html.AppendJsFile("/Areas/PersonnelManagement/Views/SRWork/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Form.js index ec95c862e..fb7b1659c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Form.js @@ -15,6 +15,10 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#DepartmentId').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' }); + $('#Name').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_account', text: 'f_realname' }); + $('#TitleWorks').lrDataItemSelect({ code: 'TitleWorks' }); + $('#Rank').lrDataItemSelect({ code: 'Level' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Index.cshtml index 781562bf4..034d965b4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Index.cshtml @@ -2,7 +2,7 @@ ViewBag.Title = "科技著作"; Layout = "~/Views/Shared/_Index.cshtml"; } -
+
@@ -11,8 +11,16 @@
-
名称
- +
论文题目
+ +
+
+
部门
+
+
+
+
等次
+
@@ -23,9 +31,10 @@
-  新增 -  编辑 +  新增 +  编辑  删除 +  评价
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Index.js index 2ad90b345..fa85915df 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/SRWork/Index.js @@ -16,18 +16,20 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); + $('#DepartmentId').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' }); + $('#Grade').lrDataItemSelect({ code: 'EncouragementDegree' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); }); // 新增 $('#lr_add').on('click', function () { - learun.layerForm({ + learun.layerForm({ id: 'form', title: '新增', url: top.$.rootUrl + '/PersonnelManagement/SRWork/Form', width: 600, - height: 400, + height: 450, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -37,12 +39,16 @@ var bootstrap = function ($, learun) { $('#lr_edit').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { + if (keyValue.indexOf(',') != -1) { + learun.alert.warning("只能选择一条记录进行编辑！"); + return; + } learun.layerForm({ id: 'form', title: '编辑', url: top.$.rootUrl + '/PersonnelManagement/SRWork/Form?keyValue=' + keyValue, width: 600, - height: 400, + height: 450, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -53,34 +59,140 @@ var bootstrap = function ($, learun) { $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { + learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { - learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/SRWork/DeleteForm', { keyValue: keyValue}, function () { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/SRWork/DeleteForm', { keyValue: keyValue }, function () { refreshGirdData(); }); } }); } }); + // 评价 + $('#lr_check').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '评价', + url: top.$.rootUrl + '/PersonnelManagement/SRWork/CheckForm?keyValue=' + keyValue, + width: 600, + height: 300, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/PersonnelManagement/SRWork/GetPageList', headData: [ - { label: "名称", name: "Name", width: 100, align: "left"}, - { label: "内容", name: "Content", width: 100, align: "left"}, - { label: "备注", name: "Remark", width: 100, align: "left"}, - { label: "参与人", name: "Participant", width: 100, align: "left"}, + { + label: "部门", name: "DepartmentId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata', + key: value, + keyId: 'id', + callback: function (_data) { + callback(_data['name']); + } + }); + } + }, + { + label: "作者", name: "Name", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo', + key: value, + keyId: 'f_account', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { label: "论文论著题目", name: "Topic", width: 100, align: "left" }, + { label: "出版社", name: "Press", width: 100, align: "left" }, + { + label: "发表时间", name: "PostedTime", width: 100, align: "left" + , formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } + }, + { + label: "级别", name: "Rank", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'Level', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: "著作职称", name: "TitleWorks", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'TitleWorks', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "奖励金额", name: "Money", width: 100, align: "left" }, + { label: "备注", name: "Remark", width: 100, align: "left" }, + { + label: "等次", name: "Grade", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EncouragementDegree', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: "审批用户", name: "AuditUser", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { + label: "审批时间", name: "AuditTime", width: 100, align: "left" + , formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd hh-mm-ss'); + } + }, + { label: "审批备注", name: "AuditRemark", width: 100, align: "left" }, ], - mainId:'ID', - isPage: true + mainId: 'ID', + isPage: true, + isMultiselect: true, + sidx: "CreateTime desc" }); page.search(); }, search: function (param) { param = param || {}; - $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; refreshGirdData = function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 535de509d..7726da8d7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1861,6 +1861,7 @@ + @@ -8125,6 +8126,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkBLL.cs index 4e87e5f2e..545987148 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkBLL.cs @@ -117,8 +117,24 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } } - + public void CheckEntity(string keyValue, SRWorkEntity entity) + { + try + { + sRWorkService.CheckEntity(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } #endregion - } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkEntity.cs index 0fea6fdff..d204a6656 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkEntity.cs @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// 日 期：2019-12-31 10:52 /// 描 述：科技著作 ///
- public class SRWorkEntity + public class SRWorkEntity { #region 实体成员 /// @@ -19,26 +19,36 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// [Column("ID")] public string ID { get; set; } - /// - /// 名称 - /// + [Column("DEPARTMENTID")] + public string DepartmentId { get; set; } [Column("NAME")] public string Name { get; set; } - /// - /// 内容 - /// - [Column("CONTENT")] - public string Content { get; set; } - /// - /// 备注 - /// + [Column("TOPIC")] + public string Topic { get; set; } + [Column("PRESS")] + public string Press { get; set; } + [Column("RANK")] + public string Rank { get; set; } + [Column("GRADE")] + public string Grade { get; set; } + [Column("TITLEWORKS")] + public string TitleWorks { get; set; } + [Column("MONEY ")] + public decimal? Money { get; set; } [Column("REMARK")] public string Remark { get; set; } - /// - /// 参与人员信息 - /// - [Column("PARTICIPANT")] - public string Participant { get; set; } + [Column("CREATEUSER")] + public string CreateUser { get; set; } + [Column("AUDITUSER")] + public string AuditUser { get; set; } + [Column("AUDITREMARK")] + public string AuditRemark { get; set; } + [Column("AUDITTIME")] + public DateTime? AuditTime { get; set; } + [Column("CREATETIME")] + public DateTime? CreateTime { get; set; } + [Column("POSTEDTIME")] + public DateTime? PostedTime { get; set; } #endregion #region 扩展操作 @@ -48,6 +58,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement public void Create() { this.ID = Guid.NewGuid().ToString(); + this.CreateUser = LoginUserInfo.Get().userId; + this.CreateTime = DateTime.Now; } /// /// 编辑调用 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkIBLL.cs index da390f67d..87cf79a5a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkIBLL.cs @@ -43,6 +43,9 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// /// void SaveEntity(string keyValue, SRWorkEntity entity); + + void CheckEntity(string keyValue, SRWorkEntity entity); + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkService.cs index 955f57e07..cf2c198ae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/SRWork/SRWorkService.cs @@ -30,24 +30,28 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement { var strSql = new StringBuilder(); strSql.Append("SELECT "); - strSql.Append(@" - t.ID, - t.Name, - t.Content, - t.Remark, - t.Participant - "); + strSql.Append(@"t.* "); strSql.Append(" FROM SRWork t "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 var dp = new DynamicParameters(new { }); - if (!queryParam["Name"].IsEmpty()) + if (!queryParam["Topic"].IsEmpty()) { - dp.Add("Name", "%" + queryParam["Name"].ToString() + "%", DbType.String); - strSql.Append(" AND t.Name Like @Name "); + dp.Add("Topic", "%" + queryParam["Topic"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Topic Like @Topic "); } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + if (!queryParam["DepartmentId"].IsEmpty()) + { + dp.Add("DepartmentId", queryParam["DepartmentId"].ToString(), DbType.String); + strSql.Append(" AND t.DepartmentId = @DepartmentId "); + } + if (!queryParam["Grade"].IsEmpty()) + { + dp.Add("Grade", queryParam["Grade"].ToString(), DbType.String); + strSql.Append(" AND t.Grade = @Grade "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) { @@ -99,7 +103,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement { try { - this.BaseRepository("CollegeMIS").Delete(t=>t.ID == keyValue); + this.BaseRepository("CollegeMIS").Delete(t => t.ID == keyValue); } catch (Exception ex) { @@ -147,6 +151,37 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } + + public void CheckEntity(string keyValue, SRWorkEntity entity) + { + var db = this.BaseRepository("CollegeMIS").BeginTrans(); + try + { + var Id = keyValue.Split(','); + foreach (var item in Id) + { + SRWorkEntity model = db.FindEntity(x => x.ID == item); + model.Grade = entity.Grade; + model.AuditUser = entity.AuditUser; + model.AuditTime = DateTime.Now; + model.AuditRemark = entity.AuditRemark; + db.Update(model); + } + db.Commit(); + } + catch (Exception ex) + { + db.Rollback(); + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } #endregion }