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

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

@@ -29,6 +29,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return View();
         }
         /// <summary>
+        /// 
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormIndex()
+        {
+            return View();
+        }
+        /// <summary>
         /// 表单页
         /// <summary>
         /// <returns></returns>
@@ -46,6 +55,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
+
+        /// <summary>
+        /// 设置公式
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Formula()
+        {
+            return View();
+        }
         #endregion
 
         #region 获取数据
@@ -115,17 +134,66 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             FillinFromEntity entity = strEntity.ToObject<FillinFromEntity>();
-            if (entity.State == 0)
+            if (!string.IsNullOrEmpty(keyValue))
             {
-                entity.State = 1;
+                #region 修改状态
+                if (entity.State == 1)
+                {
+                    entity.State = 2;
+                }
+                else if (entity.State == 2)
+                {
+                    entity.State = 3;
+                }
+                #endregion
             }
-            if (string.IsNullOrEmpty(keyValue))
+            else
             {
+                entity.State = 1;
             }
             fillinFromIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
         #endregion
 
+        #region 扩展数据
+        /// <summary>
+        /// 隐藏/撤下
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult HideList(string keyValue)
+        {
+            var Model = fillinFromIBLL.GetFillInNo(keyValue);
+            if (Model != null)
+            {
+                //隐藏
+                Model.IsFlag = 1;
+            }
+            fillinFromIBLL.SaveEntity(keyValue, Model);
+            return Success("保存成功！");
+        }
+
+        /// <summary>
+        /// 撤回
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoCanCel(string keyValue)
+        {
+            var Model = fillinFromIBLL.GetFillInNo(keyValue);
+            if (Model != null)
+            {
+                //重新填写
+                Model.State = 3;
+            }
+            fillinFromIBLL.SaveEntity(keyValue, Model);
+            return Success("保存成功！");
+        }
+        #endregion
     }
 }

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

@@ -20,8 +20,8 @@
         <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 class="lr-form-item-title">填报周期<font face="宋体">*</font></div>
+        <div id="FillingCycle" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="FillinFrom">
         <div class="lr-form-item-title">填报时间</div>
@@ -35,9 +35,21 @@
         <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="col-xs-4 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 class="col-xs-4 lr-form-item" data-table="FillinFrom" style="display: none; ">
+        <div class="lr-form-item-title">当前用户</div>
+        <input id="lrPeople" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="FillinFrom" style="display: none; ">
+        <div class="lr-form-item-title">当前时间</div>
+        <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>
+        <input id="IsFlag" 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,9 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         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')); 
             $('#FillingDept').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
             $('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
             $('#FillingCycle').lrDataItemSelect({
@@ -43,6 +46,7 @@ var bootstrap = function ($, learun) {
                 });
             }
             $('#State').val('0');
+            $('#IsFlag').val('0'); 
         }
     };
     // 保存数据

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

@@ -0,0 +1,42 @@
+@{
+    ViewBag.Title = "质量目标管理体系指标模块";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">工作模块</div>
+                                    <input id="WorderModule" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">项目名称</div>
+                                    <input id="ProjectName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">填报周期</div>
+                                    <div id="FillingCycle"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_people" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;设置填报人</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/FillinFrom/Index.js")

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

@@ -0,0 +1,248 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-21 18:39
+ * 描  述：质量目标管理体系指标模块
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#FillingCycle').lrDataItemSelect({ code: 'ThisCycle' });
+            $('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/Form',
+                    width: 500,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var State = $('#gridtable').jfGridValue('State');
+                    if (State !== 0) {
+                        learun.alert.warning("当前项目已提交不能修改！");
+                        return;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var State = $('#gridtable').jfGridValue('State');
+                    if (State !== 0) {
+                        learun.alert.warning("当前项目已提交不能删除！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/FillinFrom/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //撤回
+            $('#lr_cancel').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_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');
+                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,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(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 () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/GetPageList',
+                headData: [
+                    { label: "核心工作模块", name: "WorderModule", width: 300, align: "center" },
+                    { label: "序号", name: "SerialNo", width: 100, align: "center" },
+                    { label: "项目名称", name: "ProjectName", width: 300, align: "center" },
+                    {
+                        label: "填报周期", name: "FillingCycle", width: 100, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'ThisCycle',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "填报时间", name: "FillingTime", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'CycleTime',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "填报部门", name: "FillingDept", width: 100, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "填报人", name: "FillingPeople", width: 150, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "状态", name: "State", width: 150, align: "center",
+                        formatter: function (cellvalue) {
+                            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 {
+                                return '<span class=\"label label-default\">已完成</span>';
+                            }
+                        }
+                    },
+                    { label: "备注", name: "Demo", width: 300, align: "center" },
+                ],
+                mainId: 'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -5,39 +5,51 @@
 <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" />
+        <input id="WorderModule" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
     </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" />
+        <input id="ProjectName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
     </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" />
+        <input id="SerialNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
     </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 id="FillingDept" isvalid="yes" checkexpession="NotNull" readonly="readonly"></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 id="FillingCycle" readonly="readonly"></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 id="FillingTime" readonly="readonly"></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-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="col-xs-4 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 class="col-xs-4 lr-form-item" data-table="FillinFrom" style="display: none; ">
+        <div class="lr-form-item-title">当前用户</div>
+        <input id="lrPeople" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="FillinFrom" style="display: none; ">
+        <div class="lr-form-item-title">当前时间</div>
+        <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>
+        <input id="IsFlag" 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

@@ -15,7 +15,9 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            console.log($('#FillingDept').lrDataSourceSelect);
+            $('#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')); 
             $('#FillingDept').lrDataSourceSelect({
                 code: 'classdata',
                 value: 'id',
@@ -23,18 +25,16 @@ var bootstrap = function ($, learun) {
                 select: function (item) {
                     var DeptCode = $('#FillingDept').lrselectGet();
                     if (DeptCode != null && DeptCode != "" && DeptCode != undefined) {
-                        $('#FillingPeople').lrDataSourceSelect({
+                        $('#FillingPeople').lrselectRefresh({
                             url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=teacheruserdata',
                             value: 'f_userid',
                             text: 'f_realname',
-                            param: { strWhere: " 1=1 and f_encode ='' " },
+                            param: { strWhere: " 1=1 and f_departmentid in ('" + DeptCode + "')" }
                         });
                     }
                 }
-
             });
             $("#FillingPeople").lrselect();
-            $('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
             //设置周期
             $('#FillingCycle').lrDataItemSelect({
                 code: 'ThisCycle',
@@ -62,6 +62,7 @@ var bootstrap = function ($, learun) {
                 });
             }
             $('#State').val('0');
+            $('#IsFlag').val('0'); 
         }
     };
     // 保存数据

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

@@ -0,0 +1,59 @@
+@{
+    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" readonly="readonly" />
+    </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" readonly="readonly" />
+    </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" readonly="readonly" />
+    </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" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FillinFrom">
+        <div class="lr-form-item-title">填报周期</div>
+        <div id="FillingCycle" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FillinFrom">
+        <div class="lr-form-item-title">填报时间</div>
+        <div id="FillingTime" readonly="readonly"></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" readonly="readonly"></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="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>
+    </div>
+    <div class="col-xs-4 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 class="col-xs-4 lr-form-item" data-table="FillinFrom" style="display: none; ">
+        <div class="lr-form-item-title">当前用户</div>
+        <input id="lrPeople" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="FillinFrom" style="display: none; ">
+        <div class="lr-form-item-title">当前时间</div>
+        <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>
+        <input id="IsFlag" type="text" class="form-control" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/FillinFrom/Formula.js")

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

@@ -0,0 +1,97 @@
+/* * 版 本 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 () {
+            $('#Formula').lrGirdSelect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=FormulaMain',
+                selectWord: 'name',
+                value: 'result',
+                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'));
+            $('#FillingDept').lrDataSourceSelect({
+                code: 'classdata',
+                value: 'id',
+                text: 'name',
+                select: function (item) {
+                    var DeptCode = $('#FillingDept').lrselectGet();
+                    if (DeptCode != null && DeptCode != "" && DeptCode != undefined) {
+                        $('#FillingPeople').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=teacheruserdata',
+                            value: 'f_userid',
+                            text: 'f_realname',
+                            param: { strWhere: " 1=1 and f_departmentid in ('" + DeptCode + "')" }
+                        });
+                    }
+                }
+            });
+            $("#FillingPeople").lrselect();
+            //设置周期
+            $('#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');
+            $('#IsFlag').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/FormulaIndex.cshtml

@@ -0,0 +1,55 @@
+@{
+    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">填报周期<font face="宋体">*</font></div>
+        <div id="FillingCycle" 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="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-4 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 class="col-xs-4 lr-form-item" data-table="FillinFrom" style="display: none; ">
+        <div class="lr-form-item-title">当前用户</div>
+        <input id="lrPeople" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="FillinFrom" style="display: none; ">
+        <div class="lr-form-item-title">当前时间</div>
+        <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>
+        <input id="IsFlag" type="text" class="form-control" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/FillinFrom/FormulaIndex.js")

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

@@ -0,0 +1,70 @@
+/* * 版 本 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 () {
+            $('#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'));
+            $('#FillingDept').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
+            $('#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');
+            $('#IsFlag').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

@@ -11,25 +11,17 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">核心工作模块</div>
+                                    <div class="lr-form-item-title">工作模块</div>
                                     <input id="WorderModule" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">项目名称</div>
                                     <input id="ProjectName" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
+                                <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">填报周期</div>
                                     <div id="FillingCycle"></div>
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">状态</div>
-                                    <input id="State" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">填报人</div>
-                                    <div id="FillingPeople"></div>
-                                </div>
                             </div>
                         </div>
                     </div>

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

@@ -78,14 +78,14 @@ var bootstrap = function ($, learun) {
             $('#lr_cancel').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
-                    var RStatus = $('#gridtable').jfGridValue('State');
-                    if (RStatus == 1) {
-                        learun.alert.warning("已提交！");
+                    var State = $('#gridtable').jfGridValue('State');
+                    if (State <= 3) {
+                        learun.alert.warning("当前项未执行到此处,不能测回！");
                         return false;
                     }
-                    learun.layerConfirm('是否确认提交该项！', function (res) {
+                    learun.layerConfirm('是否确认撤回该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Repair/DoSubmit', { keyValue: keyValue }, function () {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/FillinFrom/DoCancel', { keyValue: keyValue }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -96,16 +96,19 @@ 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("已提交！");
+                    var State = $('#gridtable').jfGridValue('State');
+                    if (State !== 2) {
+                        learun.alert.warning("当前项不能设置公式！");
                         return false;
                     }
-                    learun.layerConfirm('是否确认提交该项！', function (res) {
-                        if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Repair/DoSubmit', { keyValue: keyValue }, function () {
-                                refreshGirdData();
-                            });
+                    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);
                         }
                     });
                 }
@@ -135,14 +138,9 @@ 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) {
+                    learun.layerConfirm('是否确认隐藏该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Repair/DoSubmit', { keyValue: keyValue }, function () {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/FillinFrom/HideList', { keyValue: keyValue }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -217,6 +215,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>';
                             }

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

@@ -957,7 +957,10 @@
     <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" />
     <Content Include="Areas\EducationalAdministration\Views\JournalSend\IndexOfDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\LeaveSchoolA\Form.js" />
@@ -7322,6 +7325,9 @@
     <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" />
+    <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/FillinFromBLL.cs

@@ -121,5 +121,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         #endregion
 
+
+        #region 扩展数据
+        /// <summary>
+        /// 获取CdMajor表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public FillinFromEntity GetFillInNo(string keyValue)
+        {
+            try
+            {
+                return fillinFromService.GetFillInNo(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        #endregion
     }
 }

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

@@ -14,66 +14,81 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
     public class FillinFromEntity 
     {
         #region 实体成员
-        /// <summary>
-        /// 主键
-        /// </summary>
+        /// <summary> 
+        /// 主键 
+        /// </summary> 
         [Column("ID")]
         public string Id { get; set; }
-        /// <summary>
-        /// 工作模块
-        /// </summary>
+        /// <summary> 
+        /// 工作模块 
+        /// </summary> 
         [Column("WORDERMODULE")]
         public string WorderModule { get; set; }
-        /// <summary>
-        /// 序号
-        /// </summary>
+        /// <summary> 
+        /// 序号 
+        /// </summary> 
         [Column("SERIALNO")]
         public string SerialNo { get; set; }
-        /// <summary>
-        /// 项目名称
-        /// </summary>
+        /// <summary> 
+        /// 项目名称 
+        /// </summary> 
         [Column("PROJECTNAME")]
         public string ProjectName { get; set; }
-        /// <summary>
-        /// 公式
-        /// </summary>
+        /// <summary> 
+        /// 数1 
+        /// </summary> 
         [Column("FORMULA")]
-        public string Formul { get; set; }
-        /// <summary>
-        /// 结果
-        /// </summary>
+        public string Formula { get; set; }
+        /// <summary> 
+        /// 结果 
+        /// </summary> 
         [Column("LASTRESULT")]
         public string LastResult { get; set; }
-        /// <summary>
-        /// 填报周期
-        /// </summary>
+        /// <summary> 
+        /// 填报周期 
+        /// </summary> 
         [Column("FILLINGCYCLE")]
         public string FillingCycle { get; set; }
-        /// <summary>
-        /// 填报时间
-        /// </summary>
+        /// <summary> 
+        /// 填报时间 
+        /// </summary> 
         [Column("FILLINGTIME")]
         public string FillingTime { get; set; }
-        /// <summary>
-        /// 填报部门
-        /// </summary>
+        /// <summary> 
+        /// 填报部门 
+        /// </summary> 
         [Column("FILLINGDEPT")]
         public string FillingDept { get; set; }
-        /// <summary>
-        /// 填报人
-        /// </summary>
+        /// <summary> 
+        /// 填报人 
+        /// </summary> 
         [Column("FILLINGPEOPLE")]
         public string FillingPeople { get; set; }
-        /// <summary>
-        /// 状态 0:草稿 1待指派部门 2待填写公式 3 已完成
-        /// </summary>
+        /// <summary> 
+        /// 提交人 
+        /// </summary> 
+        [Column("LRPEOPLE")]
+        public string lrPeople { get; set; }
+        /// <summary> 
+        /// 录入时间 
+        /// </summary> 
+        [Column("LRTIME")]
+        public DateTime? lrTime { get; set; }
+        /// <summary> 
+        /// 状态 0:草稿 1待指派部门 2待填写公式 3 已完成 
+        /// </summary> 
         [Column("STATE")]
         public int? State { get; set; }
-        /// <summary>
-        /// Demo
-        /// </summary>
+        /// <summary> 
+        /// Demo 
+        /// </summary> 
         [Column("DEMO")]
         public string Demo { get; set; }
+        /// <summary> 
+        /// 隐藏/撤下 
+        /// </summary> 
+        [Column("ISFLAG")]
+        public int? IsFlag { get; set; }
         #endregion
 
         #region 扩展操作

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

@@ -27,6 +27,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <returns></returns>
         FillinFromEntity GetFillinFromEntity(string keyValue);
+
+
+        /// <summary>
+        /// 获取表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        FillinFromEntity GetFillInNo(string keyValue);
         #endregion
 
         #region 提交数据

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

@@ -43,7 +43,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.FillingDept,
                 t.FillingPeople,
                 t.Demo,
-                t.State
+                t.State,
+                t.lrPeople, 
+                t.lrTime,
+                t.IsFlag
                 ");
                 strSql.Append("  FROM FillinFrom t ");
                 strSql.Append("  WHERE 1=1 ");
@@ -62,20 +65,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
                 if (!queryParam["FillingCycle"].IsEmpty())
                 {
-                    dp.Add("FillingCycle",queryParam["FillingCycle"].ToString(), DbType.String);
+                    dp.Add("FillingCycle", queryParam["FillingCycle"].ToString(), DbType.String);
                     strSql.Append(" AND t.FillingCycle = @FillingCycle ");
                 }
-                if (!queryParam["State"].IsEmpty())
-                {
-                    dp.Add("State", "%" + queryParam["State"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.State Like @State ");
-                }
                 if (!queryParam["FillingPeople"].IsEmpty())
                 {
-                    dp.Add("FillingPeople",queryParam["FillingPeople"].ToString(), DbType.String);
+                    dp.Add("FillingPeople", queryParam["FillingPeople"].ToString(), DbType.String);
                     strSql.Append(" AND t.FillingPeople = @FillingPeople ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<FillinFromEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<FillinFromEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -126,7 +124,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<FillinFromEntity>(t=>t.Id == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<FillinFromEntity>(t => t.Id == keyValue);
             }
             catch (Exception ex)
             {
@@ -176,5 +174,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         #endregion
 
+        #region 扩展数据
+
+        /// <summary>
+        /// 获取CdMajor表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public FillinFromEntity GetFillInNo(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<FillinFromEntity>(x => x.Id == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        #endregion
     }
 }