质量目标管理更改填报人

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs

@@ -168,7 +168,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                     entity.State = 2;
                 }
                 #endregion
-                qualityReportMainIBLL.EditProjectByFId(keyValue);
+                //qualityReportMainIBLL.EditProjectByFId(keyValue);
 
             }
             #region 处理填报日期

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormIndex.js

@@ -96,11 +96,11 @@ var bootstrap = function ($, learun) {
             $('#lr_people').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
-                    var RStatus = $('#gridtable').jfGridValue('State');
-                    if (RStatus !== 1) {
-                        learun.alert.warning("当前项不能设置填报人！");
-                        return false;
-                    }
+                    //var RStatus = $('#gridtable').jfGridValue('State');
+                    //if (RStatus !== 1) {
+                    //    learun.alert.warning("当前项不能设置填报人！");
+                    //    return false;
+                    //}
                     learun.layerForm({
                         id: 'form',
                         title: '设置填报人',
@@ -113,24 +113,6 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            ////隐藏显示
-            //$('#lr_hide').on('click', function () {
-            //    var keyValue = $('#gridtable').jfGridValue('Id');
-            //    if (learun.checkrow(keyValue)) {
-            //        var RStatus = $('#gridtable').jfGridValue('State');
-            //        if (RStatus == 1) {
-            //            learun.alert.warning("已提交！");
-            //            return false;
-            //        }
-            //        learun.layerConfirm('是否确认提交该项！', function (res) {
-            //            if (res) {
-            //                learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Repair/DoSubmit', { keyValue: keyValue }, function () {
-            //                    refreshGirdData();
-            //                });
-            //            }
-            //        });
-            //    }
-            //});
         },
         // 初始化列表
         initGird: function () {
@@ -198,8 +180,9 @@ var bootstrap = function ($, learun) {
                             } else if (cellvalue === 0) {
                                 return '<span class=\"label label-warning\">草稿</span>';
                             } else if (cellvalue === 1) {
-                                return '<span class=\"label label-success\">待设置填报人</span>';
-                            } else if (cellvalue === 2) {
+                                return '<span class=\"label label-success\">已提交</span>';
+                            }
+                            else if (cellvalue === 2) {
                                 return '<span class=\"label label-success\">待填报</span>';
                             } else if (cellvalue === 3) {
                                 return '<span class=\"label label-default\">已完成<pan>';
@@ -218,7 +201,7 @@ var bootstrap = function ($, learun) {
             param.IsFlag = 0;
             param.isSystem = isSystem;
             param.departmentId = departmentId;
-            param.SqlParameter = ' and t.State=1';
+            param.SqlParameter = ' and t.State>0 ';
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js

@@ -293,7 +293,7 @@ var bootstrap = function ($, learun) {
                             } else if (cellvalue === 0) {
                                 return '<span class=\"label label-warning\">草稿</span>';
                             } else if (cellvalue === 1) {
-                                return '<span class=\"label label-success\">待设置填报人</span>';
+                                return '<span class=\"label label-success\">已提交</span>';
                             } else if (cellvalue === 2) {
                                 return '<span class=\"label label-success\">待填报</span>';
                             } else if (cellvalue === 3) {