学籍异动

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

@@ -47,24 +47,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
-        /// <summary>
-        /// 表单查看页
-        /// <summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult Formbefore()
-        {
-            return View();
-        }
-        /// <summary>
-        /// 表单查看页
-        /// <summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult Formafter()
-        {
-            return View();
-        }
         #endregion
 
         #region  获取数据
@@ -140,7 +122,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             stuInfoBasicChangeIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
-        
+
         /// <summary>
         /// 审核实体数据
         /// <param name="keyValue">主键</param>
@@ -167,20 +149,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success("操作成功！");
         }
 
-        /// <summary>
-        /// 生成学籍
-        /// <param name="keyValue">主键</param>
-        /// <summary>
-        /// <returns></returns>
-        [HttpPost]
-        [AjaxOnly]
-
-        public ActionResult GenerateStu(string stuNo)
-        {
-            stuInfoBasicChangeIBLL.GenerateStu(stuNo);
-            return Success("生成成功！");
-        }
-
         #endregion
 
     }

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

@@ -26,7 +26,7 @@
         <div id="StuChangeReason" isvalid="yes" checkexpession="NotNull"></div>
     </div>
 
-    <div class="col-xs-12 text-center">学籍原安排</div>
+    <div class="col-xs-12 text-center">学籍异动前信息</div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
         <div id="DeptNo"  readonly="readonly"></div>
@@ -46,7 +46,7 @@
             <input id="OutSchool" type="text" class="form-control" />
         </div>
     </div>
-    <div class="col-xs-12 text-center">学籍新安排</div>
+    <div class="col-xs-12 text-center">学籍异动后信息</div>
     <div class="NewContainer" style="display:none;">
         <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
             <div class="lr-form-item-title" data-title="新系部">新系部</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Formafter.cshtml

@@ -1,50 +0,0 @@
-@{
-    ViewBag.Title = "学籍异动";
-    Layout = "~/Views/Shared/_Form.cshtml";
-}
-<style>
-    .text-center {
-        padding: 10px 0;
-    }
-</style>
-<div class="lr-form-wrap">
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasicChange">
-        <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
-        <input id="StuNo" type="text" class="form-control" readonly="readonly" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasicChange">
-        <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="StuInfoBasicChange">
-        <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
-        <div id="StuChangeType" readonly="readonly"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasicChange">
-        <div class="lr-form-item-title">异动原因<font face="宋体">*</font></div>
-        <div id="StuChangeReason" readonly="readonly"></div>
-    </div>
-    <div class="NewSchool" style="display:none;">
-        <div class="col-xs-12 lr-form-item" data-table="StuInfoBasicChange">
-            <div class="lr-form-item-title" data-title="转出学校">转出学校</div>
-            <input id="OutSchool" type="text" class="form-control" readonly="readonly" />
-        </div>
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
-        <div class="lr-form-item-title" data-title="新系部">新系部</div>
-        <div id="NewDeptNo" class="contentDiv " readonly="readonly"></div>
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
-        <div class="lr-form-item-title" data-title="新专业">新专业</div>
-        <div id="NewMajorNo" class="contentDiv " readonly="readonly"></div>
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
-        <div class="lr-form-item-title" data-title="新班级">新班级</div>
-        <div id="NewClassNo" class="contentDiv zhuanban" readonly="readonly"></div>
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasicChange">
-        <div class="lr-form-item-title">备注</div>
-        <textarea id="StuChangeRemark" class="form-control" style="height:50px;" readonly="readonly"></textarea>
-    </div>
-</div>
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasicChange/Formafter.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Formafter.js

@@ -1,206 +0,0 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
- * Copyright (c) 2013-2018 北京泉江科技有限公司 
- * 创建人：超级管理员
- * 日  期：2019-10-28 11:48
- * 描  述：学籍异动
- */
-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 () {
-            $('#StuChangeType').lrDataItemSelect({
-                code: 'StuChangeType', select: function (item) {
-                    if (item != null && item != undefined) {
-                        var StuNo = $('#StuNo').val();
-                        if (!StuNo) {
-                            learun.alert.warning("请输入学号或姓名！");
-                            $('#StuChangeType').lrselectSet();
-                            return false;
-                        }
-                        $(".NewContainer").find('.contentDiv').lrselectSet();
-                        $(".NewContainer").find('.contentDiv').attr("isvalid", "yes");
-                        $(".NewContainer").find('.contentDiv').attr("checkexpession", "NotNull");
-                        $(".NewContainer").find('.contentDiv').attr('readonly', 'readonly');
-                        $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
-                        $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
-                        $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
-                        $(".NewContainer").show();
-                        $(".NewSchool").hide();
-                        if (item.id === "01") { //留级
-                            $(".NewSchool").hide();
-                            $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
-                            $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet());
-                            $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet());
-                            $('#OutSchool').val('');
-                        } else if (item.id === "02") {//转校
-                            $(".NewSchool").show();
-                            $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
-                            $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
-                            $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                            $(".NewSchool").find('.OutSchool').attr("isvalid", 'yes');
-                            $(".NewSchool").find('.OutSchool').attr("checkexpession");
-                            $(".NewSchool").find('.OutSchool').attr('readonly');
-                        } else if (item.id === "03") { //复学
-                            $(".NewSchool").hide();
-                            $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                            $(".NewSchool").find('.OutSchool').attr("isvalid", "Null");
-                            $('#OutSchool').val('');
-                        } else { //退学、休学、转校
-                            $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
-                            $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
-                            $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                            $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title'));
-                            $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
-                            $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
-                            $(".NewContainer").hide();
-                            $(".NewSchool").hide();
-                            $('#OutSchool').val('');
-                        }
-                    }
-                }
-            });
-            $('#StuChangeReason').lrDataItemSelect({ code: 'StuChangeReason' });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
-            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
-            $('#NewDeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
-                    if (item != null && item != undefined) {
-                        $('#NewMajorNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "deptno='" + item.deptno + "' AND CheckMark=1 order by majorno" }
-                        });
-                    } else {
-                        $('#NewMajorNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "CheckMark=1 order by majorno" }
-                        });
-                    }
-                }
-            });
-            $('#NewMajorNo').lrDataSourceSelect({
-                code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: function (item) {
-                    if (item != null && item != undefined) {
-                        $('#NewClassNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                            param: { strWhere: "MajorNo='" + item.majorno + "' AND CheckMark=1 order by classno" }
-                        });
-                    } else {
-                        $('#NewClassNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                            param: { strWhere: "CheckMark=1 order by classno" }
-                        });
-                    }
-                }
-            });
-            $('#NewClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
-            //监听学号
-            $("#StuNo").on('blur', function () {
-                var StuNo = $(this).val();
-                if (StuNo) {
-                    learun.httpAsync('get', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetStuInfo?Account=' + StuNo, '', function (data) {
-                        if (data) {
-                            $("#StuNo").val(data.StuNo);
-                            $("#StuName").val(data.StuName);
-                            $("#DeptNo").lrselectSet(data.DeptNo);
-                            $("#MajorNo").lrselectSet(data.MajorNo);
-                            $("#ClassNo").lrselectSet(data.ClassNo);
-                        } else {
-                            learun.alert.warning("学生不存在！");
-                            //return false;
-                        }
-                    });
-                }
-            });
-            //监听姓名
-            $("#StuName").on('blur', function () {
-                var StuName = $(this).val().trim();
-                if (StuName) {
-                    learun.httpAsync('get', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetStuInfoBasicEntityByStuName?name=' + StuName, '', function (data) {
-                        if (data) {
-                            $("#StuNo").val(data.StuNo);
-                            $("#StuName").val(data.StuName);
-                            $("#DeptNo").lrselectSet(data.DeptNo);
-                            $("#MajorNo").lrselectSet(data.MajorNo);
-                            $("#ClassNo").lrselectSet(data.ClassNo);
-                        } else {
-                            learun.alert.warning("学生不存在！");
-                            return false;
-                        }
-                    });
-                }
-            });
-        },
-        initData: function () {
-            if (!!keyValue) {
-                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/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]);
-
-                            $(".NewContainer").find('.contentDiv').attr("isvalid", "yes");
-                            $(".NewContainer").find('.contentDiv').attr("checkexpession", "NotNull");
-                            $(".NewContainer").find('.contentDiv').attr('readonly', 'readonly');
-                            $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
-                            $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
-                            $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
-                            $(".NewContainer").show();
-                            if (data[id].StuChangeType == "01") { //降级、转班
-                                $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
-                                $(".NewSchool").hide();
-                            }
-                            else if (data[id].StuChangeType == "02") {//转校
-                                $(".NewSchool").show();
-                                $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
-                                $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
-                                $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                                $(".NewSchool").find('.OutSchool').attr("isvalid");
-                                $(".NewSchool").find('.OutSchool').attr("checkexpession");
-                                $(".NewSchool").find('.OutSchool').attr('readonly');
-                            } else if (data[id].StuChangeType == "03") { //转专业
-                                $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                                $(".NewSchool").hide();
-                            }
-                            else {    //退学、休学、转校
-                                $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
-                                $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
-                                $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                                $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title'));
-                                $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
-                                $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
-                                $(".NewContainer").hide();
-                                $(".NewSchool").hide();
-                            }
-                        }
-                    }
-                });
-            }
-        }
-    };
-    // 保存数据
-    acceptClick = function (callBack) {
-        if (!$('body').lrValidform()) {
-            return false;
-        }
-        var postData = {
-            strEntity: JSON.stringify($('body').lrGetFormData())
-        };
-        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/SaveForm?keyValue=' + keyValue, postData, function (res) {
-            // 保存成功后才回调
-            if (!!callBack) {
-                callBack();
-            }
-        });
-    };
-    page.init();
-}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Formbefore.cshtml

@@ -1,44 +0,0 @@
-@{
-    ViewBag.Title = "学籍异动";
-    Layout = "~/Views/Shared/_Form.cshtml";
-}
-<style>
-    .text-center {
-        padding: 10px 0;
-    }
-</style>
-<div class="lr-form-wrap">
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasicChange">
-        <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
-        <input id="StuNo" type="text" class="form-control" readonly="readonly"/>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasicChange">
-        <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="StuInfoBasicChange">
-        <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
-        <div id="StuChangeType" readonly="readonly"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasicChange">
-        <div class="lr-form-item-title">异动原因<font face="宋体">*</font></div>
-        <div id="StuChangeReason" readonly="readonly"></div>
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
-        <div class="lr-form-item-title">原系部<font face="宋体">*</font></div>
-        <div id="DeptNo" readonly="readonly"></div>
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
-        <div class="lr-form-item-title">原专业<font face="宋体">*</font></div>
-        <div id="MajorNo" readonly="readonly"></div>
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
-        <div class="lr-form-item-title">原班级<font face="宋体">*</font></div>
-        <div id="ClassNo" readonly="readonly"></div>
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasicChange">
-        <div class="lr-form-item-title">备注</div>
-        <textarea id="StuChangeRemark" class="form-control" style="height:50px;" readonly="readonly"></textarea>
-    </div>
-</div>
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasicChange/Formbefore.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Formbefore.js

@@ -1,215 +0,0 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
- * Copyright (c) 2013-2018 北京泉江科技有限公司 
- * 创建人：超级管理员
- * 日  期：2019-10-28 11:48
- * 描  述：学籍异动
- */
-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 () {
-            $('#StuChangeType').lrDataItemSelect({
-                code: 'StuChangeType', select: function (item) {
-                    if (item != null && item != undefined) {
-                        var StuNo = $('#StuNo').val();
-                        if (!StuNo) {
-                            learun.alert.warning("请输入学号或姓名！");
-                            $('#StuChangeType').lrselectSet();
-                            return false;
-                        }
-                        $(".NewContainer").find('.contentDiv').lrselectSet();
-                        $(".NewContainer").find('.contentDiv').attr("isvalid", "yes");
-                        $(".NewContainer").find('.contentDiv').attr("checkexpession", "NotNull");
-                        $(".NewContainer").find('.contentDiv').attr('readonly', 'readonly');
-                        $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
-                        $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
-                        $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
-                        $(".NewContainer").show();
-                        $(".NewSchool").hide();
-                        if (item.id === "01") { //留级
-                            $(".NewSchool").hide();
-                            $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
-                            $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet());
-                            $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet());
-                            $('#OutSchool').val('');
-                        } else if (item.id === "02") {//转校
-                            $(".NewSchool").show();
-                            $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
-                            $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
-                            $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                            $(".NewSchool").find('.OutSchool').attr("isvalid",'yes');
-                            $(".NewSchool").find('.OutSchool').attr("checkexpession");
-                            $(".NewSchool").find('.OutSchool').attr('readonly');
-                        } else if (item.id === "03") { //复学
-                            $(".NewSchool").hide();
-                            $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                            $(".NewSchool").find('.OutSchool').attr("isvalid", "Null");
-                            $('#OutSchool').val('');
-                        } else { //退学、休学、转校
-                            $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
-                            $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
-                            $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                            $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title'));
-                            $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
-                            $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
-                            $(".NewContainer").hide();
-                            $(".NewSchool").hide();
-                            $('#OutSchool').val('');
-                        }
-                    }
-                }
-            });
-            $('#StuChangeReason').lrDataItemSelect({ code: 'StuChangeReason' });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
-            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
-            $('#NewDeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
-                    if (item != null && item != undefined) {
-                        $('#NewMajorNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "deptno='" + item.deptno + "' AND CheckMark=1 order by majorno" }
-                        });
-                    } else {
-                        $('#NewMajorNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "CheckMark=1 order by majorno" }
-                        });
-                    }
-                }
-            });
-            $('#NewMajorNo').lrDataSourceSelect({
-                code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: function (item) {
-                    if (item != null && item != undefined) {
-                        $('#NewClassNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                            param: { strWhere: "MajorNo='" + item.majorno + "' AND CheckMark=1 order by classno" }
-                        });
-                    } else {
-                        $('#NewClassNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                            param: { strWhere: "CheckMark=1 order by classno" }
-                        });
-                    }
-                }
-            });
-            $('#NewClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
-            //监听学号
-            $("#StuNo").on('blur', function () {
-                var StuNo = $(this).val();
-                if (StuNo) {
-                    learun.httpAsync('get', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetStuInfo?Account=' + StuNo, '', function (data) {
-                        if (data) {
-                            $("#StuNo").val(data.StuNo);
-                            $("#StuName").val(data.StuName);
-                            $("#DeptNo").lrselectSet(data.DeptNo);
-                            $("#MajorNo").lrselectSet(data.MajorNo);
-                            $("#ClassNo").lrselectSet(data.ClassNo);
-                        } else {
-                            learun.alert.warning("学生不存在！");
-                            //return false;
-                        }
-                    });
-                }
-            });
-            //监听姓名
-            $("#StuName").on('blur', function () {
-                var StuName = $(this).val().trim();
-                if (StuName) {
-                    learun.httpAsync('get', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetStuInfoBasicEntityByStuName?name=' + StuName, '', function (data) {
-                        if (data) {
-                            $("#StuNo").val(data.StuNo);
-                            $("#StuName").val(data.StuName);
-                            $("#DeptNo").lrselectSet(data.DeptNo);
-                            $("#MajorNo").lrselectSet(data.MajorNo);
-                            $("#ClassNo").lrselectSet(data.ClassNo);
-                        } else {
-                            learun.alert.warning("学生不存在！");
-                            return false;
-                        }
-                    });
-                }
-            });
-            //编辑
-            if (!!keyValue) {
-                $("#StuNo").attr('readonly', 'readonly');
-                $("#StuName").attr('readonly', 'readonly');
-            }
-        },
-        initData: function () {
-            if (!!keyValue) {
-                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/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]);
-
-                            $(".NewContainer").find('.contentDiv').attr("isvalid", "yes");
-                            $(".NewContainer").find('.contentDiv').attr("checkexpession", "NotNull");
-                            $(".NewContainer").find('.contentDiv').attr('readonly', 'readonly');
-                            $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
-                            $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
-                            $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
-                            $(".NewContainer").show();
-                            if (data[id].StuChangeType == "01") { //降级、转班
-                                $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
-                                $(".NewSchool").hide();
-                                $('#OutSchool').val('');
-                            }
-                            else if (data[id].StuChangeType == "02") {//转校
-                                $(".NewSchool").show();
-                                $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
-                                $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
-                                $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                                $(".NewSchool").find('.OutSchool').attr("isvalid");
-                                $(".NewSchool").find('.OutSchool').attr("checkexpession");
-                                $(".NewSchool").find('.OutSchool').attr('readonly');
-                                $('#OutSchool').val('');
-                            } else if (data[id].StuChangeType == "03") { //转专业
-                                $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                                $(".NewSchool").hide();
-                                $('#OutSchool').val('');
-                            }
-                            else {    //退学、休学、转校
-                                $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
-                                $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
-                                $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                                $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title'));
-                                $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
-                                $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
-                                $(".NewContainer").hide();
-                                $(".NewSchool").hide();
-                                $('#OutSchool').val('');
-                            }
-                        }
-                    }
-                });
-            }
-        }
-    };
-    // 保存数据
-    acceptClick = function (callBack) {
-        if (!$('body').lrValidform()) {
-            return false;
-        }
-        var postData = {
-            strEntity: JSON.stringify($('body').lrGetFormData())
-        };
-        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/SaveForm?keyValue=' + keyValue, postData, function (res) {
-            // 保存成功后才回调
-            if (!!callBack) {
-                callBack();
-            }
-        });
-    };
-    page.init();
-}

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

@@ -28,9 +28,6 @@
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                         <a id="lr_check" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;审核</a>
                         <a id="lr_uncheck" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp;去审核</a>
-                        <a id="lr_before" class="btn btn-default"><i class="fa fa-square"></i>&nbsp;异动前信息</a>
-                        <a id="lr_after" class="btn btn-default"><i class="fa fa-trash"></i>&nbsp;异动后信息</a>
-                        <a id="lr_stuCode" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;生成学籍</a>
                     </div>
                 </div>
             </div>

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

@@ -108,60 +108,6 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            // 异动前学籍信息
-            $('#lr_before').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                learun.layerForm({
-                    id: 'form',
-                    title: '异动前学籍信息',
-                    url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/Formbefore?keyValue=' + keyValue,
-                    width: 800,
-                    height: 400,
-                    callBack: function (id) {
-                        return top[id].acceptClick(refreshGirdData);
-                    },
-                    btn: null
-                });
-            });
-            // 异动后学籍信息
-            $('#lr_after').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                if (learun.checkrow(keyValue)) {
-                    learun.layerForm({
-                        id: 'form',
-                        title: '异动前学籍信息',
-                        url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/Formafter?keyValue=' + keyValue,
-                        width: 800,
-                        height: 400,
-                        callBack: function (id) {
-                            return top[id].acceptClick(refreshGirdData);
-                        },
-                        btn: null
-                    });
-                }
-            });
-            $('#lr_stuCode').on('click', function () {
-                var StuNo = $('#gridtable').jfGridValue('StuNo');
-                if (learun.checkrow(StuNo)) {
-                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckStatus != 1) {
-                        learun.alert.warning("当前项目未审核无法去审！");
-                        return;
-                    }
-                    var StuChangeType = $('#gridtable').jfGridValue('StuChangeType');
-                    if (StuChangeType != "02") {
-                        learun.alert.warning("只有转入学生才可生成学籍！");
-                        return;
-                    }
-                    learun.layerConfirm('是否确认生成学籍！', function (res) {
-                        if (res) {
-                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/GenerateStu', { stuNo: StuNo }, function () {
-                                refreshGirdData();
-                            });
-                        }
-                    });
-                }
-            });
         },
         // 初始化列表
         initGird: function () {

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

@@ -101,15 +101,29 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_ChangeLog/GetPageList',
                 headData: [
+                    { label: "修改属性", name: "FieldName", width: 200, align: "left" },
+                    { label: "修改前", name: "BeforeChange", width: 200, align: "left" },
+                    { label: "修改后", name: "AfterChange", width: 200, align: "left" },
+                    {
+                        label: "修改人", name: "UpdateBy", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_account',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+
+                    },
+                    { label: "修改时间", name: "UpdateTime", width: 200, align: "left" },
                     { label: "数据主键", name: "StuID", width: 250, align: "left" },
-                    { label: "字段", name: "FieldName", width: 100, align: "left" },
-                    { label: "修改前", name: "BeforeChange", width: 100, align: "left" },
-                    { label: "修改后", name: "AfterChange", width: 100, align: "left" },
-                    { label: "修改人", name: "UpdateBy", width: 100, align: "left" },
-                    { label: "修改时间", name: "UpdateTime", width: 100, align: "left" },
                 ],
                 mainId: 'ID',
-                isPage: true
+                isPage: true,
+                sidx: 'UpdateTime desc',
             });
             page.search();
         },

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

@@ -1078,8 +1078,6 @@
     <Content Include="Areas\EducationalAdministration\Views\StuEnroll\StatisticIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuGrant\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuGrant\Index.js" />
-    <Content Include="Areas\EducationalAdministration\Views\StuInfoBasicChange\Formbefore.js" />
-    <Content Include="Areas\EducationalAdministration\Views\StuInfoBasicChange\Formafter.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasicChange\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasicChange\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasicChange\Index.js" />
@@ -7553,8 +7551,6 @@
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\FormGenerate.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexMajor.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\FormMajor.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\StuInfoBasicChange\Formafter.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\StuInfoBasicChange\Formbefore.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeBLL.cs

@@ -166,29 +166,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
-        /// <summary>
-        /// 生成学籍
-        /// <param name="keyValue">主键</param>
-        /// <summary>
-        /// <returns></returns>
-        public void GenerateStu(string stuNo)
-        {
-            try
-            {
-                stuInfoBasicChangeService.GenerateStu(stuNo);
-            }
-            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/StuInfoBasicChange/StuInfoBasicChangeIBLL.cs

@@ -57,11 +57,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary>
         /// <returns></returns>
         void DoUnCheck(string keyValue);
-        /// <summary>
-        /// 生成学籍
-        /// </summary>
-        /// <param name="keyValue"></param>
-        void GenerateStu(string stuNo);
 
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs

@@ -237,28 +237,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-
-        public void GenerateStu(string stuNo)
-        {
-            try
-            {
-                var entity = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicEntity>(s => s.StuNo == stuNo);
-                entity.StuCode = "G" + entity.IdentityCardNo;
-                this.BaseRepository("CollegeMIS").Update(entity);
-            }
-            catch (Exception ex)
-            {
-                if (ex is ExceptionEx)
-                {
-                    throw;
-                }
-                else
-                {
-                    throw ExceptionEx.ThrowServiceException(ex);
-                }
-            }
-        }
-
         #endregion
 
     }