diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Form.cshtml index 743372a2a..20c2e3fcb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Form.cshtml @@ -3,201 +3,201 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+
姓名
- +
-
+
岗位工资
- +
-
+
薪级工资
- +
-
+
提高百分之十
- +
-
+
校内补贴
- +
-
+
临时性补贴
- +
-
+
职级工资
- +
-
+
级差补贴
- +
-
+
绩效工资
- +
-
+
绩效工资减少额
- +
-
+
月发一次性绩效
- +
-
+
倾斜
- +
-
+
课时费
- +
-
+
超课时
- +
-
+
培训课酬
- +
-
+
奖金
- +
-
+
婴补
- +
-
+
班主任
- +
-
+
骨干津贴
- +
-
+
职务补
- +
-
+
加班费
- +
-
+
值班费
- +
-
+
考务费
- +
-
+
安全绩效
- +
-
+
医药费
- +
-
+
防暑降温
- +
-
+
房补
- +
-
+
物业补贴
- +
-
+
采暖补贴
- +
-
+
综合补助
- +
-
+
综治奖
- +
-
+
补发
- +
-
+
应发合计
- +
-
+
失保
- +
-
+
养保
- +
-
+
职业年金
- +
-
+
房积金
- +
-
+
医保
- +
-
+
房租
- +
-
+
网费
- +
-
+
考核扣款
- +
-
+
其他扣款
- +
-
+
代扣个税
- +
-
+
扣款合计
- +
-
+
纳税收入
- +
-
+
免税收入
- +
-
+
应发合计
- +
-
+
发放月份
- +
-
+
发放年份
- +
@Html.AppendJsFile("/Areas/PersonnelManagement/Views/Emp_Payroll/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Form.js index 3299045e3..270578388 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Form.js @@ -15,6 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#UserId').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_userid', text: 'f_realname' }); }, initData: function () { if (!!keyValue) { 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 51c123b2a..92ad7abcf 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 @@ -90,7 +90,20 @@ var bootstrap = function ($, learun) { $('#gridtable').jfGrid({ url: top.$.rootUrl + '/PersonnelManagement/Emp_Payroll/GetPageList', headData: [ - { label: "姓名", name: "SalaryName", width: 100, align: "left" }, + //{ label: "姓名", name: "UserId", width: 100, align: "left" }, + { + label: "名称", name: "UserId", 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: "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 }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.cshtml index a4ae88c9c..3800b3f68 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.cshtml @@ -5,7 +5,7 @@
姓名
- +
发放月份
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.js index a69e5a247..5d2e61a07 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.js @@ -15,6 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#UserId').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_userid', text: 'f_realname' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.js index 59cb3bc07..4aaf52b94 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.js @@ -90,7 +90,20 @@ var bootstrap = function ($, learun) { $('#gridtable').jfGrid({ url: top.$.rootUrl + '/PersonnelManagement/Emp_PayrollOnce/GetPageList', headData: [ - { label: "姓名", name: "SalaryName", width: 100, align: "left" }, + //{ label: "姓名", name: "UserId", width: 100, align: "left" }, + { + label: "名称", name: "UserId", 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: "TotalPayAmount", width: 100, align: "left", statistics: true }, { label: "实发金额", name: "FinalPayAmount", width: 100, align: "left", statistics: true }, { label: "发放月份", name: "IssueMonth", width: 100, align: "left" }, 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 3d1acc738..c8f7fab71 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 @@ -20,6 +20,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// [Column("SALARYID")] public string SalaryID { get; set; } + /// + /// 教师编码 + /// + [Column("USERID")] + public string UserId { get; set; } /// /// SalaryName /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/EMP_PayrollOnceEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/EMP_PayrollOnceEntity.cs index ceebc772c..443f10db7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/EMP_PayrollOnceEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/EMP_PayrollOnceEntity.cs @@ -20,6 +20,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// [Column("SALARYID")] public string SalaryID { get; set; } + /// + /// 教师编码 + /// + [Column("USERID")] + public string UserId { get; set; } /// /// 姓名 ///