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

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

@@ -137,9 +137,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult DeleteForm(string keyValue)
         {
-            fillinFromIBLL.DeleteEntity(keyValue);
-            return Success("删除成功！");
+            var Model = fillinFromIBLL.GetFillInNo(keyValue);
+            if (Model != null)
+            {
+                //重新填写
+                Model.IsDel = 1;
+            }
+
+            fillinFromIBLL.SaveEntity(keyValue, Model);
+            return Success("作废成功！");
         }
+
         /// <summary>
         /// 保存实体数据（新增、修改）
         /// </summary>
@@ -159,24 +167,36 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 {
                     entity.State = 2;
                 }
-                else if (entity.State == 2)
-                {
-                    entity.State = 3;
-                }
                 #endregion
             }
-            else
-            {
-                entity.State = 1;
-            }
             fillinFromIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
         #endregion
 
         #region 扩展数据
+
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult Submit(string keyValue)
+        {
+            var Model = fillinFromIBLL.GetFillInNo(keyValue);
+            if (Model != null)
+            {
+                //重新填写
+                Model.State = 2;
+            }
+            fillinFromIBLL.SaveEntity(keyValue, Model);
+            return Success("保存成功！");
+        }
+
         /// <summary>
-        /// 隐藏/撤下
+        /// 隐藏/显示
         /// </summary>
         /// <param name="keyValue"></param>
         /// <returns></returns>
@@ -187,8 +207,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             var Model = fillinFromIBLL.GetFillInNo(keyValue);
             if (Model != null)
             {
-                //隐藏
-                Model.IsFlag = 1;
+                if (Model.IsFlag == 0)
+                {
+                    Model.IsFlag = 1;
+                }
+                else
+                {
+                    Model.IsFlag = 0;
+                }
             }
             fillinFromIBLL.SaveEntity(keyValue, Model);
             return Success("保存成功！");
@@ -212,6 +238,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             fillinFromIBLL.SaveEntity(keyValue, Model);
             return Success("保存成功！");
         }
+
         #endregion
     }
 }

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

@@ -27,10 +27,10 @@
         <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;式<font face="宋体">*</font></div>
+        <div id="Formula" 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>
@@ -48,8 +48,12 @@
         <input id="lrTime" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
     </div>
     <div class="col-xs-4 lr-form-item" data-table="FillinFrom" style="display: none; ">
-        <div class="lr-form-item-title">隐藏/撤下</div>
+        <div class="lr-form-item-title">隐藏/显示</div>
         <input id="IsFlag" type="text" class="form-control" />
     </div>
+    <div class="col-xs-4 lr-form-item"  data-table="FillinFrom" style="display: none; " > 
+        <div class="lr-form-item-title">是否删除</div> 
+        <input id="IsDel" type="text" class="form-control"  /> 
+    </div> 
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/FillinFrom/Form.js")

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

@@ -15,6 +15,20 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#Formula').lrDataSourceSelect({ code: 'FormulaMain', value: 'id', text: 'name' }); 
+            $('#Formula').lrGirdSelect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=FormulaMain',
+                selectWord: 'name',
+                value: 'id',
+                text: 'name',
+                headData:
+                [
+                    { label: "公式", name: "result", width: 300, align: "left" },
+                    { label: "公式名称", name: "name", width: 300, align: "left" }
+                ],
+                select: function (item) {
+                }
+            });
             $('#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'));
@@ -49,6 +63,7 @@ var bootstrap = function ($, learun) {
             }
             $('#State').val('0');
             $('#IsFlag').val('0');
+            $('#IsDel').val('0'); 
         }
     };
     // 保存数据

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

@@ -113,24 +113,24 @@ 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();
-                            });
-                        }
-                    });
-                }
-            });
+            ////隐藏显示
+            //$('#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 () {

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

@@ -48,7 +48,7 @@
         <input id="lrTime" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
     </div>
     <div class="col-xs-4 lr-form-item" data-table="FillinFrom" style="display: none; ">
-        <div class="lr-form-item-title">隐藏/撤下</div>
+        <div class="lr-form-item-title">隐藏/显示</div>
         <input id="IsFlag" type="text" class="form-control" />
     </div>
 </div>

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

@@ -37,17 +37,17 @@
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <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_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;作废</a>
+                        <a id="lr_submit" 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_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>

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

@@ -35,6 +35,24 @@ var bootstrap = function ($, learun) {
                     }
                 });
             });
+            //提交
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var State = $('#gridtable').jfGridValue('State');
+                    if (State == 0) {
+                        learun.alert.warning("当前项已提交,不能重复提交！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认提交该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/FillinFrom/Submit', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
             // 编辑
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
@@ -56,7 +74,7 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            // 删除
+            //作废
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
@@ -92,27 +110,6 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            //设置公式
-            $('#lr_formula').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                if (learun.checkrow(keyValue)) {
-                    var State = $('#gridtable').jfGridValue('State');
-                    if (State !== 2) {
-                        learun.alert.warning("当前项不能设置公式！");
-                        return false;
-                    }
-                    learun.layerForm({
-                        id: 'form',
-                        title: '设置公式',
-                        url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/Formula?keyValue=' + keyValue,
-                        width: 600,
-                        height: 400,
-                        callBack: function (id) {
-                            return top[id].acceptClick(refreshGirdData);
-                        }
-                    });
-                }
-            });
             //设置填报人
             $('#lr_people').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
@@ -134,11 +131,11 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            //隐藏撤下
+            //隐藏显示
             $('#lr_hide').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
-                    learun.layerConfirm('是否确认隐藏该项！', function (res) {
+                    learun.layerConfirm('是否确认隐藏/显示该项！', function (res) {
                         if (res) {
                             learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/FillinFrom/HideList', { keyValue: keyValue }, function () {
                                 refreshGirdData();
@@ -153,9 +150,9 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/GetPageList',
                 headData: [
-                    { label: "核心工作模块", name: "WorderModule", width: 300, align: "center" },
+                    { label: "核心工作模块", name: "WorderModule", width: 250, align: "center" },
                     { label: "序号", name: "SerialNo", width: 100, align: "center" },
-                    { label: "项目名称", name: "ProjectName", width: 300, align: "center" },
+                    { label: "项目名称", name: "ProjectName", width: 250, align: "center" },
                     {
                         label: "填报周期", name: "FillingCycle", width: 100, align: "center",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -169,7 +166,20 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "填报时间", name: "FillingTime", width: 100, align: "left",
+                        label: "公式", name: "Formula", width: 200, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'FormulaMain',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "填报时间", name: "FillingTime", width: 80, align: "center",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -194,7 +204,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "填报人", name: "FillingPeople", width: 150, align: "center",
+                        label: "填报人", name: "FillingPeople", width: 100, align: "center",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
@@ -222,18 +232,17 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
-                    { label: "备注", name: "Demo", width: 300, align: "center" },
+                    { label: "备注", name: "Demo", width: 250, align: "center" },
                     {
-                        label: "隐藏/撤下", name: "IsFlag", width: 150, 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.Application.Web/Learun.Application.Web.csproj

@@ -957,8 +957,6 @@
     <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\FormulaIndex.js" />
-    <Content Include="Areas\EducationalAdministration\Views\FillinFrom\Formula.js" />
     <Content Include="Areas\EducationalAdministration\Views\FillinFrom\FormPeople.js" />
     <Content Include="Areas\EducationalAdministration\Views\FillinFrom\FormIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\JournalSend\FormOfDC.js" />
@@ -7333,8 +7331,6 @@
     <Content Include="Areas\EducationalAdministration\Views\PM_WorkerTechnology\StatisticIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\FillinFrom\FormPeople.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\FillinFrom\FormIndex.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\FillinFrom\Formula.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\FillinFrom\FormulaIndex.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

@@ -85,10 +85,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("DEMO")]
         public string Demo { get; set; }
         /// <summary> 
-        /// 隐藏/撤下 
+        /// 隐藏/显示 
         /// </summary> 
         [Column("ISFLAG")]
         public int? IsFlag { get; set; }
+        /// <summary> 
+        /// 是否作废 0 否 1 是 
+        /// </summary> 
+        [Column("ISDEL")]
+        public int? IsDel { get; set; }
         #endregion
 
         #region 扩展操作

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

@@ -46,7 +46,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.State,
                 t.lrPeople, 
                 t.lrTime,
-                t.IsFlag
+                t.IsFlag,
+                t.IsDel
                 ");
                 strSql.Append("  FROM FillinFrom t ");
                 strSql.Append("  WHERE 1=1 ");