【增加】学子在线-国家助学金；

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

@@ -67,6 +67,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 主页面【学生】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexOfStudent()
+        {
+            return View();
+        }
         #endregion
 
         #region 获取数据

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

@@ -6,7 +6,6 @@
  */
 var refreshGirdData;
 var types = request('types');//助学金类型：1国家助学金，2校级助学金
-console.log(types == "1" ? "国家助学金" : types == "2" ? "校级助学金" : "");
 var bootstrap = function ($, learun) {
     "use strict";
     var startTime;

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

@@ -0,0 +1,78 @@
+@{
+    ViewBag.Title = "助学金管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<style>
+    .datesearchLabel {
+        float: left;
+        line-height: 28px;
+        height: 40px;
+        padding-top: 13px;
+        padding-left: 5px;
+    }
+
+        .datesearchLabel:first-child {
+            padding-left: 0px;
+        }
+</style>
+<div class="lr-layout">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="datesearchLabel">申请</div>
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></div>
+                    </div>
+                    <div class="datesearchLabel">发放</div>
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearchRelease"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学号</div>
+                                    <input id="StuNo" 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>
+                                    <div id="F_SchoolId"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">身份证号</div>
+                                    <input id="IdentityCardNo" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">资助等级</div>
+                                    <div id="SubsidizeType"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">开户行户</div>
+                                    <input id="OpenBankNo" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm">
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuFellowship/IndexOfStudent.js")

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

@@ -0,0 +1,247 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-03-13 10:37
+ * 描  述：定制功能助学金
+ */
+var refreshGirdData;
+var types = request('types');//助学金类型：1国家助学金，2校级助学金
+var bootstrap = function ($, learun) {
+    "use strict";
+    var startTime;
+    var endTime;
+    var startTimeRelease;
+    var endTimeRelease;
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            $('#datesearchRelease').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTimeRelease = begin;
+                    endTimeRelease = end;
+                    page.search();
+                }
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 350, 400);
+            //下拉框绑定
+            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            $('#SubsidizeType').lrDataItemSelect({ code: 'StateStipend' });
+
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+        },
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuFellowship/GetPageList',
+                headData: [
+                    { label: '学号', name: 'StuNo', width: 120, align: "left" },
+                    { label: '姓名', name: 'StuName', width: 150, align: "left" },
+                    {
+                        label: '院校', name: 'F_SchoolId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                                key: value,
+                                keyId: 'f_companyid',
+                                callback: function (_data) {
+                                    callback(_data['f_fullname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "所属班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '身份证件类型', name: 'IdCardType', width: 100, align: "left"
+                        , formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'IdCardType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '身份证件号', name: 'IdentityCardNo', width: 160, align: "left" },
+                    {
+                        label: '资助等级', name: 'SubsidizeType', width: 100, align: "left"
+                        , formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StateStipend',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '资助标准', name: 'FunderNationStandard', width: 100, align: "left" },
+                    { label: '应发金额', name: 'AmountPayable', width: 100, align: "left" },
+                    { label: '实发金额', name: 'FinalPayingAmount', width: 100, align: "left" },
+                    {
+                        label: '申请日期', name: 'ApplyDate', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    { label: '发放日期', name: 'ReleaseDate', width: 100, align: "left" },
+                    { label: '申请理由', name: 'ApplyReason', width: 200, align: "left" },
+                    {
+                        label: '开户银行', name: 'OpenBank', width: 200, align: "left"
+                        , formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'DepositBank',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '开户卡账号', name: 'OpenAccount', width: 200, align: "left" },
+                    { label: '开户行号', name: 'OpenBankNo', width: 120, align: "left" },
+                    { label: '备注说明', name: 'Remark', width: 200, align: "left" },
+                    {
+                        label: '审核状态', name: 'Status', width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "0" ? "<span class=\"label label-default\">草稿</span>" : cellvalue == "1" ? "<span class=\"label label-success\">学院审核中</span>" : cellvalue == "2" ? "<span class=\"label label-success\">学工部审核中</span>" : cellvalue == "3" ? "<span class=\"label label-success\">已归档</span>" : "<span class=\"label label-default\">草稿</span>";
+                        }
+                    },
+                    {
+                        label: '创建人', name: 'CreateUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '创建时间', name: 'CreateTime', width: 130, align: "left" },
+                    { label: '提交时间', name: 'SubmitTime', width: 130, align: "left" },
+                    {
+                        label: '提交人', name: 'SubmitUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '学院审核人', name: 'FirstCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '学院审核时间', name: 'FirstCheckTime', width: 130, align: "left" },
+                    {
+                        label: '学工部审核人', name: 'SecondCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '学工部审核时间', name: 'SecondCheckTime', width: 130, align: "left" },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx: 'SubmitTime desc'
+            });
+        },
+        search: function (param) {
+            param = param || {};
+            param.Types = types;
+            param.StartTime = startTime;
+            param.EndTime = endTime;
+            param.StartTimeRelease = startTimeRelease;
+            param.EndTimeRelease = endTimeRelease;
+            param.StuNo = learun.clientdata.get(['userinfo']).account;//学生学号
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

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

@@ -6,7 +6,6 @@
  */
 var refreshGirdData;
 var types = request('types');//助学金类型：1国家助学金，2校级助学金
-console.log(types == "1" ? "国家助学金" : types == "2" ? "校级助学金" : "");
 var bootstrap = function ($, learun) {
     "use strict";
     var startTime;
@@ -83,27 +82,6 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
-            // 编辑
-            $('#lr_edit').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('ID');
-                if (learun.checkrow(keyValue)) {
-                    var Status = $('#gridtable').jfGridValue('Status');
-                    if (Status != "1") {
-                        learun.alert.warning("当前项不属于学院审核状态，无法编辑！");
-                        return false;
-                    }
-                    learun.layerForm({
-                        id: 'formOfTwo',
-                        title: '审核',
-                        url: top.$.rootUrl + '/EducationalAdministration/StuFellowship/Form?Types=' + types + '&Step=2&keyValue=' + keyValue,
-                        width: 1000,
-                        height: 600,
-                        callBack: function (id) {
-                            return top[id].acceptClick(refreshGirdData);
-                        }
-                    });
-                }
-            });
             // 归档
             $('#lr_submit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');

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

@@ -6,7 +6,6 @@
  */
 var refreshGirdData;
 var types = request('types');//助学金类型：1国家助学金，2校级助学金
-console.log(types == "1" ? "国家助学金" : types == "2" ? "校级助学金" : "");
 var bootstrap = function ($, learun) {
     "use strict";
     var startTime;

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

@@ -997,6 +997,7 @@
     <Content Include="Areas\EducationalAdministration\Views\CdMajor\IndexProvince.js" />
     <Content Include="Areas\EducationalAdministration\Views\PsychologyInfo\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexInStuScore.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfStudent.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfThree.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfTwo.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\SoonGraduateIndex.js" />
@@ -8128,6 +8129,7 @@
     <Content Include="Areas\LR_Desktop\Views\PsychologyReplyInfo\IndexReply.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfTwo.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfThree.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfStudent.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />