+
-
+
@Html.AppendJsFile("/Areas/PersonnelManagement/Views/Emp_Payroll/Index.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Index.js
index 2e7700960..51c123b2a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Index.js
@@ -2,7 +2,7 @@
* Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
* 创建人：超级管理员
* 日 期：2021-04-21 15:42
- * 描 述：考勤记录
+ * 描 述：工资条
*/
var refreshGirdData;
var bootstrap = function ($, learun) {
@@ -14,39 +14,27 @@ var bootstrap = function ($, learun) {
page.bind();
},
bind: function () {
- $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
- page.search(queryJson);
- }, 220, 400);
- //学年
- $('#IuuseYears').lrselect({
- placeholder: "请选择年度",
- allowSearch: true,
- url: top.$.rootUrl + '/PersonnelManagement/Emp_Payroll/IuuseYears',
- value: 'value',
- text: 'text'
- });
- //学期
- //$('#MPSemester').lrselect({
- // placeholder: "请选择学期",
- // allowSearch: true,
- // url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo',
- // value: 'value',
- // text: 'text'
- //});
- $('#IssueMonth').lrDataItemSelect({ code: 'IssueMonth' });
-
- //$('#MPDepartment').lrselect({
- // type: 'tree',
- // // 展开最大高度
- // maxHeight: 200,
- // // 是否允许搜索
- // allowSearch: true,
- // // 访问数据接口地址
- // url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
- $('#SalaryName')
- .lrselect({ type: 'default', allowSearch: true, value: 'SalaryID', text: 'SalaryName' })
-
- // 刷新
+ $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+ page.search(queryJson);
+ }, 220, 400);
+ //年份
+ $('#IssueYear').lrselect({
+ allowSearch: true,
+ url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear',
+ value: 'value',
+ text: 'text'
+ });
+ $('#IssueMonth').lrDataItemSelect({ code: 'MPMonth' });
+ $('#Department').lrselect({
+ type: 'tree',
+ // 展开最大高度
+ maxHeight: 200,
+ // 是否允许搜索
+ allowSearch: true,
+ // 访问数据接口地址
+ url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
+ });
+ // 刷新
$('#lr_refresh').on('click', function () {
location.reload();
});
@@ -85,7 +73,7 @@ var bootstrap = function ($, learun) {
if (learun.checkrow(keyValue)) {
learun.layerConfirm('是否确认删除该项！', function (res) {
if (res) {
- learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/Emp_Payroll/DeleteForm', { keyValue: keyValue}, function () {
+ learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/Emp_Payroll/DeleteForm', { keyValue: keyValue }, function () {
refreshGirdData();
});
}
@@ -102,64 +90,64 @@ var bootstrap = function ($, learun) {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/PersonnelManagement/Emp_Payroll/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: "OnDutyfee", 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: "SalaryName", width: 100, align: "left" },
+ { label: "岗位工资", name: "PostSalary", width: 100, align: "left", statistics: true },
+ { label: "薪级工资", name: "PayWages", width: 100, align: "left", statistics: true },
+ { label: "提高百分之十", name: "UpTenpercent", width: 100, align: "left", statistics: true },
+ { label: "校内补贴", name: "SchoolSub", width: 100, align: "left", statistics: true },
+ { label: "临时性补贴", name: "TemporarySub", width: 100, align: "left", statistics: true },
+ { label: "职级工资", name: "RankWage", width: 100, align: "left", statistics: true },
+ { label: "级差补贴", name: "DifferentialSub", width: 100, align: "left", statistics: true },
+ { label: "绩效工资", name: "MeritPay", width: 100, align: "left", statistics: true },
+ { label: "绩效工资减少额", name: "MeritPayLess", width: 100, align: "left", statistics: true },
+ { label: "月发一次性绩效", name: "MonthlyoneMerit", width: 100, align: "left", statistics: true },
+ { label: "倾斜", name: "Tilt", width: 100, align: "left", statistics: true },
+ { label: "课时费", name: "Classfees", width: 100, align: "left", statistics: true },
+ { label: "超课时", name: "SuperClass", width: 100, align: "left", statistics: true },
+ { label: "培训课酬", name: "TrainingDollars", width: 100, align: "left", statistics: true },
+ { label: "奖金", name: "Bonus", width: 100, align: "left", statistics: true },
+ { label: "婴补", name: "BabySubsidies", width: 100, align: "left", statistics: true },
+ { label: "班主任", name: "ClassTeacher", width: 100, align: "left", statistics: true },
+ { label: "骨干津贴", name: "KeyBenefits", width: 100, align: "left", statistics: true },
+ { label: "职务补", name: "PositionFill", width: 100, align: "left", statistics: true },
+ { label: "加班费", name: "OvertimePay", width: 100, align: "left", statistics: true },
+ { label: "值班费", name: "OnDutyfee", width: 100, align: "left", statistics: true },
+ { label: "考务费", name: "ExaminationFee", width: 100, align: "left", statistics: true },
+ { label: "安全绩效", name: "SecurityPay", width: 100, align: "left", statistics: true },
+ { label: "医药费", name: "MedicalBills", width: 100, align: "left", statistics: true },
+ { label: "防暑降温", name: "CoolingPurposes", width: 100, align: "left", statistics: true },
+ { label: "房补", name: "HousSub", width: 100, align: "left", statistics: true },
+ { label: "物业补贴", name: "PropertySub", width: 100, align: "left", statistics: true },
+ { label: "采暖补贴", name: "HeatingSub", width: 100, align: "left", statistics: true },
+ { label: "综合补助", name: "ComprehensiveSub", width: 100, align: "left", statistics: true },
+ { label: "综治奖", name: "ControlSub", width: 100, align: "left", statistics: true },
+ { label: "补发", name: "Replacement", width: 100, align: "left", statistics: true },
+ { label: "应发合计", name: "SendSum", width: 100, align: "left", statistics: true },
+ { label: "失保", name: "LossInsurance", width: 100, align: "left", statistics: true },
+ { label: "养保", name: "Bartender", width: 100, align: "left", statistics: true },
+ { label: "职业年金", name: "OcPension", width: 100, align: "left", statistics: true },
+ { label: "房积金", name: "HousFund", width: 100, align: "left", statistics: true },
+ { label: "医保", name: "HealthCare", width: 100, align: "left", statistics: true },
+ { label: "房租", name: "TheRent", width: 100, align: "left", statistics: true },
+ { label: "网费", name: "InternetFee", width: 100, align: "left", statistics: true },
+ { label: "考核扣款", name: "AssDeductions", width: 100, align: "left", statistics: true },
+ { label: "其他扣款", name: "OtherDeductions", width: 100, align: "left", statistics: true },
+ { label: "代扣个税", name: "WithBuckletax", width: 100, align: "left", statistics: true },
+ { label: "扣款合计", name: "DeductionsSum", width: 100, align: "left", statistics: true },
+ { label: "纳税收入", name: "TaxRevenue", width: 100, align: "left", statistics: true },
+ { label: "免税收入", name: "TaxIncome", width: 100, align: "left", statistics: true },
+ { label: "应发合计", name: "NetCombined", width: 100, align: "left", statistics: true },
{ label: "发放月份", name: "IssueMonth", width: 100, align: "left" },
- { label: "发放年份", name: "IssueYears", width: 100, align: "left" },
+ { label: "发放年份", name: "IssueYear", width: 100, align: "left" },
],
- mainId:'SalaryID',
+ mainId: 'SalaryID',
isPage: true
});
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.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/EMP_PayrollEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/EMP_PayrollEntity.cs
index ad5a7e6dc..3d1acc738 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/EMP_PayrollEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/EMP_PayrollEntity.cs
@@ -10,7 +10,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
/// 日 期：2021-04-21 15:42
- /// 描 述：考勤记录
+ /// 描 述：工资条
///
public class EMP_PayrollEntity
{
@@ -260,8 +260,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
///
[Column("ONDUTYFEE")]
public string OnDutyfee { get; set; }
- [Column(name:"ISSUEYEARS")]
- public string IssueYears { get; set; }
+ ///
+ /// IssueYear
+ ///
+ [Column("ISSUEYEAR")]
+ public string IssueYear { get; set; }
#endregion
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/Emp_PayrollBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/Emp_PayrollBLL.cs
index 06311f5eb..53e96429c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/Emp_PayrollBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/Emp_PayrollBLL.cs
@@ -10,7 +10,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
/// 日 期：2021-04-21 15:42
- /// 描 述：考勤记录
+ /// 描 述：工资条
///
public class Emp_PayrollBLL : Emp_PayrollIBLL
{
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/Emp_PayrollIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/Emp_PayrollIBLL.cs
index 26b0aa4cc..918e6dfd3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/Emp_PayrollIBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/Emp_PayrollIBLL.cs
@@ -9,7 +9,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
/// 日 期：2021-04-21 15:42
- /// 描 述：考勤记录
+ /// 描 述：工资条
///
public interface Emp_PayrollIBLL
{
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/Emp_PayrollService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/Emp_PayrollService.cs
index d8495e692..6e6a687e0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/Emp_PayrollService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/Emp_PayrollService.cs
@@ -13,7 +13,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
/// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
/// 创 建：超级管理员
/// 日 期：2021-04-21 15:42
- /// 描 述：考勤记录
+ /// 描 述：工资条
///
public class Emp_PayrollService : RepositoryFactory
{
@@ -30,64 +30,34 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
try
{
var strSql = new StringBuilder();
- strSql.Append("SELECT ");
- strSql.Append(@"
- t.SalaryID,
- t.SalaryName,
- t.PostSalary,
- t.PayWages,
- t.UpTenpercent,
- t.SchoolSub,
- t.TemporarySub,
- t.RankWage,
- t.DifferentialSub,
- t.MeritPay,
- t.MeritPayLess,
- t.MonthlyoneMerit,
- t.Tilt,
- t.Classfees,
- t.SuperClass,
- t.TrainingDollars,
- t.Bonus,
- t.BabySubsidies,
- t.ClassTeacher,
- t.KeyBenefits,
- t.PositionFill,
- t.OvertimePay,
- t.OnDutyfee,
- t.ExaminationFee,
- t.SecurityPay,
- t.MedicalBills,
- t.CoolingPurposes,
- t.HousSub,
- t.PropertySub,
- t.HeatingSub,
- t.ComprehensiveSub,
- t.ControlSub,
- t.Replacement,
- t.SendSum,
- t.LossInsurance,
- t.Bartender,
- t.OcPension,
- t.HousFund,
- t.HealthCare,
- t.TheRent,
- t.InternetFee,
- t.AssDeductions,
- t.OtherDeductions,
- t.WithBuckletax,
- t.DeductionsSum,
- t.TaxRevenue,
- t.TaxIncome,
- t.NetCombined,
- t.IssueMonth
- ");
- strSql.Append(" FROM EMP_Payroll t ");
+ strSql.Append("SELECT t.* ");
+ strSql.Append(" FROM EMP_Payroll t");
+ strSql.Append(" left join EmpInfo e on t.SalaryID=e.SalaryNumber ");
strSql.Append(" WHERE 1=1 ");
var queryParam = queryJson.ToJObject();
// 虚拟参数
var dp = new DynamicParameters(new { });
- return this.BaseRepository("CollegeMIS").FindList
(strSql.ToString(),dp, pagination);
+ if (!queryParam["IssueYear"].IsEmpty())
+ {
+ dp.Add("IssueYear", queryParam["IssueYear"].ToString(), DbType.String);
+ strSql.Append(" AND t.IssueYear = @IssueYear ");
+ }
+ if (!queryParam["IssueMonth"].IsEmpty())
+ {
+ dp.Add("IssueMonth", queryParam["IssueMonth"].ToString(), DbType.String);
+ strSql.Append(" AND t.IssueMonth = @IssueMonth ");
+ }
+ if (!queryParam["SalaryName"].IsEmpty())
+ {
+ dp.Add("SalaryName", "%" + queryParam["SalaryName"].ToString() + "%", DbType.String);
+ strSql.Append(" AND t.SalaryName Like @SalaryName ");
+ }
+ if (!queryParam["Department"].IsEmpty())
+ {
+ dp.Add("Department", queryParam["Department"].ToString(), DbType.String);
+ strSql.Append(" AND e.F_DepartmentId = @Department ");
+ }
+ return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination);
}
catch (Exception ex)
{
@@ -138,7 +108,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
{
try
{
- this.BaseRepository("CollegeMIS").Delete(t=>t.SalaryID == keyValue);
+ this.BaseRepository("CollegeMIS").Delete(t => t.SalaryID == keyValue);
}
catch (Exception ex)
{