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

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

@@ -17,6 +17,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
     {
         private StuFellowshipIBLL stuFellowshipIBLL = new StuFellowshipBLL();
         private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL();
+        private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
 
         #region 视图功能
 
@@ -96,6 +97,25 @@ 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();
+        }
         #endregion
 
         #region 获取数据

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

@@ -0,0 +1,93 @@
+@{
+    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-6 lr-form-item" data-table="StuFellowship" style="display:none;">
+        <div class="lr-form-item-title">助学金类型</div>
+        <input id="Types" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
+        <input id="StuNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">姓名</div>
+        <input id="StuName" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">院系</div>
+        <div id="DeptNo" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">班级</div>
+        <div id="ClassNo" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <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="StuFellowship">
+        <div class="lr-form-item-title">身份证件号</div>
+        <input id="IdentityCardNo" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">开户银行</div>
+        <div id="OpenBank" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">开户卡账号</div>
+        <input id="OpenAccount" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">开户行号<font face="宋体">*</font></div>
+        <input id="OpenBankNo" type="text" class="form-control" value="20230307230" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">资助等级<font face="宋体">*</font></div>
+        <div id="SubsidizeType" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">资助标准<font face="宋体">*</font></div>
+        <input id="FunderNationStandard" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">应发金额<font face="宋体">*</font></div>
+        <input id="AmountPayable" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">实发金额<font face="宋体">*</font></div>
+        <input id="FinalPayingAmount" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">申请日期<font face="宋体">*</font></div>
+        <input id="ApplyDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#ApplyDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">发放日期<font face="宋体">*</font></div>
+        <input id="ReleaseDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#ReleaseDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuFellowship">
+        <div class="lr-form-item-title">申请理由<font face="宋体">*</font></div>
+        <textarea id="ApplyReason" class="form-control" style="height: 100px;" isvalid="yes" checkexpession="NotNull"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuFellowship">
+        <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="StuFellowship">
+        <div class="lr-form-item-title">附件</div>
+        <div id="Files"></div>
+    </div>
+
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuFellowship/FormOfStudent.js")

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

@@ -0,0 +1,142 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-03-13 10:37
+ * 描  述：定制功能助学金
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var Step = request('Step');//第几步
+var Types = request('Types');//助学金类型：1国家助学金，2校级助学金
+if (Types != null && Types != undefined && Types != "") {
+    $('#Types').val(Types);
+}
+
+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();
+                $('#Files').attr('isvalid', 'yes');
+                $('#Files').attr('checkexpession', 'NotNull');
+                $('#Files').prev().html('附件<font face="宋体">*</font>');
+            } else {
+                $('#Files').removeAttr('isvalid');
+                $('#Files').removeAttr('checkexpession');
+                $('#Files').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");
+            $('#OpenBank').lrDataItemSelect({ code: 'DepositBank' });
+            //根据登录用户自动带出内容：姓名 院系 班级 身份证件号 开户银行 开户卡账号
+            var timer = setTimeout(function () {
+                $("#StuNo").val(StuNo);
+                $("#StuName").val(StuName);
+                $("#DeptNo").lrselectSet(DeptNo);
+                $("#ClassNo").lrselectSet(ClassNo);
+                $("#IdentityCardNo").val(IdentityCardNo);
+                $("#OpenBank").lrselectSet(OpenBank);
+                $("#OpenAccount").val(OpenAccount);
+                clearTimeout(timer);
+            }, 10);
+
+            //判断助学金类型：1国家助学金，2校级助学金
+            if (Types == "1") {
+                $('#SubsidizeType').lrDataItemSelect({
+                    code: 'StateStipend',
+                    select: function (item) {
+                        //系统自动带出标准、应发金额和实发金额
+                        if (item != null && item != undefined) {
+                            $("#FunderNationStandard").val(item.id);
+                            $("#FinalPayingAmount").val(item.id);
+                            $("#AmountPayable").val(item.id);
+                        }
+                    }
+                });
+            } else if (Types == "2") {
+                $('#SubsidizeType').lrDataItemSelect({
+                    code: 'SchoolStipend',
+                    select: function (item) {
+                        //系统自动带出标准、应发金额和实发金额
+                        if (item != null && item != undefined) {
+                            $("#FunderNationStandard").val(item.id);
+                            $("#FinalPayingAmount").val(item.id);
+                            $("#AmountPayable").val(item.id);
+                        }
+                    }
+                });
+            }
+
+            //申请时间：默认当天
+            $('#ApplyDate').val(getNowDate());
+            $('#Files').lrUploader();
+
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuFellowship/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]);
+                        }
+                        //判断身份证件类型为空时，默认选择“居民身份证”
+                        if (data[id].IdCardType == null || data[id].IdCardType == "" || data[id].IdCardType == undefined) {
+                            $('#IdCardType').lrselectSet("01");
+                        }
+                    }
+
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('#form').lrValidform()) {
+            return false;
+        }
+        var postData = $('#form').lrGetFormData();
+        var postDatas = {
+            strEntity: JSON.stringify(postData)
+        };
+
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuFellowship/SaveForm?keyValue=' + keyValue, postDatas, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}
+
+//获取当前时间
+function getNowDate() {
+    var myDate = new Date;
+    var year = myDate.getFullYear(); //获取当前年
+    var mon = myDate.getMonth() + 1; //获取当前月
+    var date = myDate.getDate(); //获取当前日
+    var h = myDate.getHours();//获取当前小时数(0-23)
+    var m = myDate.getMinutes();//获取当前分钟数(0-59)
+    var s = myDate.getSeconds();//获取当前秒
+    var week = myDate.getDay();
+    var weeks = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
+    //console.log(year, mon, date, weeks[week])
+    var result = year + "-" + mon + "-" + date;
+    return result;
+}

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

@@ -67,9 +67,15 @@
                     <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">
+                    <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/StuFellowship/IndexOfStudent.js

@@ -108,6 +108,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/StuFellowship/FormOfStudent?Types=' + types,
+                    width: 1000,
+                    height: 600,
+                    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/StuFellowship/FormOfStudent?Types=' + types + '&keyValue=' + keyValue,
+                        width: 1000,
+                        height: 600,
+                        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/StuFellowship/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/StuFellowship/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/Areas/StudentWork/Views/FamilyEconomy/FormOfStudent.cshtml

@@ -13,7 +13,7 @@
 </style>
 <script type="text/javascript">
     var StuNo = "@ViewBag.StuNo";
-    var StuName = "@ViewBag.StuName";
+    var StuName = "@Html.Raw(ViewBag.StuName)";
     var DeptNo = "@ViewBag.DeptNo";
     var ClassNo = "@ViewBag.ClassNo";
     var IdentityCardNo = "@ViewBag.IdentityCardNo";

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

@@ -1038,6 +1038,7 @@
     <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\FormOfStudent.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfStudent.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfThree.js" />
@@ -8309,6 +8310,7 @@
     <Content Include="Areas\AdmissionsPlatform\Views\EnrollmentMajorPlan\SourceIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\IndexCenter.cshtml" />
     <Content Include="Areas\StudentWork\Views\FamilyEconomy\FormOfStudent.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuFellowship\FormOfStudent.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/StuFellowship/StuFellowshipService.cs

@@ -69,7 +69,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 strSql.Append("SELECT t.*,s.StuName,s.DeptNo,s.ClassNo,s.IdentityCardNo,s.IdCardType,s.DepositBank as OpenBank,s.BankCard as OpenAccount ");
                 strSql.Append(" FROM StuFellowship 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();