【修改】校级奖学金；

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

@@ -51,6 +51,24 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 主页面【二级学院】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexOfTwo()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 主页面【学工部】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexOfThree()
+        {
+            return View();
+        }
 
 
         #endregion
@@ -209,11 +227,34 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             SchoolLevelScholarshipEntity entity = strEntity.ToObject<SchoolLevelScholarshipEntity>();
             schoolLevelScholarshipIBLL.SaveEntity(keyValue, entity);
-            if (string.IsNullOrEmpty(keyValue))
-            {
-            }
             return Success("保存成功！");
         }
+
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoSubmit(string keyValue, string status, string step)
+        {
+            schoolLevelScholarshipIBLL.DoSubmit(keyValue, status, step);
+            return Success("操作成功！");
+        }
+        /// <summary>
+        /// 退回
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoBack(string keyValue, string status, string step)
+        {
+            schoolLevelScholarshipIBLL.DoBack(keyValue, status, step);
+            return Success("操作成功！");
+        }
+
         #endregion
 
 

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

@@ -60,10 +60,13 @@
                         <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_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>
                     </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;提交二级学院</a>
+                    </div>
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

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

@@ -131,7 +131,24 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-
+            // 提交二级学院审核
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != "0") {
+                        learun.alert.warning("当前项不属于草稿状态，无法提交学院审核！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认提交该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/DoSubmit', { keyValue: keyValue, status: '1', step: '1' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
@@ -175,11 +192,11 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "身份证件号", name: "IdCard", width: 100, align: "left"},
-                    { label: "学年", name: "AcademicYearNo", width: 100, align: "left" },
-                    { label: "学期", name: "Semester", width: 100, align: "left" },
+                    { label: "学年", name: "AcademicYearNo", width: 50, align: "left" },
+                    { label: "学期", name: "Semester", width: 50, align: "left" },
                     { label: "成绩排名总人数", name: "CalssNum", width: 100, align: "left"},
                     { label: "成绩排名名次", name: "ClassRank", width: 100, align: "left"},
-                    { label: "资助等级", name: "FundingLevel", width: 100, align: "left",
+                    { label: "资助等级", name: "FundingLevel", width: 70, align: "left",
                         formatterAsync: function (callback, value, row, op,$cell) {
                              learun.clientdata.getAsync('dataItem', {
                                  key: value,
@@ -189,9 +206,9 @@ var bootstrap = function ($, learun) {
                                  }
                              });
                         }},
-                    { label: "资助标准", name: "FundingCriteria", width: 100, align: "left"},
-                    { label: "应发金额", name: "ShoudAmount", width: 100, align: "left"},
-                    { label: "实发金额", name: "ActualAmount", width: 100, align: "left"},
+                    { label: "资助标准", name: "FundingCriteria", width: 70, align: "left"},
+                    { label: "应发金额", name: "ShoudAmount", width: 70, align: "left"},
+                    { label: "实发金额", name: "ActualAmount", width: 70, align: "left"},
                     {
                         label: "申请日期", name: "ApplyDate", width: 100, align: "left",
                         formatter: function (cellvalue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfThree.cshtml

@@ -0,0 +1,73 @@
+@{
+    ViewBag.Title = "校级奖学金";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<style>
+    .datesearchLabel {
+        float: left;
+        line-height: 28px;
+        height: 40px;
+        padding-top: 13px;
+        padding-left: 5px;
+    }
+
+        .datesearchLabel:first-child {
+            padding-left: 0px;
+        }
+</style>
+<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="datesearchLabel">申请</div>
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></div>
+                    </div>
+                    <div class="datesearchLabel">发放</div>
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearchRelease"></div>
+                    </div>
+                    <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>
+                                    <div id="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">所属班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">身份证件号</div>
+                                    <input id="IdCard" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">资助等级</div>
+                                    <div id="FundingLevel"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">开户行账号</div>
+                                    <input id="BankCard" type="text" class="form-control" />
+                                </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_submit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;归档</a>
+                        <a id="lr_back" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;退回辅导员</a>
+                        <a id="lr_backTwo" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;退回二级学院</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfThree.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfThree.js

@@ -0,0 +1,301 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-03-16 11:49
+ * 描  述：校级奖学金
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var startTime;
+    var endTime;
+    var startTimeRelease;
+    var endTimeRelease;
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            $('#datesearchRelease').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTimeRelease = begin;
+                    endTimeRelease = end;
+                    page.search();
+                }
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 250, 400);
+            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj',value: 'classno',text: 'classname' });
+            $('#FundingLevel').lrDataItemSelect({ code: 'StateStipend' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 归档
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != "2") {
+                        learun.alert.warning("当前项不属于学工部审核状态，无法提交归档！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认归档该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/DoSubmit', { keyValue: keyValue, status: '3', step: '3' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 退回辅导员
+            $('#lr_back').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != "2") {
+                        learun.alert.warning("当前项不属于学工部审核状态，无法退回辅导员！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认退回该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/DoBack', { keyValue: keyValue, status: '0', step: '3' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 退回二级学院
+            $('#lr_backTwo').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != "2") {
+                        learun.alert.warning("当前项不属于学工部审核状态，无法退回二级学院！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认退回该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/DoBack', { keyValue: keyValue, status: '1', step: '3' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/GetPageList',
+                headData: [
+                    { label: "学号", name: "StuNo", width: 100, align: "left"},
+                    { label: "姓名", name: "StuName", width: 100, align: "left"},
+                    { label: "所属院系", name: "DeptNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                 key: value,
+                                 keyId: 'deptno',
+                                 callback: function (_data) {
+                                     callback(_data['deptname']);
+                                 }
+                             });
+                        }},
+                    { label: "所属班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                 key: value,
+                                 keyId: 'classno',
+                                 callback: function (_data) {
+                                     callback(_data['classname']);
+                                 }
+                             });
+                        }},
+                    {
+                        label: "身份证件类型", name: "IdCardType", width: 100, align: "left"
+                        , formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'IdCardType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "身份证件号", name: "IdCard", width: 100, align: "left"},
+                    { label: "学年", name: "AcademicYearNo", width: 50, align: "left" },
+                    { label: "学期", name: "Semester", width: 50, align: "left" },
+                    { label: "成绩排名总人数", name: "CalssNum", width: 100, align: "left"},
+                    { label: "成绩排名名次", name: "ClassRank", width: 100, align: "left"},
+                    { label: "资助等级", name: "FundingLevel", width: 70, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('dataItem', {
+                                 key: value,
+                                 code: 'SchoolFundingLevel',
+                                 callback: function (_data) {
+                                     callback(_data.text);
+                                 }
+                             });
+                        }},
+                    { label: "资助标准", name: "FundingCriteria", width: 70, align: "left"},
+                    { label: "应发金额", name: "ShoudAmount", width: 70, align: "left"},
+                    { label: "实发金额", name: "ActualAmount", width: 70, align: "left"},
+                    {
+                        label: "申请日期", name: "ApplyDate", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: "发放日期", name: "ProvideDate", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    { label: "申请理由", name: "ApplyAccount", width: 100, align: "left"},
+                    {
+                        label: "开户银行", name: "DepositBank", width: 100, align: "left"
+                        , formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'DepositBank',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "开户行账号", name: "BankCard", width: 100, align: "left"},
+                    { label: "开户行号", name: "BankCode", width: 100, align: "left"},
+                    { label: "备注说明", name: "Remark", width: 100, align: "left" },
+                    {
+                        label: '审核状态', name: 'Status', width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "0" ? "<span class=\"label label-default\">草稿</span>" : cellvalue == "1" ? "<span class=\"label label-success\">学院审核中</span>" : cellvalue == "2" ? "<span class=\"label label-success\">学工部审核中</span>" : cellvalue == "3" ? "<span class=\"label label-success\">已归档</span>" : "<span class=\"label label-default\">草稿</span>";
+                        }
+                    },
+                    {
+                        label: '创建人', name: 'CreateUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '创建时间', name: 'CreateTime', width: 130, align: "left" },
+                    { label: '提交时间', name: 'SubmitTime', width: 130, align: "left" },
+                    {
+                        label: '提交人', name: 'SubmitUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '学院审核人', name: 'FirstCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '学院审核时间', name: 'FirstCheckTime', width: 130, align: "left" },
+                    {
+                        label: '学工部审核人', name: 'SecondCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '学工部审核时间', name: 'SecondCheckTime', width: 130, align: "left" },
+                ],
+                mainId:'Id',
+                isPage: true,
+                sidx: 'FirstCheckTime desc'
+            });
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
+            param.StartTimeRelease = startTimeRelease;
+            param.EndTimeRelease = endTimeRelease;
+            param.Step = "3";//第三步：学工部审核
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfTwo.cshtml

@@ -0,0 +1,75 @@
+@{
+    ViewBag.Title = "校级奖学金";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<style>
+    .datesearchLabel {
+        float: left;
+        line-height: 28px;
+        height: 40px;
+        padding-top: 13px;
+        padding-left: 5px;
+    }
+
+        .datesearchLabel:first-child {
+            padding-left: 0px;
+        }
+</style>
+<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="datesearchLabel">申请</div>
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></div>
+                    </div>
+                    <div class="datesearchLabel">发放</div>
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearchRelease"></div>
+                    </div>
+                    <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>
+                                    <div id="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">所属班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">身份证件号</div>
+                                    <input id="IdCard" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">资助等级</div>
+                                    <div id="FundingLevel"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">开户行账号</div>
+                                    <input id="BankCard" type="text" class="form-control" />
+                                </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_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;审核</a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;提交学工部</a>
+                        <a id="lr_back" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;退回辅导员</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfTwo.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfTwo.js

@@ -0,0 +1,304 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-03-16 11:49
+ * 描  述：校级奖学金
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var startTime;
+    var endTime;
+    var startTimeRelease;
+    var endTimeRelease;
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            $('#datesearchRelease').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTimeRelease = begin;
+                    endTimeRelease = end;
+                    page.search();
+                }
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 250, 400);
+            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj',value: 'classno',text: 'classname' });
+            $('#FundingLevel').lrDataItemSelect({ code: 'StateStipend' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != "1") {
+                        learun.alert.warning("当前项不属于学院审核状态，无法编辑！");
+                        return false;
+                    }
+                    learun.layerForm({
+                        id: 'formOfTwo',
+                        title: '审核',
+                        url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/Form?Step=2&keyValue=' + keyValue,
+                        width: 1100,
+                        height: 700,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 提交学工部审核
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != "1") {
+                        learun.alert.warning("当前项不属于学院审核状态，无法提交学工部审核！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认提交该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/DoSubmit', { keyValue: keyValue, status: '2', step: '2' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 退回辅导员
+            $('#lr_back').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != "1") {
+                        learun.alert.warning("当前项不属于学院审核状态，无法退回辅导员！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认退回该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/DoBack', { keyValue: keyValue, status: '0', step: '2' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/GetPageList',
+                headData: [
+                    { label: "学号", name: "StuNo", width: 100, align: "left"},
+                    { label: "姓名", name: "StuName", width: 100, align: "left"},
+                    { label: "所属院系", name: "DeptNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                 key: value,
+                                 keyId: 'deptno',
+                                 callback: function (_data) {
+                                     callback(_data['deptname']);
+                                 }
+                             });
+                        }},
+                    { label: "所属班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                 key: value,
+                                 keyId: 'classno',
+                                 callback: function (_data) {
+                                     callback(_data['classname']);
+                                 }
+                             });
+                        }},
+                    {
+                        label: "身份证件类型", name: "IdCardType", width: 100, align: "left"
+                        , formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'IdCardType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "身份证件号", name: "IdCard", width: 100, align: "left"},
+                    { label: "学年", name: "AcademicYearNo", width: 50, align: "left" },
+                    { label: "学期", name: "Semester", width: 50, align: "left" },
+                    { label: "成绩排名总人数", name: "CalssNum", width: 100, align: "left"},
+                    { label: "成绩排名名次", name: "ClassRank", width: 100, align: "left"},
+                    { label: "资助等级", name: "FundingLevel", width: 70, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('dataItem', {
+                                 key: value,
+                                 code: 'SchoolFundingLevel',
+                                 callback: function (_data) {
+                                     callback(_data.text);
+                                 }
+                             });
+                        }},
+                    { label: "资助标准", name: "FundingCriteria", width: 70, align: "left"},
+                    { label: "应发金额", name: "ShoudAmount", width: 70, align: "left"},
+                    { label: "实发金额", name: "ActualAmount", width: 70, align: "left"},
+                    {
+                        label: "申请日期", name: "ApplyDate", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: "发放日期", name: "ProvideDate", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    { label: "申请理由", name: "ApplyAccount", width: 100, align: "left"},
+                    {
+                        label: "开户银行", name: "DepositBank", width: 100, align: "left"
+                        , formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'DepositBank',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "开户行账号", name: "BankCard", width: 100, align: "left"},
+                    { label: "开户行号", name: "BankCode", width: 100, align: "left"},
+                    { label: "备注说明", name: "Remark", width: 100, align: "left" },
+                    {
+                        label: '审核状态', name: 'Status', width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "0" ? "<span class=\"label label-default\">草稿</span>" : cellvalue == "1" ? "<span class=\"label label-success\">学院审核中</span>" : cellvalue == "2" ? "<span class=\"label label-success\">学工部审核中</span>" : cellvalue == "3" ? "<span class=\"label label-success\">已归档</span>" : "<span class=\"label label-default\">草稿</span>";
+                        }
+                    },
+                    {
+                        label: '创建人', name: 'CreateUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '创建时间', name: 'CreateTime', width: 130, align: "left" },
+                    { label: '提交时间', name: 'SubmitTime', width: 130, align: "left" },
+                    {
+                        label: '提交人', name: 'SubmitUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '学院审核人', name: 'FirstCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '学院审核时间', name: 'FirstCheckTime', width: 130, align: "left" },
+                    {
+                        label: '学工部审核人', name: 'SecondCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '学工部审核时间', name: 'SecondCheckTime', width: 130, align: "left" },
+                ],
+                mainId:'Id',
+                isPage: true,
+                sidx: 'SubmitTime desc'
+            });
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
+            param.StartTimeRelease = startTimeRelease;
+            param.EndTimeRelease = endTimeRelease;
+            param.Step = "2";//第二步：二级学院审核
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

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

@@ -996,6 +996,8 @@
     <Content Include="Areas\EducationalAdministration\Views\CdMajor\FormProvince.js" />
     <Content Include="Areas\EducationalAdministration\Views\CdMajor\IndexProvince.js" />
     <Content Include="Areas\EducationalAdministration\Views\PsychologyInfo\FormView.js" />
+    <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexOfThree.js" />
+    <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexOfTwo.js" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexInStuScore.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfStudent.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfThree.js" />
@@ -8130,6 +8132,8 @@
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfTwo.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfThree.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfStudent.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexOfTwo.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexOfThree.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipBLL.cs

@@ -119,6 +119,53 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DoSubmit(string keyValue, string status, string step)
+        {
+            try
+            {
+                schoolLevelScholarshipService.DoSubmit(keyValue, status, step);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 退回
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DoBack(string keyValue, string status, string step)
+        {
+            try
+            {
+                schoolLevelScholarshipService.DoBack(keyValue, status, step);
+            }
+            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/SchoolLevelScholarship/SchoolLevelScholarshipIBLL.cs

@@ -42,6 +42,20 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         void SaveEntity(string keyValue, SchoolLevelScholarshipEntity entity);
+
+
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DoSubmit(string keyValue, string status, string step);
+
+        /// <summary>
+        /// 退回
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DoBack(string keyValue, string status, string step);
+
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipService.cs

@@ -33,6 +33,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 strSql.Append("SELECT t.* ");
                 strSql.Append("  FROM SchoolLevelScholarship t ");
                 strSql.Append(" left join StuInfoBasic s on t.StuNo=s.StuNo ");
+                strSql.Append(" left join ClassInfo c on t.CreateUserNo=c.ClassTutorNo and s.ClassNo=c.ClassNo ");
+                strSql.Append(" left join CdDept d on c.DeptNo=d.DeptNo ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
@@ -79,6 +81,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("BankCard", "%" + queryParam["BankCard"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.BankCard Like @BankCard ");
                 }
+                if (!queryParam["Step"].IsEmpty() && queryParam["Step"].ToString() == "2")//第二步：二级学院审核
+                {
+                    //不查看状态为草稿的记录
+                    strSql.Append(" AND t.Status > 0 ");
+                    //二级学院审核专员==系部负责人==登录用户
+                    strSql.Append($" and d.DeptDirector='{LoginUserInfo.Get().account}' ");
+                }
+                if (!queryParam["Step"].IsEmpty() && queryParam["Step"].ToString() == "3")//第三步：学工部审核
+                {
+                    //不查看状态为学工部审核之前的记录
+                    strSql.Append(" AND t.Status > 1 ");
+                }
+                if (!queryParam["Status"].IsEmpty())
+                {
+                    dp.Add("Status", queryParam["Status"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Status = @Status ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<SchoolLevelScholarshipEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
@@ -178,6 +197,73 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DoSubmit(string keyValue, string status, string step)
+        {
+            try
+            {
+                if (step == "1")//第一步：提交二级学院审核
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update SchoolLevelScholarship set SubmitTime='{DateTime.Now}',SubmitUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
+                }
+                else if (step == "2")//第二步：提交学工部审核
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update SchoolLevelScholarship set FirstCheckTime='{DateTime.Now}',FirstCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
+                }
+                else if (step == "3")//第三步：归档
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update SchoolLevelScholarship set SecondCheckTime='{DateTime.Now}',SecondCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
+                }
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 退回
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DoBack(string keyValue, string status, string step)
+        {
+            try
+            {
+                if (step == "2")//第二步：退回辅导员
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update SchoolLevelScholarship set FirstCheckTime='{DateTime.Now}',FirstCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
+                }
+                else if (step == "3")//第三步：退回辅导员、退回二级学院
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update SchoolLevelScholarship set SecondCheckTime='{DateTime.Now}',SecondCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
+                }
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
     }