diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_ManagementPlanController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_ManagementPlanController.cs index 9b59e2ef7..36a48481d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_ManagementPlanController.cs +++ b/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("修改成功！"); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_PerformanceTrackingController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_PerformanceTrackingController.cs index c8b62e793..ba01e723b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_PerformanceTrackingController.cs +++ b/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("操作成功！"); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_QualityObjectivesController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_QualityObjectivesController.cs index 90a357c94..c38535fce 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_QualityObjectivesController.cs +++ b/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("操作成功！"); } /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Form.cshtml index c48c70cc3..31966d0f1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Form.cshtml @@ -4,25 +4,25 @@ }
-
学年*
+
年度*
-
-
学期*
-
-
+ @*
+
学期*
+
+
*@
月份*
-
-
材料名称
- -
部门*
+
+
材料名称
+ +
接收人员*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Form.js index 573228b5f..8e28755ab 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Form.js +++ b/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) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.cshtml index c28465f91..ea3ae34fc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.cshtml @@ -11,13 +11,13 @@
-
学年
+
年度
-
+ @*
学期
-
+
*@
月份
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js index b78c149cf..f6f4d1a03 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js +++ b/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) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.cshtml index c3129f044..775e420fe 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.cshtml @@ -11,13 +11,13 @@
-
学年
+
年度
-
+ @*
学期
-
+
*@
月份
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.js index eb721a6cf..2c64b1aff 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.js +++ b/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) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.cshtml index cc0f966e2..f99596f98 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.cshtml @@ -11,13 +11,13 @@
-
学年
+
年度
-
+ @*
学期
-
+
*@
月份
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.js index 7bda23c45..f735450af 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.js +++ b/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 += '' + - item.F_FileName + - ',   '; - }) - callback(bb); - } - }); + bb += '' + + item.F_FileName + + ',   '; + }) + 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) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.cshtml index a382fe016..fb4de2a30 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.cshtml @@ -4,13 +4,13 @@ }
-
学年*
+
年度*
-
+ @*
学期*
-
+
*@
月份*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.js index c16e905c2..66676bc7d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.js +++ b/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', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.cshtml index 2318960d9..20d501c00 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.cshtml @@ -11,13 +11,13 @@
-
学年
+
年度
-
+ @*
学期
-
+
*@
月份
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js index 1d4f2d948..e5a6ad7ac 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js +++ b/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) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.cshtml index b331eb145..256b56387 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.cshtml @@ -11,13 +11,13 @@
-
学年
+
年度
-
+ @*
学期
-
+
*@
月份
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.js index fccc7b18c..4813b7232 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.js +++ b/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) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.cshtml index a553bb1c6..43949651c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.cshtml @@ -11,13 +11,13 @@
-
学年
+
年度
-
+ @*
学期
-
+
*@
月份
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js index 65865f71b..922803e38 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js +++ b/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) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.cshtml index d4b1c0448..c10a8f639 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.cshtml @@ -4,13 +4,13 @@ }
-
学年*
+
年度*
-
+ @*
学期*
-
+
*@
月份*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.js index f7e7d24c1..07af4cc28 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.js +++ b/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', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.cshtml index 5e1abc024..4dce192d4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.cshtml @@ -11,13 +11,13 @@
-
学年
+
年度
-
+ @*
学期
-
+
*@
月份
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js index 8820ef2ad..1f3eef8c9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js +++ b/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) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.cshtml index 2dde24973..456e19e86 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.cshtml @@ -11,13 +11,13 @@
-
学年
+
年度
-
+ @*
学期
-
+
*@
月份
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.js index 56e7e131e..799e129c5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.js +++ b/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) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.cshtml index 04ec3b54a..d3aa79232 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.cshtml @@ -11,13 +11,13 @@
-
学年
+
年度
-
+ @*
学期
-
+
*@
月份
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.js index 18d556262..8149cbf17 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.js +++ b/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) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 7a75c40ec..5b5e4160a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -480,9 +480,9 @@ + - @@ -1418,6 +1418,21 @@ + + + + + + + + + + + + + + + @@ -1706,12 +1721,6 @@ - - - - - - @@ -1719,15 +1728,6 @@ - - - - - - - - - @@ -6750,15 +6750,6 @@ - - - - - - - - - @@ -6918,12 +6909,6 @@ - - - - - - @@ -7257,6 +7242,21 @@ + + + + + + + + + + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index 84207a07e..9e2b1c39e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -310,16 +310,16 @@ + + + + - - - - diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_ManagementPlan/MP_ManagementPlanService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_ManagementPlan/MP_ManagementPlanService.cs index 21b18e283..854af67d5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_ManagementPlan/MP_ManagementPlanService.cs +++ b/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(t => t.MPId == keyValue); + //多个删除 + var keyValueArr = keyValue.Split(','); + foreach (var item in keyValueArr) + { + this.BaseRepository("CollegeMIS").Delete(t => t.MPId == item); + } } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_PerformanceTracking/MP_PerformanceTrackingService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_PerformanceTracking/MP_PerformanceTrackingService.cs index 97d468d0a..2648d1eab 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_PerformanceTracking/MP_PerformanceTrackingService.cs +++ b/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 /// /// 查询参数 /// - public IEnumerable GetPageList(Pagination pagination, string queryJson,int MPType=1) + public IEnumerable 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(strSql.ToString(),dp, pagination); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) { @@ -160,7 +160,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement { try { - this.BaseRepository("CollegeMIS").Delete(t=>t.MPId == keyValue); + //多个删除 + var keyValueArr = keyValue.Split(','); + foreach (var item in keyValueArr) + { + this.BaseRepository("CollegeMIS").Delete(t => t.MPId == keyValue); + } } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_QualityObjectives/MP_QualityObjectivesService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_QualityObjectives/MP_QualityObjectivesService.cs index 4c8f8c67c..ebdb5c34c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_QualityObjectives/MP_QualityObjectivesService.cs +++ b/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(t => t.MPId == keyValue); + //多个删除 + var keyValueArr = keyValue.Split(','); + foreach (var item in keyValueArr) + { + this.BaseRepository("CollegeMIS").Delete(t => t.MPId == keyValue); + } } catch (Exception ex) {