diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_SendFileController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_SendFileController.cs index 18a363eee..72b4d8fbe 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_SendFileController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_SendFileController.cs @@ -21,7 +21,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { private Sys_SendFileIBLL sys_SendFileIBLL = new Sys_SendFileBLL(); - #region 视图功能 + #region 视图功能 /// /// 主页面 @@ -32,6 +32,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + [HttpGet] public ActionResult IndexDocument() { @@ -47,6 +48,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// /// 主页面【党政公文下发】 /// @@ -56,11 +58,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + [HttpGet] public ActionResult FormDocument() { return View(); } + /// /// 表单页 /// @@ -70,6 +74,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// /// 表单页【党政公文下发】 /// @@ -91,6 +96,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// /// 【党政公文下发】 /// @@ -100,6 +106,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + [HttpGet] public ActionResult ReadList() { @@ -111,6 +118,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// /// 【党政公文下发】 /// @@ -120,9 +128,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + #endregion - #region 获取数据 + #region 获取数据 /// /// 获取页面显示列表数据 @@ -135,6 +144,19 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { Pagination paginationobj = pagination.ToObject(); var data = sys_SendFileIBLL.GetPageList(paginationobj, queryJson).Where(m => m.STypeId == 1); + + foreach (var item in data) + { + var reciver=string.IsNullOrWhiteSpace(item.Receiver)?"暂无":item.Receiver; + var sql = $"SELECT COUNT(*) FROM dbo.Sys_ReceiveFile where ReadFlag=1 AND SFileId='{item.SFileId}'"; + var sendSql = $"SELECT COUNT(*) FROM dbo.Sys_ReceiveFile where SFileId='{item.SFileId}'"; + var readdt = sys_SendFileIBLL.Execute(sql); + var senddt = sys_SendFileIBLL.Execute(sendSql); + var readcount = readdt.Rows[0][0]; + var sendcount = senddt.Rows[0][0]; + item.Receiver = $"{reciver}/{readcount}/{sendcount}"; + } + var jsonData = new { rows = data, @@ -144,6 +166,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } + [HttpGet] [AjaxOnly] public ActionResult GetPageListDocument(string pagination, string queryJson) @@ -159,12 +182,25 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } + [HttpGet] [AjaxOnly] public ActionResult GetPageListParty(string pagination, string queryJson) { Pagination paginationobj = pagination.ToObject(); var data = sys_SendFileIBLL.GetPageList(paginationobj, queryJson).Where(m => m.STypeId == 3); + + foreach (var item in data) + { + var reciver = string.IsNullOrWhiteSpace(item.Receiver) ? "暂无" : item.Receiver; + var sql = $"SELECT COUNT(*) FROM dbo.Sys_ReceiveFile where ReadFlag=1 AND SFileId='{item.SFileId}'"; + var sendSql = $"SELECT COUNT(*) FROM dbo.Sys_ReceiveFile where SFileId='{item.SFileId}'"; + var readdt = sys_SendFileIBLL.Execute(sql); + var senddt = sys_SendFileIBLL.Execute(sendSql); + var readcount = readdt.Rows[0][0]; + var sendcount = senddt.Rows[0][0]; + item.Receiver = $"{readcount}/{sendcount}"; + } var jsonData = new { rows = data, @@ -174,6 +210,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } + /// /// 获取表单数据 /// @@ -190,6 +227,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } + [HttpGet] [AjaxOnly] public ActionResult GetFormDataView(string keyValue) @@ -202,6 +240,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } + /// /// 获取表单数据 /// @@ -217,9 +256,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } + #endregion - #region 提交数据 + #region 提交数据 /// /// 删除实体数据 @@ -233,6 +273,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers sys_SendFileIBLL.DeleteEntity(keyValue); return Success("删除成功!"); } + /// /// 保存实体数据(新增、修改) /// 主键 @@ -249,6 +290,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { entity.STypeId = 1; } + sys_SendFileIBLL.SaveEntity(keyValue, entity); return Success("保存成功!"); } @@ -264,6 +306,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { entity.STypeId = 2; } + sys_SendFileIBLL.SaveEntity(keyValue, entity); return Success("保存成功!"); } @@ -279,9 +322,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { entity.STypeId = 3; } + sys_SendFileIBLL.SaveEntity(keyValue, entity); return Success("保存成功!"); } + /// /// 提交 /// @@ -294,6 +339,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers sys_SendFileIBLL.ChangeStatusById(keyValue, 1, processId); return Success("操作成功!"); } + [HttpPost] [AjaxOnly] public ActionResult ChangeStatusByIdDocument(string keyValue) @@ -303,6 +349,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers sys_SendFileIBLL.ChangeStatusByProcessId(guid, 2); return Success("操作成功!"); } + /// /// 结束下发 /// @@ -316,7 +363,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers sys_SendFileIBLL.OverIssue(keyValue); return Success("下发成功!"); } - #endregion + + /* public ActionResult ReceiveFile(string keyValue) + { + + return View(); + }*/ + + #endregion + } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js index eb523302a..2a8d96a5c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js @@ -157,7 +157,7 @@ var bootstrap = function ($, learun) { }); } }, - { + { label: "接收人", name: "Receiver", width: 300, align: "left" }, { @@ -166,6 +166,7 @@ var bootstrap = function ($, learun) { { label: "下发时间", name: "SendTime", width: 150, align: "left" }, + { label: "状态", name: "SendFlag", width: 100, align: "left", formatter: function (cellvalue, row) { @@ -178,6 +179,8 @@ var bootstrap = function ($, learun) { } } }, + + ], mainId: 'SFileId', isPage: true diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexParty.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexParty.js index 1ba9aaad7..dd7a38917 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexParty.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexParty.js @@ -158,7 +158,7 @@ var bootstrap = function ($, learun) { } }, { - label: "接收人", name: "Receiver", width: 300, align: "left" + label: "接收人/阅读数/发文章数", name: "Receiver", width: 300, align: "left" }, { label: "下发人", name: "Sender", width: 100, align: "left" @@ -166,6 +166,7 @@ var bootstrap = function ($, learun) { { label: "下发时间", name: "SendTime", width: 150, align: "left" }, + { label: "状态", name: "SendFlag", width: 100, align: "left", formatter: function (cellvalue, row) { @@ -178,6 +179,10 @@ var bootstrap = function ($, learun) { } } }, + { + label: "阅读人数/总数", name: "Receiver", width: 150, align: "left", + + }, ], mainId: 'SFileId', isPage: true diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/Icon/AppIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/Icon/AppIndex.cshtml index 6e8dc0737..8e7265210 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/Icon/AppIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_CodeGeneratorModule/Views/Icon/AppIndex.cshtml @@ -7,6 +7,7 @@ + JS插件展示页面|智慧校园|快速开发平台|智慧校园敏捷开发框架 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.cshtml index b4498a4ff..012c98ccf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.cshtml @@ -78,8 +78,8 @@ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/工资项目Controller.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/工资项目Controller.cs new file mode 100644 index 000000000..3b3f42886 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/工资项目Controller.cs @@ -0,0 +1,117 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.PersonnelManagement; +using System.Web.Mvc; +using System.Collections.Generic; + +namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + /// 创 建:超级管理员 + /// 日 期:2021-04-20 16:52 + /// 描 述:工资条 + /// + public class 工资项目Controller : MvcControllerBase + { + private 工资项目IBLL 工资项目IBLL = new 工资项目BLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = 工资项目IBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var EMP_PayrollData = 工资项目IBLL.GetEMP_PayrollEntity( keyValue ); + var jsonData = new { + EMP_Payroll = EMP_PayrollData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm( keyValue) + { + 工资项目IBLL.DeleteEntity(keyValue); + return Success("删除成功!"); + } + /// + /// 保存实体数据(新增、修改) + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm( keyValue, string strEntity) + { + EMP_PayrollEntity entity = strEntity.ToObject(); + 工资项目IBLL.SaveEntity(keyValue,entity); + if (keyValue != null) + { + } + return Success("保存成功!"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/工资项目/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/工资项目/Form.cshtml new file mode 100644 index 000000000..070bfeff5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/工资项目/Form.cshtml @@ -0,0 +1,195 @@ +@{ + ViewBag.Title = "工资条"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
姓名
+ +
+
+
岗位工资
+ +
+
+
薪级工资
+ +
+
+
提高百分之十
+ +
+
+
校内补贴
+ +
+
+
临时性补贴
+ +
+
+
职级工资
+ +
+
+
级差补贴
+ +
+
+
绩效工资
+ +
+
+
绩效工资减少额
+ +
+
+
月一次性发放绩效
+ +
+
+
倾斜
+ +
+
+
课时费
+ +
+
+
超课时
+ +
+
+
培训课酬
+ +
+
+
奖金
+ +
+
+
婴补
+ +
+
+
班主任
+ +
+
+
骨干津贴
+ +
+
+
职务补
+ +
+
+
加班费
+ +
+
+
考务费
+ +
+
+
安全绩效
+ +
+
+
医药费
+ +
+
+
防暑降温
+ +
+
+
房补
+ +
+
+
物业补贴
+ +
+
+
采暖补贴
+ +
+
+
综合补助
+ +
+
+
综治奖
+ +
+
+
补发
+ +
+
+
应计合法
+ +
+
+
失保
+ +
+
+
养保
+ +
+
+
职业年金
+ +
+
+
房积金
+ +
+
+
医保
+ +
+
+
房租
+ +
+
+
网费
+ +
+
+
考核扣款
+ +
+
+
其他代扣
+ +
+
+
代扣个税
+ +
+
+
扣款合计
+ +
+
+
纳税收入
+ +
+
+
免税收入
+ +
+
+
实发合计
+ +
+
+
发放月份
+ +
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/工资项目/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/工资项目/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/工资项目/Form.js new file mode 100644 index 000000000..a9c997067 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/工资项目/Form.js @@ -0,0 +1,50 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + * 创建人:超级管理员 + * 日 期:2021-04-20 16:52 + * 描 述:工资条 + */ +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 () { + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/工资项目/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/工资项目/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/工资项目/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/工资项目/Index.cshtml new file mode 100644 index 000000000..3d5fa45aa --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/工资项目/Index.cshtml @@ -0,0 +1,27 @@ +@{ + ViewBag.Title = "工资条"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/工资项目/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/工资项目/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/工资项目/Index.js new file mode 100644 index 000000000..ade8dff1f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/工资项目/Index.js @@ -0,0 +1,134 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司 + * 创建人:超级管理员 + * 日 期:2021-04-20 16:52 + * 描 述:工资条 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/PersonnelManagement/工资项目/Form', + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('dm'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/PersonnelManagement/工资项目/Form?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('dm'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项!', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/工资项目/DeleteForm', { keyValue: keyValue}, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/PersonnelManagement/工资项目/GetPageList', + headData: [ + { label: "姓名", name: "SalaryName", width: 100, align: "left"}, + { label: "岗位工资", name: "PostSalary", width: 100, align: "left"}, + { label: "薪级工资", name: "PayWages", width: 100, align: "left"}, + { label: "提高百分之十", name: "UpTenpercent", width: 100, align: "left"}, + { label: "校内补贴", name: "SchoolSub", width: 100, align: "left"}, + { label: "临时性补贴", name: "TemporarySub", width: 100, align: "left"}, + { label: "职级工资", name: "RankWage", width: 100, align: "left"}, + { label: "级差补贴", name: "DifferentialSub", width: 100, align: "left"}, + { label: "绩效工资", name: "MeritPay", width: 100, align: "left"}, + { label: "绩效工资减少额", name: "MeritPayLess", width: 100, align: "left"}, + { label: "月一次性发放绩效", name: "MonthlyoneMerit", width: 100, align: "left"}, + { label: "倾斜", name: "Tilt", width: 100, align: "left"}, + { label: "课时费", name: "Classfees", width: 100, align: "left"}, + { label: "超课时", name: "SuperClass", width: 100, align: "left"}, + { label: "培训课酬", name: "TrainingDollars", width: 100, align: "left"}, + { label: "奖金", name: "Bonus", width: 100, align: "left"}, + { label: "婴补", name: "BabySubsidies", width: 100, align: "left"}, + { label: "班主任", name: "ClassTeacher", width: 100, align: "left"}, + { label: "骨干津贴", name: "KeyBenefits", width: 100, align: "left"}, + { label: "职务补", name: "PositionFill", width: 100, align: "left"}, + { label: "加班费", name: "OvertimePay", width: 100, align: "left"}, + { label: "考务费", name: "ExaminationFee", width: 100, align: "left"}, + { label: "安全绩效", name: "SecurityPay", width: 100, align: "left"}, + { label: "医药费", name: "MedicalBills", width: 100, align: "left"}, + { label: "防暑降温", name: "CoolingPurposes", width: 100, align: "left"}, + { label: "房补", name: "HousSub", width: 100, align: "left"}, + { label: "物业补贴", name: "PropertySub", width: 100, align: "left"}, + { label: "采暖补贴", name: "HeatingSub", width: 100, align: "left"}, + { label: "综合补助", name: "ComprehensiveSub", width: 100, align: "left"}, + { label: "综治奖", name: "ControlSub", width: 100, align: "left"}, + { label: "补发", name: "Replacement", width: 100, align: "left"}, + { label: "应计合法", name: "SendSum", width: 100, align: "left"}, + { label: "失保", name: "LossInsurance", width: 100, align: "left"}, + { label: "养保", name: "Bartender", width: 100, align: "left"}, + { label: "职业年金", name: "OcPension", width: 100, align: "left"}, + { label: "房积金", name: "HousFund", width: 100, align: "left"}, + { label: "医保", name: "HealthCare", width: 100, align: "left"}, + { label: "房租", name: "TheRent", width: 100, align: "left"}, + { label: "网费", name: "InternetFee", width: 100, align: "left"}, + { label: "考核扣款", name: "AssDeductions", width: 100, align: "left"}, + { label: "其他代扣", name: "OtherDeductions", width: 100, align: "left"}, + { label: "代扣个税", name: "WithBuckletax", width: 100, align: "left"}, + { label: "扣款合计", name: "DeductionsSum", width: 100, align: "left"}, + { label: "纳税收入", name: "TaxRevenue", width: 100, align: "left"}, + { label: "免税收入", name: "TaxIncome", width: 100, align: "left"}, + { label: "实发合计", name: "NetCombined", width: 100, align: "left"}, + { label: "发放月份", name: "IssueMonth", width: 100, align: "left"}, + ], + mainId:'dm', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); + } + }; + 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 ae6e8de91..93d6757ff 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 @@ -793,6 +793,7 @@ + @@ -6131,6 +6132,10 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop.cshtml index a9500efe0..5148cec5d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop.cshtml @@ -4,7 +4,9 @@ Layout = "~/Views/Shared/_Index.cshtml"; } - + + + @Html.AppendCssFile("/Views/Home/AdminDesktop/Index.css")