【增加】资助-家庭经济信息：学生可以发起申请；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Controllers/FamilyEconomyController.cs

@@ -18,6 +18,7 @@ namespace Learun.Application.Web.Areas.StudentWork.Controllers
     {
         private FamilyEconomyIBLL familyEconomyIBLL = new FamilyEconomyBLL();
         private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL();
+        private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
 
         #region 视图功能
 
@@ -97,6 +98,23 @@ namespace Learun.Application.Web.Areas.StudentWork.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;
+            
+            return View();
+        }
         #endregion
 
         #region 获取数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/FormOfStudent.cshtml

@@ -0,0 +1,199 @@
+@{
+    ViewBag.Title = "家庭经济信息（辅导员）";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<style>
+    .lr-form-item-title {
+        width: 155px;
+    }
+
+    .lr-form-item {
+        padding-left: 155px;
+    }
+</style>
+<script type="text/javascript">
+    var StuNo = "@ViewBag.StuNo";
+    var StuName = "@ViewBag.StuName";
+    var DeptNo = "@ViewBag.DeptNo";
+    var ClassNo = "@ViewBag.ClassNo";
+    var IdentityCardNo = "@ViewBag.IdentityCardNo";
+</script>
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item">
+        <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">
+        <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">
+        <div class="lr-form-item-title">院系</div>
+        <div id="DeptNo" type="text" class="form-control" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">班级</div>
+        <div id="ClassNo" type="text" class="form-control" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <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">
+        <div class="lr-form-item-title">身份证件类型<font face="宋体">*</font></div>
+        <div id="IdCardType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">申请时间<font face="宋体">*</font></div>
+        <input id="ApplyTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#ApplyTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否低保<font face="宋体">*</font></div>
+        <div id="IsLowIncome" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否孤儿<font face="宋体">*</font></div>
+        <div id="IsOrphan" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否单亲家庭子女<font face="宋体">*</font></div>
+        <div id="IsSingleFamilyChildren" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否残疾人子女<font face="宋体">*</font></div>
+        <div id="IsDisabledChildren" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">本人是否残疾<font face="宋体">*</font></div>
+        <div id="IsDisabled" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">残疾类别</div>
+        <div id="DisabledCategory"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否父母丧失劳动能力<font face="宋体">*</font></div>
+        <div id="IsParentsLoseWork" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否家中有大病患者<font face="宋体">*</font></div>
+        <div id="IsSeriouslyIllPatientInHome" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否脱贫家庭学生<font face="宋体">*</font></div>
+        <div id="IsOvercomePovertyFamilyStudent" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否脱贫不稳定家庭学生<font face="宋体">*</font></div>
+        <div id="IsUnstablePovertyFamilyStudent" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否边缘易致贫家庭学生<font face="宋体">*</font></div>
+        <div id="IsEdgePovertyFamilyStudent" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否边突发严重困难学生<font face="宋体">*</font></div>
+        <div id="IsEdgeAcuteDifficultyStudent" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">是否低收入家庭<font face="宋体">*</font></div>
+        <div id="IsLowIncomeFamily" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">烈士子女<font face="宋体">*</font></div>
+        <div id="IsMartyrChildren" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">家庭人均年收入<font face="宋体">*</font></div>
+        <input id="FamilyAverageIncome" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatintZero" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">家庭主要收入来源类型<font face="宋体">*</font></div>
+        <div id="FamilyIncomeSourceCategory" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">家庭是否遭受自然灾害<font face="宋体">*</font></div>
+        <div id="FamilyIsSufferNaturalDisaster" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">自然灾害具体情况描述</div>
+        <textarea id="SufferNaturalDisasterDescription" style="height:50px;" type="text" class="form-control"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">家庭是否遭受突发意外事件<font face="宋体">*</font></div>
+        <div id="FamilyIsSufferUnexpectEvent" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">突发意外事件具体描述</div>
+        <textarea id="SufferUnexpectEventDescription" style="height:50px;" type="text" class="form-control"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">家庭欠债金额<font face="宋体">*</font></div>
+        <input id="FamilyOwesAmount" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatintZero" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">家庭欠债原因</div>
+        <textarea id="FamilyOwesReason" style="height:50px;" type="text" class="form-control"></textarea>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">家庭人口数<font face="宋体">*</font></div>
+        <input id="FamilyNumber" type="text" class="form-control" isvalid="yes" checkexpession="LenNum" length="2" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">劳动力人口数<font face="宋体">*</font></div>
+        <input id="LaborNumber" type="text" class="form-control" isvalid="yes" checkexpession="LenNum" length="2" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">家庭成员失业人数<font face="宋体">*</font></div>
+        <input id="FamilyUnemployNumber" type="text" class="form-control" isvalid="yes" checkexpession="LenNum" length="2" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">赡养人口数<font face="宋体">*</font></div>
+        <input id="SupportNumber" type="text" class="form-control" isvalid="yes" checkexpession="LenNum" length="2" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">其他信息</div>
+        <textarea id="OtherInformation" style="height:50px;" type="text" class="form-control"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">是否特困供养<font face="宋体">*</font></div>
+        <div id="IsSpecialPovertySupport" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">其他<font face="宋体">*</font></div>
+        <input id="Others" type="text" class="form-control" isvalid="yes" checkexpession="LenStr" length="40" placeholder="填写农村特困供养、农村低保户、建档立卡相关信息，内容不能超过40个字符" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">家庭是否遭受疫情<font face="宋体">*</font></div>
+        <div id="FamilyIsSufferEpidemic" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">家庭遭受疫情具体情况描述</div>
+        <textarea id="SufferEpidemicDescription" style="height:50px;" type="text" class="form-control"></textarea>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">认定困难级别名称</div>
+        <div id="IdentifyDifficultyLevel"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">认定时间</div>
+        <input id="IdentifyTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#IdentifyTime').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">认定原因</div>
+        <input id="IdentifyReason" type="text" class="form-control" isvalid="yes" checkexpession="LenStrOrNull" length="30" placeholder="内容不能超过30个字符，例如“家庭人口众多，劳动力少”" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">班级认定意见</div>
+        <textarea id="ClassIdentifyOpinion" style="height:50px;" type="text" class="form-control"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">年级认定意见</div>
+        <textarea id="GradeIdentifyOpinion" style="height:50px;" type="text" class="form-control"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" id="FilesDiv">
+        <div class="lr-form-item-title">附件</div>
+        <div id="Files"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/StudentWork/Views/FamilyEconomy/FormOfStudent.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/FormOfStudent.js

@@ -0,0 +1,165 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-03-16 17:18
+ * 描  述：家庭经济信息（辅导员）
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var Step = request('Step');//第几步
+
+var bootstrap = function ($, learun) {
+    "use strict";
+    var selectedRow = learun.frameTab.currentIframe().selectedRow;
+    var page = {
+        init: function () {
+            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');
+            //根据登录用户自动带出内容：学号 姓名 院系 班级 身份证件号 
+            var timer = setTimeout(function () {
+                $("#StuNo").val(StuNo);
+                $("#StuName").val(StuName);
+                $("#DeptNo").lrselectSet(DeptNo);
+                $("#ClassNo").lrselectSet(ClassNo);
+                $("#IdentityCardNo").val(IdentityCardNo);
+                clearTimeout(timer);
+            }, 10);
+            
+            //申请时间：默认当天
+            $('#ApplyTime').val(getNowDate());
+            $('#IsLowIncome').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsOrphan').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsSingleFamilyChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsDisabledChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsDisabled').lrDataItemSelect({
+                code: 'YesOrNoBit', select: function(item) {
+                    //“残疾类别”非必填项。若“本人是否残疾”项填“是”，则该项为必填。
+                    if (item != null && item.id == "true") {
+                        $('#DisabledCategory').attr('isvalid', 'yes');
+                        $('#DisabledCategory').attr('checkexpession', 'NotNull');
+                        $('#DisabledCategory').prev().html('残疾类别<font face="宋体">*</font>');
+                    } else {
+                        $('#DisabledCategory').removeAttr('isvalid');
+                        $('#DisabledCategory').removeAttr('checkexpession');
+                        $('#DisabledCategory').prev().html('残疾类别');
+                    }
+                }
+            });
+            $('#DisabledCategory').lrDataItemSelect({ code: 'DisabledCategory' });
+            $('#IsParentsLoseWork').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsSeriouslyIllPatientInHome').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsOvercomePovertyFamilyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsUnstablePovertyFamilyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsEdgePovertyFamilyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsEdgeAcuteDifficultyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsLowIncomeFamily').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsMartyrChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#FamilyIncomeSourceCategory').lrDataItemSelect({ code: 'FamilyIncomeSourceCategory' });
+            $('#FamilyIsSufferNaturalDisaster').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#FamilyIsSufferUnexpectEvent').lrDataItemSelect({
+                code: 'YesOrNoBit', select: function (item) {
+                    //“突发意外事件具体描述”非必填项。若“家庭是否遭受突然意外事件”项填“是”，则该项为必填项。
+                    if (item != null && item.id == "true") {
+                        $('#SufferUnexpectEventDescription').attr('isvalid', 'yes');
+                        $('#SufferUnexpectEventDescription').attr('checkexpession', 'NotNull');
+                        $('#SufferUnexpectEventDescription').prev().html('突发意外事件具体描述<font face="宋体">*</font>');
+                    } else {
+                        $('#SufferUnexpectEventDescription').removeAttr('isvalid');
+                        $('#SufferUnexpectEventDescription').removeAttr('checkexpession');
+                        $('#SufferUnexpectEventDescription').prev().html('突发意外事件具体描述');
+                    }
+                }
+            });
+            $('#IsSpecialPovertySupport').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#FamilyIsSufferEpidemic').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IdentifyDifficultyLevel').lrDataItemSelect({ code: 'DifficultyLevel' });
+            //“家庭遭受疫情具体情况描述”该项如果填写，则“认定时间”、“认定原因”、“认定困难级别名称”也必须同时填写且同时通过校验
+            $('#SufferEpidemicDescription').on('blur', function () {
+                if ($(this).val().trim() != null && $(this).val().trim() != undefined && $(this).val().trim() != "") {
+                    $('#IdentifyDifficultyLevel').attr('isvalid', 'yes');
+                    $('#IdentifyDifficultyLevel').attr('checkexpession', 'NotNull');
+                    $('#IdentifyDifficultyLevel').prev().html('认定困难级别名称<font face="宋体">*</font>');
+                    $('#IdentifyTime').attr('isvalid', 'yes');
+                    $('#IdentifyTime').attr('checkexpession', 'NotNull');
+                    $('#IdentifyTime').prev().html('认定时间<font face="宋体">*</font>');
+                    $('#IdentifyReason').attr('checkexpession', 'LenStr');
+                    $('#IdentifyReason').prev().html('认定原因<font face="宋体">*</font>');
+                } else {
+                    $('#IdentifyDifficultyLevel').removeAttr('isvalid');
+                    $('#IdentifyDifficultyLevel').removeAttr('checkexpession');
+                    $('#IdentifyDifficultyLevel').prev().html('认定困难级别名称');
+                    $('#IdentifyTime').removeAttr('isvalid');
+                    $('#IdentifyTime').removeAttr('checkexpession');
+                    $('#IdentifyTime').prev().html('认定时间');
+                    $('#IdentifyReason').attr('checkexpession', 'LenStrOrNull');
+                    $('#IdentifyReason').prev().html('认定原因');
+                }
+            });
+            $('#Files').lrUploader();
+
+        },
+        initData: function () {
+            if (!!selectedRow) {
+                $('#form').lrSetFormData(selectedRow);
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        //判断：“是否单亲家庭子女”不能同时与“是否孤儿”同时填“是”
+        if ($('#IsOrphan').lrselectGet().toLowerCase() == "true") {
+            if ($('#IsSingleFamilyChildren').lrselectGet().toLowerCase() == "true") {
+                learun.alert.warning("“是否单亲家庭子女”不能同时与“是否孤儿”同时填“是”");
+                return false;
+            }
+        }
+        if (!$('#form').lrValidform()) {
+            return false;
+        }
+
+        var postData = $('#form').lrGetFormData();
+        $.lrSaveForm(top.$.rootUrl + '/StudentWork/FamilyEconomy/SaveForm?keyValue=' + keyValue, postData, 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/StudentWork/Views/FamilyEconomy/IndexOfStudent.cshtml

@@ -105,8 +105,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/StudentWork/Views/FamilyEconomy/IndexOfStudent.js

@@ -89,6 +89,78 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+            // 新增
+            $('#lr_add').on('click', function () {
+                selectedRow = null;
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/StudentWork/FamilyEconomy/FormOfStudent',
+                    width: 1100,
+                    height: 800,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                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 + '/StudentWork/FamilyEconomy/FormOfStudent?keyValue=' + keyValue,
+                        width: 1100,
+                        height: 800,
+                        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 + '/StudentWork/FamilyEconomy/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 + '/StudentWork/FamilyEconomy/DoSubmit', { keyValue: keyValue, status: '1', step: '1' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
             // 查看
             $('#lr_view').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
@@ -381,7 +453,6 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             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

@@ -1776,6 +1776,7 @@
     <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\Index.js" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\SalaryInfo\IndexPersonal.js" />
+    <Content Include="Areas\StudentWork\Views\FamilyEconomy\FormOfStudent.js" />
     <Content Include="Areas\StudentWork\Views\FamilyEconomy\FormView.js" />
     <Content Include="Areas\StudentWork\Views\FamilyEconomy\Form.js" />
     <Content Include="Areas\StudentWork\Views\FamilyEconomy\IndexOfStudent.js" />
@@ -8307,6 +8308,7 @@
     <Content Include="Areas\AdmissionsPlatform\Views\EnrollmentMajorPlanSource\SourceIndex.cshtml" />
     <Content Include="Areas\AdmissionsPlatform\Views\EnrollmentMajorPlan\SourceIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\IndexCenter.cshtml" />
+    <Content Include="Areas\StudentWork\Views\FamilyEconomy\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/StudentWork/FamilyEconomy/FamilyEconomyService.cs

@@ -141,7 +141,9 @@ namespace Learun.Application.TwoDevelopment.StudentWork
                 strSql.Append("SELECT t.*,s.StuName,s.DeptNo,s.ClassNo,s.IdentityCardNo ");
                 strSql.Append(" FROM FamilyEconomy 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 ");
                 if (!queryParam["StuNo"].IsEmpty())