gongzi

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Form.cshtml

@@ -195,5 +195,9 @@
         <div class="lr-form-item-title">发放月份</div>
         <input id="IssueMonth" type="text" class="form-control"  />
     </div>
+    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+        <div class="lr-form-item-title">发放年份</div>
+        <input id="IssueYears" type="text" class="form-control"  />
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/Emp_Payroll/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Index.cshtml

@@ -3,25 +3,53 @@
     Layout = "~/Views/Shared/_Index.cshtml";
 }
 <div class="lr-layout "  >
-    <div class="lr-layout-center">
-        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
-            <div class="lr-layout-tool">
-                <div class="lr-layout-tool-left">
-                </div>
-                <div class="lr-layout-tool-right">
-                    <div class=" btn-group btn-group-sm">
-                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
-                    </div>
-                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
-                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
-                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+<div class="lr-layout-center">
+    <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+        <div class="lr-layout-tool">
+            <div class="lr-layout-tool-left">
+                <div class="lr-layout-tool-item">
+                    <div id="multiple_condition_query">
+                        <div class="lr-query-formcontent">
+                            <div class="col-xs-12 lr-form-item">
+                                <div class="lr-form-item-title">年度</div>
+                                <div id="IuuseYears"></div>
+                            </div>
+                            @*<div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学期</div>
+                                    <div id="MPSemester"></div>
+                                </div>*@
+                            <div class="col-xs-12 lr-form-item">
+                                <div class="lr-form-item-title">月份</div>
+                                <div id="IssueMonth"></div>
+                            </div>
+                            @*<div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">部门</div>
+                                    <div id="MPDepartment"></div>
+                                </div>*@
+                            <div class="col-xs-12 lr-form-item">
+                                <div class="lr-form-item-title">接收人</div>
+                                <div id="SalaryName"></div>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
-            <div class="lr-layout-body" id="gridtable"></div>
+            <div class="lr-layout-tool-right">
+                <div class=" btn-group btn-group-sm">
+                    <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                </div>
+                <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                    <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                    <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                    <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                    <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                </div>
+            </div>
         </div>
+        <div class="lr-layout-body" id="gridtable"></div>
     </div>
 </div>
+</div>
+       
+
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/Emp_Payroll/Index.js")

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

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
         /// </summary>
         [Column("ONDUTYFEE")]
         public string OnDutyfee { get; set; }
+        [Column(name:"ISSUEYEARS")]
+        public string IssueYears { get; set; }
+
         #endregion
 
         #region 扩展操作

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