解决冲突

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

@@ -1,4 +1,5 @@
-using Learun.Util;
+using System;
+using Learun.Util;
 using System.Data;
 using Learun.Application.TwoDevelopment.EducationalAdministration;
 using System.Web.Mvc;
@@ -26,7 +27,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,8 +36,45 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
         }
+        /// <summary>
+        /// 助学金
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Indexzxj()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 助学金
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Formzxj()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 审核
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexAudit()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 审核
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormAudit()
+        {
+            return View();
+        }
+
         #endregion
 
         #region 获取数据
@@ -71,9 +109,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var ScholarshipxjData = scholarshipxjIBLL.GetScholarshipxjEntity( keyValue );
-            var jsonData = new {
-                ScholarshipAxj = ScholarshipxjData,
+            var ScholarshipxjData = scholarshipxjIBLL.GetScholarshipxjEntity(keyValue);
+            var jsonData = new
+            {
+                Scholarshipxj = ScholarshipxjData,
             };
             return Success(jsonData);
         }
@@ -93,6 +132,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             scholarshipxjIBLL.DeleteEntity(keyValue);
             return Success("删除成功！");
         }
+
         /// <summary>
         /// 保存实体数据（新增、修改）
         /// </summary>
@@ -104,14 +144,34 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
+            var LogUserinfo = LoginUserInfo.Get();
             ScholarshipxjEntity entity = strEntity.ToObject<ScholarshipxjEntity>();
-            scholarshipxjIBLL.SaveEntity(keyValue,entity);
+            if (entity.State != "0")
+            {
+                entity.AuditPeople = LogUserinfo.userId;
+                entity.AuditTime = DateTime.Today;
+            }
+            scholarshipxjIBLL.SaveEntity(keyValue, entity);
             if (string.IsNullOrEmpty(keyValue))
             {
             }
             return Success("保存成功！");
         }
         #endregion
-
+        #region 扩展数据
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult AduitForm(string keyValue)
+        {
+            var logUser = LoginUserInfo.Get();
+            scholarshipxjIBLL.AuditEntity(keyValue, logUser.userId);
+            return Success("审核成功！");
+        }
+        #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardIndex.js

@@ -52,9 +52,6 @@ var bootstrap = function ($, learun) {
                     $("#NatureType").val(item.awardname);
                     $("#shuxing").val(item.naturetype);
                     $("#awardtype").val(item.awardtype);
-                    console.log($("#NatureType").val())
-                    console.log($("#shuxing").val())
-                    console.log($("#awardtype").val())
                 }
             });
             $('#RewardObjects').lrGirdSelect({

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/Form.js

@@ -17,7 +17,7 @@ var bootstrap = function ($, learun) {
             $('#NatureType').lrDataSourceSelect({
                 code: 'PunishmentSource', value: 'id', text: 'awardname',
             });
-            $('#AttachmentName').lrUploader();
+            //$('#AttachmentName').lrUploader();
             $('#StuName').lrGirdSelect({
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
                 selectWord: 'stuno',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Form.cshtml

@@ -4,17 +4,15 @@
 }
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj">
-        <div class="lr-form-item-title">助学金类型<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">奖学金类型<font face="宋体">*</font></div>
         <div id="SchoolType" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj">
-        <div class="lr-form-item-title">学生</div>
-        <input id="StuName" type="text" class="form-control" />
+        <div class="lr-form-item-title">学生<font face="宋体">*</font></div>
+        <div id="StuName" isvalid="yes" checkexpession="NotNull"></div>
+        <input id="StuNo" type="text" class="form-control" style="display: none" />
+        <input id="ClassNo" type="text" class="form-control" style="display: none" />
     </div>
-    @*<div class="col-xs-12 lr-form-item"  data-table="Scholarshipxj" >
-            <div class="lr-form-item-title">申请材料</div>
-            <div id="AttachmentName"  ></div>
-        </div>*@
     <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj">
         <div class="lr-form-item-title">获得时间<font face="宋体">*</font></div>
         <input id="GetTime" isvalid="yes" checkexpession="NotNull" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#GetTime').trigger('change'); } })" />
@@ -23,14 +21,14 @@
         <div class="lr-form-item-title">描述</div>
         <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
     </div>
-    @*<div class="col-xs-12 lr-form-item"  data-table="Scholarshipxj" >
-            <div class="lr-form-item-title">录入人</div>
-            <input id="LrPeople" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
-        </div>
-        <div class="col-xs-12 lr-form-item"  data-table="Scholarshipxj" >
-            <div class="lr-form-item-title">录入时间</div>
-            <input id="LrTime" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
-        </div>*@
+    <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj" style="display: none">
+        <div class="lr-form-item-title">录入人</div>
+        <input id="LrPeople" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj" style="display: none">
+        <div class="lr-form-item-title">录入时间</div>
+        <input id="LrTime" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj" style="display: none; ">
         <div class="lr-form-item-title">0奖学金 1助学金</div>
         <input id="IsType" type="text" class="form-control" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Form.js

@@ -15,12 +15,38 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#SchoolType').lrDataItemSelect({ code: 'Isjxj' });
-            //$('#SchoolType').lrselectSet("2");
-            //$('#AttachmentName').lrUploader();
+            $('#SchoolType').lrDataSourceSelect({ code: 'Isjxj',value: 'id',text: 'itemname' });
             $('#LrPeople')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
             $('#LrPeople').val(learun.clientdata.get(['userinfo']).realName);
-            $('#LrTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
+            $('#LrTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd'));
+            $('#StuName').lrGirdSelect({
+                // 字段
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
+                selectWord: 'stuno',
+                value: 'stuname',
+                text: 'stuname',
+                headData: [
+                    { label: "学号", name: "stuno", width: 100, align: "left" },
+                    { 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']);
+                                }
+                            });
+                        }
+                    }
+                ],
+                select: function (item) {
+                    $("#StuNo").val(item.stuno);
+                    $("#ClassNo").val(item.classno);
+                }
+            });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/FormAudit.cshtml

@@ -0,0 +1,37 @@
+@{
+    ViewBag.Title = "助学金及审核";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj">
+        <div class="lr-form-item-title">助学金类型<font face="宋体">*</font></div>
+        <div id="SchoolType" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj">
+        <div class="lr-form-item-title">学生<font face="宋体">*</font></div>
+        <div id="StuName" isvalid="yes" checkexpession="NotNull"></div>
+        <input id="StuNo" type="text" class="form-control" style="display: none" />
+        <input id="ClassNo" type="text" class="form-control" style="display: none" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj">
+        <div class="lr-form-item-title">申请材料</div>
+        <div id="AttachmentName"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj">
+        <div class="lr-form-item-title">获得时间<font face="宋体">*</font></div>
+        <input id="GetTime" isvalid="yes" checkexpession="NotNull" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#GetTime').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj">
+        <div class="lr-form-item-title">审核状态<font face="宋体">*</font></div>
+        <div id="State" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj">
+        <div class="lr-form-item-title">不同意原因:</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Scholarshipxj/FormAudit.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/FormAudit.js

@@ -0,0 +1,85 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-10-11 16:46
+ * 描  述：助学金及审核
+ */
+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 () {
+            $('#State').lrselect({
+                data: [{ text: "待审核", value: "0" }, { text: "同意", value: "1" }, { text: "不同意", value: "2" }],
+                text: "text",
+                value: "value"
+            })
+            $('#AttachmentName').lrUploader();
+            $('#SchoolType').lrDataSourceSelect({ code: 'Iszxj',value: 'id',text: 'itemname' });
+            $('#StuName').lrGirdSelect({
+                // 字段
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
+                selectWord: 'stuno',
+                value: 'stuname',
+                text: 'stuname',
+                headData: [
+                    { label: "学号", name: "stuno", width: 100, align: "left" },
+                    { 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']);
+                                }
+                            });
+                        }
+                    }
+                ],
+                select: function (item) {
+                    $("#StuNo").val(item.stuno);
+                    $("#ClassNo").val(item.classno);
+                }
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Scholarshipxj/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/Scholarshipxj/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Formzxj.cshtml

@@ -0,0 +1,45 @@
+@{
+    ViewBag.Title = "助学金及审核";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj">
+        <div class="lr-form-item-title">助学金类型<font face="宋体">*</font></div>
+        <div id="SchoolType" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj">
+        <div class="lr-form-item-title">学生<font face="宋体">*</font></div>
+        <div id="StuName" isvalid="yes" checkexpession="NotNull"></div>
+        <input id="StuNo" type="text" class="form-control" style="display: none" />
+        <input id="ClassNo" type="text" class="form-control" style="display: none" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj">
+        <div class="lr-form-item-title">申请材料</div>
+        <div id="AttachmentName"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj">
+        <div class="lr-form-item-title">获得时间<font face="宋体">*</font></div>
+        <input id="GetTime" isvalid="yes" checkexpession="NotNull" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#GetTime').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj" style="display: none">
+        <div class="lr-form-item-title">录入人</div>
+        <input id="LrPeople" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj" style="display: none">
+        <div class="lr-form-item-title">录入时间</div>
+        <input id="LrTime" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj" style="display: none; ">
+        <div class="lr-form-item-title">0奖学金 1助学金</div>
+        <input id="IsType" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj" style="display: none; ">
+        <div class="lr-form-item-title">状态</div>
+        <input id="State" type="text" class="form-control" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Scholarshipxj/Formzxj.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Formzxj.js

@@ -0,0 +1,90 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-10-11 16:46
+ * 描  述：助学金及审核
+ */
+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 () {
+            $('#State').lrselect({
+                data: [{ text: "待审核", value: "0" }, { text: "同意", value: "1" },{ text: "不同意", value: "2" }],
+                text: "text",
+                value: "value"
+            })
+            $('#SchoolType').lrDataSourceSelect({ code: 'Iszxj',value: 'id',text: 'itemname' });
+            $('#LrPeople')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            $('#LrPeople').val(learun.clientdata.get(['userinfo']).realName);
+            $('#LrTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd'));
+            $('#AttachmentName').lrUploader();
+            $('#StuName').lrGirdSelect({
+                // 字段
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
+                selectWord: 'stuno',
+                value: 'stuname',
+                text: 'stuname',
+                headData: [
+                    { label: "学号", name: "stuno", width: 100, align: "left" },
+                    { 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']);
+                                }
+                            });
+                        }
+                    }
+                ],
+                select: function (item) {
+                    $("#StuNo").val(item.stuno);
+                    $("#ClassNo").val(item.classno);
+                }
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Scholarshipxj/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]);
+                        }
+                    }
+                });
+            }
+           $('#IsType').val('1');
+           $('#State').val('0');
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Scholarshipxj/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Index.cshtml

@@ -7,6 +7,20 @@
         <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="SchoolType"></div>
+                                </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>
+                        </div>
+                    </div>
                 </div>
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">
@@ -16,6 +30,8 @@
                         <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
                         <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        @*<a id="lr_import" class="btn btn-default"><i class="fa fa-share-square-o"></i>&nbsp;导入</a>
+                        <a id="lr_export" class="btn btn-default"><i class="fa fa-sign-out"></i>&nbsp;导出</a>*@
                     </div>
                 </div>
             </div>

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

@@ -17,6 +17,11 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#SchoolType').lrDataSourceSelect({ code: 'Isjxj',value: 'id',text: 'itemname' });
+            
             // 新增
             $('#lr_add').on('click', function () {
                 learun.layerForm({
@@ -34,6 +39,10 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(",") != -1) {
+                        learun.alert.warning("只能选择一条记录进行操作！");
+                        return false;
+                    }
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
@@ -59,28 +68,70 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 导入
+            $('#lr_import').on('click', function () {
+                learun.layerForm({
+                    id: 'ImportForm',
+                    title: '导入模板',
+                    url: top.$.rootUrl + '/LR_NewWorkFlow/NWFScheme/ImportForm',
+                    width: 600,
+                    height: 400,
+                    maxmin: true,
+                    btn: null
+                });
+            });
+            // 导出
+            $('#lr_export').on('click', function () {
+                learun.layerForm({
+                    id: "ExcelExportForm",
+                    title: '导出Excel数据',
+                    url: top.$.rootUrl + '/Utility/ExcelExportForm?gridId=gridtable&filename=log',
+                    width: 500,
+                    height: 380,
+                    callBack: function (id) {
+                        return top[id].acceptClick();
+                    },
+                    btn: ['导出Excel', '关闭']
+                });
+            });
         },
         // 初始化列表
         initGird: function () {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/Scholarshipxj/GetPageList',
                 headData: [
-                    { label: "学生", name: "StuName", width: 100, align: "left"},
-                    { label: "学生学号", name: "StuNo", width: 100, align: "left"},
-                    { label: "班级", name: "ClassNo", width: 100, align: "left" },
+                    { label: "学生", name: "StuName", width: 200, align: "left"},
+                    { label: "学生学号", name: "StuNo", width: 200, align: "left"},
+                    { label: "班级", name: "ClassNo", width: 200, 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: "SchoolType", width: 100, align: "left",
+                        label: "奖学金类型", name: "SchoolType", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Isjxj',
                                 key: value,
-                                code: 'AwardType',
+                                keyId: 'id',
                                 callback: function (_data) {
-                                    callback(_data.text);
+                                    callback(_data['itemname']);
                                 }
                             });
                         }
                     },
-                    { label: "获得时间", name: "GetTime", width: 100, align: "left"},
+                    { label: "获得时间", name: "GetTime", width: 200, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
                 ],
                 mainId:'Id',
                 isPage: true,
@@ -90,23 +141,12 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.IsType = 0;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         },
-        //downLoad: function (fileId) {
-        //    top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: top.$.lrToken }, method: 'POST' });
-        //}
     };
     refreshGirdData = function () {
         $('#gridtable').jfGridSet('reload');
     };
     page.init();
-}
-//function downLoad(fileId, fileTwo) {
-//    if (fileTwo) {
-
-//        top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () {
-
-//        });
-//    }
-//    top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' });
-//}
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/IndexTwo.cshtml → Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/IndexAudit.cshtml

@@ -1,33 +1,26 @@
 @{
-    ViewBag.Title = "奖学金提名";
+    ViewBag.Title = "助学金及审核";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-<div class="lr-layout">
+<div class="lr-layout "  >
     <div class="lr-layout-center">
-        <div class="lr-layout-wrap  ">
-            <div class="lr-layout-title">
-                <span id="titleinfo" class="lrlt">列表信息</span>
-            </div>
+        <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>
-                                    <input id="StuName" type="text" class="form-control" />
+                                    <div class="lr-form-item-title">助学金类型</div>
+                                    <div id="SchoolType"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系</div>
-                                    <div id="MajorNo"></div>
+                                    <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="Grade" type="text" class="form-control" />
-                                </div>*@
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">班级</div>
-                                    <div id="ClassNo"></div>
+                                    <div class="lr-form-item-title">状态</div>
+                                    <div id="State"></div>
                                 </div>
                             </div>
                         </div>
@@ -37,10 +30,13 @@
                     <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_allaudit"   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/DtHonoraryUser/IndexTwo.js")
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Scholarshipxj/IndexAudit.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/IndexAudit.js

@@ -0,0 +1,146 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-10-11 16:46
+ * 描  述：助学金及审核
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#SchoolType').lrDataSourceSelect({ code: 'Iszxj', value: 'id', text: 'itemname' });
+            $('#State').lrselect({
+                data: [{ text: "待审核", value: "0" }, { text: "同意", value: "1" }, { text: "不同意", value: "2" }],
+                text: "text",
+                value: "value"
+            })
+            // 审核
+            $('#lr_allaudit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(",") != -1) {
+                        learun.layerConfirm('是否确认审核选中项！', function (res) {
+                            if (res) {
+                                learun.postForm(top.$.rootUrl + '/EducationalAdministration/Scholarshipxj/AduitForm', { keyValue: keyValue }, function () {
+                                    refreshGirdData();
+                                });
+                            }
+                        });
+                    } else {
+                        var State = $('#gridtable').jfGridValue('State');
+                        if (State != 0) {
+                            learun.alert.warning("当前项不可进行审核！");
+                            return false;
+                        }
+                        learun.layerForm({
+                            id: 'form',
+                            title: '审核',
+                            url: top.$.rootUrl + '/EducationalAdministration/Scholarshipxj/FormAudit?keyValue=' + keyValue,
+                            width: 600,
+                            height: 580,
+                            callBack: function (id) {
+                                return top[id].acceptClick(refreshGirdData);
+                            }
+                        });
+
+                    }
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/Scholarshipxj/GetPageList',
+                headData: [
+                    { label: "学生", name: "StuName", width: 200, align: "left" },
+                    { label: "学生学号", name: "StuNo", width: 200, align: "left" },
+                    {
+                        label: "班级", name: "ClassNo", width: 200, 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: "SchoolType", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Iszxj',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['itemname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "申请时间", name: "GetTime", width: 200, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: "审核状态", name: "State", width: 200, align: "left",
+                        formatter: function (cellvalue) {
+                            if (cellvalue == '0') {
+                                return '<span class=\"label label-warning\">待审核</span>';
+                            } else if (cellvalue == '1') {
+                                return '<span class=\"label label-success\">审核通过</span>';
+                            } else if (cellvalue == '2') {
+                                return '<span class=\"label label-danger\">不通过</span>';
+                            }
+                        }
+                    },
+                    {
+                        label: "审核时间", name: "AuditTime", width: 200, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                ],
+                mainId: 'Id',
+                isPage: true,
+                isMultiselect: true,//复选框
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.IsType = 1;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        },
+        downLoad: function (fileId) {
+            top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: top.$.lrToken }, method: 'POST' });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}
+function downLoad(fileId, fileTwo) {
+    if (fileTwo) {
+        top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () {
+        });
+    }
+    top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' });
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/IndexTwo.js

@@ -1,133 +0,0 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
- * Copyright (c) 2013-2018 北京泉江科技有限公司 
- * 创建人：超级管理员
- * 日  期：2019-03-29 11:27
- * 描  述：在册登记明细
- */
-var refreshGirdData;
-var acceptClick;
-var bootstrap = function ($, learun) {
-    "use strict";
-    var page = {
-        init: function () {
-            page.initGird();
-            page.bind();
-            //if (currentUser) {
-            //    setTimeout("hiddenButton()", 300);
-            //}
-        },
-        bind: function () {
-            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
-                page.search(queryJson);
-            }, 200, 400);
-            // 刷新
-            $('#lr_refresh').on('click', function () {
-                location.reload();
-            });
-        },
-        // 初始化列表
-        initGird: function () {
-            $('#gridtable').jfGrid({
-                url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList',
-                headData: [
-                    {
-                        label: "学生", name: "StuName", width: 150, align: "left",
-                    },
-                    {
-                        label: "所属系", name: "DeptNo", width: 200, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-                                key: value,
-                                keyId: 'deptno',
-                                callback: function (_data) {
-                                    callback(_data['deptname']);
-                                }
-                            });
-                        }
-                    },
-                    {
-                        label: "年级", name: "Grade", width: 150, align: "left",
-                    },
-                    {
-                        label: "班级", name: "ClassNo", width: 200, 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']);
-                                }
-                            });
-                        }
-                    },
-                ],
-                mainId: 'stuId',
-                //mainId: 'AIId',
-                isMultiselect: true,
-                isPage: true,
-                //sidx: 'AICodeNum'
-            });
-            page.search();
-        },
-        search: function (param) {
-            param = param || {};
-            //param.AId = AId;
-            //if (currentUser) {
-            //    var userInfo = top.learun.clientdata.get(['userinfo']);
-            //    param.userId = userInfo.userId;
-            //}
-            param.AIIsScrap = false;
-            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
-        }
-    };
-    refreshGirdData = function () {
-        page.search();
-    };
-    // 保存数据
-    acceptClick = function (callBack) {
-        var selectedRow = $('#gridtable').jfGridGet('rowdata');
-        var postData = {
-            strEntity: JSON.stringify(selectedRow)
-        };
-        var keyValue = "";
-        $.lrSaveForm(top.$.rootUrl + '/StudentWork/SW_Ask_Student/Nominate?keyValue=' + keyValue, postData, function (res) {
-            // 保存成功后才回调
-            if (!!callBack) {
-                callBack();
-            }
-        });
-    };
-    page.init();
-}
-
-
-Date.prototype.Format = function (fmt) { //author: meizz 
-    var o = {
-        "M+": this.getMonth() + 1, //月份 
-        "d+": this.getDate(), //日 
-        "H+": this.getHours(), //小时 
-        "m+": this.getMinutes(), //分 
-        "s+": this.getSeconds(), //秒 
-        "q+": Math.floor((this.getMonth() + 3) / 3), //季度 
-        "S": this.getMilliseconds() //毫秒 
-    };
-    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
-    for (var k in o)
-        if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-    return fmt;
-}
-
-
-function datedifference(sDate1, sDate2) {    //sDate1和sDate2是2006-12-18格式  
-    var dateSpan,
-        tempDate,
-        iDays;
-    sDate1 = Date.parse(sDate1);
-    sDate2 = Date.parse(sDate2);
-    dateSpan = sDate2 - sDate1;
-    dateSpan = Math.abs(dateSpan);
-    iDays = Math.floor(dateSpan / (24 * 3600 * 1000));
-    return iDays;
-};

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Indexzxj.cshtml

@@ -0,0 +1,46 @@
+@{
+    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="SchoolType"></div>
+                                </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="State"></div>
+                                </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" learun-authorize="yes">
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        @*<a id="lr_import" class="btn btn-default"><i class="fa fa-share-square-o"></i>&nbsp;导入</a>
+                        <a id="lr_export" class="btn btn-default"><i class="fa fa-sign-out"></i>&nbsp;导出</a>*@
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Scholarshipxj/Indexzxj.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Indexzxj.js

@@ -0,0 +1,192 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-10-11 16:46
+ * 描  述：助学金及审核
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#SchoolType').lrDataSourceSelect({ code: 'Iszxj',value: 'id',text: 'itemname' });
+            $('#State').lrselect({
+                data: [{ text: "待审核", value: "0" }, { text: "同意", value: "1" }, { text: "不同意", value: "2" }],
+                text: "text",
+                value: "value"
+            })
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/Scholarshipxj/Formzxj',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(",") != -1) {
+                        learun.alert.warning("只能选择一条记录进行操作！");
+                        return false;
+                    }
+                    var State = $('#gridtable').jfGridValue('State');
+                    if (State != 0) {
+                        learun.alert.warning("当前项不可进行编辑！");
+                        return false;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/Scholarshipxj/Formzxj?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    if (State != 0) {
+                        learun.alert.warning("当前项不可进行删除！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Scholarshipxj/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 导入
+            $('#lr_import').on('click', function () {
+                learun.layerForm({
+                    id: 'ImportForm',
+                    title: '导入模板',
+                    url: top.$.rootUrl + '/LR_NewWorkFlow/NWFScheme/ImportForm',
+                    width: 600,
+                    height: 400,
+                    maxmin: true,
+                    btn: null
+                });
+            });
+            // 导出
+            $('#lr_export').on('click', function () {
+                learun.layerForm({
+                    id: "ExcelExportForm",
+                    title: '导出Excel数据',
+                    url: top.$.rootUrl + '/Utility/ExcelExportForm?gridId=gridtable&filename=log',
+                    width: 500,
+                    height: 380,
+                    callBack: function (id) {
+                        return top[id].acceptClick();
+                    },
+                    btn: ['导出Excel', '关闭']
+                });
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/Scholarshipxj/GetPageList',
+                headData: [
+                    { label: "学生", name: "StuName", width: 200, align: "left"},
+                    { label: "学生学号", name: "StuNo", width: 200, align: "left"},
+                    { label: "班级", name: "ClassNo", width: 200, 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: "SchoolType", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Iszxj',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['itemname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "申请时间", name: "GetTime", width: 200, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    { label: "审核状态", name: "State", width: 200, align: "left" ,
+                        formatter: function(cellvalue) {
+                            if (cellvalue == '0') {
+                                return '<span class=\"label label-warning\">待审核</span>';
+                            } else if (cellvalue == '1') {
+                                return '<span class=\"label label-success\">审核通过</span>';
+                            } else if (cellvalue == '2') {
+                                return '<span class=\"label label-danger\">不通过</span>';
+                            }
+                        }
+                    },
+                    {
+                        label: "审核时间", name: "AuditTime", width: 200, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                ],
+                mainId:'Id',
+                isPage: true,
+                isMultiselect: true,//复选框
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.IsType = 1;
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        },
+        downLoad: function (fileId) {
+            top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: top.$.lrToken }, method: 'POST' });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}
+function downLoad(fileId, fileTwo) {
+    if (fileTwo) {
+        top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () {
+        });
+    }
+    top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' });
+}

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

@@ -979,7 +979,10 @@
     <Content Include="Areas\EducationalAdministration\Views\R_EnterSchool\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\R_EnterSchool\DeptReport.js" />
     <Content Include="Areas\EducationalAdministration\Views\R_EnterSchool\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\Scholarshipxj\IndexTwo.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Scholarshipxj\FormAudit.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Scholarshipxj\Formzxj.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Scholarshipxj\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Scholarshipxj\IndexAudit.js" />
     <Content Include="Areas\EducationalAdministration\Views\Scholarship\FormZxj.js" />
     <Content Include="Areas\EducationalAdministration\Views\Scholarship\IndexZxj.js" />
     <Content Include="Areas\EducationalAdministration\Views\ScoreStatistics\Form.js" />
@@ -6400,7 +6403,7 @@
     <Content Include="Areas\EducationalAdministration\Views\Scholarship\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Scholarship\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\Scholarshipxj\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\Scholarshipxj\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Scholarshipxj\Indexzxj.js" />
     <Content Include="Areas\EducationalAdministration\Views\Scholarshipxj\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Scholarshipxj\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\Index.cshtml" />
@@ -7214,6 +7217,10 @@
     <Content Include="Areas\EducationalAdministration\Views\AwardPunishInfo\AwardIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Scholarship\FormZxj.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Scholarship\IndexZxj.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Scholarshipxj\Indexzxj.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Scholarshipxj\Formzxj.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Scholarshipxj\IndexAudit.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Scholarshipxj\FormAudit.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Scholarshipxj\IndexTwo.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\IndexManage.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\FormManage.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Scholarshipzxj/ScholarshipxjBLL.cs

@@ -121,5 +121,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         #endregion
 
+        #region 审核数据
+        /// <summary>
+        /// 审核数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void AuditEntity(string keyValue,string UserId)
+        {
+            try
+            {
+                scholarshipxjService.AuditEntity(keyValue, UserId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Scholarshipzxj/ScholarshipxjEntity.cs

@@ -50,7 +50,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("ISTYPE")]
         public string IsType { get; set; }
         /// <summary>
-        /// 状态 0草稿 1 审核中 2 审核完成
+        /// 状态 0待审核 1 通过 2 不通过
         /// </summary>
         [Column("STATE")]
         public string State { get; set; }
@@ -84,6 +84,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("REMARK")]
         public string Remark { get; set; }
+        /// <summary>
+        /// 不同意原因
+        /// </summary>
+        [Column("DEMO")]
+        public string Demo { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Scholarshipzxj/ScholarshipxjIBLL.cs

@@ -44,5 +44,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         void SaveEntity(string keyValue, ScholarshipxjEntity entity);
         #endregion
 
+        #region 
+        /// <summary>
+        /// 审核数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="UserId">审核人ID</param>
+        void AuditEntity(string keyValue,string UserId);
+
+        #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Scholarshipzxj/ScholarshipxjService.cs

@@ -31,24 +31,33 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.Id,
-                t.SchoolType,
-                t.StuName,
-                t.AttachmentName,
-                t.GetTime,
-                t.Remark,
-                t.LrPeople,
-                t.LrTime,
-                t.IsType,
-                t.State
-                ");
+                strSql.Append(@" *  ");
                 strSql.Append("  FROM ScholarshipAudit t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
-                return this.BaseRepository("CollegeMIS").FindList<ScholarshipxjEntity>(strSql.ToString(),dp, pagination);
+                if (!queryParam["SchoolType"].IsEmpty())
+                {
+                    dp.Add("SchoolType", queryParam["SchoolType"].ToString(), DbType.String);
+                    strSql.Append(" AND t.SchoolType = @SchoolType ");
+                }
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuName Like @StuName ");
+                }
+                if (!queryParam["IsType"].IsEmpty())
+                {
+                    dp.Add("IsType", queryParam["IsType"].ToString(), DbType.String);
+                    strSql.Append(" AND t.IsType = @IsType ");
+                }
+                if (!queryParam["State"].IsEmpty())
+                {
+                    dp.Add("State", queryParam["State"].ToString(), DbType.String);
+                    strSql.Append(" AND t.State = @State ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<ScholarshipxjEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -97,9 +106,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         public void DeleteEntity(string keyValue)
         {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<ScholarshipxjEntity>(t=>t.Id == keyValue);
+                //多个删除
+                var keyValueArr = keyValue.Split(',');
+                foreach (var item in keyValueArr)
+                {
+                    db.Delete<ScholarshipxjEntity>(t => t.Id == item && t.State != "1");
+                }
+                db.Commit();
             }
             catch (Exception ex)
             {
@@ -149,5 +165,44 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         #endregion
 
+        #region 审核数据
+        /// <summary>
+        /// 审核数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void AuditEntity(string keyValue, string UserId)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                //多个审核
+                var IdList = keyValue.Split(',');
+                foreach (var item in IdList)
+                {
+                    var List = db.FindEntity<ScholarshipxjEntity>(x => x.Id == item && x.State == "0");
+                    if (List != null)
+                    {
+                        List.State = "1";
+                        List.AuditTime = DateTime.Now;
+                        List.AuditPeople = UserId;
+                        db.Update(List);
+                    }
+                }
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
     }
 }