隐藏功能

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

@@ -35,6 +35,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult FormIndex()
         {
+            var logininfo = LoginUserInfo.Get();
+            ViewBag.userId = logininfo.userId;
+            ViewBag.isSystem = logininfo.isSystem;
+            ViewBag.departmentId = logininfo.departmentId;
             return View();
         }
         /// <summary>

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

@@ -19,7 +19,7 @@ var bootstrap = function ($, learun) {
             $('#lrPeople').val(learun.clientdata.get(['userinfo']).realName);
             $('#lrTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')); 
             $('#FillingDept').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
-            $('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
+            //$('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
             $('#FillingCycle').lrDataItemSelect({
                 code: 'ThisCycle',
                 select: function (item) {

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

@@ -2,7 +2,12 @@
     ViewBag.Title = "质量目标管理体系指标模块";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-<div class="lr-layout "  >
+<script type="text/javascript">
+    var userId = '@ViewBag.userId';
+    var isSystem = '@ViewBag.isSystem';
+    var departmentId= '@ViewBag.departmentId'
+</script>
+<div class="lr-layout ">
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
@@ -39,4 +44,4 @@
         </div>
     </div>
 </div>
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/FillinFrom/Index.js")
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/FillinFrom/FormIndex.js")

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

@@ -17,7 +17,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#FillingCycle').lrDataItemSelect({ code: 'ThisCycle' });
-            $('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
+            //$('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -92,31 +92,6 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            //设置公式
-            //$('#lr_formula').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.layerForm({
-            //            id: 'form',
-            //            title: '设置公式',
-            //            url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/FormPeople?keyValue=' + keyValue,
-            //            //                        url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList',
-            //            //param: { itemCode: 'Client_ProductInfo' },
-            //            //selectWord: 'F_ItemName',
-            //            //value: 'F_ItemValue',
-            //            //text: 'F_ItemName',
-            //            //headData: [{ label: "商品编号", name: "F_ItemValue", width: 100, align: "left" },
-            //            //{ label: "商品名称", name: "F_ItemName", width: 450, align: "left" }],
-            //            //select: function (item) {
-            //            //}
-            //        });
-            //    }   
-            //});
             //设置填报人
             $('#lr_people').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
@@ -224,6 +199,8 @@ var bootstrap = function ($, learun) {
                                 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-success\">待填报</span>';
                             } else {
                                 return '<span class=\"label label-default\">已完成</span>';
                             }
@@ -238,6 +215,10 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.IsFlag = 0;
+            param.userId = userId;
+            param.isSystem = isSystem;
+            param.departmentId = departmentId;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -17,7 +17,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#lrPeople')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
             $('#lrPeople').val(learun.clientdata.get(['userinfo']).realName);
-            $('#lrTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')); 
+            $('#lrTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
             $('#FillingDept').lrDataSourceSelect({
                 code: 'classdata',
                 value: 'id',
@@ -29,7 +29,8 @@ var bootstrap = function ($, learun) {
                             url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=teacheruserdata',
                             value: 'f_userid',
                             text: 'f_realname',
-                            param: { strWhere: " 1=1 and f_departmentid in ('" + DeptCode + "')" }
+                            param: { strWhere: " 1=1 and f_departmentid in ('" + DeptCode + "')" },
+                            maxHeight: 200,
                         });
                     }
                 }
@@ -62,7 +63,7 @@ var bootstrap = function ($, learun) {
                 });
             }
             $('#State').val('0');
-            $('#IsFlag').val('0'); 
+            $('#IsFlag').val('0');
         }
     };
     // 保存数据

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

@@ -42,7 +42,8 @@ var bootstrap = function ($, learun) {
                             url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=teacheruserdata',
                             value: 'f_userid',
                             text: 'f_realname',
-                            param: { strWhere: " 1=1 and f_departmentid in ('" + DeptCode + "')" }
+                            param: { strWhere: " 1=1 and f_departmentid in ('" + DeptCode + "')" },
+                            maxHeight: 200
                         });
                     }
                 }

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

@@ -19,7 +19,7 @@ var bootstrap = function ($, learun) {
             $('#lrPeople').val(learun.clientdata.get(['userinfo']).realName);
             $('#lrTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
             $('#FillingDept').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
-            $('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
+            //$('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
             $('#FillingCycle').lrDataItemSelect({
                 code: 'ThisCycle',
                 select: function (item) {
@@ -47,8 +47,6 @@ var bootstrap = function ($, learun) {
             }
             $('#State').val('0');
             $('#IsFlag').val('0');
-
-          
         }
     };
     // 保存数据

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

@@ -17,7 +17,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#FillingCycle').lrDataItemSelect({ code: 'ThisCycle' });
-            $('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
+            //$('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -223,6 +223,17 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "备注", name: "Demo", width: 300, align: "center" },
+                    {
+                        label: "隐藏/撤下", name: "IsFlag", width: 150, align: "center",
+                        formatter: function (cellvalue) {
+                            if (cellvalue === 0) {
+                                return '<span class=\"label label-success\">显示</span>';
+                            } else if (cellvalue === 1) {
+                                return '<span class=\"label label-default\">隐藏</span>';
+                            } 
+                        }
+                    },
+                    
                 ],
                 mainId: 'Id',
                 isPage: true

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromService.cs

@@ -73,6 +73,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("FillingPeople", queryParam["FillingPeople"].ToString(), DbType.String);
                     strSql.Append(" AND t.FillingPeople = @FillingPeople ");
                 }
+                if (!queryParam["IsFlag"].IsEmpty())
+                {
+                    dp.Add("IsFlag", queryParam["IsFlag"].ToString(), DbType.String);
+                    strSql.Append(" AND t.IsFlag = @IsFlag ");
+                }
+                if (!queryParam["userId"].IsEmpty() && !queryParam["isSystem"].ToBool() && !queryParam["departmentId"].IsEmpty())
+                {
+                    if (queryParam["isSystem"].ToBool() == false)
+                    {
+
+                    }
+                    //queryParam["userId"].ToString() != "System" &&
+                }
                 return this.BaseRepository("CollegeMIS").FindList<FillinFromEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)