分化填报周期

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

@@ -1,58 +0,0 @@
-@{
-    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-6 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>
-                </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_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;添加</a>
-                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
-                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-                        <a id="lr_cancel" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;撤回</a>
-                        <a id="lr_formula" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;设置公式</a>
-                        <a id="lr_cycle" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;设置周期</a>
-                        <a id="lr_people" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;设置填报人</a>
-                        <a id="lr_hide" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;隐藏</a>
-                        <a id="lr_import" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;导入</a>
-                    </div>
-                </div>
-            </div>
-            <div class="lr-layout-body" id="gridtable"></div>
-        </div>
-    </div>
-</div>
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/FillinFrom/CycleIndex.js")

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

@@ -1,250 +0,0 @@
-/* * 版 本 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.layerConfirm('是否确认提交该项！', function (res) {
-                        if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Repair/DoSubmit', { keyValue: keyValue }, function () {
-                                refreshGirdData();
-                            });
-                        }
-                    });
-                }
-            });
-            //设置周期
-            $('#lr_cycle').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                if (learun.checkrow(keyValue)) {
-                    var RStatus = $('#gridtable').jfGridValue('State');
-                    if (RStatus !== 0) {
-                        learun.alert.warning("当前项不能设置周期！");
-                        return false;
-                    }
-                    learun.layerForm({
-                        id: 'form',
-                        title: '设置周期',
-                        //url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/FormCycle?keyValue='+keyValue,
-                        url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/FormCycle?keyValue=' + keyValue,
-                        width: 500,
-                        height: 400,
-                        callBack: function (id) {
-                            return top[id].acceptClick(refreshGirdData);
-                        }
-                    });
-                }
-            });
-            //设置填报人
-            $('#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');
-                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: "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 if (cellvalue === 3) {
-                                //    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/Form.cshtml

@@ -15,14 +15,18 @@
         <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-12 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">填报部门<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>

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

@@ -15,6 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#FillingTime').lrDataItemSelect({ code: 'CycleTime' });
             $('#FillingCycle').lrDataItemSelect({ code: 'ThisCycle' });
             $('#FillingDept').lrDataSourceSelect({ code: 'classdata',value: 'id',text: 'name' });
             $('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata',value: 'f_userid',text: 'f_realname' });

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

@@ -1,39 +0,0 @@
-@{
-    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-12 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">填报部门<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">填报人<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/FormCycle.js")

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

@@ -1,54 +0,0 @@
-/* * 版 本 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 () {
-            $('#FillingCycle').lrDataItemSelect({ code: 'ThisCycle' });
-            $('#FillingDept').lrDataSourceSelect({ code: 'classdata',value: 'id',text: 'name' });
-            $('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata',value: 'f_userid',text: 'f_realname' });
-        },
-        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.js

@@ -18,6 +18,9 @@ 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();
@@ -122,7 +125,7 @@ var bootstrap = function ($, learun) {
                     learun.layerForm({
                         id: 'form',
                         title: '设置周期',
-                        url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/CycleIndex?keyValue=' + keyValue,
+                        url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/Form?keyValue=' + keyValue,
                         width: 500,
                         height: 400,
                         callBack: function (id) {
@@ -188,6 +191,18 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        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.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromEntity.cs

@@ -50,6 +50,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("FILLINGCYCLE")]
         public string FillingCycle { get; set; }
         /// <summary>
+        /// 填报时间
+        /// </summary>
+        [Column("FILLINGTIME")]
+        public string FillingTime { get; set; }
+        /// <summary>
         /// 填报部门
         /// </summary>
         [Column("FILLINGDEPT")]

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

@@ -39,6 +39,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.Formula,
                 t.LastResult,
                 t.FillingCycle,
+                t.FillingTime,
                 t.FillingDept,
                 t.FillingPeople,
                 t.Demo,