【增加】资助-奖学金：学生可以发起申请；

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

@@ -87,7 +87,35 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 表单页【学生】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormOfStudent()
+        {
+            var logUser = LoginUserInfo.Get();
+            var stuinfo = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(logUser.account);
+            ViewBag.StuNo = stuinfo?.StuNo;
+            ViewBag.StuName = stuinfo?.StuName;
+            ViewBag.DeptNo = stuinfo?.DeptNo;
+            ViewBag.ClassNo = stuinfo?.ClassNo;
+            ViewBag.IdentityCardNo = stuinfo?.IdentityCardNo;
+            ViewBag.OpenBank = stuinfo?.DepositBank;
+            ViewBag.OpenAccount = stuinfo?.BankCard;
+
+            return View();
+        }
 
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexInStuScoreOfStudent()
+        {
+            return View();
+        }
 
         #endregion
 
@@ -204,6 +232,30 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success(result);
         }
 
+        /// <summary>
+        /// 获取班级成绩列表
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetScoreRankByStuNo(string queryJson)
+        {
+            var param = queryJson.ToObject<StuScoreEntity>();
+            var logUser = LoginUserInfo.Get();
+            var stuinfo = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(logUser.account);
+
+            var data = stuScoreIBLL.GetScoreListByStuNo(param.AcademicYearNo, param.Semester, logUser.account, stuinfo?.ClassNo);
+
+            var result = new List<Dictionary<string, string>>();
+            var aaa = new Dictionary<string, string>();
+            aaa.Add("Rank", data.Rank.ToString());
+            aaa.Add("TotalNum", data.TotalNum.ToString());
+            aaa.Add("TotalScore", data.TotalScore.ToString());
+            result.Add(aaa);
+
+            return Success(result);
+        }
+
         /// <summary>
         /// 获取表单数据
         /// </summary>

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

@@ -0,0 +1,105 @@
+@{
+    ViewBag.Title = "校级奖学金";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<script type="text/javascript">
+    var StuNo = "@ViewBag.StuNo";
+    var StuName = "@Html.Raw(ViewBag.StuName)";
+    var DeptNo = "@ViewBag.DeptNo";
+    var ClassNo = "@ViewBag.ClassNo";
+    var IdentityCardNo = "@ViewBag.IdentityCardNo";
+    var OpenBank = "@ViewBag.OpenBank";
+    var OpenAccount = "@ViewBag.OpenAccount";
+</script>
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
+        <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly style="width: 90%;float: left;" />
+        <a id="lr_select" class="btn btn-primary" style="float: left; margin-left: 8px;padding:3px 6px;">选择成绩</a>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
+        <input id="StuNo" type="text" class="form-control" readonly isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">所属院系</div>
+        <div id="DeptNo" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">所属班级</div>
+        <div id="ClassNo" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">身份证件类型<font face="宋体">*</font></div>
+        <div id="IdCardType" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">身份证件号</div>
+        <input id="IdCard" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">学年</div>
+        <input id="AcademicYearNo" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">学期</div>
+        <input id="Semester" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">班级总人数<font face="宋体">*</font></div>
+        <input id="CalssNum" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">成绩排名名次<font face="宋体">*</font></div>
+        <input id="ClassRank" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">开户银行</div>
+        <div id="DepositBank" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">开户行账号</div>
+        <input id="BankCard" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">开户行号</div>
+        <input id="BankCode" type="text" class="form-control" value="20230307230" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">资助等级<font face="宋体">*</font></div>
+        <div id="FundingLevel" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">资助标准<font face="宋体">*</font></div>
+        <input id="FundingCriteria" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">应发金额<font face="宋体">*</font></div>
+        <input id="ShoudAmount" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">实发金额<font face="宋体">*</font></div>
+        <input id="ActualAmount" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">申请日期</div>
+        <input id="ApplyDate" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">发放日期<font face="宋体">*</font></div>
+        <input id="ProvideDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#ProvideDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">申请理由<font face="宋体">*</font></div>
+        <textarea id="ApplyAccount" class="form-control" style="height:50px;" isvalid="yes" checkexpession="NotNull"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height: 50px;" isvalid="yes" checkexpession="LenStrOrNull" length="100" placeholder="字符长度最多为100位"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" id="FilesDiv" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">附件</div>
+        <div id="Url"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/SchoolLevelScholarship/FormOfStudent.js")

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

@@ -0,0 +1,115 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-03-16 11:49
+ * 描  述：校级奖学金
+ */
+var acceptClick;
+var bindData;
+var keyValue = request('keyValue');
+var Step = request('Step');//第几步
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.hide();
+            page.bind();
+            page.initData();
+        },
+        hide: function () {
+            if (Step == "2") {//第二步：二级学院审核，时附件显示且必填；
+                $('#FilesDiv').show();
+                $('#Url').attr('isvalid', 'yes');
+                $('#Url').attr('checkexpession', 'NotNull');
+                $('#Url').prev().html('附件<font face="宋体">*</font>');
+            } else {
+                $('#Url').removeAttr('isvalid');
+                $('#Url').removeAttr('checkexpession');
+                $('#Url').prev().html('附件');
+                $('#FilesDiv').hide();
+            }
+        },
+        bind: function () {
+            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            $('#IdCardType').lrDataItemSelect({ code: 'IdCardType' });
+            $('#IdCardType').lrselectSet("01");
+            $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' });
+            $('#FundingLevel').lrDataItemSelect({
+                code: 'SchoolFundingLevel',
+                select: function (item) {
+                    if (!!item) {
+                        $('#FundingCriteria').val(item.id);
+                        $('#ShoudAmount').val(item.id);
+                        $('#ActualAmount').val(item.id);
+                    }
+                }
+            });
+            $('#ApplyDate').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
+            $('#Url').lrUploader();
+            //根据登录用户自动带出内容：姓名 院系 班级 身份证件号 开户银行 开户卡账号
+            var timer = setTimeout(function () {
+                $("#StuNo").val(StuNo);
+                $("#StuName").val(StuName);
+                $("#DeptNo").lrselectSet(DeptNo);
+                $("#ClassNo").lrselectSet(ClassNo);
+                $("#IdCard").val(IdentityCardNo);
+                $("#DepositBank").lrselectSet(OpenBank);
+                $("#BankCard").val(OpenAccount);
+                clearTimeout(timer);
+            }, 10);
+            //选择成绩
+            $("#lr_select").on('click', function () {
+                learun.layerForm({
+                    id: 'StuDentSelect',
+                    title: '选择学生成绩',
+                    url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/IndexInStuScoreOfStudent',
+                    width: 1200,
+                    height: 800,
+                    callBack: function (id) {
+                        return top[id].acceptClick(bindData);
+                    }
+                });
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/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]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    bindData = function (data) {
+        if (!!data) {
+            $('#AcademicYearNo').val(data.AcademicYearNo);
+            $('#Semester').val(data.Semester);
+            $('#CalssNum').val(data.TotalNum);
+            $('#ClassRank').val(data.Rank);
+        }
+    };
+    page.init();
+}

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

@@ -0,0 +1,111 @@
+@{ ViewBag.Title = "全院班级成绩查看"; Layout = "~/Views/Shared/_Index.cshtml"; }
+<style>
+    .lr-select {
+        width: 150px;
+    }
+</style>
+<style id="style1" media="print">
+    body,
+    html {
+        font-size: 13px;
+        font-family: "微软雅黑";
+        color: #333;
+        overflow-x: hidden;
+        letter-spacing: 0;
+    }
+
+    ul {
+        margin: 0px;
+        padding: 0px;
+        list-style: none;
+    }
+
+    li {
+        list-style: none;
+    }
+
+    table {
+        border-collapse: collapse;
+    }
+
+    .title ul {
+        overflow: hidden;
+    }
+
+    .title li {
+        width: 33.333333%;
+        float: left;
+        line-height: 24px
+    }
+
+    .tableBox {
+        height: 661px;
+        width: 33%;
+        float: left;
+        margin-left: 0.2%;
+        border: 1px solid #000;
+        box-sizing: border-box;
+    }
+
+        .tableBox:first-child {
+            margin-left: 0
+        }
+
+    .table {
+        padding: 0;
+        width: 100%;
+    }
+
+        .table td {
+            border-top: 1px solid #000;
+            line-height: 21px;
+            letter-spacing: 2px;
+        }
+
+        .table tr:first-child {
+            border-top: 0
+        }
+
+        .table th,
+        .table td {
+            padding: 0px 1px;
+            border-left: 1px solid #000;
+            font-size: 13px;
+        }
+
+            .table th:first-child,
+            .table td:first-child {
+                border-left: 0px solid #000;
+            }
+
+    .print {
+        overflow: hidden;
+        margin-top: 10px;
+    }
+</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="lr-layout-tool-item">
+                        <div id="AcademicYearNo" type="lrselect" class="lr-select"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="Semester" type="lrselect" class="lr-select"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
+                    </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>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexInStuScoreOfStudent.js")

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

@@ -0,0 +1,100 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-06-14 11:02
+ * 描  述：全院班级成绩查看
+ */
+var selectedRow;
+var refreshGirdData;
+var acceptClick;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.bind();
+            page.bindSelect();
+        },
+        bind: function () {
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var p = {};
+                p.AcademicYearNo = $('#AcademicYearNo').lrselectGet();
+                p.Semester = $('#Semester').lrselectGet();
+                if (p.AcademicYearNo == null || p.AcademicYearNo == "") {
+                    learun.alert.warning("请选择学年！");
+                    return;
+                }
+                if (p.Semester == null || p.Semester == "") {
+                    learun.alert.warning("请选择学期！");
+                    return;
+                }
+                page.initGird();
+                page.search(p);
+
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+        },
+        bindSelect: function () {
+            //学年
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetAcademicYearNoData',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学期",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                value: 'value',
+                text: 'text'
+            });
+        },
+        initGird: function () {
+            var headDatas = [
+                { label: '排名', name: 'Rank', width: 100, align: "left" },
+                { label: '班级总人数', name: 'TotalNum', width: 100, align: "left" },
+                { label: '总分', name: 'TotalScore', width: 100, align: "left" },
+            ];
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/GetScoreRankByStuNo',
+                headData: headDatas,
+                mainId: 'StuNo',
+                isPage: false,
+                sidx: 'TotalScore',
+                sord: 'desc',
+                isMultiselect: false
+            });
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        var row = $('#gridtable').jfGridGet('rowdata');
+        if ($.isEmptyObject(row)) {
+            learun.alert.warning("请选择学生！");
+            return false;
+        } 
+
+        row.AcademicYearNo = $('#AcademicYearNo').lrselectGet();
+        row.Semester = $('#Semester').lrselectGet();
+
+        if (!!callBack) {
+            callBack(row);
+            return true;
+        }
+        
+    };
+    page.init();
+}

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

@@ -58,8 +58,16 @@
                 <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_view" class="btn btn-default"><i class="fa fa-eye"></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/IndexOfStudent.js

@@ -99,6 +99,76 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/FormOfStudent',
+                    width: 1100,
+                    height: 700,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').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.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/FormOfStudent?keyValue=' + keyValue,
+                        width: 1100,
+                        height: 700,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').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.deleteForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 提交二级学院审核
+            $('#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();
+                            });
+                        }
+                    });
+                }
+            });
             // 查看
             $('#lr_view').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
@@ -279,7 +349,6 @@ var bootstrap = function ($, learun) {
             param.EndTimeRelease = endTimeRelease;
             if (learun.clientdata.get(['userinfo']).account.toLowerCase() != "system") {
                 param.StuNo = learun.clientdata.get(['userinfo']).account;//学生学号
-                param.Status = 3;
             }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }

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

@@ -1033,7 +1033,9 @@
     <Content Include="Areas\EducationalAdministration\Views\LessonInfoOfElectiveOnline\SetIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\LessonInfoOfElectiveOnline\StudentIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\PsychologyInfo\FormView.js" />
+    <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\FormOfStudent.js" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\FormView.js" />
+    <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexInStuScoreOfStudent.js" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexOfStudent.js" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexOfThree.js" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexOfTwo.js" />
@@ -8311,6 +8313,8 @@
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\IndexCenter.cshtml" />
     <Content Include="Areas\StudentWork\Views\FamilyEconomy\FormOfStudent.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\FormOfStudent.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\FormOfStudent.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexInStuScoreOfStudent.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/SchoolLevelScholarshipService.cs

@@ -33,7 +33,9 @@ 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 ClassInfo c on t.CreateUserNo=c.ClassTutorNo and s.ClassNo=c.ClassNo ");
+                strSql.Append(" left join ClassInfo c on s.ClassNo=c.ClassNo ");
                 strSql.Append(" left join CdDept d on c.DeptNo=d.DeptNo ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs

@@ -877,6 +877,7 @@ where AcademicYearNo='" + strAcademicYear + "' and Semester='" + strSemester + "
                     var rank = aaa.Select(x => x.StuNo).ToList().IndexOf(stuNo);
                     var totalScore = aaa.FirstOrDefault(x => x.StuNo == stuNo)?.Score;
 
+                    result.TotalNum = aaa.Count();
                     result.Rank = rank + 1;
                     result.TotalScore = totalScore.Value;
                 }
@@ -909,6 +910,10 @@ where AcademicYearNo='" + strAcademicYear + "' and Semester='" + strSemester + "
             /// 综合成绩
             /// </summary>
             public decimal TotalScore { get; set; }
+            /// <summary>
+            /// 班级总人数
+            /// </summary>
+            public int TotalNum { get; set; }
         }
 
         /// <summary>