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

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

@@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +35,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
+        }
+        /// <summary>
+        /// 设置填报人
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormPeople()
+        {
+            return View();
         }
         #endregion
 
@@ -71,8 +80,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var FillinFromData = fillinFromIBLL.GetFillinFromEntity( keyValue );
-            var jsonData = new {
+            var FillinFromData = fillinFromIBLL.GetFillinFromEntity(keyValue);
+            var jsonData = new
+            {
                 FillinFrom = FillinFromData,
             };
             return Success(jsonData);
@@ -105,10 +115,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             FillinFromEntity entity = strEntity.ToObject<FillinFromEntity>();
-            fillinFromIBLL.SaveEntity(keyValue,entity);
+            if (entity.State == 0)
+            {
+                entity.State = 1;
+            }
             if (string.IsNullOrEmpty(keyValue))
             {
             }
+            fillinFromIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
         #endregion

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

@@ -23,40 +23,11 @@ var bootstrap = function ($, learun) {
                     var Cycles = $("#FillingCycle").lrselectGet();
                     if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 2) {
                         $('#FillingTime').lrDataItemSelect({ code: 'CycleTime' });
-                    } 
+                    } else {
+                        $('#FillingTime').lrDataItemSelect({ code: 'undefined' });
+                    }
                 }
             });
-
-            //$('#FillingTime').lrDataItemSelect({ code: 'CycleTime' });
-
-            //$('#City').lrselect({
-            //    url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
-            //    param: { strWhere: " cparent= 650000 " },
-            //    value: 'ccode',
-            //    text: 'cname',
-            //    maxHeight: 200,
-            //    select: function (item) {
-            //        var Citys = $("#City").lrselectGet();
-            //        if (Citys != null && Citys != "" && Citys != undefined) {
-            //            $('#Area').lrselectRefresh({
-            //                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_AREA',
-            //                param: { strWhere: " 1=1 and aparent in (" + Citys + ")" },
-            //                value: "acode",
-            //                text: "aname",
-            //                maxHeight: 200
-            //            });
-            //        } else {
-            //            $('#Area').lrselectRefresh({
-            //                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_AREA',
-            //                param: { strWhere: " 1=1 and aparent ='' " },
-            //                value: "acode",
-            //                text: "aname",
-            //                maxHeight: 200
-            //            });
-            //        }
-            //    }
-            //})
-            //$("#Area").lrselect();
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -0,0 +1,43 @@
+@{
+    ViewBag.Title = "质量目标管理体系指标模块";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="FillinFrom">
+        <div class="lr-form-item-title">工作模块<font face="宋体">*</font></div>
+        <input id="WorderModule" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FillinFrom">
+        <div class="lr-form-item-title">项目名称<font face="宋体">*</font></div>
+        <input id="ProjectName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FillinFrom">
+        <div class="lr-form-item-title">序&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号<font face="宋体">*</font></div>
+        <input id="SerialNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FillinFrom">
+        <div class="lr-form-item-title">填报部门<font face="宋体">*</font></div>
+        <div id="FillingDept" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FillinFrom">
+        <div class="lr-form-item-title">填报周期</div>
+        <div id="FillingCycle"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FillinFrom">
+        <div class="lr-form-item-title">填报时间</div>
+        <div id="FillingTime"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="FillinFrom" >
+            <div class="lr-form-item-title">填报人<font face="宋体">*</font></div>
+            <div id="FillingPeople" isvalid="yes" checkexpession="NotNull" ></div>
+        </div>
+    <div class="col-xs-12 lr-form-item" data-table="FillinFrom">
+        <div class="lr-form-item-title">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</div>
+        <textarea id="Demo" class="form-control" style="height:100px;"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FillinFrom" style="display: none; ">
+        <div class="lr-form-item-title">状态</div>
+        <input id="State" type="text" class="form-control" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/FillinFrom/FormPeople.js")

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

@@ -0,0 +1,83 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-21 18:39
+ * 描  述：质量目标管理体系指标模块
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            console.log($('#FillingDept').lrDataSourceSelect);
+            $('#FillingDept').lrDataSourceSelect({
+                code: 'classdata',
+                value: 'id',
+                text: 'name',
+                select: function (item) {
+                    var DeptCode = $('#FillingDept').lrselectGet();
+                    if (DeptCode != null && DeptCode != "" && DeptCode != undefined) {
+                        $('#FillingPeople').lrDataSourceSelect({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=teacheruserdata',
+                            value: 'f_userid',
+                            text: 'f_realname',
+                            param: { strWhere: " 1=1 and f_encode ='' " },
+                        });
+                    }
+                }
+
+            });
+            $("#FillingPeople").lrselect();
+            $('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
+            //设置周期
+            $('#FillingCycle').lrDataItemSelect({
+                code: 'ThisCycle',
+                select: function (item) {
+                    var Cycles = $("#FillingCycle").lrselectGet();
+                    if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 2) {
+                        $('#FillingTime').lrDataItemSelect({ code: 'CycleTime' });
+                    } else {
+                        $('#FillingTime').lrDataItemSelect({ code: 'undefined' });
+                    }
+                }
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/FillinFrom/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+            $('#State').val('0');
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/FillinFrom/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -44,7 +44,7 @@
                         <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_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>

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

@@ -18,9 +18,6 @@ var bootstrap = function ($, learun) {
             }, 220, 400);
             $('#FillingCycle').lrDataItemSelect({ code: 'ThisCycle' });
             $('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
-            if (true) {
-
-            }
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -113,20 +110,20 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            //设置周期
-            $('#lr_cycle').on('click', function () {
+            //设置填报人
+            $('#lr_people').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
                     var RStatus = $('#gridtable').jfGridValue('State');
-                    if (RStatus !== 0) {
-                        learun.alert.warning("当前项不能设置周期！");
+                    if (RStatus !== 1) {
+                        learun.alert.warning("当前项不能设置填报人！");
                         return false;
                     }
                     learun.layerForm({
                         id: 'form',
-                        title: '设置周期',
-                        url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/Form?keyValue=' + keyValue,
-                        width: 500,
+                        title: '设置填报人',
+                        url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/FormPeople?keyValue=' + keyValue,
+                        width: 600,
                         height: 400,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
@@ -134,24 +131,6 @@ 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;
-                    }
-                    learun.layerConfirm('是否确认提交该项！', function (res) {
-                        if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Repair/DoSubmit', { keyValue: keyValue }, function () {
-                                refreshGirdData();
-                            });
-                        }
-                    });
-                }
-            });
             //隐藏撤下
             $('#lr_hide').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
@@ -235,11 +214,9 @@ var bootstrap = function ($, learun) {
                             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) {
-                                //    return '<span class=\"label label-success\">待设置周期</span>';
                             } else {
                                 return '<span class=\"label label-default\">已完成</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -956,6 +956,7 @@
     <Content Include="Areas\EducationalAdministration\Views\EvaHygieve\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\EvaViolationOfDiscipline\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\EvaViolationOfDiscipline\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\FillinFrom\FormPeople.js" />
     <Content Include="Areas\EducationalAdministration\Views\JournalSend\FormOfDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\JournalSend\IndexOfDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\LeaveSchoolA\Form.js" />
@@ -7317,6 +7318,7 @@
     <Content Include="Areas\EducationalAdministration\Views\PM_TechnicalPost\StatisticIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\PM_Resume\StatisticIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\PM_WorkerTechnology\StatisticIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\FillinFrom\FormPeople.cshtml" />
     <None Include="Areas\EducationalAdministration\Views\SchoolNews\Index.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuEnroll\StuTuition.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuEnroll\IsHelpForm.cshtml" />

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

@@ -38,7 +38,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 公式
         /// </summary>
         [Column("FORMULA")]
-        public decimal? Formul { get; set; }
+        public string Formul { get; set; }
         /// <summary>
         /// 结果
         /// </summary>