质量管理体系

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);
         }
 
@@ -148,9 +148,14 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult Qqualified(string keyValue, bool status)
         {
-            var entity = mP_ManagementPlanIBLL.GetMP_ManageMentPlanEntity(keyValue);
-            entity.MPConclusion = status?1:0;
-            mP_ManagementPlanIBLL.SaveEntity(keyValue, entity);
+            var keyValueArr = keyValue.Split(',');
+            foreach (var item in keyValueArr)
+            {
+                var entity = mP_ManagementPlanIBLL.GetMP_ManageMentPlanEntity(item);
+                entity.MPConclusion = status ? 1 : 0;
+                mP_ManagementPlanIBLL.SaveEntity(item, entity);
+            }
+           
             return Success("修改成功！");
         }
 

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

@@ -133,9 +133,13 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult Qqualified(string keyValue,bool status)
         {
-            var entity = mP_PerformanceTrackingIBLL.GetMP_ManageMentPlanEntity(keyValue);
-            entity.MPConclusion = status?1:0;
-            mP_PerformanceTrackingIBLL.SaveEntity(keyValue,entity);
+            var keyValueArr = keyValue.Split(',');
+            foreach (var item in keyValueArr)
+            {
+                var entity = mP_PerformanceTrackingIBLL.GetMP_ManageMentPlanEntity(item);
+                entity.MPConclusion = status ? 1 : 0;
+                mP_PerformanceTrackingIBLL.SaveEntity(item, entity);
+            }
             return Success("操作成功！");
         }
 

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

@@ -136,10 +136,14 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult Qqualified(string keyValue, bool status)
         {
-            var entity = mP_QualityObjectivesIBLL.GetMP_ManageMentPlanEntity(keyValue);
-            entity.MPConclusion = status?1:0;
-            mP_QualityObjectivesIBLL.SaveEntity(keyValue, entity);
-            return Success("删除成功！");
+            var keyValueArr = keyValue.Split(',');
+            foreach (var item in keyValueArr)
+            {
+                var entity = mP_QualityObjectivesIBLL.GetMP_ManageMentPlanEntity(item);
+                entity.MPConclusion = status ? 1 : 0;
+                mP_QualityObjectivesIBLL.SaveEntity(item, entity);
+            }
+            return Success("操作成功！");
         }
 
         /// <summary>

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

@@ -4,25 +4,25 @@
 }
 <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="lr-form-item-title">学期<font face="宋体">*</font></div>
-        <div id="MPSemester" isvalid="yes" checkexpession="NotNull"></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="MPSemester" isvalid="yes" checkexpession="NotNull"></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>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
-        <div class="lr-form-item-title">材料名称</div>
-        <input id="MPProjectName" type="text" class="form-control" />
-    </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="MPDepartment" isvalid="yes" checkexpession="NotNull"></div>
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
+        <div class="lr-form-item-title">材料名称</div>
+        <input id="MPProjectName" type="text" class="form-control" />
+    </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="MPReceiveUser" 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',
@@ -50,7 +50,7 @@ var bootstrap = function ($, learun) {
 
             $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text:'F_RealName' })
             $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
-            $('#MPFile').lrUploader();
+            $('#MPFile').lrUploader({ isView:false});
         },
         initData: function () {
             if (!!keyValue) {

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,21 +23,26 @@ 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' });
+            var jsdate = new Date();
+            $('#MPAcademicYearNo').lrselectSet(jsdate.getFullYear());
+            $('#MPMonth').lrselectSet(jsdate.getMonth() + 1);
+            
+
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -102,31 +107,73 @@ 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) {
+                        //    learun.clientdata.getAsync('dataItem',
+                        //        {
+                        //            key: value,
+                        //            code: 'MPMonth',
+                        //            callback: function (_data) {
+                        //                callback(_data.text);
+                        //            }
+                        //        });
+                        //}
+                    },
                     {
-                        label: "月份", name: "MPMonth", width: 100, align: "left",
+                        label: "部门", name: "MPDepartment", width: 250, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem',
-                                {
-                                    key: value,
-                                    code: 'MPMonth',
-                                    callback: function (_data) {
-                                        callback(_data.text);
-                                    }
-                                });
+                            if (value && value.indexOf(',') != -1) {
+                                var content = '';
+                                var deptarr = value.split(',');
+                                for (var i = 0; i < deptarr.length; i++) {
+                                    learun.clientdata.getAsync('custmerData',
+                                        {
+                                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                            key: deptarr[i],
+                                            keyId: 'id',
+                                            callback: function (_data) {
+                                                content += _data['name'];
+                                            }
+
+                                        });
+                                }
+                                content = content.substring(0, content.length - 1);
+                                callback(content);
+                            } else {
+                                learun.clientdata.getAsync('custmerData',
+                                    {
+                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                        key: value,
+                                        keyId: 'id',
+                                        callback: function (_data) {
+                                            callback(_data['name']);
+                                        }
+                                    });
+                            }
                         }
                     },
                     {
-                        label: "部门", name: "MPDepartment", width: 250, align: "left",
+                        label: "上传人", name: "MPUploader", width: 250, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/Department/GetDepartmentList?listId=' + value, function (res) {
-                                console.log(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: "MPProjectName", width: 150, align: "left" },
                     {
@@ -181,6 +228,14 @@ var bootstrap = function ($, learun) {
             if (isUser) {
                 param.isUser = 'true';
             }
+            var jsdate = new Date();
+            if (!param.MPAcademicYearNo && param.MPAcademicYearNo == undefined) {
+                param.MPAcademicYearNo = jsdate.getFullYear();
+            }
+            if (!param.MPMonth && param.MPMonth == undefined) {
+                param.MPMonth = jsdate.getMonth() + 1;
+            }
+            
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
         downLoad: function (fileId) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.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/IndexChildren.js

@@ -32,20 +32,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 () {
@@ -216,6 +216,10 @@ var bootstrap = function ($, learun) {
                 param.MPUploaderTwo = MPUploaderTwo;
             }
             param.ParentId = ParentId;
+            if (!param.MPAcademicYearNo) {
+                var jsdate = new Date();
+                param.MPAcademicYearNo = jsdate.getFullYear();
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
         downLoad: function (fileId) {

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

@@ -14,7 +14,6 @@ var bootstrap = function ($, learun) {
             page.initGird();
 
             page.bind();
-
         },
         bind: function () {
 
@@ -23,21 +22,24 @@ var bootstrap = function ($, learun) {
             }, 220, 400);
             //学年
             $('#MPAcademicYearNo').lrselect({
-                placeholder: "请选择学年",
+                placeholder: "请选择年度",
                 allowSearch: true,
                 url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear',
                 value: 'value',
                 text: 'text'
             });
+            var jsdate = new Date();
+            $('#MPAcademicYearNo').lrselectSet(jsdate.getFullYear());
             //学期
-            $('#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' });
+            //$('#MPMonth').lrselectSet(jsdate.getMonth() + 1);
 
             $('#MPDepartment').lrselect({
                 type: 'tree',
@@ -48,11 +50,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
+                        });
+                    }
                 }
             });
 
@@ -78,6 +81,10 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('MPId');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(',') != -1) {
+                        learun.alert.warning("只能选择一条记录进行编辑！");
+                        return;
+                    }
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
@@ -94,6 +101,10 @@ var bootstrap = function ($, learun) {
             $('#lr_uploadView').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('MPId');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(',') != -1) {
+                        learun.alert.warning("只能选择一条记录进行操作！");
+                        return;
+                    }
                     learun.layerFormForPercent({
                         id: 'form',
                         title: '提交材料',
@@ -126,6 +137,10 @@ var bootstrap = function ($, learun) {
             $("#lr_statistics").on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('MPId');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(',') != -1) {
+                        learun.alert.warning("只能选择一条记录进行操作！");
+                        return;
+                    }
                     learun.layerFormForPercent({
                         id: 'form',
                         title: '访问情况统计',
@@ -143,7 +158,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 +171,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,76 +189,123 @@ 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" },
+                    //2021-03-29 客户要求改成1、2、3
+                    //{
+                    //    label: "月份", name: "MPMonth", width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem',
+                    //            {
+                    //                key: value,
+                    //                code: 'MPMonth',
+                    //                callback: function (_data) {
+                    //                    callback(_data.text);
+                    //                }
+                    //            });
+                    //    }
+                    //},
                     {
-                        label: "月份", name: "MPMonth", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem',
-                                {
-                                    key: value,
-                                    code: 'MPMonth',
-                                    callback: function (_data) {
-                                        callback(_data.text);
-                                    }
-                                });
-                        }
+                        label: "月份", name: "MPMonth", width: 100, align: "left"
                     },
                     {
                         label: "部门", name: "MPDepartment", width: 250, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/Department/GetDepartmentList?listId=' + value, function (res) {
-                                if (res.code == learun.httpCode.success) {
-                                    callback(res.data);
+                            if (value && value.indexOf(',') != -1) {
+                                var content = '';
+                                var deptarr = value.split(',');
+                                for (var i = 0; i < deptarr.length; i++) {
+                                    learun.clientdata.getAsync('custmerData',
+                                        {
+                                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                            key: deptarr[i],
+                                            keyId: 'id',
+                                            callback: function (_data) {
+                                                content += _data['name'];
+                                            }
+
+                                        });
                                 }
-                            });
+                                content = content.substring(0, content.length - 1);
+                                callback(content);
+                            } else {
+                                learun.clientdata.getAsync('custmerData',
+                                    {
+                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                        key: value,
+                                        keyId: 'id',
+                                        callback: function (_data) {
+                                            callback(_data['name']);
+                                        }
+                                    });
+                            }
+                            //learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/Department/GetDepartmentList?listId=' + value, function (res) {
+                            //    if (res.code == learun.httpCode.success) {
+                            //        callback(res.data);
+                            //    }
+                            //});
                         }
                     },
                     {
-                        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']);
                                 }
                             });
                         }
                     },
+                    //{
+                    //    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",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            $.ajax({
-                                url: '/LR_SystemModule/Annexes/GetAnnexesFileList',
-                                data: { folderId: value },
-                                type: 'GET',
-                                dataType: "json",
-                                async: false,
-                                cache: false,
-                                success: function (res) {
-                                    var bb = '';
-                                    $.each(res.data, function (i, item) {
+                            if (value) {
+                                $.ajax({
+                                    url: '/LR_SystemModule/Annexes/GetAnnexesFileList',
+                                    data: { folderId: value },
+                                    type: 'GET',
+                                    dataType: "json",
+                                    async: false,
+                                    cache: false,
+                                    success: function (res) {
+                                        var bb = '';
+                                        $.each(res.data, function (i, item) {
 
-                                        bb += '<span onclick="downLoad(\'' +
-                                            item.F_Id +
-                                            '\',)" style="color:blue">' +
-                                            item.F_FileName +
-                                            '</span>,&nbsp;&nbsp;&nbsp;';
-                                    })
-                                    callback(bb);
-                                }
-                            });
+                                            bb += '<span onclick="downLoad(\'' +
+                                                item.F_Id +
+                                                '\',)" style="color:blue">' +
+                                                item.F_FileName +
+                                                '</span>,&nbsp;&nbsp;&nbsp;';
+                                        })
+                                        callback(bb);
+                                    }
+                                });
+                            }
                         }
                     },
                     {
                         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 "";
@@ -252,15 +314,23 @@ var bootstrap = function ($, learun) {
                     },
                 ],
                 mainId: 'MPId',
-                isPage: true
+                sidx: 'cast(MPMonth as int) asc',
+                isPage: true,
+                isMultiselect: true
             })
             page.search();
         },
         search: function (param) {
             param = param || {};
+            if (!param.MPAcademicYearNo && param.MPAcademicYearNo == undefined) {
+                var jsdate = new Date();
+                param.MPAcademicYearNo = jsdate.getFullYear();
+            }
+
             if (isUser) {
                 param.isUser = 'true';
             }
+
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
         downLoad: function (fileId) {
@@ -274,7 +344,6 @@ var bootstrap = function ($, learun) {
 
 
     page.init();
-
 }
 function downLoad(fileId, fileTwo) {
     if (fileTwo) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/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_PerformanceTracking/Form.js

@@ -24,13 +24,13 @@ var bootstrap = function ($, learun) {
                 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_PerformanceTracking/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_PerformanceTracking/Index.js

@@ -19,21 +19,25 @@ 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' });
+            var jsdate = new Date();
+            $('#MPAcademicYearNo').lrselectSet(jsdate.getFullYear());
+            $('#MPMonth').lrselectSet(jsdate.getMonth() + 1);
+
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -99,8 +103,8 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/MP_PerformanceTracking/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) {
@@ -169,6 +173,13 @@ var bootstrap = function ($, learun) {
             if (isUser) {
                 param.isUser = 'true';
             }
+            var jsdate = new Date();
+            if (!param.MPAcademicYearNo && param.MPAcademicYearNo == undefined) {
+                param.MPAcademicYearNo = jsdate.getFullYear();
+            }
+            if (!param.MPMonth && param.MPMonth == undefined) {
+                param.MPMonth = jsdate.getMonth() + 1;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.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_PerformanceTracking/IndexChildren.js

@@ -28,20 +28,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 () {
@@ -215,6 +215,10 @@ var bootstrap = function ($, learun) {
                 param.MPUploaderTwo = MPUploaderTwo;
             }
             param.ParentId = ParentId;
+            if (!param.MPAcademicYearNo) {
+                var jsdate = new Date();
+                param.MPAcademicYearNo = jsdate.getFullYear();
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/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_PerformanceTracking/IndexManagement.js

@@ -19,20 +19,22 @@ var bootstrap = function ($, learun) {
             }, 220, 400);
             //学年
             $('#MPAcademicYearNo').lrselect({
-                placeholder: "请选择学年",
+                placeholder: "请选择年度",
                 allowSearch: true,
                 url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear',
                 value: 'value',
                 text: 'text'
             });
+            var jsdate = new Date();
+            $('#MPAcademicYearNo').lrselectSet(jsdate.getFullYear());
             //学期
-            $('#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({
                 type: 'tree',
@@ -73,6 +75,10 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('MPId');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(',') != -1) {
+                        learun.alert.warning("只能选择一条记录进行编辑！");
+                        return;
+                    }
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
@@ -89,6 +95,10 @@ var bootstrap = function ($, learun) {
             $('#lr_uploadView').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('MPId');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(',') != -1) {
+                        learun.alert.warning("只能选择一条记录进行编辑！");
+                        return;
+                    }
                     learun.layerFormForPercent({
                         id: 'form',
                         title: '提交材料',
@@ -119,6 +129,10 @@ var bootstrap = function ($, learun) {
             $("#lr_statistics").on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('MPId');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(',') != -1) {
+                        learun.alert.warning("只能选择一条记录进行编辑！");
+                        return;
+                    }
                     learun.layerFormForPercent({
                         id: 'form',
                         title: '访问情况统计',
@@ -166,34 +180,46 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/MP_PerformanceTracking/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) {
-                            learun.clientdata.getAsync('dataItem',
-                                {
-                                    key: value,
-                                    code: 'MPMonth',
-                                    callback: function (_data) {
-                                        callback(_data.text);
-                                    }
-                                });
-                        }
+                        label: "月份", name: "MPMonth", width: 100, align: "left"
                     },
                     {
-                        label: "部门", name: "MPDepartment", width: 250, align: "left",
+                        label: "部门", name: "MPDepartment", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/Department/GetDepartmentList?listId=' + value, function (res) {
-                                console.log(res);
-                                if (res.code == learun.httpCode.success) {
-                                    callback(res.data);
+                            if (value && value.indexOf(',') != -1) {
+                                var content = '';
+                                var deptarr = value.split(',');
+                                for (var i = 0; i < deptarr.length; i++) {
+                                    learun.clientdata.getAsync('custmerData',
+                                        {
+                                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                            key: deptarr[i],
+                                            keyId: 'id',
+                                            callback: function (_data) {
+                                                content += _data['name'];
+                                            }
+
+                                        });
                                 }
-                            });
+                                content = content.substring(0, content.length - 1);
+                                callback(content);
+                            } else {
+                                learun.clientdata.getAsync('custmerData',
+                                    {
+                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                        key: value,
+                                        keyId: 'id',
+                                        callback: function (_data) {
+                                            callback(_data['name']);
+                                        }
+                                    });
+                            }
                         }
                     },
                     {
-                        label: "接收人", name: "MPReceiveUser", width: 250, align: "left",
+                        label: "接收人", name: "MPReceiveUser", width: 100, 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) {
@@ -202,7 +228,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "名称", name: "MPProjectName", width: 100, align: "left" },
+                    { label: "名称", name: "MPProjectName", width: 200, align: "left" },
                     {
                         label: "上传文件",
                         name: "MPFileTwo",
@@ -214,7 +240,6 @@ var bootstrap = function ($, learun) {
                                 data: { folderId: value },
                                 type: 'GET',
                                 dataType: "json",
-                                async: false,
                                 cache: false,
                                 success: function (res) {
                                     var bb = '';
@@ -245,7 +270,9 @@ var bootstrap = function ($, learun) {
                     },
                 ],
                 mainId: 'MPId',
-                isPage: true
+                sidx: 'cast(MPMonth as int) asc',
+                isPage: true,
+                isMultiselect: true
             });
             page.search();
         },
@@ -254,6 +281,10 @@ var bootstrap = function ($, learun) {
             if (isUser) {
                 param.isUser = 'true';
             }
+            if (!param.MPAcademicYearNo && param.MPAcademicYearNo == undefined) {
+                var jsdate = new Date();
+                param.MPAcademicYearNo = jsdate.getFullYear();
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/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_QualityObjectives/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_QualityObjectives/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_QualityObjectives/Index.js

@@ -19,21 +19,25 @@ 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' });
+            var jsdate = new Date();
+            $('#MPAcademicYearNo').lrselectSet(jsdate.getFullYear());
+            $('#MPMonth').lrselectSet(jsdate.getMonth() + 1);
+
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -98,8 +102,8 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/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) {
@@ -192,6 +196,13 @@ var bootstrap = function ($, learun) {
             if (isUser) {
                 param.isUser = 'true';
             }
+            var jsdate = new Date();
+            if (!param.MPAcademicYearNo && param.MPAcademicYearNo == undefined) {
+                param.MPAcademicYearNo = jsdate.getFullYear();
+            }
+            if (!param.MPMonth && param.MPMonth == undefined) {
+                param.MPMonth = jsdate.getMonth() + 1;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.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_QualityObjectives/IndexChildren.js

@@ -28,20 +28,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 () {
@@ -216,6 +216,10 @@ var bootstrap = function ($, learun) {
                 param.MPUploaderTwo = MPUploaderTwo;
             }
             param.ParentId = ParentId;
+            if (!param.MPAcademicYearNo) {
+                var jsdate = new Date();
+                param.MPAcademicYearNo = jsdate.getFullYear();
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/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_QualityObjectives/IndexManagement.js

@@ -19,20 +19,23 @@ 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'
+            //});
+            var jsdate = new Date();
+            $('#MPAcademicYearNo').lrselectSet(jsdate.getFullYear());
+
             $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
             $('#MPDepartment').lrselect({
                 type: 'tree',
@@ -73,6 +76,10 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('MPId');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(',') != -1) {
+                        learun.alert.warning("只能选择一条记录进行编辑！");
+                        return;
+                    }
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
@@ -102,6 +109,10 @@ var bootstrap = function ($, learun) {
             $('#lr_uploadView').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('MPId');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(',') != -1) {
+                        learun.alert.warning("只能选择一条记录进行编辑！");
+                        return;
+                    }
                     learun.layerFormForPercent({
                         id: 'form',
                         title: '提交材料',
@@ -119,6 +130,10 @@ var bootstrap = function ($, learun) {
             $("#lr_statistics").on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('MPId');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(',') != -1) {
+                        learun.alert.warning("只能选择一条记录进行编辑！");
+                        return;
+                    }
                     learun.layerFormForPercent({
                         id: 'form',
                         title: '访问情况统计',
@@ -166,38 +181,53 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/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) {
-                            learun.clientdata.getAsync('dataItem',
-                                {
-                                    key: value,
-                                    code: 'MPMonth',
-                                    callback: function (_data) {
-                                        callback(_data.text);
-                                    }
-                                });
-                        }
+                        label: "月份", name: "MPMonth", width: 100, align: "left"
                     },
                     {
                         label: "部门", name: "MPDepartment", width: 250, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/Department/GetDepartmentList?listId=' + value, function (res) {
-                                console.log(res);
-                                if (res.code == learun.httpCode.success) {
-                                    callback(res.data);
+                            if (value && value.indexOf(',') != -1) {
+                                var content = '';
+                                var deptarr = value.split(',');
+                                for (var i = 0; i < deptarr.length; i++) {
+                                    learun.clientdata.getAsync('custmerData',
+                                        {
+                                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                            key: deptarr[i],
+                                            keyId: 'id',
+                                            callback: function (_data) {
+                                                content += _data['name'];
+                                            }
+
+                                        });
                                 }
-                            });
+                                content = content.substring(0, content.length - 1);
+                                callback(content);
+                            } else {
+                                learun.clientdata.getAsync('custmerData',
+                                    {
+                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                        key: value,
+                                        keyId: 'id',
+                                        callback: function (_data) {
+                                            callback(_data['name']);
+                                        }
+                                    });
+                            }
                         }
                     },
                     {
                         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);
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
                                 }
                             });
                         }
@@ -245,7 +275,9 @@ var bootstrap = function ($, learun) {
                     },
                 ],
                 mainId: 'ID',
-                isPage: true
+                sidx: 'cast(MPMonth as int) asc',
+                isPage: true,
+                isMultiselect: true
             });
             page.search();
         },
@@ -254,6 +286,18 @@ var bootstrap = function ($, learun) {
             if (isUser) {
                 param.isUser = 'true';
             }
+            if (!param.MPAcademicYearNo && param.MPAcademicYearNo == undefined) {
+                var jsdate = new Date();
+                param.MPAcademicYearNo = jsdate.getFullYear();
+            }
+            //if (!param.MPAcademicYearNo) {
+            //    var jsdate = new Date();
+            //    param.MPAcademicYearNo = jsdate.getFullYear();
+            //}
+            //if (!param.MPMonth) {
+            //    var jsdate = new Date();
+            //    param.MPMonth = jsdate.getMonth() + 1;
+            //}
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -480,9 +480,9 @@
     <Compile Include="Areas\PersonnelManagement\Controllers\EpidemicReportController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\EpidemicSituationCopyController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\MeetingNoticeController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\MP_ManagementPlanController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\MP_PerformanceTrackingController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\MP_QualityObjectivesController.cs" />
-    <Compile Include="Areas\PersonnelManagement\Controllers\MP_ManagementPlanController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\OvertimeApplicationController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\ResearchMentController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\StuSaverecordController.cs" />
@@ -1418,6 +1418,21 @@
     <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\FormViewAttendance.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\IndexAttendance.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\IndexChildren.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\IndexManagement.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\UploadForm.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\IndexChildren.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\IndexManagement.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\UploadForm.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\IndexChildren.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\IndexManagement.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\UploadForm.js" />
     <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\ImportForm.css" />
@@ -1706,12 +1721,6 @@
     <Content Include="Areas\PersonnelManagement\Views\EpidemicSituationCopy\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\EpidemicSituationCopy\IndexReport.js" />
     <Content Include="Areas\PersonnelManagement\Views\EpidemicSituationCopy\Index.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\IndexChildren.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\IndexManagement.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\IndexChildren.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\IndexManagement.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\IndexChildren.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\IndexManagement.js" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\IndexOfMy.js" />
     <Content Include="Areas\PersonnelManagement\Views\StuSaverecord\Form.js" />
@@ -1719,15 +1728,6 @@
     <Content Include="Areas\PersonnelManagement\Views\TimeTable\AttendanceList.js" />
     <Content Include="Areas\PersonnelManagement\Views\TimeTable\AttendanceStatistic.js" />
     <Content Include="Areas\PersonnelManagement\Views\MP_BrowseRecord\IndexFile.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\UploadForm.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\UploadForm.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\Form.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\Index.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\UploadForm.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\Form.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\Index.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\Form.js" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\OvertimeApplication\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\OvertimeApplication\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\TimeTable\AttendanceDetail.js" />
@@ -6750,15 +6750,6 @@
     <Content Include="Areas\EducationalAdministration\Views\StuEnroll\PayAfter.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElective\ModifyForm.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Statistics\TeacherWorkload.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\Form.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\Index.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\Form.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\Index.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\Form.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\Index.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\UploadForm.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\UploadForm.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\UploadForm.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MP_BrowseRecord\IndexFile.cshtml" />
     <Content Include="Areas\EvaluationTeach\Views\Eval_Main\AnswerIndex.cshtml" />
     <Content Include="Areas\EvaluationTeach\Views\Eval_Main\TeacherIndex.cshtml" />
@@ -6918,12 +6909,6 @@
     <Content Include="Areas\EducationalAdministration\Views\R_EnterSchool\Index.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\IndexOfMy.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\FormView.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\IndexManagement.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\IndexManagement.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\IndexManagement.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\IndexChildren.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\IndexChildren.cshtml" />
-    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\IndexChildren.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\EmpInfo\Print.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Thermography\StatisticIndex.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormView.cshtml" />
@@ -7257,6 +7242,21 @@
     <Content Include="Areas\LR_OAModule\Views\LostArticleInfo\FormClaim.cshtml" />
     <Content Include="Areas\LR_OAModule\Views\LostArticleInfo\FormView.cshtml" />
     <Content Include="Areas\LR_OAModule\Views\LostArticleInfo\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\IndexChildren.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\IndexManagement.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_ManagementPlan\UploadForm.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\IndexChildren.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\IndexManagement.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_PerformanceTracking\UploadForm.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\IndexChildren.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\IndexManagement.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MP_QualityObjectives\UploadForm.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\IndexAttendance.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -310,16 +310,16 @@
     <Compile Include="PersonnelManagement\MeetingNotice\MeetingNoticeEntity.cs" />
     <Compile Include="PersonnelManagement\MeetingNotice\MeetingNoticeIBLL.cs" />
     <Compile Include="PersonnelManagement\MeetingNotice\MeetingNoticeService.cs" />
+    <Compile Include="PersonnelManagement\MP_ManagementPlan\MP_ManagementPlanBLL.cs" />
+    <Compile Include="PersonnelManagement\MP_ManagementPlan\MP_ManageMentPlanEntity.cs" />
+    <Compile Include="PersonnelManagement\MP_ManagementPlan\MP_ManagementPlanIBLL.cs" />
+    <Compile Include="PersonnelManagement\MP_ManagementPlan\MP_ManagementPlanService.cs" />
     <Compile Include="PersonnelManagement\MP_PerformanceTracking\MP_PerformanceTrackingBLL.cs" />
     <Compile Include="PersonnelManagement\MP_PerformanceTracking\MP_PerformanceTrackingIBLL.cs" />
     <Compile Include="PersonnelManagement\MP_PerformanceTracking\MP_PerformanceTrackingService.cs" />
     <Compile Include="PersonnelManagement\MP_QualityObjectives\MP_QualityObjectivesBLL.cs" />
     <Compile Include="PersonnelManagement\MP_QualityObjectives\MP_QualityObjectivesIBLL.cs" />
     <Compile Include="PersonnelManagement\MP_QualityObjectives\MP_QualityObjectivesService.cs" />
-    <Compile Include="PersonnelManagement\MP_ManagementPlan\MP_ManagementPlanBLL.cs" />
-    <Compile Include="PersonnelManagement\MP_ManagementPlan\MP_ManageMentPlanEntity.cs" />
-    <Compile Include="PersonnelManagement\MP_ManagementPlan\MP_ManagementPlanIBLL.cs" />
-    <Compile Include="PersonnelManagement\MP_ManagementPlan\MP_ManagementPlanService.cs" />
     <Compile Include="PersonnelManagement\OvertimeApplication\JbjiabanEntity.cs" />
     <Compile Include="PersonnelManagement\OvertimeApplication\OvertimeApplicationBLL.cs" />
     <Compile Include="PersonnelManagement\OvertimeApplication\OvertimeApplicationIBLL.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_ManagementPlan/MP_ManagementPlanService.cs

@@ -167,7 +167,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<MP_ManageMentPlanEntity>(t => t.MPId == keyValue);
+                //多个删除
+                var keyValueArr = keyValue.Split(',');
+                foreach (var item in keyValueArr)
+                {
+                    this.BaseRepository("CollegeMIS").Delete<MP_ManageMentPlanEntity>(t => t.MPId == item);
+                }
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_PerformanceTracking/MP_PerformanceTrackingService.cs

@@ -25,7 +25,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <summary>
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
-        public IEnumerable<MP_ManageMentPlanEntity> GetPageList(Pagination pagination, string queryJson,int MPType=1)
+        public IEnumerable<MP_ManageMentPlanEntity> GetPageList(Pagination pagination, string queryJson, int MPType = 1)
         {
             try
             {
@@ -85,12 +85,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 }
                 if (!queryParam["MPAcademicYearNo"].IsEmpty())
                 {
-                    dp.Add("MPAcademicYearNo",queryParam["MPAcademicYearNo"].ToString(), DbType.String);
+                    dp.Add("MPAcademicYearNo", queryParam["MPAcademicYearNo"].ToString(), DbType.String);
                     strSql.Append(" AND t.MPAcademicYearNo = @MPAcademicYearNo ");
                 }
                 if (!queryParam["MPSemester"].IsEmpty())
                 {
-                    dp.Add("MPSemester",queryParam["MPSemester"].ToString(), DbType.String);
+                    dp.Add("MPSemester", queryParam["MPSemester"].ToString(), DbType.String);
                     strSql.Append(" AND t.MPSemester = @MPSemester ");
                 }
                 if (!queryParam["MPDepartment"].IsEmpty())
@@ -108,7 +108,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                     dp.Add("MPUploader", "%" + queryParam["MPUploader"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.MPUploader Like @MPUploader ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<MP_ManageMentPlanEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<MP_ManageMentPlanEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -160,7 +160,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<MP_ManageMentPlanEntity>(t=>t.MPId == keyValue);
+                //多个删除
+                var keyValueArr = keyValue.Split(',');
+                foreach (var item in keyValueArr)
+                {
+                    this.BaseRepository("CollegeMIS").Delete<MP_ManageMentPlanEntity>(t => t.MPId == keyValue);
+                }
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_QualityObjectives/MP_QualityObjectivesService.cs

@@ -160,7 +160,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<MP_ManageMentPlanEntity>(t => t.MPId == keyValue);
+                //多个删除
+                var keyValueArr = keyValue.Split(',');
+                foreach (var item in keyValueArr)
+                {
+                    this.BaseRepository("CollegeMIS").Delete<MP_ManageMentPlanEntity>(t => t.MPId == keyValue);
+                }
             }
             catch (Exception ex)
             {