Merge branch '金隅分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 金隅分支

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

@@ -3,6 +3,8 @@ using System.Data;
 using Learun.Application.TwoDevelopment.EducationalAdministration;
 using System.Web.Mvc;
 using System.Collections.Generic;
+using System.Linq;
+using Learun.Application.Organization;
 
 namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 {
@@ -16,7 +18,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
     public class FillinFromController : MvcControllerBase
     {
         private FillinFromIBLL fillinFromIBLL = new FillinFromBLL();
-
+        private DepartmentBLL departmentIBLL = new DepartmentBLL();
         #region 视图功能
 
         /// <summary>
@@ -26,6 +28,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult Index()
         {
+            var logininfo = LoginUserInfo.Get();
+            ViewBag.isSystem = logininfo.isSystem;
+            ViewBag.departmentId = "";
+            var Model = departmentIBLL.GetEntity(logininfo.companyId, logininfo.departmentId);
+            if (Model.F_Manager == logininfo.realName)
+            {
+                ViewBag.departmentId = logininfo.departmentId;
+            }
             return View();
         }
         /// <summary>
@@ -36,9 +46,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult FormIndex()
         {
             var logininfo = LoginUserInfo.Get();
-            ViewBag.userId = logininfo.userId;
             ViewBag.isSystem = logininfo.isSystem;
-            ViewBag.departmentId = logininfo.departmentId;
+            ViewBag.departmentId = "";
+            var Model = departmentIBLL.GetEntity(logininfo.companyId, logininfo.departmentId);
+            if (Model.F_Manager == logininfo.realName)
+            {
+                ViewBag.departmentId = logininfo.departmentId;
+            }
             return View();
         }
         /// <summary>

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

@@ -24,8 +24,10 @@ var bootstrap = function ($, learun) {
                 code: 'ThisCycle',
                 select: function (item) {
                     var Cycles = $("#FillingCycle").lrselectGet();
-                    if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 2) {
+                    if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 3) {
                         $('#FillingTime').lrDataItemSelect({ code: 'CycleTime' });
+                    } else if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 2) {
+                        $('#FillingTime').lrDataItemSelect({ code: 'undefined' });
                     } else {
                         $('#FillingTime').lrDataItemSelect({ code: 'undefined' });
                     }

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

@@ -3,7 +3,6 @@
     Layout = "~/Views/Shared/_Index.cshtml";
 }
 <script type="text/javascript">
-    var userId = '@ViewBag.userId';
     var isSystem = '@ViewBag.isSystem';
     var departmentId= '@ViewBag.departmentId'
 </script>

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

@@ -153,7 +153,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "填报时间", name: "FillingTime", width: 100, align: "left",
+                        label: "填报时间", name: "FillingTime", width: 100, align: "center",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -216,7 +216,6 @@ 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

@@ -41,9 +41,12 @@ var bootstrap = function ($, learun) {
                 code: 'ThisCycle',
                 select: function (item) {
                     var Cycles = $("#FillingCycle").lrselectGet();
-                    if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 2) {
+                    if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 3) {
                         $('#FillingTime').lrDataItemSelect({ code: 'CycleTime' });
-                    } else {
+                    } else if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 2) {
+                        $('#FillingTime').lrDataItemSelect({ code: 'undefined' });
+                    }
+                    else {
                         $('#FillingTime').lrDataItemSelect({ code: 'undefined' });
                     }
                 }

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

@@ -54,8 +54,10 @@ var bootstrap = function ($, learun) {
                 code: 'ThisCycle',
                 select: function (item) {
                     var Cycles = $("#FillingCycle").lrselectGet();
-                    if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 2) {
+                    if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 3) {
                         $('#FillingTime').lrDataItemSelect({ code: 'CycleTime' });
+                    } else if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 2) {
+                        $('#FillingTime').lrDataItemSelect({ code: 'undefined' });
                     } else {
                         $('#FillingTime').lrDataItemSelect({ code: 'undefined' });
                     }

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

@@ -24,8 +24,15 @@ var bootstrap = function ($, learun) {
                 code: 'ThisCycle',
                 select: function (item) {
                     var Cycles = $("#FillingCycle").lrselectGet();
-                    if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 2) {
+                    if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 3) {
                         $('#FillingTime').lrDataItemSelect({ code: 'CycleTime' });
+                    } else if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 2) {
+                        //$('#FillingTime').lrselect({
+                        //    code: 'CycleTime', value: 'id', text: 'name',
+                        //    maxHeight: 200,
+                        //    select: function (item) { }
+                        //})
+                        $('#FillingTime').lrDataItemSelect({ code: 'undefined' });
                     } else {
                         $('#FillingTime').lrDataItemSelect({ code: 'undefined' });
                     }

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

@@ -2,7 +2,11 @@
     ViewBag.Title = "质量目标管理体系指标模块";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-<div class="lr-layout "  >
+<script type="text/javascript">
+    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">
@@ -34,12 +38,17 @@
                         <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;添加</a>
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-                        <a id="lr_cancel" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;撤回</a>
-                        <a id="lr_formula" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;设置公式</a>
-                        @*<a id="lr_cycle" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;设置周期</a>*@
-                        <a id="lr_people" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;设置填报人</a>
-                        <a id="lr_hide" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;隐藏</a>
-                        <a id="lr_import" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;导入</a>
+                        <a id="lr_more" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                            <i class="fa fa-reorder"></i>&nbsp;<span class="lrlt">更多</span><span class="caret"></span>
+                        </a>
+                        <ul class="dropdown-menu pull-right">
+                            <li id="lr_cancel"><a><i></i>&nbsp;<span class="lrlt">撤回</span></a></li>
+                            <li id="lr_formula"><a><i></i>&nbsp;<span class="lrlt">设置公式</span></a></li>
+                            <li id="lr_people"><a><i></i>&nbsp;<span class="lrlt">设置填报人</span></a></li>
+                            <li id="lr_hide"><a><i></i>&nbsp;<span class="lrlt">隐藏</span></a></li>
+                            <li id="lr_import"><a><i></i>&nbsp;<span class="lrlt">导入</span></a></li>
+                           
+                        </ul>
                     </div>
                 </div>
             </div>

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

@@ -242,6 +242,8 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.isSystem = isSystem;
+            param.departmentId = departmentId;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -88,6 +88,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         dp.Add("FillingDept", queryParam["departmentId"].ToString(), DbType.String);
                         strSql.Append(" AND t.FillingDept = @FillingDept ");
                     }
+                    else
+                    {
+                        dp.Add("FillingDept", "undefined11", DbType.String);
+                        strSql.Append(" AND t.FillingDept = @FillingDept ");
+                    }
                 }
                 //sql条件
                 if (!queryParam["SqlParameter"].IsEmpty())