-
-
+
+
@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 45ffe6962..2e7700960 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
@@ -8,12 +8,45 @@ var refreshGirdData;
var bootstrap = function ($, learun) {
"use strict";
var page = {
+
init: function () {
page.initGird();
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' })
+
+ // 刷新
$('#lr_refresh').on('click', function () {
location.reload();
});
@@ -116,7 +149,8 @@ var bootstrap = function ($, learun) {
{ 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"},
+ { label: "发放月份", name: "IssueMonth", width: 100, align: "left" },
+ { label: "发放年份", name: "IssueYears", width: 100, align: "left" },
],
mainId:'SalaryID',
isPage: true
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 69e11fed9..ad5a7e6dc 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
@@ -1,6 +1,7 @@
using Learun.Util;
using System;
using System.ComponentModel.DataAnnotations.Schema;
+using System.Security.AccessControl;
namespace Learun.Application.TwoDevelopment.PersonnelManagement
{
@@ -259,6 +260,9 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
///
[Column("ONDUTYFEE")]
public string OnDutyfee { get; set; }
+ [Column(name:"ISSUEYEARS")]
+ public string IssueYears { get; set; }
+
#endregion
#region 扩展操作
diff --git a/Learun.Framework.Ultimate V7/西昌单校区版V3.0.sln b/Learun.Framework.Ultimate V7/西昌单校区版V3.0.sln
index b2f47cb27..223970e1c 100644
--- a/Learun.Framework.Ultimate V7/西昌单校区版V3.0.sln
+++ b/Learun.Framework.Ultimate V7/西昌单校区版V3.0.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.779
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30907.101
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "01 Framework 基础模块", "01 Framework 基础模块", "{C6B09613-CC72-4D16-8056-1FD68ED86BF3}"
EndProject
@@ -1637,7 +1637,7 @@ Global
{E05A2B9A-A939-450F-9A44-A8B3201D055A} = {ED258CD0-0A0C-490B-9D8F-B4CEC4467251}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {968C278F-4142-4DFF-96B0-B3D70A649451}
EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35
+ SolutionGuid = {968C278F-4142-4DFF-96B0-B3D70A649451}
EndGlobalSection
EndGlobal