【修改】质量管理体系-质量目标：同内控检查；

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

@@ -310,7 +310,11 @@ var bootstrap = function ($, learun) {
                                                 item.F_Id +
                                                 '\',)" style="color:blue">' +
                                                 item.F_FileName +
-                                                '</span>,&nbsp;&nbsp;&nbsp;';
+                                                '</span>&nbsp;&nbsp;&nbsp;';
+
+                                            if (i < res.data.length - 1) {
+                                                bb += ',&nbsp;&nbsp;&nbsp;';
+                                            }
                                         })
                                         callback(bb);
                                     }

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

@@ -33,7 +33,7 @@ var bootstrap = function ($, learun) {
             //});
 
             $('#MPDepartment').lrselect({
-                type: 'tree',
+                type: 'treemultiple',
                 // 展开最大高度
                 maxHeight: 200,
                 // 是否允许搜索
@@ -41,10 +41,18 @@ var bootstrap = function ($, learun) {
                 // 访问数据接口地址
                 url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
                 select: function (val) {
-                    var departmentIds = val.id;
-                    $('#MPReceiveUser').lrselectRefresh({
-                        url: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByDepartmentIds?departmentId=' + departmentIds
-                    })
+                    if (val && val.length > 0) {
+                        var departmentIds = '';
+                        for (var i = 0; i < val.length; i++) {
+                            departmentIds += val[i].id;
+                            if (i < val.length - 1) {
+                                departmentIds += ',';
+                            }
+                        }
+                        $('#MPReceiveUser').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByDepartmentIds?departmentId=' + departmentIds
+                        })
+                    }
                 }
             });
 

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

@@ -163,7 +163,11 @@ var bootstrap = function ($, learun) {
                                             item.F_Id +
                                             '\',)" style="color:blue">' +
                                             item.F_FileName +
-                                            '</span>,&nbsp;&nbsp;&nbsp;';
+                                            '</span>&nbsp;&nbsp;&nbsp;';
+
+                                        if (i < res.data.length - 1) {
+                                            bb += ',&nbsp;&nbsp;&nbsp;';
+                                        }
                                     })
                                     callback(bb);
                                 }

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

@@ -38,7 +38,7 @@ var bootstrap = function ($, learun) {
 
             $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
             $('#MPDepartment').lrselect({
-                type: 'tree',
+                type: 'treemultiple',
                 // 展开最大高度
                 maxHeight: 200,
                 // 是否允许搜索
@@ -46,11 +46,18 @@ 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 && val.length > 0) {
+                        var departmentIds = '';
+                        for (var i = 0; i < val.length; i++) {
+                            departmentIds += val[i].id;
+                            if (i < val.length - 1) {
+                                departmentIds += ',';
+                            }
+                        }
+                        $('#MPReceiveUser').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByDepartmentIds?departmentId=' + departmentIds
+                        })
+                    }
                 }
             });
 
@@ -149,9 +156,14 @@ var bootstrap = function ($, learun) {
             $('#lr_qualified').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('MPId');
                 if (learun.checkrow(keyValue)) {
+                    var MPConclusion = $('#gridtable').jfGridValue('MPConclusion');
+                    if (MPConclusion == 1) {
+                        learun.alert.warning("当前项已合格");
+                        return false;
+                    }
                     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_QualityObjectives/Qqualified', {keyValue:keyValue, status: true }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -162,9 +174,14 @@ var bootstrap = function ($, learun) {
             $('#lr_noqualified').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('MPId');
                 if (learun.checkrow(keyValue)) {
+                    var MPConclusion = $('#gridtable').jfGridValue('MPConclusion');
+                    if (MPConclusion != 1) {
+                        learun.alert.warning("当前项已不合格");
+                        return false;
+                    }
                     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_QualityObjectives/Qqualified', {keyValue:keyValue, status: false }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -203,8 +220,10 @@ var bootstrap = function ($, learun) {
                                             }
 
                                         });
+                                    if (i < deptarr.length - 1) {
+                                        content += ',';
+                                    }
                                 }
-                                content = content.substring(0, content.length - 1);
                                 callback(content);
                             } else {
                                 learun.clientdata.getAsync('custmerData',
@@ -254,7 +273,11 @@ var bootstrap = function ($, learun) {
                                             item.F_Id +
                                             '\',)" style="color:blue">' +
                                             item.F_FileName +
-                                            '</span>,&nbsp;&nbsp;&nbsp;';
+                                            '</span>&nbsp;&nbsp;&nbsp;';
+
+                                        if (i < res.data.length - 1) {
+                                            bb += ',&nbsp;&nbsp;&nbsp;';
+                                        }
                                     })
                                     callback(bb);
                                 }

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

@@ -30,30 +30,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.MPId,
-                t.MPAcademicYearNo,
-                t.MPSemester,
-                t.MPFile,
-                t.MPType,
-                t.MPUploader,
-                t.MPRemark,
-                t.MPDepartment,
-                t.MPProjectName,
-                t.MPFileTwo,
-                t.MPUploadTimes,
-                t.MPOverTime,
-                t.MPStatus,
-                t.MPConclusion,
-                t.SUpdateTime,
-                t.MPFileTwoRemark,
-                t.ParentId,
-                t.MPUploaderTwo,
-                t.MPMonth,
-                t.MPReceiveUser,
-                t.MPUploadTime
-                ");
+                strSql.Append("SELECT t.* ");
                 strSql.Append("  FROM MP_ManageMentPlan t ");
                 strSql.Append("  WHERE 1=1 ");
                 strSql.Append($"  AND MPType={MPType} ");