diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuLeaveManagementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuLeaveManagementController.cs index 97b9b5d0e..dfc9cef3c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuLeaveManagementController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuLeaveManagementController.cs @@ -56,23 +56,23 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult CheckIndex() { - ViewBag.IsDeptDirector = false; //登录用户是否是系主任标识 - var deptDirectorRoleId = Config.GetValue("DeptDirectorRoleId"); - var loginInfoRoleIds = LoginUserInfo.Get().roleIds; - if (loginInfoRoleIds.IndexOf(',') == -1) - { - if (loginInfoRoleIds == deptDirectorRoleId) - { - ViewBag.IsDeptDirector = true; - } - } - else - { - if (loginInfoRoleIds.Split(',').Contains(deptDirectorRoleId)) - { - ViewBag.IsDeptDirector = true; - } - } + ////ViewBag.IsDeptDirector = false; //登录用户是否是系主任标识 + //var deptDirectorRoleId = Config.GetValue("DeptDirectorRoleId"); + //var loginInfoRoleIds = LoginUserInfo.Get().roleIds; + //if (loginInfoRoleIds.IndexOf(',') == -1) + //{ + // if (loginInfoRoleIds == deptDirectorRoleId) + // { + // ViewBag.IsDeptDirector = true; + // } + //} + //else + //{ + // if (loginInfoRoleIds.Split(',').Contains(deptDirectorRoleId)) + // { + // ViewBag.IsDeptDirector = true; + // } + //} return View(); } /// @@ -197,20 +197,33 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers entity.CheckUserId = loginInfo.userId; entity.CheckUserNo = loginInfo.account; entity.CheckTime = DateTime.Now; + if (entity.CheckStatus == "1") + { + entity.CheckStatus = "2"; + } + else + { + entity.CheckStatus = "3"; + } stuLeaveManagementIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } - /// - /// 提交实体数据 - /// - /// 主键 - /// - [HttpPost] - [AjaxOnly] - public ActionResult DoSubmit(string keyValue, string status, string processId) + ///// + ///// 提交实体数据 + ///// + ///// 主键 + ///// + //[HttpPost] + //[AjaxOnly] + //public ActionResult DoSubmit(string keyValue, string status, string processId) + //{ + // stuLeaveManagementIBLL.DoSubmit(keyValue, status, processId); + // return Success("提交成功！"); + //} + public ActionResult DoSubmit(string keyValue) { - stuLeaveManagementIBLL.DoSubmit(keyValue, status, processId); + stuLeaveManagementIBLL.DoSubmit(keyValue); return Success("提交成功！"); } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.js index 25ff742de..c29b31bd5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.js @@ -41,6 +41,7 @@ var bootstrap = function ($, learun) { var postData = { strEntity: JSON.stringify($('body').lrGetFormData()) }; + console.log(postData,"postData") $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/SaveCheckForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.cshtml index 8565e691a..c4169a329 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.cshtml @@ -36,6 +36,6 @@ @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js") - +*@ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js index b3ebe58b7..4bd01fc41 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js @@ -27,11 +27,11 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('Id'); if (learun.checkrow(keyValue)) { //判断是否可以审核：请假天数大于2天且登录用户不是系主任，提示无法审核； - var day = $('#gridtable').jfGridValue('LeaveDay'); - if (day > 2 && IsDeptDirector.toLowerCase() == "false") { - learun.alert.warning("该请假申请大于2天，需要由系主任审核！"); - return false; - } + //var day = $('#gridtable').jfGridValue('LeaveDay'); + //if (day > 2 && IsDeptDirector.toLowerCase() == "false") { + // learun.alert.warning("该请假申请大于2天，需要由系主任审核！"); + // return false; + //} learun.layerForm({ id: 'checkform', title: '审核', @@ -51,15 +51,8 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/GetPageList', headData: [ { - label: "审核状态", name: "CheckStatus", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'LeaveCheck', - callback: function (_data) { - callback(_data.text ? _data.text : "申请中"); - } - }); + label: "审核状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "待审核" : cellvalue == "2" ? "审核通过" : cellvalue == "3" ? "审核未通过" : "草稿"; } }, { label: "审核备注", name: "CheckRemark", width: 100, align: "left" }, @@ -134,33 +127,33 @@ var bootstrap = function ($, learun) { } }); } - }, - { - label: "班主任", name: "ClassDiredctorNo", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo', - key: value, - keyId: 'empno', - callback: function (_data) { - callback(_data['empname']); - } - }); - } - }, - { - label: "辅导员", name: "ClassTutorNo", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo', - key: value, - keyId: 'empno', - callback: function (_data) { - callback(_data['empname']); - } - }); - } - }, + } + //{ + // label: "班主任", name: "ClassDiredctorNo", width: 100, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo', + // key: value, + // keyId: 'empno', + // callback: function (_data) { + // callback(_data['empname']); + // } + // }); + // } + //}, + //{ + // label: "辅导员", name: "ClassTutorNo", width: 100, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo', + // key: value, + // keyId: 'empno', + // callback: function (_data) { + // callback(_data['empname']); + // } + // }); + // } + //}, ], mainId: 'Id', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml index c6e7e5af0..71cf78aae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml @@ -15,14 +15,14 @@
返校时间*
-
+
请假天数*
-
+ @*
未销假次数
-
+
*@
附件上传
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/FormView.cshtml index 19728f453..8faf2c748 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/FormView.cshtml @@ -15,14 +15,14 @@
返校时间*
-
+
请假天数*
-
+ @*
未销假次数
-
+
*@
附件上传
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.js index 7735ec920..0c13f950d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.js @@ -33,7 +33,7 @@ var bootstrap = function ($, learun) { height: 400, callBack: function (id) { var res = false; - // 验证数据 + // 验证数据审核 res = top[id].validForm(); // 保存数据 if (res) { @@ -107,6 +107,25 @@ var bootstrap = function ($, learun) { }); } }); + ////  流程提交 + //$('#lr_submit').on('click', function () { + // var keyValue = $('#gridtable').jfGridValue('Id'); + // if (learun.checkrow(keyValue)) { + // var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + // if (CheckStatus != "0") { + // learun.alert.warning("当前项已提交！"); + // return false; + // } + // learun.layerConfirm('是否确认提交该项！', function (res) { + // if (res) { + // processId = learun.newGuid(); + // learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/DoSubmit', { keyValue: keyValue, status: "1", processId: processId }, function (res) { + // refreshGirdData(res, {}); + // }); + // } + // }); + // } + //}); //  提交 $('#lr_submit').on('click', function () { var keyValue = $('#gridtable').jfGridValue('Id'); @@ -118,14 +137,42 @@ var bootstrap = function ($, learun) { } learun.layerConfirm('是否确认提交该项！', function (res) { if (res) { - processId = learun.newGuid(); - learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/DoSubmit', { keyValue: keyValue, status: "1", processId: processId }, function (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/DoSubmit', { keyValue: keyValue }, function (res) { refreshGirdData(res, {}); }); } }); } }); + //审核 + $('#lr_check').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus != "1") { + learun.alert.warning("当前项不可审核！"); + return false; + } learun.layerForm({ + id: 'form', + title: '审核', + url: top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/Form?keyValue=' + keyValue, + width: 600, + height: 400 + //callBack: function (id) { + // var res = false; + // // 验证数据 + // res = top[id].validForm(); + // // 保存数据 + // if (res) { + // res = top[id].save('', function () { + // page.search(); + // }); + // } + // return res; + //} + }); + } + }); }, // 初始化列表 initGird: function () { @@ -272,21 +319,24 @@ var bootstrap = function ($, learun) { $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; - refreshGirdData = function (res, postData) { - if (!!res) { - if (res.code == 200) { - // 发起流程 - var postData = { - schemeCode: 'StuLeaveManagement',// 填写流程对应模板编号 - processId: processId, - level: '1', - }; - learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) { - learun.loading(false); - }); - } - page.search(); - } + //refreshGirdData = function (res, postData) { + // if (!!res) { + // if (res.code == 200) { + // // 发起流程 + // var postData = { + // schemeCode: 'StuLeaveManagement',// 填写流程对应模板编号 + // processId: processId, + // level: '1', + // }; + // learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) { + // learun.loading(false); + // }); + // } + // page.search(); + // } + //}; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); }; page.init(); } 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 846cf2e87..d14a0bfee 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 @@ -1111,6 +1111,7 @@ + @@ -7686,6 +7687,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj index d033e9e9f..241a43d9b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj @@ -200,6 +200,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementBLL.cs index 4aef237d6..1bc698092 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementBLL.cs @@ -42,6 +42,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + public IEnumerable GetList(string queryJson) + { + try + { + return stuLeaveManagementService.GetList(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } /// /// 获取StuLeaveManagement表实体数据 @@ -165,6 +183,28 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + /// + /// 提交实体数据 + /// + /// 主键 + public void DoSubmit(string keyValue) + { + try + { + stuLeaveManagementService.DoSubmit(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } /// /// 审核实体数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementIBLL.cs index 3ba13f447..11a6fe124 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementIBLL.cs @@ -22,6 +22,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// IEnumerable GetPageList(Pagination pagination, string queryJson); /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetList(string queryJson); + /// /// 获取StuLeaveManagement表实体数据 /// /// 主键 @@ -55,6 +61,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// 主键 void DoSubmit(string keyValue, string status, string processId); + void DoSubmit(string keyValue); /// /// 审核实体数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementService.cs index 48da054f0..d78147123 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementService.cs @@ -108,6 +108,93 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT t.*,s.StuName as CreateUserName "); + //strSql.Append("SELECT t.*,s.StuName as CreateUserName,s.ClassNo,s.DeptNo,s.MajorNo,c.ClassDiredctorNo,c.ClassTutorNo "); + strSql.Append(" FROM StuLeaveManagement t "); + strSql.Append(" left join StuInfoBasic s on t.CreateUserNo=s.StuNo "); + //strSql.Append(" left join ClassInfo c on s.ClassNo=c.ClassNo "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["LeaveType"].IsEmpty()) + { + dp.Add("LeaveType", queryParam["LeaveType"].ToString(), DbType.String); + strSql.Append(" AND t.LeaveType = @LeaveType "); + } + if (!queryParam["CheckStatus"].IsEmpty()) + { + dp.Add("CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); + strSql.Append(" AND t.CheckStatus = @CheckStatus "); + } + if (!queryParam["StuNo"].IsEmpty()) + { + dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String); + strSql.Append(" AND t.CreateUserNo = @StuNo "); + } + //班级班主任/辅导员/系主任 + //if (!queryParam["ClassManagerNo"].IsEmpty()) + //{ + // dp.Add("ClassManagerNo", queryParam["ClassManagerNo"].ToString(), DbType.String); + // strSql.Append(" AND (c.ClassDiredctorNo = @ClassManagerNo or c.ClassTutorNo = @ClassManagerNo "); + // //登录用户是否是系主任：若是，展示大于2天的请假记录； + // var deptDirectorRoleId = Config.GetValue("DeptDirectorRoleId"); + // if (deptDirectorRoleId != null) + // { + // var loginInfoRoleIds = LoginUserInfo.Get().roleIds; + // if (loginInfoRoleIds.IndexOf(',') == -1) + // { + // if (loginInfoRoleIds == deptDirectorRoleId) + // { + // strSql.Append(" or t.LeaveDay>2 )"); + // } + // else + // { + // strSql.Append(" ) "); + // } + // } + // else + // { + // if (loginInfoRoleIds.Split(',').Contains(deptDirectorRoleId)) + // { + // strSql.Append(" or t.LeaveDay>2 )"); + // } + // else + // { + // strSql.Append(" ) "); + // } + // } + // } + // else + // { + // strSql.Append(" ) "); + // } + //} + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } /// /// 获取StuLeaveManagement表实体数据 /// @@ -239,6 +326,28 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 提交实体数据 + /// + /// 主键 + public void DoSubmit(string keyValue) + { + try + { + this.BaseRepository("CollegeMIS").ExecuteBySql("update StuLeaveManagement set CheckStatus='1' where Id='" + keyValue + "' "); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } /// /// 审核实体数据 ///