调整新生学费管理，增加新生资助管理

3 yıl önce · a37b0940b0
--- a/V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs
+++ b/V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs
@@ -204,6 +204,34 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
        {
            return View();
        }
        /// <summary>
        /// 完善资助信息
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        public ActionResult IsHelpForm()
        {
            return View();
        }

        /// <summary>
        /// 资助变更
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        public ActionResult HelpChange()
        {
            return View();
        }
        /// <summary>
        /// 新生学费管理
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        public ActionResult StuTuition()
        {
            return View();
        }

        /// <summary>
        /// 是否军训
@@ -793,6 +821,66 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
            return Success("操作成功");
        }

        /// <summary>
        /// 学生学费管理-确认资助
        /// </summary>
        /// <returns></returns>
        [HttpPost]
        [AjaxOnly]
        public ActionResult Support(string keyValue)
        {
            var stuIds = "";
            if (keyValue.Contains(","))
            {
                var keyValueArr = keyValue.Split(',');
                stuIds = string.Join("','", keyValueArr);
            }
            else
            {
                stuIds = keyValue;
            }
            stuEnrollIBLL.Support(stuIds);
            return Success("操作成功");
        }

        /// <summary>
        /// 学生资助管理-完善资助信息
        /// </summary>
        /// <returns></returns>
        [HttpPost]
        [AjaxOnly]
        public ActionResult SupplySupport(string keyValue, string strEntity)
        {
            StuEnrollEntity entity = strEntity.ToObject<StuEnrollEntity>();
            stuEnrollIBLL.SupplySupport(keyValue, entity);
            return Success("保存成功！");
        }

        /// <summary>
        /// 提交资助变更
        /// </summary>
        /// <param name="keyValue"></param>
        /// <returns></returns>
        [HttpPost]
        [AjaxOnly]
        public ActionResult ChangeStatusById(string keyValue, string processId)
        {
            stuEnrollIBLL.ChangeStatusById(keyValue, 1, processId);
            return Success("操作成功！");
        }

        /// <summary>
        /// 学生资助管理-资助变更
        /// </summary>
        /// <returns></returns>
        [HttpPost]
        [AjaxOnly]
        public ActionResult SupportChange(string keyValue, string strEntity)
        {
            StuEnrollEntity entity = strEntity.ToObject<StuEnrollEntity>();
            stuEnrollIBLL.SupportChange(keyValue, entity);
            return Success("保存成功！");
        }
        [HttpPost]
        [AjaxOnly]
        public ActionResult Military(string stuId, bool status, bool payAfter = false)
@@ -1129,7 +1217,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                    name = item.status
                });
            }
            

            var jsonData = new
            {
                legendDataIsReport = legendDataIsReport,
--- a/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/HelpChange.cshtml
+++ b/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/HelpChange.cshtml
@@ -0,0 +1,36 @@
@{
    ViewBag.Title = "新生资助变更";
    Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
    <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
        <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
        <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
    </div>
    <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
        <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
        <div id="ClassNo" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
    </div>
    <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
        <div class="lr-form-item-title">开户银行<font face="宋体">*</font></div>
        <input id="SupportBank" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
    </div>
    <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
        <div class="lr-form-item-title">银行卡号<font face="宋体">*</font></div>
        <input id="SupportBankCard" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
    </div>
    <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
        <div class="lr-form-item-title">金额<font face="宋体">*</font></div>
        <input id="SupportAmount" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
    </div>
    <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
        <div class="lr-form-item-title">联系电话</div>
        <input id="SecondMobile" type="text" class="form-control" />
    </div>
    <div class="col-xs-12 lr-form-item" data-table="StuEnroll">
        <div class="lr-form-item-title">备注</div>
        <input id="SupportChangeRemark" type="text" class="form-control" />
    </div>
 </div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuEnroll/HelpChange.js")

--- a/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/HelpChange.js
+++ b/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/HelpChange.js
@@ -0,0 +1,79 @@
 /* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
 * Copyright (c) 2013-2018 北京泉江科技有限公司 
 * 创建人：超级管理员
 * 日  期：2019-07-17 11:20
 * 描  述：新生录取管理
 */
 var acceptClick;
 var keyValue = request('keyValue');
 // 设置权限
 var setAuthorize;
 // 设置表单数据
 var setFormData;
 // 验证数据是否填写完整
 var validForm;
 // 保存数据
 var save;
 var bootstrap = function ($, learun) {
    "use strict";
    var page = {
        init: function () {
            $('.lr-form-wrap').lrscroll();
            page.bind();
            page.initData();
            //idcardreader.objectcheck("btnread");
        },
        bind: function () {
            
            $('#ClassNo').lrselect({
                allowSearch: true,
                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
                param: { strWhere: "1=1 AND CheckMark=1" },
                value: "classno",
                text: "classname"
            });
            
        },
        initData: function () {
            if (!!keyValue) {
                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/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]);
                        }
                    }
                    // $('#MajorNo').lrselectSet(data.StuEnroll.MajorNo);
                    $('#ClassNo').lrselectSet(data.StuEnroll.ClassNo);
                });
            }
        }
    };
    // 验证数据是否填写完整
    validForm = function () {
        if (!$('body').lrValidform()) {
            return false;
        }
        return true;
    };
    // 保存数据
    save = function (processId, callBack, i) {
        if (!$('body').lrValidform()) {
            return false;
        }
        var postData = {};
        var strEntity = $('body').lrGetFormData();
        strEntity.SupportProcessId = processId;
        postData.strEntity = JSON.stringify(strEntity);
       
        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/SupportChange?keyValue=' + keyValue, postData, function (res) {
            // 保存成功后才回调
            if (!!callBack) {
                callBack(res, strEntity, i);
            }
        });
    };
    page.init();
 }
--- a/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.cshtml
+++ b/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.cshtml
@@ -0,0 +1,69 @@
@{
    ViewBag.Title = "资助变更管理";
    Layout = "~/Views/Shared/_Index.cshtml";
 }
 <div class="lr-layout ">
    <div class="lr-layout-center">
        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
            <div class="lr-layout-tool">
                <div class="lr-layout-tool-left">
                    <div class="lr-layout-tool-item">
                        <div id="multiple_condition_query">
                            <div class="lr-query-formcontent">
                                <div class="col-xs-12 lr-form-item">
                                    <div class="lr-form-item-title">系</div>
                                    <div id="DeptNo"></div>
                                </div>
                                <div class="col-xs-12 lr-form-item">
                                    <div class="lr-form-item-title">专业</div>
                                    <div id="MajorNo"></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>
                                    <div id="Year"></div>
                                </div>
                                @*<div class="col-xs-12 lr-form-item">
                                    <div class="lr-form-item-title">是否资助</div>
                                    <div id="IsSubsidize1"></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>
                                    <input id="StuName" type="text" class="form-control" />
                                </div>
                                <div class="col-xs-12 lr-form-item">
                                    <div class="lr-form-item-title">报名号</div>
                                    <input id="RegistrationNo" type="text" class="form-control" />
                                </div>
                            </div>
                        </div>
                    </div>
                </div>
                <div class="lr-layout-tool-right">
                    @*<div class=" btn-group btn-group-sm">
                        <span>资助</span><span id="allAmount"></span>
                        <span>不资助</span><span id="isAmount"></span>

                    </div>*@
                    <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_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 提交</a>
                    </div>
                </div>
            </div>
            <div class="lr-layout-body" id="gridtable"></div>
        </div>
    </div>
 </div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.js")
--- a/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.js
+++ b/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.js
@@ -0,0 +1,189 @@
 /* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
 * Copyright (c) 2013-2018 北京泉江科技有限公司 
 * 创建人：超级管理员
 * 日  期：2019-07-17 11:20
 * 描  述：新生资助变更管理
 */
 var refreshGirdData;
 var processId = '';
 var bootstrap = function ($, learun) {
    "use strict";
    var page = {
        init: function () {
            page.initGird();
            page.bind();
            //page.refreshMoney();
        },
        bind: function () {
            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                page.search(queryJson);
                //page.refreshMoney();
            }, 380, 400);
            
            $('#ClassNo').lrselect({
                allowSearch: true,
                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
                param: { strWhere: "1=1 AND CheckMark=1" },
                value: "classno",
                text: "classname"
            });
            // 刷新
            $('#lr_refresh').on('click', function () {
                location.reload();
            });
            // 打印
            $('#lr_print').on('click', function () {
                $('#gridtable').jqprintTable();
            });
            $('#lr_view').on('click', function () {
                var keyValue = $('#gridtable').jfGridValue('StuId');
                if (learun.checkrow(keyValue)) {
                    learun.layerForm({
                        id: 'form',
                        title: '查看',
                        url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/FormView?keyValue=' + keyValue,
                        width: 800,
                        height: 600,
                        btn: null
                    });
                }
            });

            //  提交
            $('#lr_submit').on('click', function () {
                var keyValue = $('#gridtable').jfGridValue('StuId');
                if (learun.checkrow(keyValue)) {
                    var AAStatus = $('#gridtable').jfGridValue('SupportStatus');
                    if (AAStatus !== 0) {
                        learun.alert.warning("当前项目已提交，请耐心等待审批！");
                        return;
                    }
                    learun.layerConfirm('是否确认提交该项！', function (res) {
                        if (res) {
                            processId = learun.newGuid();
                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/ChangeStatusById', { keyValue: keyValue, processId: processId }, function (res) {
                                refreshGirdData(res, {});
                            });
                        }
                    });
                }
            });

        },
        // 初始化列表
        initGird: function () {
            $('#gridtable').jfGrid({
                url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetPageList',
                headData: [
                    { label: "姓名", name: "StuName", width: 100, align: "left" },
                    {
                        label: "班级", name: "ClassNo", width: 150, 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: "ResidenceType", width: 100, align: "left",
                        formatterAsync: function (callback, value, row, op, $cell) {
                            learun.clientdata.getAsync('dataItem', {
                                key: value,
                                code: 'HouseholdCategory',
                                callback: function (_data) {
                                    callback(_data.text);
                                }
                            });
                        }
                    },
                    {
                        label: "享受等级", name: "SupportGrade", width: 100, align: "left",
                        formatterAsync: function (callback, value, row, op, $cell) {
                            console.log('享受等级',value);
                            learun.clientdata.getAsync('dataItem', {
                                key: value,
                                code: 'SupportGrade',
                                callback: function (_data) {
                                    console.log('dataItem', _data);
                                    callback(_data.text);
                                }
                            });
                        }
                    }, {
                        label: "资助种类", name: "SupportType", width: 100, align: "left",
                        formatterAsync: function (callback, value, row, op, $cell) {
                            learun.clientdata.getAsync('dataItem', {
                                key: value,
                                code: 'SupportType1',
                                callback: function (_data) {
                                    if (_data.text) {
                                        callback(_data.text);
                                    } else {
                                        learun.clientdata.getAsync('dataItem', {
                                            key: value,
                                            code: 'SupportType2',
                                            callback: function (_data) {
                                                callback(_data.text);
                                            }
                                        });
                                    }
                                }
                            });
                        }
                    },
                    { label: "符合资助条件", name: "SupportCondition", width: 200, align: "left" },
                    { label: "备注信息", name: "SupportRemarks", width: 200, align: "left" }
                ],
                isMultiselect: true,
                mainId: 'StuId',
                isPage: true
            });
            page.search();
        },
        refreshMoney: function () {
            //var deptNo = $("#DeptNo").lrselectGet();
            //var majorNo = $("#MajorNo").lrselectGet();
            //var classNo = $("#ClassNo").lrselectGet();
            //$.post(
            //    top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetHelpStatistics',
            //    {
            //        DeptNo: deptNo,
            //        MajorNo: majorNo,
            //        ClassNo: classNo
            //    },
            //    function (res) {
            //        $("#allAmount").html(res.data.aa);
            //        $("#isAmount").html(res.data.bb);
            //    }, "json");
        },
        search: function (param) {
            param = param || {};
            param.SqlParameter = ' AND IsReport=1 AND IsSupportChange=1';
            param.Grade = "20";
            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
        },

    };

    refreshGirdData = function (res, postData) {
        if (res && res.code && res.code == 200) {
            // 发起流程

            var postData = {
                schemeCode: 'Ass_PurchaseApply',// 填写流程对应模板编号 
                processId: processId,
                level: '1',
            };
            learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
                learun.loading(false);
            });

        }
        page.search();
    };
    page.init();
 }
--- a/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.cshtml
+++ b/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.cshtml
@@ -1,5 +1,5 @@
@{
    ViewBag.Title = "新生录取管理";
    ViewBag.Title = "新生资助管理";
    Layout = "~/Views/Shared/_Index.cshtml";
 }
 <div class="lr-layout ">
@@ -26,10 +26,10 @@
                                    <div class="lr-form-item-title">学年</div>
                                    <div id="Year"></div>
                                </div>
                                <div class="col-xs-12 lr-form-item">
                                @*<div class="col-xs-12 lr-form-item">
                                    <div class="lr-form-item-title">是否资助</div>
                                    <div id="IsSubsidize1"></div>
                                </div>
                                </div>*@
                                <div class="col-xs-12 lr-form-item">

                                    <div class="lr-form-item-title">身份证</div>
@@ -48,20 +48,18 @@
                    </div>
                </div>
                <div class="lr-layout-tool-right">
                    <div class=" btn-group btn-group-sm">
                    @*<div class=" btn-group btn-group-sm">
                        <span>资助</span><span id="allAmount"></span>
                        <span>不资助</span><span id="isAmount"></span>

                    </div>
                    </div>*@
                    <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_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
                        <a id="lr_uploadFile" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;上传资料</a>
                        @*<a id="lr_allhelp" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 全部资助</a>*@
                        <a id="lr_help" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 确认资助</a>
                        <a id="lr_nohelp" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 不资助</a>
                        <a id="lr_supply" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 完善资助信息</a>
                        <a id="lr_change" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 资助变更</a>
                    </div>
                </div>
            </div>
--- a/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js
+++ b/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js
@@ -11,19 +11,19 @@ var bootstrap = function ($, learun) {
        init: function () {
            page.initGird();
            page.bind();
            page.refreshMoney();
            //page.refreshMoney();
        },
        bind: function () {
            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                page.search(queryJson);
                page.refreshMoney();
                //page.refreshMoney();
            }, 380, 400);
            $("#IsSubsidize1").lrDataItemSelect({ code: "jyYewOrNot" });
            $('#Year').lrselect({
                url:top.$.rootUrl+'/EducationalAdministration/StuEnroll/GetYearListByClass',
                value:"year",
                text:"year",
            })
                url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
                value: "year",
                text: "year",
            });

            $('#DeptNo').lrselect({
                allowSearch: true,
@@ -97,99 +97,61 @@ var bootstrap = function ($, learun) {
                    });
                }
            });
            //上传资料
            $('#lr_uploadFile').on('click', function () {

            //完善资助信息
            $("#lr_supply").on('click', function () {
                var keyValue = $('#gridtable').jfGridValue('StuId');
                if (learun.checkrow(keyValue)) {
                    learun.layerForm({
                        id: 'form',
                        title: '编辑',
                        url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/SubsidizeUrl?keyValue=' + keyValue,
                        title: '完善信息',
                        url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/IsHelpForm?keyValue=' + keyValue,
                        width: 600,
                        height: 200,
                        height: 400,
                        callBack: function (id) {
                            return top[id].acceptClick(refreshGirdData);
                        }
                    });
                }
            });

            //确认资助
            $("#lr_help").on('click', function () {
                var data = $('#gridtable').jfGridGet('rowdata');
                if (data.length > 0) {
                    learun.layerConfirm('是否确认资助!',
                        function (res) {
                            if (res) {
                                learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/Help',
                                    { stuId: JSON.stringify(data), status: true },
                                    function (res) {
                                        refreshGirdData();

                                    });
                            }


                        });

                }

            });

            //全部资助
            $("#lr_allhelp").on('click', function () {
                learun.layerConfirm('是否全部资助!',
                    function (res) {
                        if (res) {

                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/AllHelp',
                                {},
                                function (res) {
                                    refreshGirdData();

            //资助变更
            $("#lr_change").on('click', function () {
                var keyValue = $('#gridtable').jfGridValue('StuId');
                if (learun.checkrow(keyValue)) {
                    learun.layerForm({
                        id: 'form',
                        title: '资助变更',
                        url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/HelpChange?keyValue=' + keyValue,
                        width: 600,
                        height: 400,
                        callBack: function (id) {
                            var res = false;
                            // 验证数据
                            res = top[id].validForm();
                            // 保存数据
                            if (res) {
                                res = top[id].save('', function () {
                                    page.search();
                                });
                            }
                            return res;
                        }


                    });


            });


            //确认资助
            $("#lr_nohelp").on('click', function () {
                var data = $('#gridtable').jfGridGet('rowdata');
                if (data.length > 0) {
                    learun.layerConfirm('是否确认不资助!',
                        function (res) {
                            if (res) {
                                learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/Help',
                                    { stuId: JSON.stringify(data), status: false },
                                    function (res) {
                                        refreshGirdData();

                                    });
                            }


                        });

                }

            });



        },
        // 初始化列表
        initGird: function () {
            $('#gridtable').lrAuthorizeJfGrid({
            $('#gridtable').jfGrid({
                url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetPageList',
                headData: [
                    { label: "姓名", name: "StuName", width: 100, align: "left" },
                    {
                        label: "班级", name: "ClassNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                        label: "班级", name: "ClassNo", width: 150, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                            learun.clientdata.getAsync('custmerData', {
                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
                                key: value,
@@ -201,94 +163,11 @@ var bootstrap = function ($, learun) {
                        }
                    },
                    {
                        label: "录取方式", name: "Admissions", width: 100, align: "left",
                        formatterAsync: function (callback, value, row, op, $cell) {
                            learun.clientdata.getAsync('dataItem', {
                                key: value,
                                code: 'enrollType',
                                callback: function (_data) {
                                    callback(_data.text);
                                }
                            });
                        }
                    },
                    { label: "学生报名号", name: "RegistrationNo", width: 100, align: "left" },
                    {
                        label: "招生类别", name: "EnrollType", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                            learun.clientdata.getAsync('dataItem', {
                                key: value,
                                code: 'EnrollStudentType',
                                callback: function (_data) {
                                    if (_data.text == "计划外") {
                                        callback('<span class=\"label label-success\" style=\"background:#DC143C\">计划外</span>')
                                    } else {

                                        callback(_data.text);
                                    }
                                }
                            });
                        }
                    },
                    {
                        label: "是否资助", name: "IsSubsidize1", width: 100, align: "left", formatter: function (value, row) {

                            if (row.IsSubsidize1) {
                                return '<span class=\"label label-success\">资助</span>';
                            } else if (row.IsSubsidize1 == false) {
                                return '<span class=\"label label-warning\">不资助</span>';
                            } else {
                                return "未处理";
                            }
                        }
                    },
                    {
                        label: "是否上传资料", name: "SubsidizeUrl", width: 100, align: "left", formatter: function (value) {
                            if (value) {
                                return '<span class=\"label label-success\">已上传</span>';
                            } else {
                                return '<span class=\"label label-warning\">未上传</span>';
                            }
                        }
                    },
                    {
                        label: "性别", name: "Gender", width: 100, align: "left", formatter: function (value) {
                            return value == "1" ? "男" : "女";

                        }
                    },
                    {
                        label: "民族", name: "Nationals", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                            learun.clientdata.getAsync('custmerData', {
                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality',
                                key: value,
                                keyId: 'nationalityno',
                                callback: function (_data) {
                                    callback(_data['nationality']);
                                }
                            });
                        }
                    },
                    { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return learun.formatDate(val, 'yyyy-MM-dd') } },
                    { label: "身份证", name: "IDCard", width: 100, align: "left" },
                    {
                        label: "政治面貌", name: "Political", width: 100, align: "left",
                        formatterAsync: function (callback, value, row, op, $cell) {
                            learun.clientdata.getAsync('custmerData', {
                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
                                key: value,
                                keyId: 'partyfaceno',
                                callback: function (_data) {
                                    callback(_data['partyface']);
                                }
                            });
                        }
                    },
                    {
                        label: "届别", name: "FreshType", width: 100, align: "left",
                        label: "户别", name: "ResidenceType", width: 100, align: "left",
                        formatterAsync: function (callback, value, row, op, $cell) {
                            learun.clientdata.getAsync('dataItem', {
                                key: value,
                                code: 'timeType',
                                code: 'HouseholdCategory',
                                callback: function (_data) {
                                    callback(_data.text);
                                }
@@ -296,51 +175,40 @@ var bootstrap = function ($, learun) {
                        }
                    },
                    {
                        label: "户别", name: "ResidenceType", width: 100, align: "left",
                        label: "享受等级", name: "SupportGrade", width: 100, align: "left",
                        formatterAsync: function (callback, value, row, op, $cell) {
                            learun.clientdata.getAsync('dataItem', {
                                key: value,
                                code: 'HouseholdCategory',
                                code: 'SupportGrade',
                                callback: function (_data) {
                                    callback(_data.text);
                                }
                            });
                        }
                    },
                    {
                        label: "考生类别", name: "StuType", width: 100, align: "left",
                    }, {
                        label: "资助种类", name: "SupportType", width: 100, align: "left",
                        formatterAsync: function (callback, value, row, op, $cell) {
                            learun.clientdata.getAsync('dataItem', {
                                key: value,
                                code: 'stuType',
                                code: 'SupportType1',
                                callback: function (_data) {
                                    callback(_data.text);
                                    if (_data.text) {
                                        callback(_data.text);
                                    } else {
                                        learun.clientdata.getAsync('dataItem', {
                                            key: value,
                                            code: 'SupportType2',
                                            callback: function (_data) {
                                                callback(_data.text);
                                            }
                                        });
                                    }
                                }
                            });
                        }
                    },
                    { label: "户口地", name: "ResidenceAddress", width: 100, align: "left" },
                    { label: "非京籍报考类", name: "NonNative", width: 100, align: "left" },
                    { label: "学籍所在学校", name: "FromSchool", width: 100, align: "left" },
                    { label: "家庭住址", name: "HomeAddress", width: 100, align: "left" },
                    { label: "第一监护人", name: "FirstGuardian", width: 100, align: "left" },
                    { label: "与被监护人关系", name: "FirstRelationship", width: 100, align: "left" },
                    { label: "工作单位", name: "FirstUnits", width: 100, align: "left" },
                    { label: "联系电话", name: "FirstMobile", width: 100, align: "left" },
                    { label: "第二监护人", name: "SecondGuardian", width: 100, align: "left" },
                    { label: "与被监护人关系", name: "SecondRelationship", width: 100, align: "left" },
                    { label: "工作单位", name: "SecondUnits", width: 100, align: "left" },
                    { label: "联系电话", name: "SecondMobile", width: 100, align: "left" },
                    { label: "接收通知书地址", name: "Acceptance", width: 100, align: "left" },
                    { label: "收件人", name: "Recipient", width: 100, align: "left" },
                    { label: "邮政编码", name: "ZipCode", width: 100, align: "left" },
                    { label: "既往病史", name: "MedicalHistory", width: 100, align: "left" },
                    { label: "加分照顾对象", name: "AdditionalCare", width: 100, align: "left" },
                    { label: "录取专业代码", name: "MajorNo", width: 100, align: "left" },
                    { label: "录取专业名称", name: "MajorName", width: 100, align: "left" },

                    { label: "是否住宿", name: "IsAccommodation", width: 100, align: "left" },
                    { label: "准考证号", name: "ExamRegistration", width: 100, align: "left" },
                    { label: "符合资助条件", name: "SupportCondition", width: 200, align: "left" },
                    { label: "备注信息", name: "SupportRemarks", width: 200, align: "left" }
                ],
                isMultiselect: true,
                mainId: 'StuId',
@@ -366,13 +234,11 @@ var bootstrap = function ($, learun) {
        },
        search: function (param) {
            param = param || {};
            param.SqlParameter = ' AND IsReport=1';
            param.SqlParameter = ' AND IsReport=1 AND IsSupport=1';
            param.Grade = "20";
            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
        }
    };
    refreshGirdData = function () {
        page.search();
        },

    };
    page.init();
 }
--- a/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelpForm.cshtml
+++ b/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelpForm.cshtml
@@ -0,0 +1,28 @@
@{
    ViewBag.Title = "新生录取管理";
    Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
    <div class="col-xs-12 lr-form-item" data-table="StuEnroll">
        <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
        <input id="StuName" type="text" class="form-control" readonly="readonly" />
    </div>
    <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
        <div class="lr-form-item-title">享受等级<font face="宋体">*</font></div>
        <div id="SupportGrade" isvalid="yes" checkexpession="NotNull"></div>
    </div>
    <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
        <div class="lr-form-item-title">资助种类<font face="宋体">*</font></div>
        <div id="SupportType" isvalid="yes" checkexpession="NotNull"></div>
    </div>
    <div class="col-xs-12 lr-form-item" data-table="StuEnroll">
        <div class="lr-form-item-title">符合资助条件</div>
        <input id="SupportCondition" type="text" class="form-control" />
    </div>
    <div class="col-xs-12 lr-form-item" data-table="StuEnroll">
        <div class="lr-form-item-title">备注信息</div>
        <input id="SupportRemarks" type="text" class="form-control"/>
    </div>
 </div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuEnroll/IsHelpForm.js")

--- a/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelpForm.js
+++ b/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelpForm.js
@@ -0,0 +1,65 @@
 /* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
 * Copyright (c) 2013-2018 北京泉江科技有限公司 
 * 创建人：超级管理员
 * 日  期：2021-05-25 
 * 描  述：完善资助信息
 */
 var acceptClick;
 var keyValue = request('keyValue');
 var bootstrap = function ($, learun) {
    "use strict";
    var page = {
        init: function () {
            $('.lr-form-wrap').lrscroll();
            page.bind();
            page.initData();
        },
        bind: function () {
            $('#SupportGrade').lrDataItemSelect({
                code: 'SupportGrade',
                select: function (item) {
                    if (item != undefined) {
                        if (item.id == '1') {
                            $('#SupportType').lrDataItemSelect({ code: 'SupportType1' });
                        }
                        else if (item.id == '2') {
                            $('#SupportType').lrDataItemSelect({ code: 'SupportType2' });
                        }
                    }
                }
            });
            $('#SupportType').lrDataItemSelect({ code: 'SupportType1' });
        },
        initData: function () {
            if (!!keyValue) {
                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/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/StuEnroll/SupplySupport?keyValue=' + keyValue, postData, function (res) {
            // 保存成功后才回调
            if (!!callBack) {
                callBack();
            }
        });
    };
    page.init();
 }
--- a/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.cshtml
+++ b/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.cshtml
@@ -0,0 +1,73 @@
@{
    ViewBag.Title = "新生学费管理";
    Layout = "~/Views/Shared/_Index.cshtml";
 }
 <div class="lr-layout ">
    <div class="lr-layout-center">
        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
            <div class="lr-layout-tool">
                <div class="lr-layout-tool-left">
                    <div class="lr-layout-tool-item">
                        <div id="multiple_condition_query">
                            <div class="lr-query-formcontent">
                                <div class="col-xs-12 lr-form-item">
                                    <div class="lr-form-item-title">系</div>
                                    <div id="DeptNo"></div>
                                </div>
                                <div class="col-xs-12 lr-form-item">
                                    <div class="lr-form-item-title">专业</div>
                                    <div id="MajorNo"></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>
                                    <div id="Year"></div>
                                </div>
                                <div class="col-xs-12 lr-form-item">
                                    <div class="lr-form-item-title">免学费</div>
                                    <div id="IsSubsidize1"></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>
                                    <input id="StuName" type="text" class="form-control" />
                                </div>
                                <div class="col-xs-12 lr-form-item">
                                    <div class="lr-form-item-title">报名号</div>
                                    <input id="RegistrationNo" type="text" class="form-control" />
                                </div>
                            </div>
                        </div>
                    </div>
                </div>
                <div class="lr-layout-tool-right">
                    <div class=" btn-group btn-group-sm">
                        <span>免学费</span><span id="allAmount"></span>
                                        <span>不免学费</span><span id="isAmount"></span>

                    </div>
                    <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_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
                        <a id="lr_uploadFile" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;上传资料</a>
                        <a id="lr_help" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 免学费</a>
                        <a id="lr_nohelp" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 不免学费</a>
                        @*<a id="lr_allhelp" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 全部免学费</a>*@
                        <a id="lr_support" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 确认资助</a>
                    </div>
                </div>
            </div>
            <div class="lr-layout-body" id="gridtable"></div>
        </div>
    </div>
 </div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.js")
--- a/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.js
+++ b/V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.js
@@ -0,0 +1,385 @@
 /* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
 * Copyright (c) 2013-2018 北京泉江科技有限公司 
 * 创建人：超级管理员
 * 日  期：2019-07-17 11:20
 * 描  述：新生录取管理
 */
 var refreshGirdData;
 var bootstrap = function ($, learun) {
    "use strict";
    var page = {
        init: function () {
            page.initGird();
            page.bind();
            page.refreshMoney();
        },
        bind: function () {
            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                page.search(queryJson);
                page.refreshMoney();
            }, 380, 400);
            $("#IsSubsidize1").lrDataItemSelect({ code: "jyYewOrNot" });
            $('#Year').lrselect({
                url:top.$.rootUrl+'/EducationalAdministration/StuEnroll/GetYearListByClass',
                value:"year",
                text:"year",
            })

            $('#DeptNo').lrselect({
                allowSearch: true,
                value: "deptno",
                text: "deptname",
                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
                select: function (item) {
                    if (item) {
                        $('#MajorNo').lrselectRefresh({
                            allowSearch: true,
                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
                        });
                    } else {
                        $('#MajorNo').lrselectRefresh({
                            allowSearch: true,
                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
                            param: { strWhere: "1=1 AND CheckMark=1" }
                        });
                    }

                }
            });
            $('#MajorNo').lrselect({
                allowSearch: true,
                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
                value: "majorno",
                text: "majorname",
                param: { strWhere: "1=1 AND CheckMark=1" },
                select: function (item) {
                    if (item) {
                        $('#ClassNo').lrselectRefresh({
                            allowSearch: true,
                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
                            param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1" }
                        });
                    } else {
                        $('#ClassNo').lrselectRefresh({
                            allowSearch: true,
                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
                            param: { strWhere: "1=1 AND CheckMark=1" }
                        });
                    }
                }
            });
            $('#ClassNo').lrselect({
                allowSearch: true,
                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
                param: { strWhere: "1=1 AND CheckMark=1" },
                value: "classno",
                text: "classname"
            });
            // 刷新
            $('#lr_refresh').on('click', function () {
                location.reload();
            });
            // 打印
            $('#lr_print').on('click', function () {
                $('#gridtable').jqprintTable();
            });
            $('#lr_view').on('click', function () {
                var keyValue = $('#gridtable').jfGridValue('StuId');
                if (learun.checkrow(keyValue)) {
                    learun.layerForm({
                        id: 'form',
                        title: '查看',
                        url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/FormView?keyValue=' + keyValue,
                        width: 800,
                        height: 600,
                        btn: null
                    });
                }
            });
            //上传资料
            $('#lr_uploadFile').on('click', function () {
                var keyValue = $('#gridtable').jfGridValue('StuId');
                if (learun.checkrow(keyValue)) {
                    learun.layerForm({
                        id: 'form',
                        title: '编辑',
                        url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/SubsidizeUrl?keyValue=' + keyValue,
                        width: 600,
                        height: 200,
                        callBack: function (id) {
                            return top[id].acceptClick(refreshGirdData);
                        }
                    });
                }
            });

            //确认免学费
            $("#lr_help").on('click', function () {
                var data = $('#gridtable').jfGridGet('rowdata');
                if (data.length > 0) {
                    learun.layerConfirm('是否确认免学费!',
                        function (res) {
                            if (res) {
                                learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/Help',
                                    { stuId: JSON.stringify(data), status: true },
                                    function (res) {
                                        refreshGirdData();

                                    });
                            }


                        });

                }

            });

            //全部免学费
            $("#lr_allhelp").on('click', function () {
                learun.layerConfirm('是否全部免学费!',
                    function (res) {
                        if (res) {

                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/AllHelp',
                                {},
                                function (res) {
                                    refreshGirdData();

                                });
                        }


                    });


            });


            //确认不免学费
            $("#lr_nohelp").on('click', function () {
                var data = $('#gridtable').jfGridGet('rowdata');
                if (data.length > 0) {
                    learun.layerConfirm('是否确认不免学费!',
                        function (res) {
                            if (res) {
                                learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/Help',
                                    { stuId: JSON.stringify(data), status: false },
                                    function (res) {
                                        refreshGirdData();
                                    });
                            }
                        });
                }

            });
            
            //确认资助
            $('#lr_support').on('click', function () {
                var keyValue = $('#gridtable').jfGridValue('StuId');
                if (learun.checkrow(keyValue)) {
                    learun.layerConfirm('是否确认资助？', function (res) {
                        if (res) {
                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/Support', { keyValue: keyValue }, function () {
                                refreshGirdData();
                            });
                        }
                    });
                }
            });
            
        },
        // 初始化列表
        initGird: function () {
            $('#gridtable').jfGrid({
                url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetPageList',
                headData: [
                    { label: "姓名", name: "StuName", width: 100, align: "left" },
                    {
                        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: "Admissions", width: 100, align: "left",
                        formatterAsync: function (callback, value, row, op, $cell) {
                            learun.clientdata.getAsync('dataItem', {
                                key: value,
                                code: 'enrollType',
                                callback: function (_data) {
                                    callback(_data.text);
                                }
                            });
                        }
                    },
                    { label: "学生报名号", name: "RegistrationNo", width: 100, align: "left" },
                    {
                        label: "招生类别", name: "EnrollType", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                            learun.clientdata.getAsync('dataItem', {
                                key: value,
                                code: 'EnrollStudentType',
                                callback: function (_data) {
                                    if (_data.text == "计划外") {
                                        callback('<span class=\"label label-success\" style=\"background:#DC143C\">计划外</span>')
                                    } else {

                                        callback(_data.text);
                                    }
                                }
                            });
                        }
                    },
                    {
                        label: "免学费", name: "IsSubsidize1", width: 100, align: "left", formatter: function (value, row) {
                            if (row.IsSubsidize1) {
                                return '<span class=\"label label-success\">是</span>';
                            } else if (row.IsSubsidize1 == false) {
                                return '<span class=\"label label-warning\">否</span>';
                            } else {
                                return "未处理";
                            }
                        }
                    },
                    {
                        label: "是否上传资料", name: "SubsidizeUrl", width: 100, align: "left", formatter: function (value) {
                            if (value) {
                                return '<span class=\"label label-success\">已上传</span>';
                            } else {
                                return '<span class=\"label label-warning\">未上传</span>';
                            }
                        }
                    },
                    {
                        label: "性别", name: "Gender", width: 100, align: "left", formatter: function (value) {
                            return value == "1" ? "男" : "女";

                        }
                    },
                    {
                        label: "民族", name: "Nationals", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                            learun.clientdata.getAsync('custmerData', {
                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality',
                                key: value,
                                keyId: 'nationalityno',
                                callback: function (_data) {
                                    callback(_data['nationality']);
                                }
                            });
                        }
                    },
                    { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return learun.formatDate(val, 'yyyy-MM-dd') } },
                    { label: "身份证", name: "IDCard", width: 150, align: "left" },
                    {
                        label: "政治面貌", name: "Political", width: 100, align: "left",
                        formatterAsync: function (callback, value, row, op, $cell) {
                            learun.clientdata.getAsync('custmerData', {
                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
                                key: value,
                                keyId: 'partyfaceno',
                                callback: function (_data) {
                                    callback(_data['partyface']);
                                }
                            });
                        }
                    },
                    {
                        label: "届别", name: "FreshType", width: 100, align: "left",
                        formatterAsync: function (callback, value, row, op, $cell) {
                            learun.clientdata.getAsync('dataItem', {
                                key: value,
                                code: 'timeType',
                                callback: function (_data) {
                                    callback(_data.text);
                                }
                            });
                        }
                    },
                    {
                        label: "户别", name: "ResidenceType", width: 100, align: "left",
                        formatterAsync: function (callback, value, row, op, $cell) {
                            learun.clientdata.getAsync('dataItem', {
                                key: value,
                                code: 'HouseholdCategory',
                                callback: function (_data) {
                                    callback(_data.text);
                                }
                            });
                        }
                    },
                    {
                        label: "考生类别", name: "StuType", width: 100, align: "left",
                        formatterAsync: function (callback, value, row, op, $cell) {
                            learun.clientdata.getAsync('dataItem', {
                                key: value,
                                code: 'stuType',
                                callback: function (_data) {
                                    callback(_data.text);
                                }
                            });
                        }
                    },
                    { label: "户口地", name: "ResidenceAddress", width: 100, align: "left" },
                    { label: "非京籍报考类", name: "NonNative", width: 100, align: "left" },
                    { label: "学籍所在学校", name: "FromSchool", width: 100, align: "left" },
                    { label: "家庭住址", name: "HomeAddress", width: 100, align: "left" },
                    { label: "第一监护人", name: "FirstGuardian", width: 100, align: "left" },
                    { label: "与被监护人关系", name: "FirstRelationship", width: 100, align: "left" },
                    { label: "工作单位", name: "FirstUnits", width: 100, align: "left" },
                    { label: "联系电话", name: "FirstMobile", width: 100, align: "left" },
                    { label: "第二监护人", name: "SecondGuardian", width: 100, align: "left" },
                    { label: "与被监护人关系", name: "SecondRelationship", width: 100, align: "left" },
                    { label: "工作单位", name: "SecondUnits", width: 100, align: "left" },
                    { label: "联系电话", name: "SecondMobile", width: 100, align: "left" },
                    { label: "接收通知书地址", name: "Acceptance", width: 100, align: "left" },
                    { label: "收件人", name: "Recipient", width: 100, align: "left" },
                    { label: "邮政编码", name: "ZipCode", width: 100, align: "left" },
                    { label: "既往病史", name: "MedicalHistory", width: 100, align: "left" },
                    { label: "加分照顾对象", name: "AdditionalCare", width: 100, align: "left" },
                    { label: "录取专业代码", name: "MajorNo", width: 100, align: "left" },
                    { label: "录取专业名称", name: "MajorName", width: 100, align: "left" },

                    { label: "是否住宿", name: "IsAccommodation", width: 100, align: "left" },
                    { label: "准考证号", name: "ExamRegistration", width: 100, align: "left" },
                ],
                isMultiselect: true,
                mainId: 'StuId',
                isPage: true
            });
            page.search();
        },
        refreshMoney: function () {
            var deptNo = $("#DeptNo").lrselectGet();
            var majorNo = $("#MajorNo").lrselectGet();
            var classNo = $("#ClassNo").lrselectGet();
            $.post(
                top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetHelpStatistics',
                {
                    DeptNo: deptNo,
                    MajorNo: majorNo,
                    ClassNo: classNo
                },
                function (res) {
                    $("#allAmount").html(res.data.aa);
                    $("#isAmount").html(res.data.bb);
                }, "json");
        },
        search: function (param) {
            param = param || {};
            param.SqlParameter = ' AND IsReport=1';
            param.Grade = "20";
            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
        }
    };
    refreshGirdData = function () {
        page.search();
    };
    page.init();
 }
--- a/V7/Learun.Application.Web/Learun.Application.Web.csproj
+++ b/V7/Learun.Application.Web/Learun.Application.Web.csproj
@@ -979,6 +979,10 @@
    <Content Include="Areas\EducationalAdministration\Views\StuConsumption\IndexForStudent.js" />
    <Content Include="Areas\EducationalAdministration\Views\StuConsumption\IndexForTeacher.js" />
    <Content Include="Areas\EducationalAdministration\Views\StuEnroll\AmountForm.js" />
    <Content Include="Areas\EducationalAdministration\Views\StuEnroll\HelpChange.js" />
    <Content Include="Areas\EducationalAdministration\Views\StuEnroll\IndexHelpChange.js" />
    <Content Include="Areas\EducationalAdministration\Views\StuEnroll\IsHelpForm.js" />
    <Content Include="Areas\EducationalAdministration\Views\StuEnroll\StuTuition.js" />
    <Content Include="Areas\EducationalAdministration\Views\StuEnroll\Peichart.js" />
    <Content Include="Areas\EducationalAdministration\Views\StuEnroll\StatisticIndex.js" />
    <Content Include="Areas\EducationalAdministration\Views\StuGrant\Form.js" />
@@ -7248,6 +7252,10 @@
    <Content Include="Areas\EducationalAdministration\Views\PM_EducationExperience\StatisticIndex.cshtml" />
    <Content Include="Areas\EducationalAdministration\Views\PM_TechnicalPost\StatisticIndex.cshtml" />
    <None Include="Areas\EducationalAdministration\Views\SchoolNews\Index.cshtml" />
    <Content Include="Areas\EducationalAdministration\Views\StuEnroll\StuTuition.cshtml" />
    <Content Include="Areas\EducationalAdministration\Views\StuEnroll\IsHelpForm.cshtml" />
    <Content Include="Areas\EducationalAdministration\Views\StuEnroll\HelpChange.cshtml" />
    <Content Include="Areas\EducationalAdministration\Views\StuEnroll\IndexHelpChange.cshtml" />
    <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
    <Content Include="Views\Login\Default-beifen.cshtml" />
    <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollBLL.cs
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollBLL.cs
@@ -612,6 +612,83 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                }
            }
        }
        
        public void Support(string stuIds)
        {
            try
            {
                stuEnrollService.Support(stuIds);
            }
            catch (Exception ex)
            {
                if (ex is ExceptionEx)
                {
                    throw;
                }
                else
                {
                    throw ExceptionEx.ThrowBusinessException(ex);
                }
            }
        }

        public void SupplySupport(string keyValue, StuEnrollEntity entity)
        {
            try
            {
                stuEnrollService.SupplySupport(keyValue,entity);
            }
            catch (Exception ex)
            {
                if (ex is ExceptionEx)
                {
                    throw;
                }
                else
                {
                    throw ExceptionEx.ThrowBusinessException(ex);
                }
            }
        }


        public void SupportChange(string keyValue, StuEnrollEntity entity)
        {
            try
            {
                stuEnrollService.SupportChange(keyValue, entity);
            }
            catch (Exception ex)
            {
                if (ex is ExceptionEx)
                {
                    throw;
                }
                else
                {
                    throw ExceptionEx.ThrowBusinessException(ex);
                }
            }
        }

        public void ChangeStatusById(string keyValue, int status, string processId)
        {
            try
            {
                stuEnrollService.ChangeStatusById(keyValue, status, processId);
            }
            catch (Exception ex)
            {
                if (ex is ExceptionEx)
                {
                    throw;
                }
                else
                {
                    throw ExceptionEx.ThrowBusinessException(ex);
                }
            }
        }

        public (bool, string) Military(string stuId, bool status, bool payAfter)
        {
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollEntity.cs
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollEntity.cs
@@ -290,11 +290,72 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
        [Column("MILITARYURL")]
        public string MilitaryUrl { get; set; }
        /// <summary>
        /// 是否资助
        /// 是否免学费
        /// </summary>
        [Column("ISSUBSIDIZE1")]
        public bool? IsSubsidize1 { get; set; }
        /// <summary>
        /// 是否资助
        /// </summary>
        [Column("ISSUPPORT")]
        public bool? IsSupport { get; set; }
        /// <summary>
        /// 资助等级
        /// </summary>
        [Column("SUPPORTGRADE")]
        public string SupportGrade { get; set; }
        /// <summary>
        /// 资助种类
        /// </summary>
        [Column("SUPPORTTYPE")]
        public string SupportType { get; set; }
        /// <summary>
        /// 符合资助条件
        /// </summary>
        [Column("SUPPORTCONDITION")]
        public string SupportCondition { get; set; }
        /// <summary>
        /// 资助备注
        /// </summary>
        [Column("SUPPORTREMARKS")]
        public string SupportRemarks { get; set; }

        /// <summary>
        /// 资助变更--是否变更
        /// </summary>
        [Column("ISSUPPORTCHANGE")]
        public bool? IsSupportChange { get; set; }
        /// <summary>
        /// 资助变更--开户行
        /// </summary>
        [Column("SUPPORTBANK")]
        public string SupportBank { get; set; }
        /// <summary>
        /// 资助变更--银行卡号
        /// </summary>
        [Column("SUPPORTBANKCARD")]
        public string SupportBankCard { get; set; }
        /// <summary>
        /// 资助变更--金额
        /// </summary>
        [Column("SUPPORTAMOUNT")]
        public decimal? SupportAmount { get; set; }
        /// <summary>
        /// 资助变更--状态
        /// </summary>
        [Column("SUPPORTSTATUS")]
        public int? SupportStatus { get; set; }
        /// <summary>
        /// 资助变更--备注
        /// </summary>
        [Column("SUPPORTCHANGEREMARK")]
        public string SupportChangeRemark { get; set; }
        /// <summary>
        /// 资助变更--流程Id
        /// </summary>
        [Column("SUPPORTPROCESSID")]
        public string SupportProcessId { get; set; }
        /// <summary>
        /// 是否军训
        /// </summary>
        [Column("ISMILITARY")]
@@ -306,7 +367,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
        public bool? IsCheckIn { get; set; }

        /// <summary>
        /// 是否资助
        /// 是否免学费
        /// </summary>
        [Column("ISSUBSIDIZE12")]
        public bool? IsSubsidize12 { get; set; }
--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollIBLL.cs
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollIBLL.cs
@@ -70,6 +70,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
        void AllStay();
        (bool, string) Help(string stuId, bool status, bool payAfter);
        void AllHelp();
        void Support(string stuIds);
        void SupplySupport(string keyValue, StuEnrollEntity entity);
        void ChangeStatusById(string keyValue, int status, string processId);
        void SupportChange(string keyValue, StuEnrollEntity entity);
        (bool, string) Military(string stuId, bool status, bool payAfter);
        void AllMilitary();

--- a/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs
+++ b/V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs
@@ -98,7 +98,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                t.DeptNo,
                t.Grade,
                t.THROUGHPROJECT,
                t.Status
                t.Status,
 t.IsSupport,t.SupportGrade,t.SupportType,t.SupportCondition,t.SupportRemarks
                ");
                strSql.Append("  FROM StuEnroll t ");
                strSql.Append("  WHERE 1=1 ");
@@ -347,7 +348,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
        /// <summary>
        /// <param name="queryJson">查询参数</param>
        /// <returns></returns>
        public IEnumerable<StuEnrollEntity> GetList( string queryJson)
        public IEnumerable<StuEnrollEntity> GetList(string queryJson)
        {
            try
            {
@@ -1291,11 +1292,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                            amountRecordEntity.Create();
                            if (status)
                            {
                                amountRecordEntity.Content = "确认资助";
                                amountRecordEntity.Content = "确认免学费";
                            }
                            else
                            {
                                amountRecordEntity.Content = "取消资助";
                                amountRecordEntity.Content = "取消免学费";
                            }

                            amountRecordEntity.StuID = item.StuId;
@@ -2527,6 +2528,116 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                }
            }
        }

        /// <summary>
        /// 新生学费管理-确认资助
        /// </summary>
        /// <param name="stuIds"></param>
        public void Support(string stuIds)
        {
            try
            {
                if (!string.IsNullOrEmpty(stuIds))
                {
                    string sql = $"update StuEnroll set IsSupport=1 where StuId in ('{stuIds}')";
                    this.BaseRepository("CollegeMis").ExecuteBySql(sql);
                }
            }
            catch (Exception ex)
            {
                if (ex is ExceptionEx)
                {
                    throw;
                }
                else
                {
                    throw ExceptionEx.ThrowServiceException(ex);
                }
            }
        }

        /// <summary>
        /// 新生资助管理--完善资助信息
        /// </summary>
        /// <param name="keyValue"></param>
        /// <param name="entity"></param>
        public void SupplySupport(string keyValue, StuEnrollEntity entity)
        {
            try
            {
                if (!string.IsNullOrEmpty(keyValue))
                {
                    string sql = $@"update StuEnroll set SupportGrade='{entity.SupportGrade}',
 SupportType='{entity.SupportType}',
 SupportCondition='{entity.SupportCondition}',
 SupportRemarks='{entity.SupportRemarks}' 
 where StuId='{keyValue}'";
                    this.BaseRepository("CollegeMis").ExecuteBySql(sql);
                }
            }
            catch (Exception ex)
            {
                if (ex is ExceptionEx)
                {
                    throw;
                }
                else
                {
                    throw ExceptionEx.ThrowServiceException(ex);
                }
            }
        }

        /// <summary>
        /// 新生资助管理--资助变更
        /// </summary>
        /// <param name="keyValue"></param>
        /// <param name="entity"></param>
        public void SupportChange(string keyValue, StuEnrollEntity entity)
        {
            try
            {
                if (!string.IsNullOrEmpty(keyValue))
                {
                    string sql = $@"update StuEnroll set SupportBank='{entity.SupportBank}',
 SupportBankCard='{entity.SupportBankCard}',
 SupportAmount='{entity.SupportAmount}',
 SupportProcessId='{entity.SupportProcessId}',SupportStatus=0,IsSupportChange=1
 where StuId='{keyValue}'";
                    this.BaseRepository("CollegeMis").ExecuteBySql(sql);
                }
            }
            catch (Exception ex)
            {
                if (ex is ExceptionEx)
                {
                    throw;
                }
                else
                {
                    throw ExceptionEx.ThrowServiceException(ex);
                }
            }
        }

        /// <summary>
        /// 修改审批状态
        /// </summary>
        /// <param name="keyValue"></param>
        /// <param name="status"></param>
        public void ChangeStatusById(string keyValue, int status, string processId)
        {
            try
            {
                BaseRepository("CollegeMis").ExecuteBySql("update StuEnroll set SupportStatus=" + status + ",SupportProcessId='" + processId + "' where  StuId='" + keyValue + "'", null);
            }
            catch (Exception ex)
            {
                throw ExceptionEx.ThrowServiceException(ex);
            }
        }


        #endregion 提交数据
    }
 }