金隅内控调整

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_ManagementPlanController.cs

@@ -118,7 +118,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult GetAcademicYear()
         {
-            var data = WebHelper.GenerateNearByAcademicTwo();
+            var data = WebHelper.GenerateNearByYear();
             return Success(data);
         }
 

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

@@ -4,13 +4,13 @@
 }
 <div class="lr-form-wrap">
     <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
-        <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">年度<font face="宋体">*</font></div>
         <div id="MPAcademicYearNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
+    @*<div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
         <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
         <div id="MPSemester" isvalid="yes" checkexpession="NotNull"></div>
-    </div>
+    </div>*@
     <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
         <div class="lr-form-item-title">月份<font face="宋体">*</font></div>
         <div id="MPMonth" isvalid="yes" checkexpession="NotNull"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Form.js

@@ -17,20 +17,20 @@ var bootstrap = function ($, learun) {
         bind: function () {
             //学年
             $('#MPAcademicYearNo').lrselect({
-                placeholder: "请选择学年",
+                placeholder: "请选择年度",
                 allowSearch: true,
                 url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear',
                 value: 'value',
                 text: 'text'
             });
             //学期
-            $('#MPSemester').lrselect({
-                placeholder: "请选择学期",
-                allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo',
-                value: 'value',
-                text: 'text'
-            });
+            //$('#MPSemester').lrselect({
+            //    placeholder: "请选择学期",
+            //    allowSearch: true,
+            //    url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo',
+            //    value: 'value',
+            //    text: 'text'
+            //});
 
             $('#MPDepartment').lrselect({
                 type: 'tree',

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

@@ -11,13 +11,13 @@
                         <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 class="lr-form-item-title">年度</div>
                                     <div id="MPAcademicYearNo"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                @*<div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="MPSemester"></div>
-                                </div>
+                                </div>*@
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">月份</div>
                                     <div id="MPMonth"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js

@@ -23,20 +23,20 @@ var bootstrap = function ($, learun) {
             }, 220, 400);
             //学年
             $('#MPAcademicYearNo').lrselect({
-                placeholder: "请选择学年",
+                placeholder: "请选择年度",
                 allowSearch: true,
                 url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear',
                 value: 'value',
                 text: 'text'
             });
             //学期
-            $('#MPSemester').lrselect({
-                placeholder: "请选择学期",
-                allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo',
-                value: 'value',
-                text: 'text'
-            });
+            //$('#MPSemester').lrselect({
+            //    placeholder: "请选择学期",
+            //    allowSearch: true,
+            //    url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo',
+            //    value: 'value',
+            //    text: 'text'
+            //});
             $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -102,8 +102,8 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetPageList',
                 headData: [
-                    { label: "学年", name: "MPAcademicYearNo", width: 100, align: "left" },
-                    { label: "学期", name: "MPSemester", width: 100, align: "left" },
+                    { label: "年度", name: "MPAcademicYearNo", width: 100, align: "left" },
+                    //{ label: "学期", name: "MPSemester", width: 100, align: "left" },
                     {
                         label: "月份", name: "MPMonth", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -128,6 +128,26 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "上传人", name: "MPUploader", width: 250, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                        //formatterAsync: function (callback, value, row, op, $cell) {
+                        //    learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds?keyValue=' + value, function (res) {
+                        //        if (res.code == learun.httpCode.success) {
+                        //            callback(res.data);
+                        //        }
+                        //    });
+                        //}
+                    },
                     { label: "材料名称", name: "MPProjectName", width: 150, align: "left" },
                     {
                         label: "上传文件",

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.cshtml

@@ -11,13 +11,13 @@
                         <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 class="lr-form-item-title">年度</div>
                                     <div id="MPAcademicYearNo"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                @*<div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="MPSemester"></div>
-                                </div>
+                                </div>*@
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">月份</div>
                                     <div id="MPMonth"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.js

@@ -23,20 +23,20 @@ var bootstrap = function ($, learun) {
             }, 220, 400);
             //学年
             $('#MPAcademicYearNo').lrselect({
-                placeholder: "请选择学年",
+                placeholder: "请选择年度",
                 allowSearch: true,
                 url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear',
                 value: 'value',
                 text: 'text'
             });
             //学期
-            $('#MPSemester').lrselect({
-                placeholder: "请选择学期",
-                allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo',
-                value: 'value',
-                text: 'text'
-            });
+            //$('#MPSemester').lrselect({
+            //    placeholder: "请选择学期",
+            //    allowSearch: true,
+            //    url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo',
+            //    value: 'value',
+            //    text: 'text'
+            //});
             $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
 
             $('#MPDepartment').lrselect({
@@ -48,11 +48,12 @@ var bootstrap = function ($, learun) {
                 // 访问数据接口地址
                 url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
                 select: function (val) {
-                    console.log(val);
-                    var departmentIds = val.id;
-                    $('#MPReceiveUser').lrselectRefresh({
-                        url: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByDepartmentIds?departmentId=' + departmentIds
-                    })
+                    if (val) {
+                        var departmentIds = val.id;
+                        $('#MPReceiveUser').lrselectRefresh({
+                            url: top.$.rootUrl +'/LR_OrganizationModule/User/GetListByDepartmentIds?departmentId=' +departmentIds
+                        });
+                    }
                 }
             });
 
@@ -143,7 +144,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认合格！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/Qqualified', {keyValue:keyValue, status: true }, function () {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/Qqualified', { keyValue: keyValue, status: true }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -156,7 +157,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认不合格！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/Qqualified', {keyValue:keyValue, status: false }, function () {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/Qqualified', { keyValue: keyValue, status: false }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -174,8 +175,8 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetPageList',
                 headData: [
-                    { label: "学年", name: "MPAcademicYearNo", width: 100, align: "left" },
-                    { label: "学期", name: "MPSemester", width: 100, align: "left" },
+                    { label: "年度", name: "MPAcademicYearNo", width: 100, align: "left" },
+                    //{ label: "学期", name: "MPSemester", width: 100, align: "left" },
                     {
                         label: "月份", name: "MPMonth", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -200,18 +201,38 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "接收人", name: "MPReceiveUser", width: 250, align: "left",
+                        label: "上传人", name: "MPUploader", width: 250, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds?keyValue=' + value, function (res) {
-                                if (res.code == learun.httpCode.success) {
-                                    callback(res.data);
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
                                 }
                             });
                         }
+                        //formatterAsync: function (callback, value, row, op, $cell) {
+                        //    learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds?keyValue=' + value, function (res) {
+                        //        if (res.code == learun.httpCode.success) {
+                        //            callback(res.data);
+                        //        }
+                        //    });
+                        //}
                     },
+                    //{
+                    //    label: "接收人", name: "MPReceiveUser", width: 250, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds?keyValue=' + value, function (res) {
+                    //            if (res.code == learun.httpCode.success) {
+                    //                callback(res.data);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     { label: "材料名称", name: "MPProjectName", width: 150, align: "left" },
                     {
-                        label: "上传文件",
+                        label: "上传材料",
                         name: "MPFileTwo",
                         width: 200,
                         align: "left",
@@ -241,9 +262,9 @@ var bootstrap = function ($, learun) {
                     {
                         label: "是否合格", name: "MPConclusion", width: 100, align: "left", formatter: function (val) {
 
-                            if (val===1) {
+                            if (val === 1) {
                                 return "合格";
-                            } else if (val===0) {
+                            } else if (val === 0) {
                                 return "不合格";
                             } else {
                                 return "";
@@ -261,6 +282,10 @@ var bootstrap = function ($, learun) {
             if (isUser) {
                 param.isUser = 'true';
             }
+            if (!param.MPAcademicYearNo) {
+                var jsdate = new Date();
+                param.MPAcademicYearNo = jsdate.getFullYear();
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
         downLoad: function (fileId) {