From cfacb768c036393ae846bd34c73cf8514019cc5e Mon Sep 17 00:00:00 2001 From: zhichao lei <442149704@qq.com> Date: Mon, 26 Oct 2020 12:24:44 +0800 Subject: [PATCH] =?UTF-8?q?=20=E2=80=A2=20=E5=86=85=E6=8E=A7=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E6=A8=A1=E5=9D=97=E5=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8?= =?UTF-8?q?=EF=BC=8C=E5=92=8C=E6=8C=87=E5=AE=9A=E6=8E=A5=E6=94=B6=E4=BA=BA?= =?UTF-8?q?=20=20=E2=80=A2=20=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD=E4=B8=BA?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E4=B8=80=E4=B8=AA=E4=BA=BA=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=9D=90=E6=96=99=20=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E9=83=A8=E9=97=A8=20=E5=92=8C=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E6=8E=A5=E6=94=B6=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/EmpInfo/Form.js | 8 ++- .../Views/EmpInfo/Index.js | 2 +- .../MP_ManagementPlanController.cs | 2 +- .../MP_PerformanceTrackingController.cs | 2 +- .../MP_QualityObjectivesController.cs | 2 +- .../Views/MP_ManagementPlan/Form.js | 6 +- .../Views/MP_ManagementPlan/Index.cshtml | 6 +- .../Views/MP_ManagementPlan/Index.js | 49 ++++++++----- .../MP_ManagementPlan/IndexManagement.cshtml | 12 +++- .../MP_ManagementPlan/IndexManagement.js | 62 +++++++++++++++- .../Views/MP_PerformanceTracking/Form.cshtml | 4 +- .../Views/MP_PerformanceTracking/Form.js | 8 +-- .../Views/MP_PerformanceTracking/Index.cshtml | 5 +- .../Views/MP_PerformanceTracking/Index.js | 57 ++++++++++----- .../IndexManagement.cshtml | 12 +++- .../MP_PerformanceTracking/IndexManagement.js | 68 ++++++++++++++++-- .../Views/MP_QualityObjectives/Form.cshtml | 4 +- .../Views/MP_QualityObjectives/Form.js | 8 +-- .../Views/MP_QualityObjectives/Index.cshtml | 5 +- .../Views/MP_QualityObjectives/Index.js | 62 +++++++++++++--- .../IndexManagement.cshtml | 12 +++- .../MP_QualityObjectives/IndexManagement.js | 70 +++++++++++++++++-- .../plugin/custmerform/lr-formcomponts.js | 25 +++++++ .../MP_ManageMentPlanEntity.cs | 2 +- .../MP_ManagementPlanService.cs | 13 ++-- .../MP_PerformanceTrackingService.cs | 13 ++-- .../MP_QualityObjectivesService.cs | 13 ++-- 27 files changed, 425 insertions(+), 107 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js index abb827acb..5b97c732c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js @@ -6,16 +6,22 @@ */ var acceptClick; var keyValue = request('keyValue'); +var isView = request('isView'); if (!!keyValue) { NewEmpId = keyValue; } - var isTeacher = request('isTeacher'); +var isTeacher = request('isTeacher'); var bootstrap = function ($, learun) { "use strict"; var ue; var page = { init: function () { $('.lr-form-wrap').lrscroll(); + if (isView) { + $.each($("[data-table=EmpInfo]"), function (i, item) { + $(item).children('div,input').attr('readonly', 'readonly'); + }); + } page.bind(); page.initData(); page.hide(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js index 9d4e72dcc..987b1a19e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js @@ -120,7 +120,7 @@ var bootstrap = function ($, learun) { learun.layerForm({ id: 'formView', title: '查看', - url: top.$.rootUrl + '/EducationalAdministration/EmpInfo/FormView?keyValue=' + keyValue, + url: top.$.rootUrl + '/EducationalAdministration/EmpInfo/Form?keyValue=' + keyValue+'&isView='+true, width: 1162, height: 600, btn: null 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 490575436..5b19d3b61 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 @@ -149,7 +149,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers public ActionResult Qqualified(string keyValue, bool status) { var entity = mP_ManagementPlanIBLL.GetMP_ManageMentPlanEntity(keyValue); - entity.MPConclusion = status; + entity.MPConclusion = status?1:0; mP_ManagementPlanIBLL.SaveEntity(keyValue, 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 0ed12955c..c8b62e793 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 @@ -134,7 +134,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers public ActionResult Qqualified(string keyValue,bool status) { var entity = mP_PerformanceTrackingIBLL.GetMP_ManageMentPlanEntity(keyValue); - entity.MPConclusion = status; + entity.MPConclusion = status?1:0; mP_PerformanceTrackingIBLL.SaveEntity(keyValue,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 65d3c3922..90a357c94 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 @@ -137,7 +137,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers public ActionResult Qqualified(string keyValue, bool status) { var entity = mP_QualityObjectivesIBLL.GetMP_ManageMentPlanEntity(keyValue); - entity.MPConclusion = status; + entity.MPConclusion = status?1:0; mP_QualityObjectivesIBLL.SaveEntity(keyValue, entity); return Success("删除成功！"); } 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 e5d0dc23e..70b37d4e5 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 @@ -33,7 +33,7 @@ var bootstrap = function ($, learun) { }); $('#MPDepartment').lrselect({ - type: 'treemultiple', + type: 'tree', // 展开最大高度 maxHeight: 200, // 是否允许搜索 @@ -41,14 +41,14 @@ var bootstrap = function ($, learun) { // 访问数据接口地址 url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree', select: function (val) { - var departmentIds = val.map(t => t.id).toString(); + var departmentIds = val.id; $('#MPReceiveUser').lrselectRefresh({ url: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByDepartmentIds?departmentId=' + departmentIds }) } }); - $('#MPReceiveUser').lrselect({ type: 'multiple', allowSearch: true, value: 'F_UserId', text:'F_RealName' }) + $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text:'F_RealName' }) $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); $('#MPFile').lrUploader(); }, 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 5cd161470..92d79f235 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 @@ -31,8 +31,10 @@
-  下载模板 -  查看提交材料 + @* 下载模板 +  查看提交材料*@ +  提交材料 +
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 b61f10b3a..fb6812e61 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 @@ -59,23 +59,42 @@ var bootstrap = function ($, learun) { } }); - $('#lr_down').on('click', function () { + $('#lr_down').on('click', + function () { - var FileId = $('#gridtable').jfGridValue('MPFile'); - if (!!FileId) { + var FileId = $('#gridtable').jfGridValue('MPFile'); + if (!!FileId) { - var url = top.$.rootUrl + '/LR_SystemModule/Annexes/DownForm?keyVaule=' + FileId; + var url = top.$.rootUrl + '/LR_SystemModule/Annexes/DownForm?keyVaule=' + FileId; + learun.layerForm({ + id: 'downform', + title: '文件下载', + url: url, + width: 600, + height: 400, + maxmin: true, + btn: null + }); + } + }); + + + // 上传 + $('#lr_upload').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('MPId'); + if (learun.checkrow(keyValue)) { learun.layerForm({ - id: 'downform', - title: '文件下载', - url: url, + id: 'formupload', + title: '上传', + url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/UploadForm?keyValue=' + keyValue, width: 600, height: 400, - maxmin: true, - btn: null + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } }); } - }) + }); }, // 初始化列表 initGird: function () { @@ -110,8 +129,8 @@ var bootstrap = function ($, learun) { }, { label: "材料名称", name: "MPProjectName", width: 150, align: "left" }, { - label: "模板材料", - name: "MPFile", + label: "上传文件", + name: "MPFileTwo", width: 200, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -128,7 +147,7 @@ var bootstrap = function ($, learun) { bb += '' + + '\',)" style="color:blue">' + item.F_FileName + ',   '; }) @@ -137,7 +156,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "说明", name: "MPRemark", width: 200, align: "left" }, + //{ label: "说明", name: "MPRemark", width: 200, align: "left" }, ], mainId: 'MPId', isPage: true @@ -149,8 +168,6 @@ var bootstrap = function ($, learun) { if (isUser) { param.isUser = 'true'; } - var loginInfo = top.learun.clientdata.get(['userinfo']); - param.MPDepartment = loginInfo.departmentId; $('#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 cfa01bacc..c1485ccfb 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 @@ -19,8 +19,12 @@
-
上传者
- +
部门
+
+
+
+
接收人
+
@@ -37,7 +41,9 @@
 打印 -  查看提交材料 + @* 查看提交材料*@ +  合格 +  不合格  访问情况统计
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 aba0afcad..b7f1f3ea2 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 @@ -37,6 +37,25 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); + + $('#MPDepartment').lrselect({ + type: 'tree', + // 展开最大高度 + maxHeight: 200, + // 是否允许搜索 + allowSearch: true, + // 访问数据接口地址 + 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 + }) + } + }); + + $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text: 'F_RealName' }) // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -117,6 +136,32 @@ var bootstrap = function ($, learun) { } }); + // 合格 + $('#lr_qualified').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('MPId'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认合格！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/Qqualified', {keyValue:keyValue, status: true }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 不合格 + $('#lr_noqualified').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('MPId'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认不合格！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/Qqualified', {keyValue:keyValue, status: false }, function () { + refreshGirdData(); + }); + } + }); + } + }); // 打印 $('#lr_print').on('click', function () { @@ -165,8 +210,8 @@ var bootstrap = function ($, learun) { }, { label: "材料名称", name: "MPProjectName", width: 150, align: "left" }, { - label: "模板材料", - name: "MPFile", + label: "上传文件", + name: "MPFileTwo", width: 200, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -192,7 +237,18 @@ var bootstrap = function ($, learun) { }); } }, - { label: "说明", name: "MPRemark", width: 200, align: "left" }, + { + label: "是否合格", name: "MPConclusion", width: 100, align: "left", formatter: function (val) { + + if (val===1) { + return "合格"; + } else if (val===0) { + return "不合格"; + } else { + return ""; + } + } + }, ], mainId: 'MPId', isPage: true 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 77820ead7..a382fe016 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 @@ -27,10 +27,10 @@
材料名称
-
+ @*
提交截止日期
-
+
*@
模板上传
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 f5008e50f..14a03f2b3 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 @@ -31,8 +31,9 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); + $('#MPDepartment').lrselect({ - type: 'treemultiple', + type: 'tree', // 展开最大高度 maxHeight: 200, // 是否允许搜索 @@ -40,15 +41,14 @@ var bootstrap = function ($, learun) { // 访问数据接口地址 url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree', select: function (val) { - var departmentIds = val.map(t => t.id).toString(); + var departmentIds = val.id; $('#MPReceiveUser').lrselectRefresh({ url: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByDepartmentIds?departmentId=' + departmentIds }) } }); - $('#MPReceiveUser').lrselect({ type: 'multiple', allowSearch: true, value: 'F_UserId', text:'F_RealName' }) - $('#MPFile').lrUploader(); + $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text: 'F_RealName' }) $('#MPFile').lrUploader(); $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); }, initData: function () { 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 80254402e..75cd1df42 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 @@ -31,8 +31,9 @@
-  下载模板 -  查看提交材料 + @* 下载模板 +  查看提交材料*@ +  提交材料
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 130bc882a..3e6de57c0 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 @@ -46,7 +46,7 @@ var bootstrap = function ($, learun) { learun.layerFormForPercent({ id: 'form', title: '提交材料', - url: top.$.rootUrl + '/PersonnelManagement/MP_PerformanceTracking/IndexChildren?ParentId=' + ParentId+'&&MPUploaderTwo='+loginInfo.userId, + url: top.$.rootUrl + '/PersonnelManagement/MP_PerformanceTracking/IndexChildren?ParentId=' + ParentId + '&&MPUploaderTwo=' + loginInfo.userId, width: '80%', height: '80%', callBack: function (id) { @@ -55,23 +55,42 @@ var bootstrap = function ($, learun) { }); } }); - $('#lr_down').on('click', function () { + $('#lr_down').on('click', + function () { - var FileId = $('#gridtable').jfGridValue('MPFile'); - if (!!FileId) { + var FileId = $('#gridtable').jfGridValue('MPFile'); + if (!!FileId) { - var url = top.$.rootUrl + '/LR_SystemModule/Annexes/DownForm?keyVaule=' + FileId; + var url = top.$.rootUrl + '/LR_SystemModule/Annexes/DownForm?keyVaule=' + FileId; + learun.layerForm({ + id: 'downform', + title: '文件下载', + url: url, + width: 600, + height: 400, + maxmin: true, + btn: null + }); + } + }); + // 上传 + $('#lr_upload').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('MPId'); + if (learun.checkrow(keyValue)) { learun.layerForm({ - id: 'downform', - title: '文件下载', - url: url, + id: 'formupload', + title: '上传', + url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/UploadForm?keyValue=' + keyValue, width: 600, height: 400, - maxmin: true, - btn: null + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } }); } - }) + }); + + }, // 初始化列表 @@ -94,8 +113,13 @@ var bootstrap = function ($, learun) { }); } }, + { label: "项目名称", name: "MPProjectName", width: 100, align: "left" }, { - label: "模板材料", name: "MPFile", width: 200, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + label: "上传文件", + name: "MPFileTwo", + width: 200, + align: "left", + formatterAsync: function (callback, value, row, op, $cell) { $.ajax({ url: '/LR_SystemModule/Annexes/GetAnnexesFileList', data: { folderId: value }, @@ -109,7 +133,7 @@ var bootstrap = function ($, learun) { bb += '' + + '\',)" style="color:blue">' + item.F_FileName + ',   '; }) @@ -118,9 +142,8 @@ var bootstrap = function ($, learun) { }); } }, - { label: "项目名称", name: "MPProjectName", width: 100, align: "left" }, - { label: "截止时间", name: "MPOverTime", width: 100, align: "left" }, - { label: "说明", name: "MPRemark", width: 200, align: "left" }, + //{ label: "截止时间", name: "MPOverTime", width: 100, align: "left" }, + //{ label: "说明", name: "MPRemark", width: 200, align: "left" }, ], mainId: 'MPId', @@ -133,8 +156,6 @@ var bootstrap = function ($, learun) { if (isUser) { param.isUser = 'true'; } - var loginInfo = top.learun.clientdata.get(['userinfo']); - param.MPDepartment = loginInfo.departmentId; $('#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 fc4136048..d6ee95fc1 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 @@ -19,8 +19,12 @@
-
上传者
- +
部门
+
+
+
+
接收人
+
@@ -37,7 +41,9 @@
 打印 -  查看提交材料 + @* 查看提交材料*@ +  合格 +  不合格  访问情况统计
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 39563a03f..e836e507c 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 @@ -33,6 +33,24 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); + $('#MPDepartment').lrselect({ + type: 'tree', + // 展开最大高度 + maxHeight: 200, + // 是否允许搜索 + allowSearch: true, + // 访问数据接口地址 + 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 + }) + } + }); + + $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text: 'F_RealName' }) // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -111,6 +129,32 @@ var bootstrap = function ($, learun) { } }); + // 合格 + $('#lr_qualified').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('MPId'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认合格！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/Qqualified', {keyValue:keyValue, status: true }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 不合格 + $('#lr_noqualified').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('MPId'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认不合格！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/Qqualified', {keyValue:keyValue, status: false }, function () { + refreshGirdData(); + }); + } + }); + } + }); // 打印 $('#lr_print').on('click', function () { $('#gridtable').jqprintTable(); @@ -157,8 +201,13 @@ var bootstrap = function ($, learun) { }); } }, + { label: "名称", name: "MPProjectName", width: 100, align: "left" }, { - label: "模板材料", name: "MPFile", width: 200, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + label: "上传文件", + name: "MPFileTwo", + width: 200, + align: "left", + formatterAsync: function (callback, value, row, op, $cell) { $.ajax({ url: '/LR_SystemModule/Annexes/GetAnnexesFileList', data: { folderId: value }, @@ -167,13 +216,12 @@ var bootstrap = function ($, learun) { async: false, cache: false, success: function (res) { - console.log(res); var bb = ''; $.each(res.data, function (i, item) { bb += '' + + '\',)" style="color:blue">' + item.F_FileName + ',   '; }) @@ -182,10 +230,18 @@ var bootstrap = function ($, learun) { }); } }, - { label: "名称", name: "MPProjectName", width: 100, align: "left" }, - { label: "截止时间", name: "MPOverTime", width: 100, align: "left" }, - { label: "说明", name: "MPRemark", width: 200, align: "left" }, + { + label: "是否合格", name: "MPConclusion", width: 100, align: "left", formatter: function (val) { + if (val === 1) { + return "合格"; + } else if (val === 0) { + return "不合格"; + } else { + return ""; + } + } + }, ], mainId: 'MPId', isPage: true 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 ca6e0c03b..d4b1c0448 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 @@ -28,10 +28,10 @@
接收人员*
-
+ @*
提交截止日期
-
+
*@
附件上传
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 10d8689c5..d64df6b73 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 @@ -31,8 +31,9 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); + $('#MPDepartment').lrselect({ - type: 'treemultiple', + type: 'tree', // 展开最大高度 maxHeight: 200, // 是否允许搜索 @@ -40,15 +41,14 @@ var bootstrap = function ($, learun) { // 访问数据接口地址 url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree', select: function (val) { - var departmentIds = val.map(t => t.id).toString(); + var departmentIds = val.id; $('#MPReceiveUser').lrselectRefresh({ url: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByDepartmentIds?departmentId=' + departmentIds }) } }); - $('#MPReceiveUser').lrselect({ type: 'multiple', allowSearch: true, value: 'F_UserId', text:'F_RealName' }) - $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); + $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text: 'F_RealName' }) $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); $('#MPFile').lrUploader(); }, initData: function () { 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 41c5ecf34..32fb32174 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 @@ -31,8 +31,9 @@
-  下载模板 -  查看提交材料 + @* 下载模板 +  查看提交材料*@ +  提交材料
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 f2d682877..51f9051b8 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 @@ -47,7 +47,7 @@ var bootstrap = function ($, learun) { learun.layerFormForPercent({ id: 'form', title: '提交材料', - url: top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/IndexChildren?ParentId=' + ParentId+'&&MPUploaderTwo='+loginInfo.userId, + url: top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/IndexChildren?ParentId=' + ParentId + '&&MPUploaderTwo=' + loginInfo.userId, width: '80%', height: '80%', callBack: function (id) { @@ -72,7 +72,24 @@ var bootstrap = function ($, learun) { btn: null }); } - }) + }); + // 上传 + $('#lr_upload').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('MPId'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'formupload', + title: '上传', + url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/UploadForm?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + }, // 初始化列表 @@ -95,8 +112,37 @@ var bootstrap = function ($, learun) { }); } }, + //{ + // label: "模板材料", name: "MPFile", 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) { + + // bb += '' + + // item.F_FileName + + // ',   '; + // }) + // callback(bb); + // } + // }); + // } + //}, + { label: "材料名称", name: "MPProjectName", width: 100, align: "left" }, { - label: "模板材料", name: "MPFile", width: 200, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + label: "上传文件", + name: "MPFileTwo", + width: 200, + align: "left", + formatterAsync: function (callback, value, row, op, $cell) { $.ajax({ url: '/LR_SystemModule/Annexes/GetAnnexesFileList', data: { folderId: value }, @@ -110,7 +156,7 @@ var bootstrap = function ($, learun) { bb += '' + + '\',)" style="color:blue">' + item.F_FileName + ',   '; }) @@ -119,9 +165,9 @@ var bootstrap = function ($, learun) { }); } }, - { label: "材料名称", name: "MPProjectName", width: 100, align: "left" }, - { label: "截止时间", name: "MPOverTime", width: 100, align: "left" }, - { label: "说明", name: "MPRemark", width: 200, align: "left" }, + + //{ label: "截止时间", name: "MPOverTime", width: 100, align: "left" }, + //{ label: "说明", name: "MPRemark", width: 200, align: "left" }, ], mainId: 'ID', isPage: true @@ -133,8 +179,6 @@ var bootstrap = function ($, learun) { if (isUser) { param.isUser = 'true'; } - var loginInfo = top.learun.clientdata.get(['userinfo']); - param.MPDepartment = loginInfo.departmentId; $('#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 d42b54076..b5c34d4d5 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 @@ -19,8 +19,12 @@
-
上传者
- +
部门
+
+
+
+
接收人
+
@@ -37,7 +41,9 @@
 打印 -  查看提交材料 + @* 查看提交材料*@ +  合格 +  不合格  访问情况统计
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 4fea6580c..569fa21b4 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 @@ -33,6 +33,24 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); + $('#MPDepartment').lrselect({ + type: 'tree', + // 展开最大高度 + maxHeight: 200, + // 是否允许搜索 + allowSearch: true, + // 访问数据接口地址 + 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 + }) + } + }); + + $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text: 'F_RealName' }) // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -111,6 +129,32 @@ var bootstrap = function ($, learun) { } }); + // 合格 + $('#lr_qualified').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('MPId'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认合格！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/Qqualified', {keyValue:keyValue, status: true }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 不合格 + $('#lr_noqualified').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('MPId'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认不合格！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/Qqualified', {keyValue:keyValue, status: false }, function () { + refreshGirdData(); + }); + } + }); + } + }); // 打印 $('#lr_print').on('click', function () { $('#gridtable').jqprintTable(); @@ -157,9 +201,13 @@ var bootstrap = function ($, learun) { }); } }, - + { label: "材料名称", name: "MPProjectName", width: 100, align: "left" }, { - label: "模板材料", name: "MPFile", width: 200, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + label: "上传文件", + name: "MPFileTwo", + width: 200, + align: "left", + formatterAsync: function (callback, value, row, op, $cell) { $.ajax({ url: '/LR_SystemModule/Annexes/GetAnnexesFileList', data: { folderId: value }, @@ -168,13 +216,12 @@ var bootstrap = function ($, learun) { async: false, cache: false, success: function (res) { - console.log(res); var bb = ''; $.each(res.data, function (i, item) { bb += '' + + '\',)" style="color:blue">' + item.F_FileName + ',   '; }) @@ -183,9 +230,18 @@ var bootstrap = function ($, learun) { }); } }, - { label: "材料名称", name: "MPProjectName", width: 100, align: "left" }, - { label: "截止时间", name: "MPOverTime", width: 100, align: "left" }, - { label: "说明", name: "MPRemark", width: 200, align: "left" }, + { + label: "是否合格", name: "MPConclusion", width: 100, align: "left", formatter: function (val) { + + if (val === 1) { + return "合格"; + } else if (val === 0) { + return "不合格"; + } else { + return ""; + } + } + }, ], mainId: 'ID', isPage: true diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/custmerform/lr-formcomponts.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/custmerform/lr-formcomponts.js index aa02cb4d2..a81c715a9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/custmerform/lr-formcomponts.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/custmerform/lr-formcomponts.js @@ -1334,6 +1334,31 @@ $row.hide(); } + $row.append($compont); + return $compont; + }, + renderQuery: function (compont, $row) { + var $compont = $('
'); + $row.append($compont); + + switch (compont.dataType) { + case 'company': + $compont.lrCompanySelect({ type: 'multiple' }) + break; + case 'department': + $compont.lrDepartmentSelect(); + break; + case 'user': + $compont.lrUserSelect({ type: '1' }) + break; + case 'role': + $compont.lrPostSelect({ type: 'treemultiple' }); + break; + } + if (compont.isHide == '1') { + $row.hide(); + } + $row.append($compont); return $compont; } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_ManagementPlan/MP_ManageMentPlanEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_ManagementPlan/MP_ManageMentPlanEntity.cs index 157c54875..21bc2ad43 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_ManagementPlan/MP_ManageMentPlanEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_ManagementPlan/MP_ManageMentPlanEntity.cs @@ -101,7 +101,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// /// [Column("MPCONCLUSION")] - public bool? MPConclusion { get; set; } + public int? MPConclusion { get; set; } /// /// 修改次数 /// 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 f1caabb20..d40ec3e1a 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 @@ -64,12 +64,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement //接收人的查看条件 if (!queryParam["isUser"].IsEmpty()) { - var month = (int.Parse(DateTime.Now.ToString("MM")) - 1).ToString(); - var yearNo = Common.GetSemesterAndYear().AcademicYearShort; + //var month = (int.Parse(DateTime.Now.ToString("MM")) - 1).ToString(); + //var yearNo = Common.GetSemesterAndYear().AcademicYearShort; var currentUserId = LoginUserInfo.Get().userId; strSql.Append(" AND t.MPReceiveUser like '%" + currentUserId + "%'"); - strSql.Append(" AND t.MPMonth = '" + month + "' "); - strSql.Append(" AND t.MPAcademicYearNo = '" + yearNo + "' "); + //strSql.Append(" AND t.MPMonth = '" + month + "' "); + //strSql.Append(" AND t.MPAcademicYearNo = '" + yearNo + "' "); } if (!queryParam["ParentId"].IsEmpty()) { @@ -95,6 +95,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement dp.Add("MPDepartment", "%" + queryParam["MPDepartment"].ToString() + "%", DbType.String); strSql.Append(" AND t.MPDepartment like @MPDepartment "); } + if (!queryParam["MPReceiveUser"].IsEmpty()) + { + dp.Add("MPReceiveUser", "%" + queryParam["MPReceiveUser"].ToString() + "%", DbType.String); + strSql.Append(" AND t.MPReceiveUser like @MPReceiveUser "); + } if (!queryParam["MPSemester"].IsEmpty()) { dp.Add("MPSemester", queryParam["MPSemester"].ToString(), DbType.String); 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 fbe5e87d4..97d468d0a 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 @@ -62,12 +62,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement var dp = new DynamicParameters(new { }); if (!queryParam["isUser"].IsEmpty()) { - var month = (int.Parse(DateTime.Now.ToString("MM")) - 1).ToString(); - var yearNo = Common.GetSemesterAndYear().AcademicYearShort; + //var month = (int.Parse(DateTime.Now.ToString("MM")) - 1).ToString(); + //var yearNo = Common.GetSemesterAndYear().AcademicYearShort; var currentUserId = LoginUserInfo.Get().userId; strSql.Append(" AND t.MPReceiveUser like '%" + currentUserId + "%'"); - strSql.Append(" AND t.MPMonth = '" + month + "' "); - strSql.Append(" AND t.MPAcademicYearNo = '" + yearNo + "' "); + //strSql.Append(" AND t.MPMonth = '" + month + "' "); + //strSql.Append(" AND t.MPAcademicYearNo = '" + yearNo + "' "); } if (!queryParam["ParentId"].IsEmpty()) { @@ -98,6 +98,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement dp.Add("MPDepartment", "%" + queryParam["MPDepartment"].ToString() + "%", DbType.String); strSql.Append(" AND t.MPDepartment like @MPDepartment "); } + if (!queryParam["MPReceiveUser"].IsEmpty()) + { + dp.Add("MPReceiveUser", "%" + queryParam["MPReceiveUser"].ToString() + "%", DbType.String); + strSql.Append(" AND t.MPReceiveUser like @MPReceiveUser "); + } if (!queryParam["MPUploader"].IsEmpty()) { dp.Add("MPUploader", "%" + queryParam["MPUploader"].ToString() + "%", DbType.String); 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 02fdf7bd8..4c8f8c67c 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 @@ -62,12 +62,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement var dp = new DynamicParameters(new { }); if (!queryParam["isUser"].IsEmpty()) { - var month = (int.Parse(DateTime.Now.ToString("MM")) - 1).ToString(); - var yearNo = Common.GetSemesterAndYear().AcademicYearShort; + //var month = (int.Parse(DateTime.Now.ToString("MM")) - 1).ToString(); + //var yearNo = Common.GetSemesterAndYear().AcademicYearShort; var currentUserId = LoginUserInfo.Get().userId; strSql.Append(" AND t.MPReceiveUser like '%" + currentUserId + "%'"); - strSql.Append(" AND t.MPMonth = '" + month + "' "); - strSql.Append(" AND t.MPAcademicYearNo = '" + yearNo + "' "); + //strSql.Append(" AND t.MPMonth = '" + month + "' "); + //strSql.Append(" AND t.MPAcademicYearNo = '" + yearNo + "' "); } if (!queryParam["ParentId"].IsEmpty()) { @@ -98,6 +98,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement dp.Add("MPDepartment", "%" + queryParam["MPDepartment"].ToString() + "%", DbType.String); strSql.Append(" AND t.MPDepartment like @MPDepartment "); } + if (!queryParam["MPReceiveUser"].IsEmpty()) + { + dp.Add("MPReceiveUser", "%" + queryParam["MPReceiveUser"].ToString() + "%", DbType.String); + strSql.Append(" AND t.MPReceiveUser like @MPReceiveUser "); + } if (!queryParam["MPUploader"].IsEmpty()) { dp.Add("MPUploader", "%" + queryParam["MPUploader"].ToString() + "%", DbType.String);