diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Gz_AmountsController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Gz_AmountsController.cs index 4ba188ade..68a86c4c3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Gz_AmountsController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Gz_AmountsController.cs @@ -89,6 +89,30 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers }; return Success(jsonData); } + + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageListCol(string pagination, string queryJson) + { + //pagination = "{page:1,rows:1}"; + queryJson = "{Year:2023,Month:12}"; + Pagination paginationobj = pagination.ToObject(); + var data = gz_AmountsIBLL.GetPageListCol(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } /// /// 获取表单数据 /// @@ -101,6 +125,14 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers var data = gz_AmountsIBLL.GetEntity(keyValue); return Success(data); } + + [HttpGet] + [AjaxOnly] + public ActionResult GetDetail(string userNo,int year,int month) + { + var data = gz_AmountsIBLL.GetAmountsDetail(userNo, year, month); + return Success(data); + } #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Gz_ItemsController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Gz_ItemsController.cs index 78643af04..c4695487f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Gz_ItemsController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Gz_ItemsController.cs @@ -115,6 +115,19 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers gz_ItemsIBLL.SaveEntity(keyValue, entity); return Success("保存成功!"); } + + /// + /// 展示/取消 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult Show(string keyValue) + { + gz_ItemsIBLL.ShowOrHidden(keyValue); + return Success("操作成功!"); + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml index 538a7fd9c..0400f4363 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/Index.cshtml @@ -11,12 +11,12 @@
- + - + @@ -36,7 +36,7 @@ 查看 导入 - 删除 + @*删除*@
@@ -122,11 +122,11 @@ border show-overflow-tooltip height="500"> - *@