【增加】学籍异动管理的迁移；

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

@@ -16,7 +16,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
     /// </summary>
     public class StuEncourgementTranController : MvcControllerBase
     {
-        private StuEncourgementIBLL stuEncourgementIBLL = new StuEncourgementBLL();
+        private StuEncourgementTranIBLL stuEncourgementTranIBLL = new StuEncourgementTranBLL();
 
         #region  视图功能
 
@@ -88,7 +88,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult GetPageList(string pagination, string queryJson)
         {
             Pagination paginationobj = pagination.ToObject<Pagination>();
-            var data = stuEncourgementIBLL.GetPageList(paginationobj, queryJson);
+            var data = stuEncourgementTranIBLL.GetPageList(paginationobj, queryJson);
             var jsonData = new
             {
                 rows = data,
@@ -107,7 +107,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetPageListOne(string queryJson)
         {
-            var data = stuEncourgementIBLL.GetPageList(queryJson);
+            var data = stuEncourgementTranIBLL.GetPageList(queryJson);
             var data1 = data.GroupBy(x => new { x.AcademicYearNo, x.Semester, x.DeptNo, x.Num }).Select(x => new
             {
                 AcademicYearNo = x.Key.AcademicYearNo,
@@ -126,7 +126,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetPageListTwo(string queryJson)
         {
-            var data = stuEncourgementIBLL.GetPageList(queryJson);
+            var data = stuEncourgementTranIBLL.GetPageList(queryJson);
             var data1 = data.GroupBy(x => new { x.AcademicYearNo, x.Semester, x.DeptNo, x.Grade, x.Num }).Select(x => new
             {
                 AcademicYearNo = x.Key.AcademicYearNo,
@@ -146,7 +146,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetPageListThree(string queryJson)
         {
-            var data = stuEncourgementIBLL.GetPageList(queryJson);
+            var data = stuEncourgementTranIBLL.GetPageList(queryJson);
             var data1 = data.GroupBy(x => new
             {
                 x.AcademicYearNo,
@@ -177,7 +177,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetPageListStu(string queryJson)
         {
-            var data = stuEncourgementIBLL.GetPageList(queryJson);
+            var data = stuEncourgementTranIBLL.GetPageList(queryJson);
             var data1 = data.GroupBy(x => new { x.AcademicYearNo, x.Semester, x.StuNo, x.StuName, x.Num }).Select(x => new
             {
                 AcademicYearNo = x.Key.AcademicYearNo,
@@ -197,7 +197,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var StuEncourgementData = stuEncourgementIBLL.GetStuEncourgementEntity(keyValue);
+            var StuEncourgementData = stuEncourgementTranIBLL.GetStuEncourgementEntity(keyValue);
             var jsonData = new
             {
                 StuEncourgement = StuEncourgementData,
@@ -217,7 +217,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult DeleteForm(string keyValue)
         {
-            stuEncourgementIBLL.DeleteEntity(keyValue);
+            stuEncourgementTranIBLL.DeleteEntity(keyValue);
             return Success("删除成功！");
         }
         /// <summary>
@@ -230,8 +230,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
-            StuEncourgementEntity entity = strEntity.ToObject<StuEncourgementEntity>();
-            stuEncourgementIBLL.SaveEntity(keyValue, entity);
+            StuEncourgementTranEntity entity = strEntity.ToObject<StuEncourgementTranEntity>();
+            stuEncourgementTranIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
         #endregion

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

@@ -103,12 +103,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
-        /// <summary>
-        /// 综合查询
-        /// </summary>
-        /// <returns></returns>
         [HttpGet]
-        public ActionResult IndexQuery()
+        public ActionResult ReinstateIndex()
         {
             return View();
         }
@@ -250,7 +246,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             StuTransferInfoEntity entity = strEntity.ToObject<StuTransferInfoEntity>();
             entity.AnomalousType = "04";
             entity.ChangeReason = "转入";
-            entity.StuId= Guid.NewGuid().ToString();
+            entity.StuId = Guid.NewGuid().ToString();
             stuTransferInfoIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }

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

@@ -15,7 +15,7 @@
     </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'); } })" />
+        <input id="AuditTime" isvalid="yes" checkexpession="NotNull" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AuditTime').trigger('change'); } })" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Scholarshipxj">
         <div class="lr-form-item-title">描述</div>

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

@@ -132,7 +132,8 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "获得时间", name: "GetTime", width: 200, align: "left",
+                    {
+                        label: "获得时间", name: "AuditTime", width: 200, align: "left",
                         formatter: function (cellvalue) {
                             return learun.formatDate(cellvalue, 'yyyy-MM-dd');
                         }

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

@@ -2,21 +2,24 @@
     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 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="GetTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" />
+                        <div id="datesearch"></div>
+                    </div>
+                    @*<div class="lr-layout-tool-item">
+                            <div id="multiple_condition_query">
+                                <div class="lr-query-formcontent">
+                                    <div class="col-xs-12 lr-form-item">
+                                        <div class="lr-form-item-title">时段</div>
+                                        <input id="AuditTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" />
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                    </div>
+                        </div>*@
                 </div>
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">

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

@@ -7,6 +7,8 @@
 var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
+    var logbegin = '';
+    var logend = '';
     var page = {
         init: function () {
             page.initGird();
@@ -17,10 +19,35 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
-            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
-                page.search(queryJson);
-            }, 220, 400);
-           
+            //$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+            //    page.search(queryJson);
+            //}, 220, 400);
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                selectfn: function (begin, end) {
+                    logbegin = begin;
+                    logend = end;
+
+                    page.search();
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
@@ -33,11 +60,15 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "审核状态", name: "State", width: 200, align: "left", formatter: function (cellvalue) {
-                            return cellvalue == "1" ? "享受" : "不享受";
+                        label: "审核状态", name: "State", width: 200, align: "left", formatter: function (cellvalue, row) {
+                            if (row.IsType == 0) {
+                                return cellvalue = "享受";
+                            } else {
+                                return cellvalue == "1" ? "享受" : "不享受";
+                            }
                         }
                     },
-                    { label: "数量", name: "Count", width: 200, align: "left"}
+                    { label: "数量", name: "Count", width: 200, align: "left" }
                 ],
                 mainId: '',
                 isPage: false,
@@ -46,7 +77,9 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            param.StartTime = logbegin;
+            param.EndTime = logend;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
     };
     refreshGirdData = function () {

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

@@ -85,7 +85,7 @@
                     </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="lt_transaction" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;异动转入</a>
+                        @*<a id="lt_transaction" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;异动转入</a>*@
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                         <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/printxjk.cshtml

@@ -76,7 +76,7 @@
 <body>
     <div id="print-content">
         <div class="header">
-            <h4>长阳土家族自治县职业教育中心学生学籍卡</h4>
+            <h4>学生学籍卡</h4>
         </div>
         <p>
             <b><em>经办人：</em><input type="text" /></b>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PrintSignFlow.cshtml

@@ -76,7 +76,7 @@
 
     <!--  / warpper  -->
     <div class="printBox" style="overflow: hidden;">
-        <div class="title">长阳土家族自治县职业教育中心</div>
+        <div class="title"></div>
         <div class="title">2022年新生报到流程单</div>
         <table cellspacing="0" cellpadding="0" class="table">
             <tr>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.cshtml

@@ -18,6 +18,7 @@
                                     <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="ClassNo"></div>
@@ -27,17 +28,17 @@
                                     <div id="CreateUserId"></div>
                                 </div>
                                 @*<div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">审核人</div>
-                                    <div id="CheckUserId"></div>
-                                </div>*@
+            <div class="lr-form-item-title">审核人</div>
+            <div id="CheckUserId"></div>
+        </div>*@
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">审核状态</div>
                                     <div id="F_EnabledMark"></div>
                                 </div>
                                 @*<div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">保留学籍</div>
-                                    <div id="StuStatus"></div>
-                                </div>*@
+            <div class="lr-form-item-title">保留学籍</div>
+            <div id="StuStatus"></div>
+        </div>*@
                             </div>
                         </div>
                     </div>
@@ -48,7 +49,7 @@
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_check" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;审核</a>
-                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;删除</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                         <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                         <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js

@@ -281,9 +281,9 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
-                    {
-                        label: '操作', name: 'CZ', width: 100, align: "center",
-                    },
+                    //{
+                    //    label: '操作', name: 'CZ', width: 100, align: "center",
+                    //},
                     //{
                     //    label: '是否保留学籍', name: 'StuStatus', width: 80, align: "left",
                     //    formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml

@@ -2,91 +2,144 @@
     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 " style="overflow-y:scroll;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
-            <div class="lr-layout-tool">
-                <div class="lr-layout-tool-left">
-                    <div class="lr-layout-tool-item">
-                        <div id="multiple_condition_query">
-                            <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">专业</div>
-                                    <div id="MajorNo"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">年级</div>
-                                    <div id="Grade"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">班级</div>
-                                    <div id="ClassNo"></div>
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">姓名</div>
-                                    <input id="StuName" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">身份证号</div>
-                                    <input id="IdentityCardNo" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">学生编号</div>
-                                    <input id="StuNo" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">学籍号</div>
-                                    <input id="StuCode" type="text" class="form-control" />
+<style>
+    .navtabwrap {
+    }
+
+    .navul {
+        display: flex;
+        align-items: flex-end;
+        border-bottom: 1px solid #ddd;
+        height: 38px;
+    }
+
+        .navul li {
+            width: 80px;
+            height: 28px;
+            margin-left: 15px;
+            line-height: 28px;
+            text-align: center;
+            border-radius: 4px 4px 0 0;
+            cursor: pointer;
+            margin-bottom: -1px;
+        }
+
+            .navul li:hover {
+                background: #eee;
+            }
+
+    .active {
+        color: #555;
+        cursor: default;
+        background-color: #fff;
+        border: 1px solid #ddd;
+        border-bottom-color: transparent;
+    }
+
+    .condiv {
+        display: none;
+        height: 100%;
+    }
+
+    .divactive {
+        display: block;
+    }
+
+    .contabwrap {
+        height: calc(100% - 50px);
+    }
+</style>
+<div class="navtabwrap" id="navultab">
+    <ul class="navul">
+        <li class="active">退学</li>
+        <li>恢复学籍</li>
+    </ul>
+
+</div>
+<div class="contabwrap" id="condivtab">
+    <div class="condiv divactive" id="tab1">
+        <div class="lr-layout ">
+            <div class="lr-layout-center">
+                <div class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
+                    <div class="lr-layout-tool">
+                        <div class="lr-layout-tool-left">
+                            <div class="lr-layout-tool-item">
+                                <div id="multiple_condition_query">
+                                    <div class="lr-query-formcontent">
+                                        <div class="col-xs-12 lr-form-item">
+                                            <div class="lr-form-item-title">系部</div>
+                                            <div id="DeptNo"></div>
+                                        </div>
+                                        <div class="col-xs-12 lr-form-item">
+                                            <div class="lr-form-item-title">专业</div>
+                                            <div id="MajorNo"></div>
+                                        </div>
+                                        <div class="col-xs-12 lr-form-item">
+                                            <div class="lr-form-item-title">年级</div>
+                                            <div id="Grade"></div>
+                                        </div>
+                                        <div class="col-xs-12 lr-form-item">
+                                            <div class="lr-form-item-title">班级</div>
+                                            <div id="ClassNo"></div>
+                                        </div>
+                                        <div class="col-xs-6 lr-form-item">
+                                            <div class="lr-form-item-title">姓名</div>
+                                            <input id="StuName" type="text" class="form-control" />
+                                        </div>
+                                        <div class="col-xs-6 lr-form-item">
+                                            <div class="lr-form-item-title">身份证号</div>
+                                            <input id="IdentityCardNo" type="text" class="form-control" />
+                                        </div>
+                                        <div class="col-xs-12 lr-form-item">
+                                            <div class="lr-form-item-title">学号</div>
+                                            <input id="ProvinceCode" type="text" class="form-control" />
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
-
-                    @*<div class="lr-layout-tool-item">
-                            <div class="lr-query-btn" style="padding:0 10px;" id="listitem">
-                                点击
+                        <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>*@
-                </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>
-                </div>
-            </div>
-            <div class="lr-layout-body" style="height:50%;border-bottom:1px solid #ccc;" id="gridtable"></div>
+                    <div class="lr-layout-body" style="height:50%;border-bottom:1px solid #ccc;" id="gridtable"></div>
 
-            <div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;margin-top:50px;" id="selgridtab"></div>
-            <div class="lr-form-wrap" style="height:30%;" id="form">
-                <div class="col-xs-3 lr-form-item">
-                    <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
-                    <div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly></div>
-                </div>
-                <div class="col-xs-3 lr-form-item">
-                    <div class="lr-form-item-title">注销账号<font face="宋体">*</font></div>
-                    <div id="F_WriteMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
-                </div>
-                <div class="col-xs-3 lr-form-item">
-                    <div class="lr-form-item-title">保留学籍<font face="宋体">*</font></div>
-                    <div id="StuStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
-                </div>
-                <div class="col-xs-3 lr-form-item">
-                    <div class="lr-form-item-title">离班日期<font face="宋体">*</font></div>
-                    <input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EnteDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
-                </div>
-                <div class="col-xs-12 lr-form-item">
-                    <div class="lr-form-item-title">异动原因</div>
-                    <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
+                    <div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;margin-top:50px;" id="selgridtab"></div>
+                    <div class="lr-form-wrap" style="height:30%;" id="form">
+                        <div class="col-xs-3 lr-form-item">
+                            <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
+                            <div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+                        </div>
+                        <div class="col-xs-3 lr-form-item">
+                            <div class="lr-form-item-title">注销账号<font face="宋体">*</font></div>
+                            <div id="F_WriteMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+                        </div>
+                        <div class="col-xs-3 lr-form-item">
+                            <div class="lr-form-item-title">保留学籍<font face="宋体">*</font></div>
+                            <div id="StuStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+                        </div>
+                        <div class="col-xs-3 lr-form-item">
+                            <div class="lr-form-item-title">离班日期<font face="宋体">*</font></div>
+                            <input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EnteDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+                        </div>
+                        <div class="col-xs-12 lr-form-item">
+                            <div class="lr-form-item-title">异动原因</div>
+                            <textarea id="ChangeReason" class="form-control" style="height: 100px;"></textarea>
+                        </div>
+                    </div>
+                    <div id="subbtn" style="margin:0 auto;cursor:pointer;margin-bottom:10px; position:relative; width:80px; height:28px;line-height:28px;border-radius:4px; background:#039cfd;color:#FFF;text-align:center;">
+                        提交
+                    </div>
                 </div>
             </div>
-            <div id="subbtn" style="margin:0 auto;cursor:pointer;margin-bottom:10px; position:relative; width:80px; height:28px;line-height:28px;border-radius:4px; background:#039cfd;color:#FFF;text-align:center;">
-                提交
-            </div>
         </div>
     </div>
+    <div class="condiv" id="tab2">
+        <iframe id="EducationExperienceReturn" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
+    </div>
 </div>
+
+
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js

@@ -10,6 +10,52 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
+            $('#navultab li').on('click', function () {
+                if (!$(this).hasClass('active')) {
+                    $(this).parent().find('.active').removeClass('active');
+                    $(this).addClass('active');
+                    $('#condivtab .condiv').eq($(this).index()).siblings().hide()
+                    $('#condivtab .condiv').eq($(this).index()).show()
+                }
+            })
+            $('#SubmitBtn').on('click', function () {
+
+                if (!$('body').lrValidform()) {
+                    return false;
+                }
+                var entity = $('body').lrGetFormData();
+                let starttime = new Date(entity.SuspensionBeginTime).getTime();
+                let endtime = new Date(entity.SuspensionEndTime).getTime();
+                if (endtime < starttime) {
+                    learun.alert.warning("起始日期不能大于终止日期！");
+                    return false;
+                }
+
+                if (parseInt(Math.abs(endtime - starttime) / 1000 / 60 / 60 / 24) < 183) {
+                    learun.alert.warning("起始时间与终止时间不能小于半年！");
+                    return false;
+                }
+
+                var selgridtab = $('#selgridtab').jfGridGet('rowdatas');
+                $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) },
+                    function (res) {
+                        //console.log(res)
+                        if (res.code == 200) {
+                            setTimeout(function () {
+                                location.reload();
+                            }, 100)
+                        }
+                        // 保存成功后才回调
+                        //if (!!callBack) {
+                        //    callBack(res);
+                        //}
+                    }
+                );
+            })
+            $("#EducationExperienceReturn").attr("src", "/EducationalAdministration/StuTransferInfo/ReinstateIndex");
+
+
+
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 280, 400);
@@ -124,8 +170,19 @@ var bootstrap = function ($, learun) {
                 text: "classname"
             });
             //提交下拉框
-            $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
-            $('#AnomalousType').lrselectSet("05");
+            //$('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
+            $('#AnomalousType').lrselect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList3',
+                param: { itemCode: 'StuChangeType', strWhere: "and( F_ItemValue='05' or F_ItemValue='12'or F_ItemValue='11' or F_ItemValue='10'or F_ItemValue='13'or F_ItemValue='14' ) order by F_ItemValue desc" },
+                value: "F_ItemValue",
+                text: "F_ItemName"
+                //nodeClick: function (item) {
+                //    type = item.value;
+                //    $('#titleinfo').text(item.text);
+                //    page.search();
+                //}
+            });
+            //$('#AnomalousType').lrselectSet("05");
             $('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' });
             $('#F_WriteMark').lrDataItemSelect({ code: 'YesOrNoInt' });
             // 刷新
@@ -735,6 +792,9 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.CheckMark = '1';
+            param.Mustsql = '1';
+            param.RestAgainSql = '1';
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/FormView.cshtml

@@ -2,96 +2,115 @@
     ViewBag.Title = "学籍异动列表";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
+<div style="padding-right:30px;padding-top:10px">
+    <div style="text-align:right">
+        <span id="printBtn" class="btn btn-primary">打印</span>
+    </div>
+    <script>
+        $('#printBtn').click(function () {
+            $('#form').jqprint();
+        })
+    </script>
+</div>
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <style>
+        .printTitle {
+            text-align: center;
+            font-size: 24px;
+            color: #333;
+            line-height: 58px;
+        }
+    </style>
+    <div class="printNode printTitle" style="margin-bottom:20px">《学生学历证明》</div>
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">姓名</div>
         <input id="StuName" type="text" class="form-control" readonly="readonly" />
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">学号</div>
         <input id="StuNo" type="text" class="form-control" readonly="readonly" />
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">性别</div>
         <div id="Gender" readonly="readonly"></div>
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">证件号码</div>
         <input id="IdentityCardNo" type="text" class="form-control" readonly="readonly" />
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">异动类型</div>
         <div id="AnomalousType" readonly="readonly"></div>
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">是否保留学籍</div>
         <div id="StuStatus" readonly="readonly"></div>
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-12 lr-form-item" data-table="StuTransferInfo">
+        <div class="lr-form-item-title">异动原因</div>
+        <input id="ChangeReason" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuTransferInfo">
+        <div class="lr-form-item-title">休学年限</div>
+        <input id="SuspensionPeriod" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">申请人</div>
         <div id="CreateUserId" readonly="readonly"></div>
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">申请时间</div>
         <input id="CreateTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" />
     </div>
-    <div class="col-xs-9 lr-form-item" data-table="StuTransferInfo">
-        <div class="lr-form-item-title">休学年限</div>
-        <input id="SuspensionPeriod" type="text" class="form-control" readonly="readonly" />
-    </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">生效状态</div>
         <div id="F_EnabledMark" readonly="readonly"></div>
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">异动前班级</div>
-        <div id="ClassNo" readonly="readonly" ></div>
+        <div id="ClassNo" readonly="readonly"></div>
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">异动前年级</div>
-        <div id="Grade" readonly="readonly" ></div>
+        <div id="Grade" readonly="readonly"></div>
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">异动前专业</div>
-        <div id="MajorNo" readonly="readonly" ></div>
+        <div id="MajorNo" readonly="readonly"></div>
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">异动前系部</div>
-        <div id="DeptNo" readonly="readonly" ></div>
+        <div id="DeptNo" readonly="readonly"></div>
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">异动后班级</div>
-        <div id="NewClassNo" readonly="readonly" ></div>
+        <div id="NewClassNo" readonly="readonly"></div>
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">异动后年级</div>
-        <div id="NewGrade" readonly="readonly" ></div>
+        <div id="NewGrade" readonly="readonly"></div>
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">异动后专业</div>
-        <div id="NewMajorNo" readonly="readonly" ></div>
+        <div id="NewMajorNo" readonly="readonly"></div>
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">异动后系部</div>
-        <div id="NewDeptNo" readonly="readonly" ></div>
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuTransferInfo">
-        <div class="lr-form-item-title">异动原因</div>
-        <input id="ChangeReason" type="text" class="form-control" readonly="readonly" />
+        <div id="NewDeptNo" readonly="readonly"></div>
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">离班日期</div>
         <input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" />
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">审核人</div>
         <div id="CheckUserId" readonly="readonly"></div>
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">审核状态</div>
         <div id="F_EnabledMark2" readonly="readonly"></div>
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="StuTransferInfo">
+    <div class="col-xs-4 lr-form-item" data-table="StuTransferInfo">
         <div class="lr-form-item-title">审核时间</div>
         <input id="CheckTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" />
     </div>

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

@@ -7,6 +7,9 @@
         <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="datesearch"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
@@ -19,7 +22,11 @@
                                     <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 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>
                                 <div class="col-xs-12 lr-form-item">
@@ -59,9 +66,9 @@
                     </div>
 
                     <div class="lr-layout-tool-item">
-                        <div id="changeDrop" class="lr-query-wrap" style="width:80px;">
+                        <div id="changeDrop" class="lr-query-wrap" style="width:140px;">
                             <div class="lr-query-btn">
-                                添加退学异动
+                                添加退学异动/恢复学籍
                             </div>
                         </div>
                     </div>
@@ -94,7 +101,6 @@
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                     </div>
                     <div class=" btn-group btn-group-sm">
-                        <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
                         <a id="lr_compoundQuery" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;综合查询</a>
                     </div>
                 </div>

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

@@ -8,73 +8,132 @@ var selectedRow;
 var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
+    var startTime;
+    var endTime;
     var page = {
         init: function () {
             page.initGird();
             page.bind();
         },
         bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '2',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
             // 跳转
-            var modulesTree = learun.clientdata.get(['modulesTree']);
+            //var modulesTree = learun.clientdata.get(['modulesTree']);
             $('#changeMajor').on('click', function () {
-                let item = modulesTree[0].filter(item => {
-                    return item.F_FullName == "教务信息管理"
-                })
-                let modules = modulesTree[item[0].F_ModuleId].filter(item => {
-                    return item.F_EnCode == "Transfermenu" //学籍异动菜单
-                })
-                let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => {
-                    return item.F_EnCode == "MajorIndex"// "转专业"
-                })
-                learun.frameTab.open(moduleitem[0]);
+                //let item = modulesTree[0].filter(item => {
+                //    return item.F_FullName == "教务信息管理"
+                //})
+                //let modules = modulesTree[item[0].F_ModuleId].filter(item => {
+                //    return item.F_EnCode == "Transfermenu" //学籍异动菜单
+                //})
+                //let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => {
+                //    return item.F_EnCode == "MajorIndex"// "转专业"
+                //})
+                var SetkeyValue = 'c94221e8-9ad3-4af8-8976-c08067532902';
+                $.lrSetForm(top.$.rootUrl + '/LR_SystemModule/Module/GetFormData?keyValue=' + SetkeyValue, function (data) {
+                    if (data.moduleEntity != null) {
+                        learun.frameTab.open(data.moduleEntity);
+                    }
+                });
+                //learun.frameTab.open(moduleitem[0]);
             })
             $('#changeRestAgain').on('click', function () {
-                let item = modulesTree[0].filter(item => {
-                    return item.F_FullName == "教务信息管理"
-                })
-                let modules = modulesTree[item[0].F_ModuleId].filter(item => {
-                    return item.F_EnCode == "Transfermenu" //学籍异动菜单
-                })
-                let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => {
-                    return item.F_EnCode == "RestAgain"//  "休学复学"
-                })
-                learun.frameTab.open(moduleitem[0]);
+                var SetkeyValue = '36df4209-152b-4842-97e0-6057a40fe903';
+                $.lrSetForm(top.$.rootUrl + '/LR_SystemModule/Module/GetFormData?keyValue=' + SetkeyValue, function (data) {
+                    if (data.moduleEntity != null) {
+                        learun.frameTab.open(data.moduleEntity); //  "休学复学"
+                    }
+                });
+                //let item = modulesTree[0].filter(item => {
+                //    return item.F_FullName == "教务信息管理"
+                //})
+                //let modules = modulesTree[item[0].F_ModuleId].filter(item => {
+                //    return item.F_EnCode == "Transfermenu" //学籍异动菜单
+                //})
+                //let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => {
+                //    return item.F_EnCode == "RestAgain"//  "休学复学"
+                //})
+                //learun.frameTab.open(moduleitem[0]);
             })
             $('#changeDrop').on('click', function () {
-                let item = modulesTree[0].filter(item => {
-                    return item.F_FullName == "教务信息管理"
-                })
-                let modules = modulesTree[item[0].F_ModuleId].filter(item => {
-                    return item.F_EnCode == "Transfermenu" //学籍异动菜单
-                })
-                let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => {
-                    return item.F_EnCode == "DropOut"//  "退学异动"
-                })
-                learun.frameTab.open(moduleitem[0]);
+                var SetkeyValue = 'a418147e-7768-44c2-ae5f-05bc4de6af2b';
+                $.lrSetForm(top.$.rootUrl + '/LR_SystemModule/Module/GetFormData?keyValue=' + SetkeyValue, function (data) {
+                    if (data.moduleEntity != null) {
+                        learun.frameTab.open(data.moduleEntity); //  "退学异动"
+                    }
+                });
+                //let item = modulesTree[0].filter(item => {
+                //    return item.F_FullName == "教务信息管理"
+                //})
+                //let modules = modulesTree[item[0].F_ModuleId].filter(item => {
+                //    return item.F_EnCode == "Transfermenu" //学籍异动菜单
+                //})
+                //let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => {
+                //    return item.F_EnCode == "DropOut"//  "退学异动"
+                //})
+                //learun.frameTab.open(moduleitem[0]);
             })
             $('#changeIndexAnd').on('click', function () {
-                let item = modulesTree[0].filter(item => {
-                    return item.F_FullName == "教务信息管理"
-                })
-                let modules = modulesTree[item[0].F_ModuleId].filter(item => {
-                    return item.F_EnCode == "Transfermenu" //学籍异动菜单
-                })
-                let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => {
-                    return item.F_EnCode == "InAndOut" //"转入转出异动"
-                })
-                learun.frameTab.open(moduleitem[0]);
+                var SetkeyValue = 'e3c24747-9b2f-4645-8392-1e0f1b37340d';
+                $.lrSetForm(top.$.rootUrl + '/LR_SystemModule/Module/GetFormData?keyValue=' + SetkeyValue, function (data) {
+                    if (data.moduleEntity != null) {
+                        learun.frameTab.open(data.moduleEntity); //"转入转出异动"
+                    }
+                });
+                //let item = modulesTree[0].filter(item => {
+                //    return item.F_FullName == "教务信息管理"
+                //})
+                //let modules = modulesTree[item[0].F_ModuleId].filter(item => {
+                //    return item.F_EnCode == "Transfermenu" //学籍异动菜单
+                //})
+                //let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => {
+                //    return item.F_EnCode == "InAndOut" //"转入转出异动"
+                //})
+                //learun.frameTab.open(moduleitem[0]);
             })
             $('#changeCheck').on('click', function () {
-                let item = modulesTree[0].filter(item => {
-                    return item.F_FullName == "教务信息管理"
-                })
-                let modules = modulesTree[item[0].F_ModuleId].filter(item => {
-                    return item.F_EnCode == "Transfermenu" //学籍异动菜单
-                })
-                let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => {
-                    return item.F_EnCode == "CheckIndex" //"学籍异动审核"
-                })
-                learun.frameTab.open(moduleitem[0]);
+                var SetkeyValue = '5d40d91e-833c-4511-96e6-4a91afaabc9f';
+                $.lrSetForm(top.$.rootUrl + '/LR_SystemModule/Module/GetFormData?keyValue=' + SetkeyValue, function (data) {
+                    if (data.moduleEntity != null) {
+                        learun.frameTab.open(data.moduleEntity); //"学籍异动审核"
+                    }
+                });
+                //let item = modulesTree[0].filter(item => {
+                //    return item.F_FullName == "教务信息管理"
+                //})
+                //let modules = modulesTree[item[0].F_ModuleId].filter(item => {
+                //    return item.F_EnCode == "Transfermenu" //学籍异动菜单
+                //})
+                //let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => {
+                //    return item.F_EnCode == "CheckIndex" //"学籍异动审核"
+                //})
+                //learun.frameTab.open(moduleitem[0]);
             })
 
 
@@ -85,7 +144,7 @@ var bootstrap = function ($, learun) {
             // 查询
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 290, 400);
+            }, 350, 400);
             $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
             $('#ClassNo').lrselect({
                 allowSearch: true,
@@ -101,24 +160,24 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
-            // 查看
-            $('#lr_view').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('ID');
-                if (learun.checkrow(keyValue)) {
-                    if (keyValue.indexOf(',') != -1) {
-                        learun.alert.warning("只能选择一条记录进行查看！");
-                        return;
-                    }
-                    learun.layerForm({
-                        id: 'formview',
-                        title: '查看',
-                        url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/FormView?keyValue=' + keyValue,
-                        width: 1000,
-                        height: 600,
-                        btn: null
-                    });
-                }
-            });
+            //// 查看
+            //$('#lr_view').on('click', function () {
+            //    var keyValue = $('#gridtable').jfGridValue('ID');
+            //    if (learun.checkrow(keyValue)) {
+            //        if (keyValue.indexOf(',') != -1) {
+            //            learun.alert.warning("只能选择一条记录进行查看！");
+            //            return;
+            //        }
+            //        learun.layerForm({
+            //            id: 'formview',
+            //            title: '查看',
+            //            url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/FormView?keyValue=' + keyValue,
+            //            width: 1000,
+            //            height: 600,
+            //            btn: null
+            //        });
+            //    }
+            //});
             // 综合查询
             $('#lr_compoundQuery').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
@@ -146,7 +205,7 @@ var bootstrap = function ($, learun) {
                     { label: '姓名', name: 'StuName', width: 100, align: "left" },
                     { label: '学号', name: 'StuNo', width: 160, align: "left" },
                     {
-                        label: "性别", name: "GenderNo", width: 80, align: "left",
+                        label: "性别", name: "Gender", width: 80, align: "left",
                         formatter: function (cellvalue) {
                             return cellvalue == true ? "男" : "女";
                         }
@@ -262,19 +321,19 @@ var bootstrap = function ($, learun) {
                     //        return learun.formatDate(cellvalue, 'yyyy-MM-dd');
                     //    }
                     //},
-                    //{
-                    //    label: '创建用户', name: 'CreateUserId', 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_userid',
-                    //            callback: function (_data) {
-                    //                callback(_data['f_realname']);
-                    //            }
-                    //        });
-                    //    }
-                    //},
+                    {
+                        label: '申请人', name: 'CreateUserId', width: 140, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: '审核时间', name: 'CheckTime', width: 150, align: "left",
                         formatter: function (cellvalue) {
@@ -389,7 +448,7 @@ var bootstrap = function ($, learun) {
                     //{ label: '联系电话', name: 'Mobile', width: 100, align: "left" },
                     //{ label: '家庭地址', name: 'MailAddress', width: 200, align: "left" },
                     //{ label: '转出学校', name: 'OutSchool', width: 100, align: "left" },
-                    //{ label: '备注', name: 'Remark', width: 500, align: "left" },
+                    { label: '备注', name: 'Remark', width: 300, align: "left" },
                 ],
                 mainId: 'ID',
                 isPage: true,
@@ -400,6 +459,8 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
             param.SqlParameter = ' and F_EnabledMark = 1 ';
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml

@@ -88,27 +88,27 @@
                         @*转入学生信息*@
                         <div style="font-size:18px;border-bottom:1px solid #eee;margin:20px;margin-top:120px;padding-bottom:10px;">转入学生信息</div>
                         <div class="col-xs-3 lr-form-item">
-                            <div class="lr-form-item-title">转学前学校</div>
+                            <div class="lr-form-item-title">转入前学校</div>
                             <input id="TransferPreSchool" type="text" class="form-control" />
                         </div>
                         <div class="col-xs-3 lr-form-item">
-                            <div class="lr-form-item-title">转学前年级</div>
+                            <div class="lr-form-item-title">转入前年级</div>
                             <input id="TransferPreGrade" type="text" class="form-control" />
                         </div>
                         <div class="col-xs-3 lr-form-item">
-                            <div class="lr-form-item-title">转学前班级</div>
+                            <div class="lr-form-item-title">转入前班级</div>
                             <input id="TransferPreClass" type="text" class="form-control" />
                         </div>
                         <div class="col-xs-3 lr-form-item">
-                            <div class="lr-form-item-title">转学前专业</div>
+                            <div class="lr-form-item-title">转入前专业</div>
                             <input id="TransferPreMajor" type="text" class="form-control" />
                         </div>
                         <div class="col-xs-3 lr-form-item">
-                            <div class="lr-form-item-title">转学前学号</div>
+                            <div class="lr-form-item-title">转入前学号</div>
                             <input id="TransferPreStuNo" type="text" class="form-control" />
                         </div>
                         <div class="col-xs-3 lr-form-item">
-                            <div class="lr-form-item-title">转学日期</div>
+                            <div class="lr-form-item-title">转入日期</div>
                             <input id="TransferPreDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#TransferPreDate').trigger('change'); } })" />
                         </div>
                         <div class="col-xs-3 lr-form-item">
@@ -159,6 +159,14 @@
                             <div class="lr-form-item-title">家庭地址</div>
                             <input id="MailAddress" type="text" class="form-control" />
                         </div>
+                        <div class="col-xs-3 lr-form-item">
+                            <div class="lr-form-item-title">监护人</div>
+                            <input id="Guardian" type="text" class="form-control" />
+                        </div>
+                        <div class="col-xs-3 lr-form-item">
+                            <div class="lr-form-item-title">监护人电话</div>
+                            <input id="GuardianMobile" type="text" class="form-control" />
+                        </div>
 
                     </div>
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js

@@ -9,6 +9,7 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
+            $('#LeaveDate').val(learun.formatDate(new Date(), 'yyyy-MM-dd'));
             //选项卡切换
             $('#navultab li').on('click', function () {
                 if (!$(this).hasClass('active')) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml

@@ -34,13 +34,9 @@
                                     <div class="lr-form-item-title">身份证号</div>
                                     <input id="IdentityCardNo" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">学生编号</div>
-                                    <input id="StuNo" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">学籍号</div>
-                                    <input id="StuCode" type="text" class="form-control" />
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学号</div>
+                                    <input id="ProvinceCode" type="text" class="form-control" />
                                 </div>
                             </div>
                         </div>
@@ -100,7 +96,7 @@
                 </div>
                 <div class="col-xs-4 lr-form-item">
                     <div class="lr-form-item-title">离班日期<font face="宋体">*</font></div>
-                    <input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EnteDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+                    <input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" readonly />
                 </div>
                 <div class="col-xs-4 lr-form-item">
                     <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
@@ -112,12 +108,13 @@
                 </div>*@
                 <div class="col-xs-12 lr-form-item">
                     <div class="lr-form-item-title">异动原因</div>
-                    <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
+                    <textarea id="ChangeReason" class="form-control" style="height: 100px;"></textarea>
+                </div>
+                <div class="col-xs-12 lr-form-item">
+                    <div id="subbtn" style="margin:0 auto;cursor:pointer;margin-bottom:10px; position:relative; width:80px; height:28px;line-height:28px;border-radius:4px; background:#039cfd;color:#FFF;text-align:center;">
+                        提交
+                    </div>
                 </div>
-            </div>
-
-            <div id="subbtn" style="margin:0 auto;cursor:pointer;margin-bottom:10px; position:relative; width:80px; height:28px;line-height:28px;border-radius:4px; background:#039cfd;color:#FFF;text-align:center;">
-                提交
             </div>
         </div>
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.js

@@ -238,7 +238,7 @@ var bootstrap = function ($, learun) {
             //$('#AnomalousType').lrselectSet("01");
             $('#AnomalousType').lrselect({
                 url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList3',
-                param: { itemCode: 'StuChangeType', strWhere: "and( F_ItemValue='01' or F_ItemValue='07'or F_ItemValue='08') order by F_ItemValue desc" },
+                param: { itemCode: 'StuChangeType', strWhere: "and( F_ItemValue='01' or F_ItemValue='07'or F_ItemValue='08' or F_ItemValue='15' ) order by F_ItemValue desc" },
                 value: "F_ItemValue",
                 text: "F_ItemName"
                 //nodeClick: function (item) {
@@ -249,6 +249,38 @@ var bootstrap = function ($, learun) {
             });
             $('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' });
 
+            const formatTime = (format = "", num = new Date().getTime()) => {
+                format = format || "YYYY-mm-dd HH:MM:SS";   //第一个参数不填时，使用默认格式
+                let ret, date, renum;
+                // 处理时间戳，js一般获取的时间戳是13位，PHP一般是10位,根据实际情况做判断处理
+                if (num.toString().length == 10) {
+                    date = new Date(parseInt(num) * 1000);
+                } else {
+                    date = new Date(parseInt(num));
+                }
+                const opt = {
+                    "Y": date.getFullYear().toString(), // 年
+                    "m": (date.getMonth() + 1).toString(), // 月
+                    "d": date.getDate().toString(), // 日
+                    "H": date.getHours().toString(), // 时
+                    "M": date.getMinutes().toString(), // 分
+                    "S": date.getSeconds().toString() // 秒
+                    // 目前用的是这六种符号,有其他格式化字符需求可以继续添加，值必须转化成字符串
+                };
+                for (var k in opt) {
+                    ret = new RegExp("(" + k + "+)").exec(format);
+                    if (ret) {
+                        renum = (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")) //根据复数前面是否补零,如“mm”补零，单“m”前面不补零
+                        format = format.replace(ret[1], renum)  //替换
+                    };
+                };
+                return format;
+            };
+            $('#LeaveDate').on('change', function () {
+                var dateTime = new Date($('#LeaveDate').val());
+                dateTime = dateTime.setDate(dateTime.getDate() - 1);
+                $('#EnteDate').val(formatTime('YYYY-mm-dd', dateTime))
+            });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -862,6 +894,9 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.CheckMark = '1';
+            param.Mustsql = '1';
+            param.RestAgainSql = '1';
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryAPStuHealthIndex.cshtml

@@ -2,93 +2,104 @@
     ViewBag.Title = "学籍异动列表";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
+<link href="~/Content/css/StuTransferInfo/QueryScoreIndex.css" rel="stylesheet" />
 <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="printNode printTitle" style="width:100%">《学生学历证明》</div>
+                <div class="lr-layout-tool-left tabli">
+                    <span class="XLDA_title" style="display:none">心理健康档案</span>
+                </div>
                 @*<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="AnomalousType"></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="ClassNo"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">申请人</div>
-                                    <div id="CreateUserId"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">审核人</div>
-                                    <div id="CheckUserId"></div>
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                        <div class="lr-form-item-title">审核状态</div>
-                        <div id="NationalityNo"></div>
-                    </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">保留学籍</div>
-                                    <div id="StuStatus"></div>
-                                </div>
-                            </div>
+            <div class="lr-layout-tool-item">
+                <div id="multiple_condition_query">
+                    <div class="lr-query-formcontent">
+                        <div class="col-xs-12 lr-form-item">
+                            <div class="lr-form-item-title">异动类型</div>
+                            <div id="AnomalousType"></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="ClassNo"></div>
+                        </div>
+                        <div class="col-xs-12 lr-form-item">
+                            <div class="lr-form-item-title">申请人</div>
+                            <div id="CreateUserId"></div>
+                        </div>
+                        <div class="col-xs-12 lr-form-item">
+                            <div class="lr-form-item-title">审核人</div>
+                            <div id="CheckUserId"></div>
+                        </div>
+                        <div class="col-xs-6 lr-form-item">
+                <div class="lr-form-item-title">审核状态</div>
+                <div id="NationalityNo"></div>
+            </div>
+                        <div class="col-xs-12 lr-form-item">
+                            <div class="lr-form-item-title">保留学籍</div>
+                            <div id="StuStatus"></div>
                         </div>
                     </div>
+                </div>
+            </div>
 
-                    <div class="lr-layout-tool-item">
-                        <div id="changeMajor" class="lr-query-wrap" style="width:150px;">
-                            <div class="lr-query-btn">
-                                添加转专业（班级）异动
-                            </div>
-                        </div>
+            <div class="lr-layout-tool-item">
+                <div id="changeMajor" class="lr-query-wrap" style="width:150px;">
+                    <div class="lr-query-btn">
+                        添加转专业（班级）异动
                     </div>
+                </div>
+            </div>
 
-                    <div class="lr-layout-tool-item">
-                        <div id="changeRestAgain" class="lr-query-wrap" style="width:110px;">
-                            <div class="lr-query-btn">
-                                添加休学复学异动
-                            </div>
-                        </div>
+            <div class="lr-layout-tool-item">
+                <div id="changeRestAgain" class="lr-query-wrap" style="width:110px;">
+                    <div class="lr-query-btn">
+                        添加休学复学异动
                     </div>
+                </div>
+            </div>
 
-                    <div class="lr-layout-tool-item">
-                        <div id="changeDrop" class="lr-query-wrap" style="width:80px;">
-                            <div class="lr-query-btn">
-                                添加退学异动
-                            </div>
-                        </div>
+            <div class="lr-layout-tool-item">
+                <div id="changeDrop" class="lr-query-wrap" style="width:80px;">
+                    <div class="lr-query-btn">
+                        添加退学异动
                     </div>
+                </div>
+            </div>
 
-                    <div class="lr-layout-tool-item">
-                        <div id="changeIndexAnd" class="lr-query-wrap" style="width:110px;">
-                            <div class="lr-query-btn">
-                                添加转入转出异动
-                            </div>
-                        </div>
+            <div class="lr-layout-tool-item">
+                <div id="changeIndexAnd" class="lr-query-wrap" style="width:110px;">
+                    <div class="lr-query-btn">
+                        添加转入转出异动
                     </div>
+                </div>
+            </div>
 
-                    <div class="lr-layout-tool-item">
-                        <div id="changeCheck" class="lr-query-wrap" style="width:110px;">
-                            <div class="lr-query-btn">
-                                学籍异动审核
-                            </div>
-                        </div>
+            <div class="lr-layout-tool-item">
+                <div id="changeCheck" class="lr-query-wrap" style="width:110px;">
+                    <div class="lr-query-btn">
+                        学籍异动审核
                     </div>
-                </div>*@
+                </div>
+            </div>
+        </div>*@
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">
+                        <a id="printBtn" class="btn btn-primary" style="margin-right:8px;border-radius:3px">打印</a>
+                        <script>
+                            $('#printBtn').click(function () {
+                                $('.lr-layout-wrap').jqprint();
+                            })
+                        </script>
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                 </div>
             </div>
-            <div class="lr-layout-body" id="gridtable"></div>
+            <div class="lr-layout-body XLDA_blox" id="gridtable"></div>
         </div>
     </div>
 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryAPStuHealthIndex.js

@@ -22,20 +22,7 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/LogisticsManagement/APStuHealthRecordsTran/GetPageList',
                 headData: [
                     {
-                        label: "申请人", name: "PStuNo", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
-                                key: value,
-                                keyId: 'stuno',
-                                callback: function (_data) {
-                                    callback(_data['stuname']);
-                                }
-                            });
-                        }
-                    },
-                    {
-                        label: "系", name: "PDeptNo", width: 100, align: "left",
+                        label: "系", name: "DeptNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
@@ -48,7 +35,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "专业", name: "PMajorNo", width: 100, align: "left",
+                        label: "专业", name: "MajorNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
@@ -61,7 +48,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "班级", name: "PClassNo", 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',
@@ -73,31 +60,21 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "预约时间", name: "PTime", width: 100, align: "left" },
                     {
-                        label: "预约老师", name: "PEmpNo", width: 100, align: "left",
+                        label: "学生", name: "Stuno", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Psychology',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
                                 key: value,
-                                keyId: 'f_account',
+                                keyId: 'stuno',
                                 callback: function (_data) {
-                                    callback(_data['f_realname']);
+                                    callback(_data['stuname']);
                                 }
                             });
                         }
                     },
-                    {
-                        label: "预约成功", name: "PAgreee", width: 100, align: "left",
-                        formatter(val) {
-                            if (val === 'true') {
-                                return '成功';
-                            } else {
-                                return '待处理';
-                            }
-                        }
-                    },
-                    { label: "备注", name: "Remark", width: 100, align: "left" },
+
+                    { label: "描述", name: "Remark", width: 100, align: "left" },
                 ],
                 mainId: 'ID',
                 isPage: true
@@ -106,7 +83,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
-            param.StuNo = StuNo;
+            param.Stuno = StuNo;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.cshtml

@@ -2,7 +2,8 @@
     ViewBag.Title = "综合查询-基本信息";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-@Html.AppendCssFile("/Views/UserCenter/user.css")
+<link href="~/Content/css/UserCenter/user.css" rel="stylesheet" />
+
 <style>
     #tab2 > .lr-scroll-box,
     #tab3 > .lr-scroll-box,
@@ -13,12 +14,10 @@
         width: 100%;
     }
 </style>
-<script>
-
-</script>
 <div class="lr-form-tabs" id="lr_form_tabs">
     <ul class="nav nav-tabs">
         <li><a data-value="tab1">基本资料</a></li>
+        <li><a data-value="tab">异动情况</a></li>
         <li><a data-value="tab2">成绩查看</a></li>
         <li><a data-value="tab3">奖助学金查看</a></li>
         <li><a data-value="tab4">心理健康档案</a></li>
@@ -27,9 +26,21 @@
     </ul>
 </div>
 <div class="tab-content lr-tab-content" id="lr_tab_content">
-    <div class="lr-form-wrap tab-pane" id="tab1" style="height:100%;overflow:auto">
+    <div class="lr-form-wrap tab-pane" id="tab">
+        <iframe id="FormView" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
+    </div>
+    <div class="lr-form-wrap tab-pane" id="tab1" style="height:100%;overflow:auto;">
+        <div style="padding-right:30px;padding-top:10px">
+            <div style="text-align:right">
+                <span id="printBtn" class="btn btn-primary">打印</span>
+            </div>
+            <script>
+                $('#printBtn').click(function () {
+                    $('#student').jqprint();
+                })
+            </script>
+        </div>
         <div id="student" class="user_warpper student_warpper">
-            
             <div class="index_sec index_sec1">
                 @*<div class="userTitle">基本信息</div>*@
                 <!--  / user_sec1  -->
@@ -46,7 +57,7 @@
                         <ul class="userSec1R">
                             <li>性 &nbsp; &nbsp; &nbsp; 别 : {{studentInfo.GenderNo | sex}}</li>
                             <li>出生日期 : {{studentInfo.Birthday | date}}</li>
-                            <li>校 &nbsp; &nbsp; &nbsp; 区 : {{studentInfo.F_SchoolId | company}}</li>
+                            <li class="row_">校 &nbsp; &nbsp; &nbsp; 区 : {{studentInfo.F_SchoolId | company}}</li>
                         </ul>
                     </div>
                 </div>
@@ -56,10 +67,10 @@
                     <div class="userSec2Box">
                         <div class="userSec2T">基本信息  <i class="fa fa-angle-right"></i></div>
                         <ul class="userSec2List">
-                            <li>民  族 : {{studentInfo.NationalityNo |nationalityNo}}</li>
-                            <li>政治面貌 : {{studentInfo.PartyFaceNo | partyFaceNo}}</li>
-                            <li>身份证号 : {{studentInfo.IdentityCardNo}}  </li>
-                            <li>户口所在地 : {{studentInfo.FatherUnit}}</li>
+                            <li class="row_30">民  族 : {{studentInfo.NationalityNo |nationalityNo}}</li>
+                            <li class="row_30">政治面貌 : {{studentInfo.PartyFaceNo | partyFaceNo}}</li>
+                            <li class="row_38">身份证号 : {{studentInfo.IdentityCardNo}}  </li>
+                            <li class="row_">户口所在地 : {{studentInfo.FatherUnit}}</li>
                         </ul>
                     </div>
 
@@ -70,19 +81,19 @@
                             <li>监护人联系电话 : {{studentInfo.GuardianPhone}}</li>
                             <li>与监护人关系 : {{studentInfo.GuardianType |guardiantype}}</li>
                             <li>邮政编码 : {{studentInfo.PostalCode}}</li>
-                            <li>家庭地址 : {{studentInfo.MailAddress}}</li>
+                            <li class="row_">家庭地址 : {{studentInfo.MailAddress}}</li>
                         </ul>
                     </div>
 
                     <div class="userSec2Box">
                         <div class="userSec2T">学籍信息  <i class="fa fa-angle-right"></i></div>
                         <ul class="userSec2List">
-                            <li>学 &nbsp; 籍 &nbsp; 号 : {{studentInfo.StuCode}}</li>
-                            <li>学  号 : {{studentInfo.StuNo}}</li>
-                            <li>年 &nbsp; &nbsp; &nbsp; 级 : {{studentInfo.Grade}}</li>
-                            <li>系 部 : {{studentInfo.DeptNo | deptNo}}  </li>
-                            <li>专 业 : {{studentInfo.MajorNo | majorNo}}</li>
-                            <li>班       级 : {{studentInfo.ClassNo | class}}   </li>
+                            <li>学&nbsp;籍&nbsp;号 : {{studentInfo.StuCode}}</li>
+                            <li>学 &nbsp; &nbsp; 号 : {{studentInfo.StuNo}}</li>
+                            <li>年 &nbsp; &nbsp; 级 : {{studentInfo.Grade}}</li>
+                            <li>系 &nbsp; &nbsp; 部 : {{studentInfo.DeptNo | deptNo}}  </li>
+                            <li>专 &nbsp; &nbsp; 业 : {{studentInfo.MajorNo | majorNo}}</li>
+                            <li>班 &nbsp; &nbsp; 级 : {{studentInfo.ClassNo | class}}   </li>
                             <li>入团时间 : {{studentInfo.JoinLeagueDate | date}}  </li>
                             <li>现有学历 : {{studentInfo.GraduateNo | graduateNo}}</li>
                             <li>报到日期 : {{studentInfo.RegisterDate | date}}</li>
@@ -316,7 +327,7 @@
         </script>
 
     </div>
-    <div class="lr-form-wrap tab-pane" id="tab2" style="overflow-y: auto;">
+    <div class="lr-form-wrap tab-pane" id="tab2">
         <iframe id="QueryScoreIndex" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
     </div>
     <div class="lr-form-wrap tab-pane" id="tab3">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.js

@@ -16,6 +16,7 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             //选项卡
+            $("#FormView").attr("src", "/EducationalAdministration/StuTransferInfo/FormView?keyValue=" + keyValue);
             $("#QueryScoreIndex").attr("src", "/EducationalAdministration/StuTransferInfo/QueryScoreIndex?keyValue=" + keyValue + '&StuNo=' + StuNo);
             $("#QueryScholarshipIndex").attr("src", "/EducationalAdministration/StuTransferInfo/QueryScholarshipIndex?keyValue=" + keyValue + '&StuNo=' + StuNo);
             $("#QueryAPStuHealthIndex").attr("src", "/EducationalAdministration/StuTransferInfo/QueryAPStuHealthIndex?keyValue=" + keyValue + '&StuNo=' + StuNo);
@@ -27,13 +28,13 @@ var bootstrap = function ($, learun) {
         },
         initData: function () {
             if (!!keyValue) {
-                
+
             }
         }
     };
     // 保存数据
     acceptClick = function (callBack) {
-        
+
     };
     page.init();
 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryMSRMilitaryIndex.cshtml

@@ -2,60 +2,155 @@
     ViewBag.Title = "学籍异动列表";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
+<link href="~/Content/css/StuTransferInfo/QueryScoreIndex.css" rel="stylesheet" />
 <div class="lr-layout ">
     <div class="lr-layout-center">
-        <div class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
-            <div class="lr-layout-tool">
-                @*<div class="lr-layout-tool-left">
-                <div class="lr-layout-tool-item">
-                    <div id="multiple_condition_query">
-                        <div class="lr-query-formcontent">
-                            <div class="col-xs-12 lr-form-item">
-                                <div class="lr-form-item-title">系部</div>
-                                <div id="DeptNo"></div>
-                            </div>
-                            <div class="col-xs-12 lr-form-item">
-                                <div class="lr-form-item-title">专业</div>
-                                <div id="MajorNo"></div>
-                            </div>
-                            <div class="col-xs-12 lr-form-item">
-                                <div class="lr-form-item-title">年级</div>
-                                <div id="Grade"></div>
-                            </div>
-                            <div class="col-xs-12 lr-form-item">
-                                <div class="lr-form-item-title">班级</div>
-                                <div id="ClassNo"></div>
-                            </div>
-                            <div class="col-xs-6 lr-form-item">
-                                <div class="lr-form-item-title">姓名</div>
-                                <input id="StuName" type="text" class="form-control" />
-                            </div>
-                            <div class="col-xs-6 lr-form-item">
-                                <div class="lr-form-item-title">身份证号</div>
-                                <input id="IdentityCardNo" type="text" class="form-control" />
-                            </div>
-                            <div class="col-xs-6 lr-form-item">
-                                <div class="lr-form-item-title">学生编号</div>
-                                <input id="StuNo" type="text" class="form-control" />
-                            </div>
-                            <div class="col-xs-6 lr-form-item">
-                                <div class="lr-form-item-title">学籍号</div>
-                                <input id="StuCode" type="text" class="form-control" />
+        @*<div style="padding-right:30px;padding-top:10px">
+            <div style="text-align:right">
+                <span id="printBtn" class="btn btn-primary">打印</span>
+            </div>
+            <script>
+                $('#printBtn').click(function () {
+                    $('#printBox').jqprint();
+                })
+            </script>
+        </div>*@
+        <style>
+            #printBtn {
+                margin-bottom: 16px
+            }
+
+            .tabbox {
+                position: relative;
+            }
+
+            .printBtn {
+                position: absolute;
+                right: 4px;
+                top: 4px
+            }
+        </style>
+        <div id="printBox" class="lr-layout-wrap lr-layout-wrap-notitle
+             " style="overflow-y:scroll; padding:0;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
+            @*<div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">系部</div>
+                                    <div id="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">专业</div>
+                                    <div id="MajorNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">年级</div>
+                                    <div id="Grade"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="StuName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">身份证号</div>
+                                    <input id="IdentityCardNo" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学生编号</div>
+                                    <input id="StuNo" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学籍号</div>
+                                    <input id="StuCode" type="text" class="form-control" />
+                                </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>
+            </div>*@
+
+            <div class="tabbox">
+                <span id="printBtn1" class="btn btn-primary printBtn">打印</span>
+                <div class="printNode printTitle">《学生学历证明》</div>
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        参军记录
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        参军记录
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" style="border-top: 1px solid #ccc;" id="gridtable"></div>
+                </div>
+            </div>
+
+            <div class="tabbox">
+                <span id="printBtn2" class="btn btn-primary printBtn">打印</span>
+                <div class="printNode printTitle">《学生学历证明》</div>
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        参军意向
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        参军意向
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" style="border-top: 1px solid #ccc;" id="gridtableTwo"></div>
+                </div>
+            </div>
+
+            <div class="tabbox">
+                <span id="printBtn3" class="btn btn-primary printBtn">打印</span>
+                <div class="printNode printTitle">《学生学历证明》</div>
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        兵役记录
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        兵役记录
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" style="border-top: 1px solid #ccc;" id="gridtableThree"></div>
+                </div>
             </div>
-            <div class="lr-layout-body" style="height:40%;border-bottom:1px solid #ccc;" id="gridtable"></div>
-            <div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;margin-top:50px;" id="gridtableTwo"></div>
-            <div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;margin-top:50px;" id="gridtableThree"></div>
+
+
+
         </div>
+        <script>
+            $('#printBtn1').click(function () {
+                $('.tabbox:nth-child(1)').jqprint();
+            })
+            $('#printBtn2').click(function () {
+                $('.tabbox:nth-child(2)').jqprint();
+            })
+            $('#printBtn3').click(function () {
+                $('.tabbox:nth-child(3)').jqprint();
+            })
+        </script>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/QueryMSRMilitaryIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryMSRMilitaryIndex.js

@@ -17,6 +17,14 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+
+            //切换
+            $('#tabul li').on('click', function () {
+                $(this).hide();
+                $(this).siblings('li').show()
+                $(this).parent().siblings('div').toggle(500)
+                //$('#tabdivo').toggle(500)
+            })
         },
         // 初始化列表
         initGird: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScholarshipIndex.cshtml

@@ -2,11 +2,37 @@
     ViewBag.Title = "学籍异动列表";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
+<link href="~/Content/css/StuTransferInfo/QueryScoreIndex.css" rel="stylesheet" />
 <div class="lr-layout ">
     <div class="lr-layout-center">
-        <div class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
-            <div class="lr-layout-tool">
-                @*<div class="lr-layout-tool-left">
+        @*<div style="padding-right:30px;padding-top:10px">
+                <div style="text-align:right">
+                    <span id="printBtn" class="btn btn-primary">打印</span>
+                </div>
+                <script>
+                    $('#printBtn').click(function () {
+                        $('#printBox').jqprint();
+                    })
+                </script>
+            </div>*@
+        <style>
+            #printBtn {
+                margin-bottom: 16px
+            }
+
+            .tabbox {
+                position: relative;
+            }
+
+            .printBtn {
+                position: absolute;
+                right: 4px;
+                top: 4px
+            }
+        </style>
+        <div id="printBox" class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll;padding:0;;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
+            @*<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">
@@ -45,17 +71,63 @@
                             </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="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>
+                </div>*@
+
+
+            <div class="tabbox">
+                <span id="printBtn1" class="btn btn-primary printBtn">打印</span>
+                <div class="printNode printTitle">《学生学历证明》</div>
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        助学金
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        助学金
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" style="border-top: 1px solid #ccc;" id="gridtable"></div>
                 </div>
             </div>
-            <div class="lr-layout-body" style="height:45%;border-bottom:1px solid #ccc;" id="gridtable"></div>
 
-            <div class="lr-layout-body" style="height:45%;border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;margin-top:50px;" id="gridtableTwo"></div>
+            <div class="tabbox">
+                <span id="printBtn2" class="btn btn-primary printBtn">打印</span>
+                <div class="printNode printTitle">《学生学历证明》</div>
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        奖学金
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        奖学金
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" style="border-top: 1px solid #ccc;" id="gridtableTwo"></div>
+                </div>
+            </div>
+
+
         </div>
     </div>
+    <script>
+        $('#printBtn1').click(function () {
+            $('.tabbox:nth-child(1)').jqprint();
+        })
+        $('#printBtn2').click(function () {
+            $('.tabbox:nth-child(2)').jqprint();
+        })
+    </script>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScholarshipIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScholarshipIndex.js

@@ -16,6 +16,13 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+            //切换
+            $('#tabul li').on('click', function () {
+                $(this).hide();
+                $(this).siblings('li').show()
+                $(this).parent().siblings('div').toggle(500)
+                //$('#tabdivo').toggle(500)
+            })
         },
         // 初始化列表
         initGird: function () {
@@ -39,7 +46,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "奖学金类型", name: "SchoolType", width: 150, align: "left",
+                        label: "助学金类型", name: "SchoolType", width: 150, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/EducationalAdministration/Scholarship/GetList?queryJson=' + JSON.stringify({ IsType: 0, IsValid: 0 }),
@@ -87,7 +94,7 @@ var bootstrap = function ($, learun) {
                         label: "奖学金类型", name: "SchoolType", width: 150, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/EducationalAdministration/Scholarship/GetList?queryJson=' + JSON.stringify({ IsType: 0, IsValid: 0 }),
+                                url: '/EducationalAdministration/Scholarship/GetList?queryJson=' + JSON.stringify({ IsType: 1, IsValid: 0 }),
                                 key: value,
                                 keyId: 'Id',
                                 callback: function (_data) {
@@ -97,7 +104,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "获得时间", name: "GetTime", width: 150, align: "left",
+                        label: "获得时间", name: "AuditTime", width: 150, align: "left",
                         formatter: function (cellvalue) {
                             return learun.formatDate(cellvalue, 'yyyy-MM-dd');
                         }
@@ -118,6 +125,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StuNo = StuNo;
             param.IsType = 1;
+            param.State = 1;
             $('#gridtableTwo').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScoreIndex.cshtml

@@ -0,0 +1,107 @@
+@{
+    ViewBag.Title = "学籍异动综合查询-成绩查看";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<link href="~/Content/css/StuTransferInfo/QueryScoreIndex.css" rel="stylesheet" />
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <style>
+            #printBtn {
+                margin-bottom: 16px
+            }
+
+            .tabbox {
+                position: relative;
+            }
+
+            .printBtn {
+                position: absolute;
+                right: 4px;
+                top: 4px
+            }
+        </style>
+        <div id="printBox" class="lr-layout-wrap lr-layout-wrap-notitle" style="overflow-y:auto;padding:0;">
+            @*<div class="lr-layout-tool">
+
+                    <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>
+                </div>*@
+            <div class="tabbox">
+                <span id="printBtn1" class="btn btn-primary printBtn">打印</span>
+                <div class="printNode printTitle">《学生学历证明》</div>
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        成绩
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        成绩
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" id="gridtable" style="border-top:1px solid #ccc;"></div>
+                </div>
+            </div>
+
+            <div class="tabbox">
+                <span id="printBtn2" class="btn btn-primary printBtn">打印</span>
+                <div class="printNode printTitle">《学生学历证明》</div>
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        补考成绩
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        补考成绩
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" id="gridtableNotPass" style="border-top:1px solid #ccc;"></div>
+                </div>
+            </div>
+
+
+            <div class="tabbox">
+                <span id="printBtn3" class="btn btn-primary printBtn">打印</span>
+                <div class="printNode printTitle">《学生学历证明》</div>
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        二次补考成绩
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        二次补考成绩
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" id="gridtableNotPossTwo" style="border-top:1px solid #ccc;"></div>
+                </div>
+            </div>
+
+
+
+        </div>
+    </div>
+
+    <script>
+        $('#printBtn1').click(function () {
+            $('.tabbox:nth-child(1)').jqprint();
+        })
+        $('#printBtn2').click(function () {
+            $('.tabbox:nth-child(2)').jqprint();
+        })
+        $('#printBtn3').click(function () {
+            $('.tabbox:nth-child(3)').jqprint();
+        })
+    </script>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScoreIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScoreIndex.js

@@ -0,0 +1,287 @@
+var refreshGirdData;
+var StuId = request('keyValue');
+var StuNo = request('StuNo');
+var tempdatra = new Array();
+var list = [];
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();;
+            page.bind();
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+
+            //切换
+            $('#tabul li').on('click', function () {
+                $(this).hide();
+                $(this).siblings('li').show()
+                $(this).parent().siblings('div').toggle(500)
+                //$('#tabdivo').toggle(500)
+            })
+
+
+
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuScoreTran/GetPageList',
+                headData: [
+                    { label: '学号', name: 'StuNo', width: 150, align: "left" },
+                    { label: '姓名', name: 'StuName', width: 100, align: "left" },
+                    {
+                        label: "性别", name: "GenderNo", width: 40, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "男" : "女";
+                        }
+                    },
+                    {
+                        label: "系所", name: "DeptNo", width: 100, 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: "MajorNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "年级", name: "Grade", width: 40, align: "left" },
+                    { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" },
+                    { label: '学期', name: "Semester", width: 40, align: "left" },
+                    {
+                        label: '课程名称', name: "LessonName", width: 150, align: "left",
+                        //formatterAsync: function (callback, value, row, op, $cell) {
+                        //    learun.clientdata.getAsync('custmerData', {
+                        //        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                        //        key: value,
+                        //        keyId: 'lessonno',
+                        //        callback: function (_data) {
+                        //            callback(_data['lessonname']);
+                        //        }
+                        //    });
+                        //}
+                    },
+                    {
+                        label: '平时成绩', name: 'OrdinaryScore', width: 80, align: "left"
+                    },
+                    {
+                        label: '期中成绩', name: 'TermInScore', width: 80, align: "left"
+                    },
+                    {
+                        label: '期末成绩', name: 'TermEndScore', width: 80, align: "left"
+                    },
+                    {
+                        label: '其他成绩', name: 'OtherScore', width: 80, align: "left"
+                    },
+                    { label: '总成绩', name: 'Score', width: 80, align: "left" },
+                    {
+                        label: '备注', name: 'Remark', width: 100, align: "left"
+                    }
+                ],
+                mainId: 'ScoreId',
+                isPage: true
+            });
+            $('#gridtableNotPass').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTran/GetPageList',
+                headData: [
+                    { label: '学号', name: 'StuNo', width: 150, align: "left" },
+                    { label: '姓名', name: 'StuName', width: 100, align: "left" },
+                    {
+                        label: "性别", name: "GenderNo", width: 40, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "男" : "女";
+                        }
+                    },
+                    {
+                        label: "系所", name: "DeptNo", width: 100, 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: "MajorNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "年级", name: "Grade", width: 40, align: "left" },
+                    { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" },
+                    { label: '学期', name: 'Semester', width: 40, align: "left" },
+                    {
+                        label: '课程名称', name: 'LessonName', width: 150, align: "left",
+                        //formatterAsync: function (callback, value, row, op, $cell) {
+                        //    learun.clientdata.getAsync('custmerData', {
+                        //        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                        //        key: value,
+                        //        keyId: 'lessonno',
+                        //        callback: function (_data) {
+                        //            callback(_data['lessonname']);
+                        //        }
+                        //    });
+                        //}
+                    },
+                    {
+                        label: '期末成绩', name: 'TermEndScore', width: 80, align: "left"
+                    },
+                    { label: '补考成绩', name: 'Score', width: 80, align: "left" },
+                    {
+                        label: '备注', name: 'Remark', width: 100, align: "left"
+                    }
+                ],
+                mainId: 'ScoreId',
+                isPage: true
+            });
+
+            $('#gridtableNotPossTwo').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTwoTran/GetPageList',
+                headData: [
+                    { label: '学号', name: 'StuNo', width: 150, align: "left" },
+                    { label: '姓名', name: 'StuName', width: 100, align: "left" },
+                    {
+                        label: "性别", name: "GenderNo", width: 40, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "男" : "女";
+                        }
+                    },
+                    {
+                        label: "系所", name: "DeptNo", width: 100, 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: "MajorNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "年级", name: "Grade", width: 40, align: "left" },
+                    { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" },
+                    { label: '学期', name: 'Semester', width: 40, align: "left" },
+                    {
+                        label: '课程名称', name: 'LessonName', width: 150, align: "left",
+                        //formatterAsync: function (callback, value, row, op, $cell) {
+                        //    learun.clientdata.getAsync('custmerData', {
+                        //        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                        //        key: value,
+                        //        keyId: 'lessonno',
+                        //        callback: function (_data) {
+                        //            callback(_data['lessonname']);
+                        //        }
+                        //    });
+                        //}
+                    },
+                    {
+                        label: '期末成绩', name: 'TermEndScore', width: 80, align: "left"
+                    },
+                    { label: '二次补考成绩', name: 'Score', width: 80, align: "left" },
+                    {
+                        label: '备注', name: 'Remark', width: 100, align: "left"
+                    }
+                ],
+                mainId: 'ScoreId',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.StuNo = StuNo;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+            $('#gridtableNotPass').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+            $('#gridtableNotPossTwo').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryStuEncourgementIndex.cshtml

@@ -2,59 +2,134 @@
     ViewBag.Title = "学籍异动列表";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
+<link href="~/Content/css/StuTransferInfo/QueryScoreIndex.css" rel="stylesheet" />
 <div class="lr-layout ">
     <div class="lr-layout-center">
-        <div class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
-            <div class="lr-layout-tool">
-                @*<div class="lr-layout-tool-left">
-                    <div class="lr-layout-tool-item">
-                        <div id="multiple_condition_query">
-                            <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">专业</div>
-                                    <div id="MajorNo"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">年级</div>
-                                    <div id="Grade"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">班级</div>
-                                    <div id="ClassNo"></div>
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">姓名</div>
-                                    <input id="StuName" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">身份证号</div>
-                                    <input id="IdentityCardNo" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">学生编号</div>
-                                    <input id="StuNo" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">学籍号</div>
-                                    <input id="StuCode" type="text" class="form-control" />
-                                </div>
-                            </div>
+        @*<div style="padding-right:30px;padding-top:10px">
+            <div style="text-align:right">
+                <span id="printBtn" class="btn btn-primary">打印</span>
+            </div>
+            <script>
+                $('#printBtn').click(function () {
+                    $('#printBox').jqprint();
+                })
+            </script>
+        </div>*@
+        <style>
+            #printBtn {
+                margin-bottom: 16px
+            }
+
+            .tabbox {
+                position: relative;
+            }
+
+            .printBtn {
+                position: absolute;
+                right: 4px;
+                top: 4px
+            }
+        </style>
+        <div id="printBox" class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll;padding:0;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
+            @*<div class="lr-layout-tool">
+          <div class="lr-layout-tool-left">
+            <div class="lr-layout-tool-item">
+                <div id="multiple_condition_query">
+                    <div class="lr-query-formcontent">
+                        <div class="col-xs-12 lr-form-item">
+                            <div class="lr-form-item-title">系部</div>
+                            <div id="DeptNo"></div>
+                        </div>
+                        <div class="col-xs-12 lr-form-item">
+                            <div class="lr-form-item-title">专业</div>
+                            <div id="MajorNo"></div>
+                        </div>
+                        <div class="col-xs-12 lr-form-item">
+                            <div class="lr-form-item-title">年级</div>
+                            <div id="Grade"></div>
+                        </div>
+                        <div class="col-xs-12 lr-form-item">
+                            <div class="lr-form-item-title">班级</div>
+                            <div id="ClassNo"></div>
+                        </div>
+                        <div class="col-xs-6 lr-form-item">
+                            <div class="lr-form-item-title">姓名</div>
+                            <input id="StuName" type="text" class="form-control" />
+                        </div>
+                        <div class="col-xs-6 lr-form-item">
+                            <div class="lr-form-item-title">身份证号</div>
+                            <input id="IdentityCardNo" type="text" class="form-control" />
+                        </div>
+                        <div class="col-xs-6 lr-form-item">
+                            <div class="lr-form-item-title">学生编号</div>
+                            <input id="StuNo" type="text" class="form-control" />
+                        </div>
+                        <div class="col-xs-6 lr-form-item">
+                            <div class="lr-form-item-title">学籍号</div>
+                            <input id="StuCode" type="text" class="form-control" />
                         </div>
                     </div>
+                </div>
+            </div>
+        </div>
+            <div class="lr-layout-tool-right">
+                <div class=" btn-group btn-group-sm">
+                    <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                </div>
+            </div>
+        </div>*@
+
+            <div class="tabbox">
+                <span id="printBtn1" class="btn btn-primary printBtn">打印</span>
+                <div class="printNode printTitle">《学生学历证明》</div>
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        学生奖励
+
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        学生奖励
+                        @*<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="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>
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" style="border-top:1px solid #ccc;" id="gridtable"></div>
+                </div>
+            </div>
+
+            <div class="tabbox">
+                <span id="printBtn2" class="btn btn-primary printBtn">打印</span>
+                <div class="printNode printTitle">《学生学历证明》</div>
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        学生处分
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        学生处分
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" style="border-top: 1px solid #ccc;" id="gridtableTwo"></div>
                 </div>
             </div>
-            <div class="lr-layout-body" style="height:45%;border-bottom:1px solid #ccc;" id="gridtable"></div>
+            <script>
+                $('#printBtn1').click(function () {
+                    $('.tabbox:nth-child(1)').jqprint();
+                })
+                $('#printBtn2').click(function () {
+                    $('.tabbox:nth-child(2)').jqprint();
+                })
+            </script>
+
 
-            <div class="lr-layout-body" style="height:45%;border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;margin-top:50px;" id="gridtableTwo"></div>
         </div>
     </div>
 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryStuEncourgementIndex.js

@@ -16,6 +16,14 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+
+            //切换
+            $('#tabul li').on('click', function () {
+                $(this).hide();
+                $(this).siblings('li').show()
+                $(this).parent().siblings('div').toggle(500)
+                //$('#tabdivo').toggle(500)
+            })
         },
         // 初始化列表
         initGird: function () {
@@ -39,7 +47,7 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/EducationalAdministration/StuPunishmentTran/GetPageList',
                 headData: [
                     { label: "学号", name: "StuNo", width: 200, align: "left" },
-                    { label: "姓名", name: "StuName", width: 200, align: "left" },
+                    { label: "姓名", name: "StuName", width: 150, align: "left" },
                     {
                         label: "处分名称", name: "PunishNo", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -52,7 +60,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "处分原因", name: "PunishReason", width: 300, align: "left" },
+                    { label: "处分原因", name: "PunishReason", width: 200, align: "left" },
                     { label: "处分日期", name: "PunishDate", width: 200, align: "left" },
                     { label: "处分文号", name: "FileNo", width: 200, align: "left" },
                     {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReinstateIndex.cshtml

@@ -0,0 +1,101 @@
+@{
+    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 " style="overflow-y:scroll;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
+            <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-6 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="StuName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学籍状态</div>
+                                    <div id="AnomalousType"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">原系部</div>
+                                    <div id="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">原专业</div>
+                                    <div id="MajorNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">原年级</div>
+                                    <div id="Grade"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">原班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    @*<div class="lr-layout-tool-item">
+                            <div class="lr-query-btn" style="padding:0 10px;" id="listitem">
+                                点击
+                            </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>
+            </div>
+            <div class="lr-layout-body" style="height:50%;border-bottom:1px solid #ccc;" id="gridtable"></div>
+
+            <div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;border-bottom:1px solid #ccc;margin-top:50px;" id="selgridtab"></div>
+            <div class="lr-form-wrap" style="height:40%;" id="form">
+                <div class="col-xs-3 lr-form-item">
+                    <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
+                    <div id="NewAnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+                </div>
+                <div class="col-xs-3 lr-form-item">
+                    <div class="lr-form-item-title">恢复学籍<font face="宋体">*</font></div>
+                    <div id="RecoverStuStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+                </div>
+                <div class="col-xs-3 lr-form-item">
+                    <div class="lr-form-item-title">恢复账号<font face="宋体">*</font></div>
+                    <div id="RecoverWriteMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+                </div>
+                <div class="col-xs-3 lr-form-item">
+                    <div class="lr-form-item-title">入班日期<font face="宋体">*</font></div>
+                    <input id="LeaveDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#LeaveDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+                </div>
+                <div class="col-xs-3 lr-form-item">
+                    <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
+                    <div id="NewDeptNo" isvalid="yes" checkexpession="NotNull"></div>
+                </div>
+                <div class="col-xs-3 lr-form-item">
+                    <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
+                    <div id="NewMajorNo" isvalid="yes" checkexpession="NotNull"></div>
+                </div>
+                <div class="col-xs-3 lr-form-item">
+                    <div class="lr-form-item-title">年级<font face="宋体">*</font></div>
+                    <div id="NewGrade" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+                </div>
+                <div class="col-xs-3 lr-form-item">
+                    <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
+                    <div id="NewClassNo" isvalid="yes" checkexpession="NotNull"></div>
+                </div>
+                <div class="col-xs-12 lr-form-item">
+                    <div class="lr-form-item-title">异动原因</div>
+                    <textarea id="ChangeReason" class="form-control" style="height: 100px;"></textarea>
+                </div>
+            </div>
+
+            <div id="SubmitBtn" style="margin:0 auto;cursor:pointer;margin-bottom:10px; position:relative; width:80px; height:28px;line-height:28px;border-radius:4px; background:#039cfd;color:#FFF;text-align:center;">
+                提交
+            </div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/ReinstateIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReinstateIndex.js

@@ -0,0 +1,518 @@
+var refreshGirdData;
+var StuId;
+var tempdatra = new Array();
+var list = [];
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 280, 400);
+            $('#SubmitBtn').on('click', function () {
+                if (!$('body').lrValidform()) {
+                    return false;
+                }
+                var entity = $('body').lrGetFormData();
+                entity.AnomalousType = entity.NewAnomalousType;
+                var selgridtab = $('#selgridtab').jfGridGet('rowdatas');
+                $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveAgainEntity', { entity: entity, strStuTranEntity: JSON.stringify(selgridtab) },
+                    function (res) {
+                        //console.log(res)
+                        if (res.code == 200) {
+                            setTimeout(function () {
+                                location.reload();
+                            }, 100)
+                        }
+                        // 保存成功后才回调
+                        //if (!!callBack) {
+                        //    callBack(res);
+                        //}
+                    }
+                );
+            })
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
+                    }
+
+                }
+            });
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                select: function (item) {
+                    var Grades = $("#Grade").lrselectGet();
+                    if (Grades != null && Grades != "" && Grades != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    }
+                }
+            });
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: "value",
+                text: "text",
+                select: function (item) {
+                    var MajorNos = $("#MajorNo").lrselectGet();
+                    if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    }
+
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" },
+                value: "classno",
+                text: "classname"
+            });
+
+            //提交下拉框
+            $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
+            $('#NewDeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                select: function (item) {
+                    if (item) {
+                        $('#NewMajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#NewMajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
+                    }
+
+                }
+            });
+            $('#NewMajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                select: function (item) {
+                    var Grades = $("#NewGrade").lrselectGet();
+                    if (Grades != null && Grades != "" && Grades != "undefined") {
+                        if (item) {
+                            $('#NewClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
+                            });
+                        } else {
+                            $('#NewClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#NewClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" }
+                            });
+                        } else {
+                            $('#NewClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    }
+                }
+            });
+            $('#NewGrade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: "value",
+                text: "text",
+                select: function (item) {
+                    var MajorNos = $("#NewMajorNo").lrselectGet();
+                    if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") {
+                        if (item) {
+                            $('#NewClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#NewClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#NewClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#NewClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    }
+
+                }
+            });
+            $('#NewClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" },
+                value: "classno",
+                text: "classname"
+            });
+            $('#RecoverWriteMark').lrDataItemSelect({ code: 'YesOrNoInt' });
+            $('#RecoverStuStatus').lrDataItemSelect({ code: 'YesOrNoInt' });
+            $('#NewAnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
+            $('#NewAnomalousType').lrselectSet("16");
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('StuId');
+                if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(',') != -1) {
+                        learun.alert.warning("只能选择一条记录进行查看！");
+                        return;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '查看',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/FormView?keyValue=' + keyValue,
+                        width: 1162,
+                        height: 600,
+                        btn: null
+                    });
+                }
+            });
+            $('#selgridtab').jfGrid({
+                headData: [
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
+                    { label: "姓名", name: "StuName", width: 100, align: "left" },
+                    {
+                        label: "性别", name: "Gender", width: 80, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "男" : "女";
+                        }
+                    },
+                    {
+                        label: "出生日期", name: "Birthday", width: 100, align: "left", ishide: true,
+                        formatter: function (value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
+                        }
+                    },
+                    { label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" },
+                    {
+                        label: "民族", name: "NationalityNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'National',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "年级", name: "Grade", width: 100, align: "left" },
+                    {
+                        label: "系所", name: "DeptNo", width: 100, 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: "MajorNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "学制", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'EduSystem',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "家庭地址", name: "MailAddress", width: 100, align: "left" },
+                    { label: "联系电话", name: "Mobile", width: 100, align: "left" },
+                    { label: "户口所在地", name: "ResidencePlace", width: 100, align: "left" },
+                    { label: "档案所在地", name: "LocationFile", width: 100, align: "left" },
+                    {
+                        label: "操作", name: "Delete", width: 100, align: "center",
+                        formatter: function (callback, cellvalue, row, op, $cell) {
+                            var $div = $('<div></div>');
+                            var $hbtn = $('<span class="label label-info" style="cursor: pointer;margin-right:8px;"> 移除</span>');
+                            $hbtn.on('click', function () {
+                                tempdatra.map((item, index) => {
+                                    if (item.StuNo == cellvalue.StuNo) {
+                                        tempdatra.splice(index, 1)
+                                    }
+                                });
+                                //console.log(tempdatra)
+                                $('#selgridtab').jfGridSet('refreshdata', tempdatra);
+
+                            });
+                            $div.append($hbtn);
+                            return $div;
+                        }
+                    },
+                ],
+                mainId: 'AAIId',
+            });
+
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGridLei({
+                url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/GetPageList',
+                headData: [
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
+                    { label: "姓名", name: "StuName", width: 100, align: "left" },
+                    {
+                        label: "性别", name: "Gender", width: 80, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "男" : "女";
+                        }
+                    },
+                    {
+                        label: "出生日期", name: "Birthday", width: 100, align: "left", ishide: true,
+                        formatter: function (value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
+                        }
+                    },
+                    { label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" },
+                    {
+                        label: "民族", name: "NationalityNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'National',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "年级", name: "Grade", width: 100, align: "left" },
+                    {
+                        label: "系所", name: "DeptNo", width: 100, 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: "MajorNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "学制", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'EduSystem',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "家庭地址", name: "MailAddress", width: 100, align: "left" },
+                    { label: "联系电话", name: "Mobile", width: 100, align: "left" },
+                    { label: "户口所在地", name: "ResidencePlace", width: 100, align: "left" },
+                    { label: "档案所在地", name: "LocationFile", width: 100, align: "left" },
+                ],
+                mainId: 'StuId',
+                isPage: true,
+                rows: 100,
+                isMultiselect: true,
+                onSelectRow: function (rowdata, type) {
+                    if (type) {
+                        list.push(rowdata)
+                        let temp = {}
+                        list = list.reduce((prev, curv) => {
+                            if (temp[curv.StuNo]) { }
+                            else {
+                                temp[curv.StuNo] = true
+                                prev.push(curv)
+                            }
+                            return prev
+                        }, [])
+                        //var selectedRow = $('#gridtable').jfGridGet('rowdata');
+                        tempdatra = list
+                        $('#selgridtab').jfGridSet('refreshdata', tempdatra);
+                    }
+                }
+
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.SqlParameter = ' and (AnomalousType=05 or  AnomalousType=10 or AnomalousType= 13  or AnomalousType= 14) and IsReturnSchool=0 and F_EnabledMark=1 and id not in(select ReturnSchoolId from StuTransferInfo where ReturnSchoolId is not null ) ';
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml

@@ -91,13 +91,9 @@
                                             <div class="lr-form-item-title">身份证号</div>
                                             <input id="IdentityCardNo" type="text" class="form-control" />
                                         </div>
-                                        <div class="col-xs-6 lr-form-item">
-                                            <div class="lr-form-item-title">学生编号</div>
-                                            <input id="StuNo" type="text" class="form-control" />
-                                        </div>
-                                        <div class="col-xs-6 lr-form-item">
-                                            <div class="lr-form-item-title">学籍号</div>
-                                            <input id="StuCode" type="text" class="form-control" />
+                                        <div class="col-xs-12 lr-form-item">
+                                            <div class="lr-form-item-title">学号</div>
+                                            <input id="ProvinceCode" type="text" class="form-control" />
                                         </div>
                                     </div>
                                 </div>
@@ -113,39 +109,39 @@
 
                     <div class="lr-layout-body" style="height:40%;border-bottom:1px solid #ccc;border-top: 1px solid #ccc;margin-top:50px;" id="selgridtab"></div>
                     <div class="lr-form-wrap" style="height:30%;" id="form">
-                        <div class="col-xs-2 lr-form-item">
+                        <div class="col-xs-4 lr-form-item">
                             <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
                             <div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
                         </div>
-                        <div class="col-xs-2 lr-form-item">
+                        <div class="col-xs-4 lr-form-item">
                             <div class="lr-form-item-title">注销账号<font face="宋体">*</font></div>
                             <div id="F_WriteMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                         </div>
-                        <div class="col-xs-2 lr-form-item">
+                        <div class="col-xs-4 lr-form-item">
                             <div class="lr-form-item-title">保留学籍<font face="宋体">*</font></div>
                             <div id="StuStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                         </div>
-                        <div class="col-xs-3 lr-form-item">
+                        <div class="col-xs-4 lr-form-item">
                             <div class="lr-form-item-title">离班日期<font face="宋体">*</font></div>
                             <input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EnteDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
                         </div>
-                        <div class="col-xs-3 lr-form-item">
+                        <div class="col-xs-4 lr-form-item">
                             <div class="lr-form-item-title">休学年限<font face="宋体">*</font></div>
                             <input id="SuspensionPeriod" class="form-control" type="text" isvalid="yes" checkexpession="NotNull" />
                         </div>
-                        <div class="col-xs-2 lr-form-item">
+                        <div class="col-xs-2 lr-form-item"> 
                             <div class="lr-form-item-title">休学时段<font face="宋体">*</font></div>
                             <input id="SuspensionBeginTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'SuspensionEndTime\',{d:-3});}', dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#SuspensionBeginTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
 
                         </div>
-                        <div class="col-xs-2 lr-form-item" style="padding-left:25px;">
-                            <div class="lr-form-item-title" style="width:25px;">至<font face="宋体">*</font></div>
+                        <div class="col-xs-2 lr-form-item">
+                            <div class="lr-form-item-title" style="width:25px;">    至<font face="宋体">*</font></div>
                             <input id="SuspensionEndTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'SuspensionBeginTime\',{d:3})}', dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#SuspensionEndTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
 
                         </div>
                         <div class="col-xs-12 lr-form-item">
                             <div class="lr-form-item-title">异动原因</div>
-                            <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
+                            <textarea id="ChangeReason" class="form-control" style="height: 100px;"></textarea>
                         </div>
 
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js

@@ -764,6 +764,9 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.CheckMark = '1';
+            param.Mustsql = '1';
+            param.RestAgainSql = '1';
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.cshtml

@@ -88,7 +88,7 @@
                 </div>
                 <div class="col-xs-12 lr-form-item">
                     <div class="lr-form-item-title">异动原因</div>
-                    <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
+                    <textarea id="ChangeReason" class="form-control" style="height: 100px;"></textarea>
                 </div>
             </div>
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.js

@@ -292,9 +292,9 @@ var bootstrap = function ($, learun) {
                     //        return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
                     //    }
                     //},
-                    { label: "学生编号", name: "StuNo", width: 100, align: "left", ishide: true, },
-                    { label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
-                    { label: "学号", name: "ProvinceCode", width: 100, align: "left" },
+                    //{ label: "学生编号", name: "StuNo", width: 100, align: "left", ishide: true, },
+                    //{ label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
@@ -383,37 +383,11 @@ var bootstrap = function ($, learun) {
                                 }
                             });
                         }
-                    },
-                    //{
-                    //    label: "身体状态", name: "HealthStatus", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'QRCodeHealthStatus',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{
-                    //    label: "学习形式", name: "StudyModality", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'StudyModality',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
-                    //{ label: "入学方式", name: "EntranceWay", width: 100, align: "left" },
-                    //{ label: "入学年月", name: "EntranceDate", width: 100, align: "left" },
-                    //{ label: "余额", name: "Balance", width: 100, align: "left" },
+                    },                    
                     { label: "家庭地址", name: "MailAddress", width: 100, align: "left" },
-                    { label: "联系电话", name: "mobile", width: 100, align: "left" },
-                    { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
-                    { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
+                    { label: "联系电话", name: "Mobile", width: 100, align: "left" },
+                    { label: "户口所在地", name: "ResidencePlace", width: 100, align: "left" },
+                    { label: "档案所在地", name: "LocationFile", width: 100, align: "left" },
                     {
                         label: "操作", name: "Delete", width: 100, align: "center",
                         formatter: function (callback, cellvalue, row, op, $cell) {
@@ -449,12 +423,12 @@ var bootstrap = function ($, learun) {
                     //        return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
                     //    }
                     //},
-                    { label: "学生编号", name: "StuNo", width: 100, align: "left" },
-                    { label: "学籍号", name: "StuCode", width: 100, align: "left" },
-                    { label: "学号", name: "ProvinceCode", width: 100, align: "left" },
+                    //{ label: "学生编号", name: "StuNo", width: 100, align: "left", hide: true },
+                    //{ label: "学籍号", name: "StuCode", width: 100, align: "left", hide: true},
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
-                        label: "性别", name: "GenderNo", width: 80, align: "left",
+                        label: "性别", name: "Gender", width: 80, align: "left",
                         formatter: function (cellvalue) {
                             return cellvalue == true ? "男" : "女";
                         }
@@ -541,290 +515,10 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    //{
-                    //    label: "身体状态", name: "HealthStatus", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'QRCodeHealthStatus',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{
-                    //    label: "学习形式", name: "StudyModality", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'StudyModality',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
-                    //{ label: "入学方式", name: "EntranceWay", width: 100, align: "left" },
-                    //{ label: "入学年月", name: "EntranceDate", width: 100, align: "left" },
-                    //{ label: "余额", name: "Balance", width: 100, align: "left" },
                     { label: "家庭地址", name: "MailAddress", width: 100, align: "left" },
-                    { label: "联系电话", name: "mobile", width: 100, align: "left" },
-                    { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
-                    { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
-                    //{
-                    //    label: "五年一贯制", name: "FiveYear", width: 100, align: "left"
-                    //    , formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'PieceCultivateWay',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{
-                    //    label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center",
-                    //    formatter: function (cellvalue) {
-                    //        return cellvalue == "1" ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
-                    //    }
-                    //},
-                    //{
-                    //    label: "是否上传头像", name: "Photo", width: 80, align: "center",
-                    //    formatter: function (cellvalue) {
-                    //        if (cellvalue != null && cellvalue != "" && cellvalue != undefined) {
-                    //            return cellvalue = "<span class=\"label label-success\">是</span>";
-                    //        } else {
-                    //            return cellvalue = "<span class=\"label label-danger\">否</span>";
-                    //        }
-                    //    }
-                    //},
-                    //{ label: "拼音", name: "SpellFull", width: 100, align: "left", ishide: true },
-                    //{ label: "就读方式", name: "StudyingWay", width: 100, align: "left", ishide: true },
-                    //{
-                    //    label: "国籍", name: "CountryNo", width: 100, align: "left", ishide: true,
-                    //    formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'BCdCountry',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{
-                    //    label: "港澳台侨外", name: "OverseasChineseNo", width: 100, align: "left", ishide: true,
-                    //    formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'BCdOverseasChinese',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{
-                    //    label: "婚姻状况", name: "MarriageStatus", width: 100, align: "left", ishide: true,
-                    //    formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'BCdOverseasChinese',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{ label: "乘火车区间", name: "TrainInterval", width: 100, align: "left", ishide: true, },
-                    //{ label: "是否随迁子女", name: "IsTrailChildren", width: 100, align: "left", ishide: true, },
-                    //{ label: "生源地行政区划码", name: "StuPlaceCode", width: 100, align: "left", ishide: true, },
-                    //{ label: "出生地行政区划码", name: "BirthPlaceCode", width: 100, align: "left", ishide: true, },
-                    //{ label: "籍贯地行政区划码", name: "NativePlaceCode", width: 100, align: "left", ishide: true, },
-                    //{ label: "所属派出所", name: "BelongPolice", width: 100, align: "left", ishide: true, },
-                    //{ label: "户口所在地行政区划码", name: "ResidencePlaceCode", width: 100, align: "left", ishide: true, },
-                    //{ label: "是否农户", name: "ResidenceNo", width: 100, align: "left", ishide: true, },
-                    //{
-                    //    label: "学生居住地类型", name: "StuLivePlaceType", width: 100, align: "left", ishide: true,
-                    //    formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'StuLivePlaceType',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{
-                    //    label: "健康状况", name: "HealthStatusNo", width: 100, align: "left", ishide: true,
-                    //    formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'StuHealthType',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{ label: "学生来源", name: "StuOrigin", width: 100, align: "left", ishide: true, },
-                    //{ label: "招生对象", name: "RecruitObject", width: 100, align: "left", ishide: true, },
-                    //{ label: "贫困户否建档立卡贫困户", name: "PoorIsRecord", width: 100, align: "left", ishide: true, },
-                    //{
-                    //    label: "招生方式", name: "RecruitWay", width: 100, align: "left", ishide: true,
-                    //    formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'RecruitWay',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{
-                    //    label: "联招合作类型", name: "RecruitCooperateType", width: 100, align: "left", ishide: true,
-                    //    formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'RecruitCooperateType',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{ label: "准考证号", name: "AdmissionNo", width: 100, align: "left", ishide: true, },
-                    //{ label: "考生号", name: "ksh", width: 100, align: "left", ishide: true, },
-                    //{ label: "考试总分", name: "ExamScore", width: 100, align: "left", ishide: true, },
-                    //{ label: "联招合作办学形式", name: "RecruitCooperateForm", width: 100, align: "left", ishide: true, },
-                    //{ label: "联招合作学校代码", name: "RecruitCooperateSchoolNo", width: 100, align: "left", ishide: true, },
-                    //{ label: "校外教学点", name: "SchoolOutsidePlace", width: 100, align: "left", ishide: true, },
-                    //{ label: "英文姓名", name: "EnglishName", width: 100, align: "left", ishide: true, },
-                    //{ label: "家庭邮政编码", name: "PostalCode", width: 100, align: "left", ishide: true, },
-                    //{ label: "其他联系方式", name: "OtherContact", width: 100, align: "left", ishide: true, },
-                    //{ label: "成员1姓名", name: "OneName", width: 100, align: "left", ishide: true, },
-                    //{ label: "成员1联系电话", name: "OneMobile", width: 100, align: "left", ishide: true },
-                    //{
-                    //    label: "成员1关系", name: "OneMembership", width: 100, align: "left", ishide: true,
-                    //    formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'GuardianType',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{ label: "成员1是否监护人", name: "OneIsGuardian", width: 100, align: "left", ishide: true, },
-                    //{
-                    //    label: "成员1出生年月", name: "OneBirthday", width: 100, align: "left", ishide: true,
-                    //    formatter: function (value) {
-                    //        return learun.formatDate(value, 'yyyy-MM-dd');
-                    //    }
-                    //},
-                    //{
-                    //    label: "成员1身份证件类型", name: "OneIdCardType", width: 100, align: "left", ishide: true,
-                    //    formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'IdCardType',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{ label: "成员1身份证件号", name: "OneIdCardNo", width: 100, align: "left", ishide: true, },
-                    //{
-                    //    label: "成员1民族", name: "OneNationalityNo", width: 100, align: "left", ishide: true,
-                    //    formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'National',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{
-                    //    label: "成员1健康状况", name: "OneHealthStatus", width: 100, align: "left", ishide: true,
-                    //    formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'EpiHealth',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{ label: "成员1工作或学习单位", name: "OneJob", width: 100, align: "left", ishide: true, },
-                    //{ label: "成员2姓名", name: "TwoName", width: 100, align: "left", ishide: true, },
-                    //{ label: "成员2联系电话", name: "TwoMobile", width: 100, align: "left", ishide: true },
-                    //{
-                    //    label: "成员2关系", name: "TwoMembership", width: 100, align: "left", ishide: true,
-                    //    formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'GuardianType',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{ label: "成员2是否监护人", name: "TwoIsGuardian", width: 100, align: "left", ishide: true, },
-                    //{
-                    //    label: "成员2出生年月", name: "TwoBirthday", width: 100, align: "left", ishide: true,
-                    //    formatter: function (value) {
-                    //        return learun.formatDate(value, 'yyyy-MM-dd');
-                    //    }
-                    //},
-                    //{
-                    //    label: "成员2身份证件类型", name: "TwoIdCardType", width: 100, align: "left", ishide: true,
-                    //    formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'IdCardType',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{ label: "成员2身份证件号", name: "TwoIdCardNo", width: 100, align: "left", ishide: true, },
-                    //{
-                    //    label: "成员2民族", name: "TwoNationalityNo", width: 100, align: "left", ishide: true,
-                    //    formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'National',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{
-                    //    label: "成员2健康状况", name: "TwoHealthStatus", width: 100, align: "left", ishide: true,
-                    //    formatterAsync: function (callback, value, row, op, $cell) {
-                    //        learun.clientdata.getAsync('dataItem', {
-                    //            key: value,
-                    //            code: 'EpiHealth',
-                    //            callback: function (_data) {
-                    //                callback(_data.text);
-                    //            }
-                    //        });
-                    //    }
-                    //},
-                    //{ label: "成员2工作或学习单位", name: "TwoJob", width: 100, align: "left", ishide: true, },
-                    //{ label: "成员2职务", name: "TwoPosition", width: 100, align: "left", ishide: true, },
-
+                    { label: "联系电话", name: "Mobile", width: 100, align: "left" },
+                    { label: "户口所在地", name: "ResidencePlace", width: 100, align: "left" },
+                    { label: "档案所在地", name: "LocationFile", width: 100, align: "left" },
                 ],
                 mainId: 'StuId',
                 isPage: true,
@@ -853,7 +547,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
-            param.SqlParameter = ' and AnomalousType=06  and IsReturnSchool=1 and F_EnabledMark=1 ';
+            param.SqlParameter = ' and AnomalousType=06  and IsReturnSchool=0 and F_EnabledMark=1 and id not in(select ReturnSchoolId from StuTransferInfo where ReturnSchoolId is not null ) ';
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml

@@ -34,13 +34,9 @@
                                     <div class="lr-form-item-title">身份证号</div>
                                     <input id="IdentityCardNo" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">学生编号</div>
-                                    <input id="StuNo" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">学籍号</div>
-                                    <input id="StuCode" type="text" class="form-control" />
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学号</div>
+                                    <input id="ProvinceCode" type="text" class="form-control" />
                                 </div>
                             </div>
                         </div>
@@ -62,25 +58,29 @@
 
             <div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;margin-top:50px;" id="selgridtab"></div>
             <div class="lr-form-wrap" style="height:30%;" id="form">
-                <div class="col-xs-3 lr-form-item">
+                <div class="col-xs-4 lr-form-item">
                     <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
                     <div id="AnomalousType" type="text" readonly="readonly" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                 </div>
-                <div class="col-xs-3 lr-form-item">
+                <div class="col-xs-4 lr-form-item">
                     <div class="lr-form-item-title">注销账号<font face="宋体">*</font></div>
                     <div id="F_WriteMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                 </div>
-                <div class="col-xs-3 lr-form-item">
+                <div class="col-xs-4 lr-form-item">
                     <div class="lr-form-item-title">保留学籍<font face="宋体">*</font></div>
                     <div id="StuStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                 </div>
-                <div class="col-xs-3 lr-form-item">
+                <div class="col-xs-6 lr-form-item">
                     <div class="lr-form-item-title">离班日期<font face="宋体">*</font></div>
                     <input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EnteDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
                 </div>
+                <div class="col-xs-6 lr-form-item">
+                    <div class="lr-form-item-title">转出到</div>
+                    <input id="OutSchool" type="text" class="form-control" placeholder="转出学校" />
+                </div>
                 <div class="col-xs-12 lr-form-item">
                     <div class="lr-form-item-title">异动原因</div>
-                    <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
+                    <textarea id="ChangeReason" class="form-control" style="height: 100px;"></textarea>
                 </div>
             </div>
             <div id="subbtn" style="margin:0 auto;cursor:pointer;margin-bottom:10px; position:relative; width:80px; height:28px;line-height:28px;border-radius:4px; background:#039cfd;color:#FFF;text-align:center;">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js

@@ -736,6 +736,10 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.CheckMark = '1';
+            param.Mustsql = '1';
+            param.RestAgainSql = '1';
+            param.RolloffSql = '1';
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/StuTransferInfo/QueryScoreIndex.css

@@ -0,0 +1,108 @@
+.lr-layout-body {
+    overflow: auto;
+}
+
+.lr-layout-wrap {
+    border: none;
+}
+
+.tabbox {
+    width: 100%;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    margin-bottom: 20px;
+}
+
+.tabwrap {
+    height: 40px;
+    line-height: 40px;
+}
+
+.tabli {
+    display: flex;
+    align-items: center;
+    padding-left: 15px;
+}
+
+.tabli img {
+    width: 25px;
+    height: 25px;
+    margin-right: 10px;
+    cursor: pointer;
+}
+
+.tabdiv {
+    height: 300px;
+}
+
+.printTitle {
+    text-align: center;
+    font-size: 24px;
+    color: #333;
+    line-height: 58px;
+}
+
+.printNode {
+    display: none !important;
+}
+
+@media print {
+
+    .printNode {
+        display: block !important;
+    }
+
+    .tabdiv {
+        height: unset;
+        max-height:100%
+    }
+
+    body {
+        zoom: 77%; /* 缩放比例 */
+    }
+    ::-webkit-scrollbar {
+        display: none
+    }
+    .btn {
+        display: none;
+    }
+
+    .tabli>img{
+        display:none;
+    }
+    /*心理健康档案*/
+    .XLDA_blox {
+        border-top: 1px solid #ccc;
+    }
+    .XLDA_title {
+        display: block !important;
+        font-size: 14px;
+        color: #333;
+    }
+
+    /*打印时框架样式处理*/
+    /*.lr-layout.lr-layout-left-center {
+        padding-left: 0px!important;
+    }
+    .lr-layout-center>.lr-layout-wrap {
+        padding-top: 0px!important;
+    }
+    .lr-scroll-box {
+        position: unset!important;
+    }
+    .jfgrid-footer{
+        display:none;
+    }
+    .jfgrid_body_gridtable {
+        overflow: unset !important;
+        height: auto !important;
+    }
+
+    .lr-layout-title{
+        border-top:0!important;
+    }
+    .lr-layout-body{
+        height:2848px!important;
+        border:none!important;
+    }*/
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/UserCenter/user.css

@@ -0,0 +1,198 @@
+@charset "utf-8";
+/* CSS Document */
+* {
+    /*background: #eee;*/
+    -webkit-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    -o-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
+.user_warpper {
+    padding: 40px;
+    padding-top:20px;
+}
+
+.userTitle {
+    color: #282E3B;
+    font-size: 30px;
+}
+
+.user_sec1 {
+    padding: 30px 10px 30px 60px;
+    position: relative;
+    border-radius: 2px;
+    overflow: hidden;
+    background-size: 100% 100%;
+    -moz-background-size: 100% 100%;
+    -webkit-background-size: 100% 100%;
+    -o-background-size: 100% 100%;
+}
+
+.student_warpper .user_sec1 {
+    background-image: url('/Content/images/Login/user1.jpg');
+    filter: progid:DXImageTransform.Microsoft.AlphaImageLoader ('/Content/images/Login/user1.jpg',  sizingMethod='scale');
+}
+
+
+
+.user_sec1 > img {
+    position: absolute;
+    top: 0;
+    left: 13px;
+    width: 36px;
+}
+
+.userSec1Box {
+    line-height: 0;
+}
+
+    .userSec1Box > * {
+        display: inline-block;
+        vertical-align: middle;
+    }
+
+.userSec1L {
+    margin-right: 50px;
+    width: 140px;
+}
+
+.userSec1Img {
+    margin-bottom: 20px;
+    overflow: hidden;
+    height: 0;
+    padding-bottom: 100%;
+    border-radius: 50%;
+}
+
+    .userSec1Img img {
+        width: 100%;
+    }
+
+.userSec1T {
+    font-size: 22px;
+    color: #fff;
+    line-height: 26px;
+    text-align: center;
+}
+
+.userSec1R {
+    width: 75%;
+    overflow: hidden;
+    margin-top: -40px;
+}
+
+    .userSec1R li {
+        width: 25%;
+        float: left;
+        font-size: 15px;
+        color: #fff;
+        margin-top: 40px;
+        line-height: 24px;
+        padding: 0 5px;
+    }
+
+.userSec2Box {
+    padding-top: 30px;
+    border-top: 1px solid #F0F0F0;
+}
+
+    .userSec2Box:first-child {
+        border-top: 0;
+    }
+
+.userSec2T {
+    font-size: 15px;
+    margin-bottom: 30px;
+}
+
+.student_warpper .userSec2T {
+    color: #56BFCC;
+}
+
+.teacher_warpper .userSec2T {
+    color: #6D9CE6;
+}
+
+.userSec2T i {
+    margin-left: 10px;
+}
+
+.userSec2List {
+    overflow: hidden;
+    margin: 0 -5px;
+    margin-bottom: 30px;
+}
+
+    .userSec2List li {
+        color: #282E3B;
+        font-size: 15px;
+        width: 25%;
+        float: left;
+        padding: 0 5px;
+    }
+
+@media(max-width:1366px) {
+    .userSec1L {
+        margin-right: 20px;
+        width: 120px;
+    }
+
+    .userSec1R {
+        width: 75%;
+        margin-top: -25px;
+    }
+
+        .userSec1R li {
+            margin-top: 25px;
+        }
+}
+
+@media print {
+    .user_sec1 {
+        border: 1px solid #ccc;
+    }
+
+    .user_warpper.student_warpper {
+        box-sizing: border-box;
+        padding-left:20px;
+        padding-right:20px;
+    }
+
+    .userSec1R li {
+        width: 30%
+    }
+
+    .userSec1R li:nth-child(2) {
+        width: 50%
+    }
+
+    .userSec1R li.row_ {
+        width: 100%
+    }
+
+    .userSec2List {
+        display: flex;
+        flex-wrap: wrap;
+        margin-bottom: 20px;
+    }
+
+    .userSec2List li {
+        box-sizing: border-box;
+        margin-bottom: 12px;
+        width: 33%;
+    }
+
+    .userSec2List li.row_30 {
+        width: 30%;
+    }
+
+    .userSec2List li.row_ {
+        width: 100%;
+    }
+
+    .userSec2List li.row_38 {
+        width: 38%;
+    }
+}

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

@@ -23,7 +23,8 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <UseGlobalApplicationHostFile />
-    <Use64BitIISExpress>false</Use64BitIISExpress>
+    <Use64BitIISExpress>
+    </Use64BitIISExpress>
     <SccProjectName>
     </SccProjectName>
     <SccLocalPath>
@@ -1377,11 +1378,13 @@
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\CheckIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryAPStuHealthIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryMSRMilitaryIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryScoreIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryStuEncourgementIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryScholarshipIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryBasicInfo.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\IndexQuery.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\ReinstateIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\RolloffIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\ReturnIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\IntoIndex.js" />
@@ -1906,6 +1909,8 @@
     <Content Include="Content\css\OnlineRegistrate\Header.html" />
     <Content Include="Content\css\OnlineRegistrate\login.css" />
     <Content Include="Content\css\OnlineRegistrate\style.css" />
+    <Content Include="Content\css\StuTransferInfo\QueryScoreIndex.css" />
+    <Content Include="Content\css\UserCenter\user.css" />
     <Content Include="Content\echarts\AplicationVisitStatistic.html" />
     <Content Include="Areas\LR_SystemModule\Views\Log\OnlineUserIndex.js" />
     <Content Include="Areas\LR_SystemModule\Views\Log\UseStatistics.js" />
@@ -2221,6 +2226,7 @@
     <Content Include="Content\css\swiper.min1.css" />
     <Content Include="Content\idcardreader\idcardreaderv1.js" />
     <Content Include="Content\idcardreader\npCertReader.dll" />
+    <Content Include="Content\images\addicon.png" />
     <Content Include="Content\images\calendar.png" />
     <Content Include="Content\images\chick1.png" />
     <Content Include="Content\images\DragSSO\close.png" />
@@ -2662,6 +2668,7 @@
     <Content Include="Content\images\SsoSystem\noLogin.png" />
     <Content Include="Content\images\SsoSystem\search.png" />
     <Content Include="Content\images\SsoSystem\user.jpg" />
+    <Content Include="Content\images\subicon.png" />
     <Content Include="Content\jquery\plugin\jqprint\._jquery.jqprint-0.3.js" />
     <Content Include="Content\jquery\plugin\jqprint\jqprint.css" />
     <Content Include="Content\jquery\plugin\jqprint\jQuery.print.js" />
@@ -8100,6 +8107,8 @@
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryStuEncourgementIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuLeaveManagement\FormView.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\InputScoreIndexInTeacherImport.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryScoreIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\ReinstateIndex.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.Application.Web/Views/UserCenter/IndexForDC.cshtml

@@ -719,7 +719,7 @@
             @if (ViewBag.UserType == "学生")
             {
                 <div class="lr-layout-wrap-item " id="lr_layout_item6" style="padding: 10;">
-                    <center><h3> 长阳土家族自治县职业教育中心</h3></center>
+                    <center><h3> </h3></center>
                     <center>     
                         <h3>
                             选修课选课流程

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

@@ -40,7 +40,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("SCHOOLTYPE")]
         public string SchoolType { get; set; }
         /// <summary>
-        /// 获得时间 /申请时间
+        /// 申请时间
         /// </summary>
         [Column("GETTIME")]
         public DateTime? GetTime { get; set; }
@@ -60,7 +60,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("AUDITPEOPLE")]
         public string AuditPeople { get; set; }
         /// <summary>
-        /// 审核时间
+        /// 获得时间 /审核时间
         /// </summary>
         [Column("AUDITTIME")]
         public DateTime? AuditTime { get; set; }

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

@@ -88,16 +88,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT t.Id,t.GetTime,t.IsType,(case when t.State is not null then t.State else 0 end) as State  ");
+                strSql.Append("SELECT t.Id,t.AuditTime,t.IsType,(case when t.State is not null then t.State else 0 end) as State  ");
                 strSql.Append("  FROM ScholarshipAudit t  ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
-                if (!queryParam["GetTime"].IsEmpty())
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
                 {
-                    dp.Add("GetTime", queryParam["GetTime"].ToDate(), DbType.DateTime);
-                    strSql.Append(" AND t.GetTime = @GetTime ");
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.AuditTime >= @startTime AND t.AuditTime <= @endTime ) ");
                 }
                 return this.BaseRepository("CollegeMIS").FindList<ScholarshipxjEntity>(strSql.ToString(), dp);
             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs

@@ -159,6 +159,22 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         strSql.Append(" AND t.Photo is null  ");
                     }
                 }
+
+                #region 学籍异动专项查询条件 与其他无关
+                if (!queryParam["Mustsql"].IsEmpty())
+                {
+                    strSql.Append(" AND stuno not in(select stuno from StuTransferInfo where F_EnabledMark =0) ");
+                }
+                //查询去除 退学,休学,开除,死亡,失踪,注销,自动退学
+                if (!queryParam["RestAgainSql"].IsEmpty())
+                {
+                    strSql.Append("  AND stuno not in(select stuno from StuTransferInfo where anomaloustype = '02,05,06,10,11,12,13,14' and F_EnabledMark =0 )");
+                }
+                if (!queryParam["RolloffSql"].IsEmpty())//转出
+                {
+                    strSql.Append(" AND stuno not in(select stuno from StuTransferInfo where anomaloustype = '02')");
+                }
+                #endregion
                 return this.BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
@@ -1213,61 +1229,62 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     entity.Modify(keyValue);
-
-                    var oldEntity = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicEntity>(keyValue);
-                    List<StuInfoBasic_ChangeLogEntity> list = new List<StuInfoBasic_ChangeLogEntity>();
-                    var tableInfos = this.BaseRepository("CollegeMIS").FindTable(@"SELECT t.[name] AS 表名,c.[name] AS 字段名,cast(ep.[value] 
-  as varchar(100)) AS [字段说明]
-  FROM sys.tables AS t
-  INNER JOIN sys.columns 
-  AS c ON t.object_id = c.object_id
-   LEFT JOIN sys.extended_properties AS ep 
-  ON ep.major_id = c.object_id AND ep.minor_id = c.column_id WHERE ep.class =1 
-  AND t.name='StuInfoBasic'");
-
-                    PropertyInfo[] properties = oldEntity.GetType().GetProperties();
-                    foreach (System.Reflection.PropertyInfo item in properties)
-                    {
-                        string name = item.Name;
-                        object oldValue = item.GetValue(oldEntity);
-                        object newValue = item.GetValue(entity);
-                        if (oldValue == null || newValue == null)
-                        {
-                            continue;
-                        }
-                        if (!oldValue.Equals(newValue))
-                        {
-                            var columnName = "";
-                            foreach (DataRow rows in tableInfos.Rows)
-                            {
-                                if (rows["字段名"].ToString() == item.Name)
-                                {
-                                    columnName = rows["字段说明"].ToString();
-                                }
-
-                            }
-                            var changeEntity = new StuInfoBasic_ChangeLogEntity
-                            {
-                                StuID = keyValue,
-                                BeforeChange = oldValue.ToString(),
-                                AfterChange = newValue.ToString(),
-                                FieldName = columnName,
-                                UpdateBy = loginUser.userId,
-                                UpdateTime = DateTime.Now,
-                                StuChangeType = "09",
-                                StuChangeRemark = "点击学籍信息管理-修改按钮进行操作"
-                            };
-                            changeEntity.Create();
-                            list.Add(changeEntity);
-                        }
-
-                    }
-
-                    if (list.Count > 0)
-                    {
-                        db.Insert(list);
-                    }
-
+                    // wx 根据要求去除
+                    #region 编辑加入学籍异动信息
+                    //                  var oldEntity = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicEntity>(keyValue);
+                    //                  List<StuInfoBasic_ChangeLogEntity> list = new List<StuInfoBasic_ChangeLogEntity>();
+                    //                  var tableInfos = this.BaseRepository("CollegeMIS").FindTable(@"SELECT t.[name] AS 表名,c.[name] AS 字段名,cast(ep.[value] 
+                    //as varchar(100)) AS [字段说明]
+                    //FROM sys.tables AS t
+                    //INNER JOIN sys.columns 
+                    //AS c ON t.object_id = c.object_id
+                    // LEFT JOIN sys.extended_properties AS ep 
+                    //ON ep.major_id = c.object_id AND ep.minor_id = c.column_id WHERE ep.class =1 
+                    //AND t.name='StuInfoBasic'");
+
+                    //                  PropertyInfo[] properties = oldEntity.GetType().GetProperties();
+                    //                  foreach (System.Reflection.PropertyInfo item in properties)
+                    //                  {
+                    //                      string name = item.Name;
+                    //                      object oldValue = item.GetValue(oldEntity);
+                    //                      object newValue = item.GetValue(entity);
+                    //                      if (oldValue == null || newValue == null)
+                    //                      {
+                    //                          continue;
+                    //                      }
+                    //                      if (!oldValue.Equals(newValue))
+                    //                      {
+                    //                          var columnName = "";
+                    //                          foreach (DataRow rows in tableInfos.Rows)
+                    //                          {
+                    //                              if (rows["字段名"].ToString() == item.Name)
+                    //                              {
+                    //                                  columnName = rows["字段说明"].ToString();
+                    //                              }
+
+                    //                          }
+                    //                          var changeEntity = new StuInfoBasic_ChangeLogEntity
+                    //                          {
+                    //                              StuID = keyValue,
+                    //                              BeforeChange = oldValue.ToString(),
+                    //                              AfterChange = newValue.ToString(),
+                    //                              FieldName = columnName,
+                    //                              UpdateBy = loginUser.userId,
+                    //                              UpdateTime = DateTime.Now,
+                    //                              StuChangeType = "09",
+                    //                              StuChangeRemark = "点击学籍信息管理-修改按钮进行操作"
+                    //                          };
+                    //                          changeEntity.Create();
+                    //                          list.Add(changeEntity);
+                    //                      }
+
+                    //                  }
+
+                    //                  if (list.Count > 0)
+                    //                  {
+                    //                      db.Insert(list);
+                    //                  } 
+                    #endregion
 
                     var annexesFileEntity = this.BaseRepository().FindEntity<AnnexesFileEntity>(a => a.F_FolderId == entity.Photo);
                     var url = "";
@@ -1291,23 +1308,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 else
                 {
                     entity.Create();
-                    if (entity.IsTran == "0")//转入/进
-                    {
-                        //学籍异动日志表
-                        var changeEntity = new StuInfoBasic_ChangeLogEntity
-                        {
-                            StuID = entity.StuId,
-                            BeforeChange = null,
-                            AfterChange = entity.StuId,
-                            FieldName = "学籍表主键",
-                            UpdateBy = loginUser.userId,
-                            UpdateTime = DateTime.Now,
-                            StuChangeType = "04",
-                            StuChangeRemark = "点击学籍信息管理-异动转入按钮进行操作"
-                        };
-                        changeEntity.Create();
-                        db.Insert(changeEntity);
-                    }
+                    // wx 根据要求去除
+                    #region 学籍异动日志表
+                    //if (entity.IsTran == "0")//转入/进
+                    //{
+                    //    //学籍异动日志表
+                    //    var changeEntity = new StuInfoBasic_ChangeLogEntity
+                    //    {
+                    //        StuID = entity.StuId,
+                    //        BeforeChange = null,
+                    //        AfterChange = entity.StuId,
+                    //        FieldName = "学籍表主键",
+                    //        UpdateBy = loginUser.userId,
+                    //        UpdateTime = DateTime.Now,
+                    //        StuChangeType = "04",
+                    //        StuChangeRemark = "点击学籍信息管理-异动转入按钮进行操作"
+                    //    };
+                    //    changeEntity.Create();
+                    //    db.Insert(changeEntity);
+                    //} 
+                    #endregion
                     db.Insert(entity);
                 }
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTran/StuScoreNotPassTranService.cs

@@ -125,16 +125,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(fieldSql);
-                strSql.Append(" FROM StuScoreNotPassTran t ");
-                var userlogin = LoginUserInfo.Get();
-                if (userlogin.Description == "学生")
+                strSql.Append("SELECT t.* ");
+                strSql.Append(" FROM StuScoreNotPassTran t where 1= 1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["StuNo"].IsEmpty())
                 {
-                    strSql.Append(" where 1= 1 and Stuno = '" + userlogin.account + "'");
+                    dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.StuNo = @StuNo ");
                 }
 
-                return this.BaseRepository("CollegeMIS").FindList<StuScoreNotPassTranEntity>(strSql.ToString(), pagination);
+                return this.BaseRepository("CollegeMIS").FindList<StuScoreNotPassTranEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwoTran/StuScoreNotPassTwoTranService.cs

@@ -125,15 +125,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(fieldSql);
-                strSql.Append(" FROM StuScoreNotPassTwoTran t ");
-                var userlogin = LoginUserInfo.Get();
-                if (userlogin.Description == "学生")
+                strSql.Append("SELECT t.* ");
+                strSql.Append(" FROM StuScoreNotPassTwoTran t where 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["StuNo"].IsEmpty())
                 {
-                    strSql.Append(" where 1= 1 and Stuno = '" + userlogin.account + "'");
+                    dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.StuNo = @StuNo ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<StuScoreNotPassTwoTranEntity>(strSql.ToString(), pagination);
+
+                return this.BaseRepository("CollegeMIS").FindList<StuScoreNotPassTwoTranEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreTran/StuScoreTranService.cs

@@ -127,15 +127,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(fieldSql);
-                strSql.Append(" FROM StuScoreTran t ");
-                var userlogin = LoginUserInfo.Get();
-                if (userlogin.Description == "学生")
+                strSql.Append("SELECT t.* ");
+                strSql.Append(" FROM StuScoreTran t where 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["StuNo"].IsEmpty())
                 {
-                    strSql.Append(" where 1= 1 and Stuno = '" + userlogin.account + "'");
+                    dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.StuNo = @StuNo ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<StuScoreTranEntity>(strSql.ToString(), pagination);
+
+                return this.BaseRepository("CollegeMIS").FindList<StuScoreTranEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoEntity.cs

@@ -207,7 +207,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("SUSPENSIONENDTIME")]
         public DateTime? SuspensionEndTime { get; set; }
         /// <summary>
-        /// 是否已复学 1是 0否【休学】
+        /// 是否已复学 1是 0否【休学】/是否恢复学籍  退学,开除,注销学籍
         /// </summary>
         /// <returns></returns>
         [Column("ISRETURNSCHOOL")]
@@ -261,6 +261,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("RESIDENCEPLACE")]
         public string ResidencePlace { get; set; }
         /// <summary>
+        /// 档案所在地
+        /// </summary>
+        /// <returns></returns>
+        [Column("LOCATIONFILE")]
+        public string LocationFile { get; set; }
+        /// <summary>
         /// 籍贯
         /// </summary>
         [Column("REGIONNO")]
@@ -330,6 +336,22 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         [Column("STUTRANID")]
         public string StuTranId { get; set; }
+        /// <summary>
+        /// 复学时关联休学主键
+        /// </summary>
+        /// <returns></returns>
+        [Column("RETURNSCHOOLID")]
+        public string ReturnSchoolId { get; set; }
+        /// <summary>
+        /// 监护人
+        /// </summary>
+        [Column("GUARDIAN")]
+        public string Guardian { get; set; }
+        /// <summary>
+        /// 监护人电话
+        /// </summary>
+        [Column("GUARDIANMOBILE")]
+        public string GuardianMobile { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs

@@ -7,6 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 
 namespace Learun.Application.TwoDevelopment.EducationalAdministration
@@ -110,6 +111,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("F_EnabledMark", queryParam["F_EnabledMark"].ToString(), DbType.String);
                     strSql.Append(" AND t.F_EnabledMark = @F_EnabledMark ");
                 }
+                if (!queryParam["Grade"].IsEmpty())
+                {
+                    dp.Add("Grade", queryParam["Grade"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.Grade=@Grade OR t.NewGrade=@Grade) ");
+                }
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.CreateTime >= @startTime AND t.CreateTime <= @endTime ) ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<StuTransferInfoEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
@@ -269,14 +281,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     InsertEntity.SuspensionBeginTime = entity.SuspensionBeginTime;
                     InsertEntity.SuspensionEndTime = entity.SuspensionEndTime;
                     InsertEntity.SuspensionPeriod = entity.SuspensionPeriod;
-                    InsertEntity.ChangeReason = entity.Remark;
+                    InsertEntity.OutSchool = entity.OutSchool;
+                    InsertEntity.Remark = entity.Remark;
                     //
                     InsertEntity.StuStatus = entity.StuStatus;
                     InsertEntity.F_WriteMark = entity.F_WriteMark;
 
                     InsertEntity.Create();
                     //去重验证
-                    if (InsertEntity.AnomalousType == "01" || InsertEntity.AnomalousType == "07" || InsertEntity.AnomalousType == "08")//转专业、转班、留级
+                    if (InsertEntity.AnomalousType == "01" || InsertEntity.AnomalousType == "07" || InsertEntity.AnomalousType == "08" || InsertEntity.AnomalousType == "15")//转专业、转班、留级 跳级
                     {
                         if (this.BaseRepository("CollegeMIS").FindEntity<StuTransferInfoEntity>(x =>
                             x.AnomalousType == InsertEntity.AnomalousType && x.StuId == InsertEntity.StuId && x.DeptNo == InsertEntity.DeptNo && x.MajorNo == InsertEntity.MajorNo &&
@@ -297,7 +310,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             entitylist.Add(InsertEntity);
                         }
                     }
-                    else if (InsertEntity.AnomalousType == "02" || InsertEntity.AnomalousType == "05")//退学、转出
+                    else if (InsertEntity.AnomalousType == "02" || InsertEntity.AnomalousType == "05" || InsertEntity.AnomalousType == "10" || InsertEntity.AnomalousType == "11" || InsertEntity.AnomalousType == "12" || InsertEntity.AnomalousType == "13" || InsertEntity.AnomalousType == "14")//退学、死亡,失踪,开除,转出,注销,自动退学
                     {
                         if (this.BaseRepository("CollegeMIS").FindEntity<StuTransferInfoEntity>(x =>
                             x.AnomalousType == InsertEntity.AnomalousType && x.StuId == InsertEntity.StuId && x.EnteDate == InsertEntity.EnteDate) == null)
@@ -339,12 +352,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 //保存的数据
                 List<StuTransferInfoEntity> entitylist = new List<StuTransferInfoEntity>();
-
                 foreach (var item in strStuList)
                 {
                     var InsertEntity = new StuTransferInfoEntity();
                     //历史数据
                     InsertEntity.StuId = item.StuId;
+                    InsertEntity.ReturnSchoolId = item.ID;
+                    InsertEntity.StuTranId = item.StuTranId;
                     InsertEntity.StuNo = item.StuNo;
                     InsertEntity.StuName = item.StuName;
                     InsertEntity.Gender = item.Gender;
@@ -358,7 +372,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     InsertEntity.AnomalousType = entity.AnomalousType;
                     InsertEntity.ChangeReason = entity.ChangeReason;
                     InsertEntity.NewClassNo = entity.NewClassNo;
-                    InsertEntity.MajorNo = entity.MajorNo;
+                    InsertEntity.NewMajorNo = entity.NewMajorNo;
                     InsertEntity.NewDeptNo = entity.NewDeptNo;
                     InsertEntity.NewGrade = entity.NewGrade;
                     InsertEntity.LeaveDate = entity.LeaveDate;
@@ -370,7 +384,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
                     InsertEntity.Create();
                     //去重验证
-                    if (InsertEntity.AnomalousType == "03")//复学
+                    if (InsertEntity.AnomalousType == "03" || InsertEntity.AnomalousType == "16")//复学 //恢复学籍
                     {
                         if (this.BaseRepository("CollegeMIS").FindEntity<StuTransferInfoEntity>(x =>
                             x.AnomalousType == InsertEntity.AnomalousType && x.StuId == InsertEntity.StuId && x.LeaveDate == InsertEntity.LeaveDate &&
@@ -409,31 +423,36 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             var db1 = this.BaseRepository().BeginTrans();
             try
             {
-                List<StuTransferInfoEntity> UpStuTran = new List<StuTransferInfoEntity>();
                 List<StuInfoBasicTranEntity> InStuinTran = new List<StuInfoBasicTranEntity>();
-                List<StuInfoBasicEntity> Stulist = new List<StuInfoBasicEntity>();
-                List<StuInfoBasicEntity> upStulist = new List<StuInfoBasicEntity>();
+                //List<StuInfoBasicEntity> Stulist = new List<StuInfoBasicEntity>();
+
                 var StuEntity = new StuInfoBasicEntity();
                 var Id = keyValue.Split(',');
                 foreach (var item in Id)
                 {
                     var addTruan = new StuInfoBasicEntity();
-                    var upTrua = this.BaseRepository("CollegeMIS").FindEntity<StuTransferInfoEntity>(x => x.ID == item);
+                    var upTrua = db.FindEntity<StuTransferInfoEntity>(x => x.ID == item);
                     upTrua.CheckUserId = userInfo.userId;
                     upTrua.CheckTime = DateTime.Now;
                     upTrua.F_EnabledMark = 1;
 
-                    var stulist = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicEntity>(x => x.StuId == upTrua.StuId);
-                    var InsertStuTran = new StuInfoBasicTranEntity();
+                    var stulist = db.FindEntity<StuInfoBasicEntity>(x => x.StuId == upTrua.StuId);
 
+                    var InsertStuTran = new StuInfoBasicTranEntity();
                     switch (upTrua.AnomalousType)
                     {
                         case "01": //留级                        
-                        case "07": //转班
-                        case "08": //转专业
                         case "02": //转校
                         case "05": //退学
                         case "06": //休学
+                        case "07": //转班
+                        case "08": //转专业
+                        case "10": //开除
+                        case "11": //死亡
+                        case "12": //失踪
+                        case "13": //注销
+                        case "14": //自动退学
+                        case "15": //跳级
 
                             #region 复制一份学生学籍表
                             copyStuInfoBasic(upTrua, stulist, InsertStuTran);
@@ -445,12 +464,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             var StuScoreHistory = db.FindList<StuScoreEntity>(x => x.StuNo == InsertStuTran.StuNo
                                                 && x.DeptNo == InsertStuTran.DeptNo && x.MajorNo == InsertStuTran.MajorNo
                                                 && x.ClassNo == InsertStuTran.ClassNo && x.F_SchoolId == InsertStuTran.F_SchoolId);
-                            if (StuScoreHistory != null)
+                            if (StuScoreHistory.Any())
                             {
                                 foreach (var itemScore in StuScoreHistory)
                                 {
                                     //插入新数据
-                                    db.ExecuteBySql(" insert into StuScoreTran select * from StuScore where Scoreid = '" + itemScore.ScoreId + "'");
+                                    db.ExecuteBySql(" insert into StuScoreTran select * from StuScore where Scoreid = '" + itemScore.ScoreId + "' and Scoreid not in (select Scoreid from StuScoreTran)");
                                     //删除旧数据
                                     db.Delete<StuScoreEntity>(x => x.ScoreId == itemScore.ScoreId);
                                 }
@@ -464,7 +483,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 foreach (var entity in StuSelectLessonListHistory)
                                 {
                                     //插入新数据
-                                    db.ExecuteBySql("insert into StuSelectLessonListTran select * from StuSelectLessonList where SelectId='" + entity.SelectId + "'");
+                                    db.ExecuteBySql("insert into StuSelectLessonListTran select * from StuSelectLessonList where SelectId='" + entity.SelectId + "' and SelectId not in (select SelectId from StuSelectLessonListTran)");
                                     //删除旧数据
                                     db.Delete<StuSelectLessonListEntity>(x => x.SelectId == entity.SelectId);
                                 }
@@ -478,7 +497,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 foreach (var entity in StuSelectLessonListOfElectiveHistory)
                                 {
                                     //插入新数据
-                                    db.ExecuteBySql("insert into StuSelectLessonListOfElectiveTran select * from StuSelectLessonListOfElective where Id='" + entity.Id + "'");
+                                    db.ExecuteBySql("insert into StuSelectLessonListOfElectiveTran select * from StuSelectLessonListOfElective where Id='" + entity.Id + "' and Id not in (select Id from StuSelectLessonListOfElectiveTran) ");
                                     //修改旧数据：报名成功时，选课表中报名成功人数字段减一；
                                     if (entity.Status == 2)
                                     {
@@ -493,11 +512,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             var StuScoreNotPassHistory = db.FindList<StuScoreNotPassEntity>(x => x.StuNo == InsertStuTran.StuNo
                                                 && x.DeptNo == InsertStuTran.DeptNo && x.MajorNo == InsertStuTran.MajorNo
                                                 && x.ClassNo == InsertStuTran.ClassNo && x.F_SchoolId == InsertStuTran.F_SchoolId);
-                            if (StuScoreNotPassHistory != null)
+                            if (StuScoreNotPassHistory.Any())
                             {
                                 foreach (var itemScore in StuScoreNotPassHistory)
                                 {
-                                    db.ExecuteBySql(" insert into StuScoreNotPassTran select * from StuScoreNotPass where Scoreid = '" + itemScore.ScoreId + "'");
+                                    db.ExecuteBySql(" insert into StuScoreNotPassTran select * from StuScoreNotPass where Scoreid = '" + itemScore.ScoreId + "' and Scoreid not in (select Scoreid from StuScoreNotPassTran)");
                                     //删除旧数据
                                     db.Delete<StuScoreNotPassTranEntity>(x => x.ScoreId == itemScore.ScoreId);
                                 }
@@ -507,12 +526,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             var StuScoreNotPassTwoHistory = db.FindList<StuScoreNotPassTwoEntity>(x => x.StuNo == InsertStuTran.StuNo
                                                 && x.DeptNo == InsertStuTran.DeptNo && x.MajorNo == InsertStuTran.MajorNo
                                                 && x.ClassNo == InsertStuTran.ClassNo && x.F_SchoolId == InsertStuTran.F_SchoolId);
-                            if (StuScoreNotPassTwoHistory != null)
+                            if (StuScoreNotPassTwoHistory.Any())
                             {
                                 foreach (var itemScore in StuScoreNotPassTwoHistory)
                                 {
                                     //插入数据
-                                    db.ExecuteBySql(" insert into StuScoreNotPassTwoTran select * from StuScoreNotPassTwo where Scoreid = '" + itemScore.ScoreId + "'");
+                                    db.ExecuteBySql(" insert into StuScoreNotPassTwoTran select * from StuScoreNotPassTwo where Scoreid = '" + itemScore.ScoreId + "' and Scoreid not in (select Scoreid from StuScoreNotPassTwoTran) ");
                                     //删除旧数据
                                     db.Delete<StuScoreNotPassTwoTranEntity>(x => x.ScoreId == itemScore.ScoreId);
                                 }
@@ -520,118 +539,125 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             #endregion
                             #region 助学金奖学金（ScholarshipAudit，新-写入，旧-删除；）
                             var ScholarshipHistory = db.FindList<ScholarshipxjEntity>(x => x.StuNo == InsertStuTran.StuNo);
-                            if (ScholarshipHistory != null)
+                            if (ScholarshipHistory.Any())
                             {
                                 foreach (var items in ScholarshipHistory)
                                 {
-                                    db.ExecuteBySql(" insert into ScholarshipTran select * from ScholarshipAudit where IsType = 1  and State =1 and id = '" + items.Id + "'");
-                                    db.ExecuteBySql(" insert into ScholarshipTran select * from ScholarshipAudit where IsType = 0  and id =  '" + items.Id + "'");
+                                    db.ExecuteBySql(" insert into ScholarshipTran select * from ScholarshipAudit where id = '" + items.Id + "' and id not in (select id from ScholarshipTran )");
                                     // 删除旧数据
-                                    db.Delete<ScholarshipxjEntity>(x => x.Id == items.Id);
+                                    //db.Delete<ScholarshipxjEntity>(x => x.Id == items.Id);
                                 }
                             }
                             #endregion
                             #region 学生心理健康档案（APStuHealthRecords，新-写入，旧-删除；）
                             var AspHistory = db.FindList<APStuHealthRecordsEntity>(x => x.Stuno == InsertStuTran.StuNo);
-                            if (AspHistory != null)
+                            if (AspHistory.Any())
                             {
                                 foreach (var items in AspHistory)
                                 {
-                                    db.ExecuteBySql(" insert into APStuHealthRecordsTran select * from APStuHealthRecords where ID = " + items.ID + "'");
+                                    db.ExecuteBySql(" insert into APStuHealthRecordsTran select * from APStuHealthRecords where ID = '" + items.ID + "' and ID not in (select ID from APStuHealthRecordsTran )");
                                     // 删除旧数据
-                                    db.Delete<APStuHealthRecordsEntity>(x => x.ID == items.ID);
+                                    //db.Delete<APStuHealthRecordsEntity>(x => x.ID == items.ID);
                                 }
                             }
                             #endregion
                             #region 兵役一（MSRIntentionManagement，新-写入，旧-删除；）
                             var MSRIntentionHistory = db.FindList<MSRIntentionManagementEntity>(x => x.StuNo == InsertStuTran.StuNo);
-                            if (MSRIntentionHistory != null)
+                            if (MSRIntentionHistory.Any())
                             {
                                 foreach (var items in MSRIntentionHistory)
                                 {
-                                    db.ExecuteBySql(" insert into MSRIntentionManagementTran select * from MSRIntentionManagement where ID = " + items.ID + "'");
+                                    db.ExecuteBySql(" insert into MSRIntentionManagementTran select * from MSRIntentionManagement where ID = '" + items.ID + "' and ID not in (select ID from MSRIntentionManagementTran) ");
                                     // 删除旧数据
-                                    db.Delete<MSRIntentionManagementEntity>(x => x.ID == items.ID);
+                                    //db.Delete<MSRIntentionManagementEntity>(x => x.ID == items.ID);
                                 }
                             }
                             #endregion
                             #region 兵役二（MSRMilitaryRecord，新-写入，旧-删除；）
                             var MSRMilitaryRecordHistory = db.FindList<MSRMilitaryRecordEntity>(x => x.StuNo == InsertStuTran.StuNo);
-                            if (MSRMilitaryRecordHistory != null)
+                            if (MSRMilitaryRecordHistory.Any())
                             {
                                 foreach (var items in MSRMilitaryRecordHistory)
                                 {
-                                    db.ExecuteBySql(" insert into MSRMilitaryRecordTran select * from MSRMilitaryRecord where ID = " + items.ID + "'");
+                                    db.ExecuteBySql(" insert into MSRMilitaryRecordTran select * from MSRMilitaryRecord where ID = '" + items.ID + "' and ID not in (select ID from MSRMilitaryRecordTran)");
                                     // 删除旧数据
-                                    db.Delete<MSRMilitaryRecordEntity>(x => x.ID == items.ID);
+                                    //db.Delete<MSRMilitaryRecordEntity>(x => x.ID == items.ID);
                                 }
                             }
                             #endregion
                             #region 兵役三（MSRMilitaryServiceRegistration，新-写入，旧-删除；）
                             var MSRMilitaryServiceRegistrationHistory = db.FindList<MSRMilitaryServiceRegistrationEntity>(x => x.StuNo == InsertStuTran.StuNo);
-                            if (MSRMilitaryServiceRegistrationHistory != null)
+                            if (MSRMilitaryServiceRegistrationHistory.Any())
                             {
                                 foreach (var items in MSRMilitaryServiceRegistrationHistory)
                                 {
-                                    db.ExecuteBySql(" insert into MSRMilitaryServiceRegistrationTran select * from MSRMilitaryServiceRegistration where ID = " + items.ID + "'");
+                                    db.ExecuteBySql(" insert into MSRMilitaryServiceRegistrationTran select * from MSRMilitaryServiceRegistration where ID = '" + items.ID + "' and ID not in (select ID from MSRMilitaryServiceRegistrationTran)");
                                     // 删除旧数据
-                                    db.Delete<MSRMilitaryRecordEntity>(x => x.ID == items.ID);
+                                    //db.Delete<MSRMilitaryRecordEntity>(x => x.ID == items.ID);
                                 }
                             }
                             #endregion
                             #region 奖励（StuEncourgement，新-写入，旧-删除；）
                             var StuEncourgementHistory = db.FindList<StuEncourgementEntity>(x => x.StuNo == InsertStuTran.StuNo);
-                            if (StuEncourgementHistory != null)
+                            if (StuEncourgementHistory.Any())
                             {
                                 foreach (var items in StuEncourgementHistory)
                                 {
-                                    db.ExecuteBySql(" insert into StuEncourgementTran select * from StuEncourgement where ID = " + items.ID + "'");
+                                    db.ExecuteBySql(" insert into StuEncourgementTran select * from StuEncourgement where ID = '" + items.ID + "'  and ID not in (select ID from StuEncourgementTran) ");
                                     // 删除旧数据
-                                    db.Delete<StuEncourgementEntity>(x => x.ID == items.ID);
+                                    //db.Delete<StuEncourgementEntity>(x => x.ID == items.ID);
                                 }
                             }
                             #endregion
                             #region 处分（StuPunishment，新-写入，旧-删除；）
                             var StuPunishmentHistory = db.FindList<StuPunishmentEntity>(x => x.StuNo == InsertStuTran.StuNo);
-                            if (StuPunishmentHistory != null)
+                            if (StuPunishmentHistory.Any())
                             {
                                 foreach (var items in StuPunishmentHistory)
                                 {
-                                    db.ExecuteBySql(" insert into StuPunishmentTran select * from StuPunishment where ID = " + items.Id + "'");
+                                    db.ExecuteBySql(" insert into StuPunishmentTran select * from StuPunishment where ID = '" + items.Id + "' and ID not in (select ID from StuPunishmentTran)");
                                     // 删除旧数据
-                                    db.Delete<StuPunishmentEntity>(x => x.Id == items.Id);
+                                    //db.Delete<StuPunishmentEntity>(x => x.Id == items.Id);
                                 }
                             }
                             #endregion
 
-                            if (upTrua.AnomalousType == "01" || upTrua.AnomalousType == "07" || upTrua.AnomalousType == "08")
+                            if (upTrua.AnomalousType == "01" || upTrua.AnomalousType == "07" || upTrua.AnomalousType == "08" || upTrua.AnomalousType == "15")
                             {
                                 #region 学籍操作
 
-                                StuEntity = new StuInfoBasicEntity
-                                {
-                                    //修改学籍表信息
-                                    StuId = upTrua.StuId,
-                                    StuNo = upTrua.StuNo,
-                                    StuName = upTrua.StuName,
-                                    ClassNo = upTrua.NewClassNo,
-                                    MajorNo = upTrua.NewMajorNo,
-                                    DeptNo = upTrua.NewDeptNo,
-                                    Grade = upTrua.NewGrade,
-                                    EduSystem = upTrua.EduSystem
-                                };
-
-                                upStulist.Add(StuEntity);
+                                //修改学籍表信息
+                                stulist.ClassNo = upTrua.NewClassNo;
+                                stulist.MajorNo = upTrua.NewMajorNo;
+                                stulist.DeptNo = upTrua.NewDeptNo;
+                                stulist.Grade = upTrua.NewGrade;
+                                stulist.EduSystem = upTrua.EduSystem;
+                                db.Update(stulist);
                                 #endregion
 
                                 #region 课表（StuSelectLessonList，旧-写入新班级课表数据；）
-
-                                db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist));
-                                
+                                //db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist));
+                                //  wx修改 2023-3-21 课表空数据报错 ,查找同班同学 如果不为空继续执行                           
+                                if (CreateInsertStuSelectLessonList(upTrua, stulist) != null)
+                                {
+                                    db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist));
+                                }
                                 #endregion
                             }
-                            else if (upTrua.AnomalousType == "02" || upTrua.AnomalousType == "05" || upTrua.AnomalousType == "06")
+                            else if (upTrua.AnomalousType == "02" || upTrua.AnomalousType == "05" || upTrua.AnomalousType == "06" || upTrua.AnomalousType == "10" || upTrua.AnomalousType == "11" || upTrua.AnomalousType == "12" || upTrua.AnomalousType == "13" || upTrua.AnomalousType == "14")
                             {
+                                if (upTrua.AnomalousType == "06") //休学保存部分基础数据 StuTransferInfo数据?
+                                {
+                                    upTrua.NationalityNo = stulist.NationalityNo;
+                                    upTrua.Province = stulist.F_ProvinceId;
+                                    upTrua.City = stulist.F_CityId;
+                                    upTrua.County = stulist.F_CountyId;
+                                    upTrua.Mobile = stulist.mobile;
+                                    upTrua.Remark = stulist.Remark;
+                                    upTrua.ResidencePlace = stulist.FatherUnit;
+                                    upTrua.LocationFile = stulist.MatherUnit;
+                                    upTrua.MailAddress = stulist.MailAddress;
+                                }
                                 #region 学籍操作
                                 if (upTrua.StuStatus == 0) //如果保留学籍，basic不动；否则删除学籍basic,备份到basictran；
                                 {
@@ -651,16 +677,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             }
                             break;
                         case "03": //复学
+                        case "16": //恢复学籍
                             //学籍异动列表
                             if (upTrua.IsReturnSchool == "0")
                             {
                                 upTrua.IsReturnSchool = "1";
+                                //修改记录为已审核
+                                upTrua.F_EnabledMark = 1;
+                                upTrua.CheckTime = DateTime.Now;
+                                upTrua.CheckUserId = userInfo.userId;
+                                //修改关联休学记录的 IsReturnSchool = 1 
+                                db.ExecuteBySql(" update StuTransferInfo set IsReturnSchool = 1 where  ID = '" + upTrua.ReturnSchoolId + "'");
+
                                 //1.basic找，有就改；2.basictran复制并改；
                                 if (stulist == null)
                                 {
                                     #region 重新生成学籍
                                     //复学的学籍
-                                    var ReturnStu = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicTranEntity>(x => x.StuId == upTrua.StuId);
+                                    var ReturnStu = db.FindEntity<StuInfoBasicTranEntity>(x => x.StuId == upTrua.StuId);
 
                                     addTruan.StuId = ReturnStu.StuId;
                                     addTruan.StuNo = ReturnStu.StuNo;
@@ -835,7 +869,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                     addTruan.DiplomaReceiveIdcard = ReturnStu.DiplomaReceiveIdcard;
                                     addTruan.DiplomaReceiveRemark = ReturnStu.DiplomaReceiveRemark;
                                     addTruan.CheckMark = "0";
-                                    Stulist.Add(addTruan);
+                                    db.Insert(addTruan);
                                     #endregion
 
                                 }
@@ -847,7 +881,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                     stulist.Grade = upTrua.NewGrade;
                                     db.Update(stulist);
                                 }
-                                
+
                                 if (upTrua.RecoverWriteMark == "1") //恢复账号
                                 {
                                     #region 用户表
@@ -860,20 +894,28 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
                             #region 课表（StuSelectLessonList，旧-写入新班级课表数据；）
 
-                            db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist));
+                            //db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist));
+                            //  wx修改 2023-3-21 课表空数据报错 ,查找同班同学 如果不为空继续执行
+                            if (CreateInsertStuSelectLessonList(upTrua, stulist) != null)
+                            {
+                                db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist));
+                            }
 
                             #endregion
                             break;
+
                         case "04": //转入
                             #region 学籍表加数据
                             var stuInfoBasicEntity = new StuInfoBasicEntity();
                             stuInfoBasicEntity.StuId = upTrua.StuId;
                             stuInfoBasicEntity.StuNo = upTrua.StuNo;
+                            stuInfoBasicEntity.ProvinceCode = upTrua.StuNo;
                             stuInfoBasicEntity.StuName = upTrua.StuName;
-                            stuInfoBasicEntity.DeptNo = upTrua.DeptNo;
-                            stuInfoBasicEntity.MajorNo = upTrua.MajorNo;
-                            stuInfoBasicEntity.Grade = upTrua.Grade;
-                            stuInfoBasicEntity.ClassNo = upTrua.ClassNo;
+                            stuInfoBasicEntity.DeptNo = upTrua.NewDeptNo;
+                            stuInfoBasicEntity.MajorNo = upTrua.NewMajorNo;
+                            stuInfoBasicEntity.Grade = upTrua.NewGrade;
+                            stuInfoBasicEntity.ClassNo = upTrua.NewClassNo;
+                            stuInfoBasicEntity.EduSystem = upTrua.NewEduSystem;
                             stuInfoBasicEntity.GenderNo = upTrua.Gender;
                             stuInfoBasicEntity.Birthday = upTrua.Birthday;
                             stuInfoBasicEntity.NationalityNo = upTrua.NationalityNo;
@@ -885,26 +927,150 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             stuInfoBasicEntity.MailAddress = upTrua.MailAddress;
                             stuInfoBasicEntity.F_SchoolId = this.BaseRepository().FindEntity<CompanyEntity>(x => x.F_DeleteMark == 0 && x.F_EnabledMark == 1)?.F_CompanyId;
                             stuInfoBasicEntity.IdCardType = upTrua.IdCardType;
+                            stuInfoBasicEntity.Guardian = upTrua.Guardian;
+                            stuInfoBasicEntity.GuardianPhone = upTrua.GuardianMobile;
                             db.Insert(stuInfoBasicEntity);
                             #endregion
 
                             #region 课表（StuSelectLessonList，旧-写入新班级课表数据；）
 
-                            db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist));
-
+                            //db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist));
+                            //  wx修改 2023-3-21 课表空数据报错 ,查找同班同学 如果不为空继续执行                           
+                            if (CreateInsertStuSelectLessonList(upTrua, stulist) != null)
+                            {
+                                db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist));
+                            }
                             #endregion
                             break;
                         default:
                             break;
                     }
+                    #region 学籍查看异动信息
+                    var sql = @"if (select count(*) from StuInfoBasic  where StuId='" + upTrua.StuId + "')>0 select * from StuInfoBasic where StuId='" + upTrua.StuId + "' else if (select count(*) from StuInfoBasicTran where StuId='" + upTrua.StuId + "' )>0 select * from StuInfoBasicTran where StuId= '" + upTrua.StuId + "'";
+                    var oldEntity = db.FindList<StuInfoBasicEntity>(sql).FirstOrDefault();
+                    List<StuInfoBasic_ChangeLogEntity> list = new List<StuInfoBasic_ChangeLogEntity>();
+
+                    //if (upTrua.AnomalousType == "03" || upTrua.AnomalousType == "16")//复学
+                    //{
+                    //    //学籍异动日志表
+                    //    var changeEntity = new StuInfoBasic_ChangeLogEntity
+                    //    {
+                    //        StuID = oldEntity.StuId,
+                    //        BeforeChange = null,
+                    //        AfterChange = null,
+                    //        FieldName = "学籍表主键",
+                    //        UpdateBy = LoginUserInfo.Get().userId,
+                    //        UpdateTime = DateTime.Now,
+                    //        StuChangeType = upTrua.AnomalousType,
+                    //        StuChangeRemark = "学籍异动-学籍异动审核操作"
+                    //    };
+                    //    changeEntity.Create();
+                    //    db.Insert(changeEntity);
+                    //}
+                    if (upTrua.AnomalousType != "04" && upTrua.AnomalousType != "05" && upTrua.AnomalousType != "06" && upTrua.AnomalousType != "10" && upTrua.AnomalousType != "11" && upTrua.AnomalousType != "12" && upTrua.AnomalousType != "13" && upTrua.AnomalousType != "14")
+                    {
+                        var tableInfos = this.BaseRepository("CollegeMIS").FindTable(
+                                                       @"SELECT t.[name] AS 表名,c.[name] AS 字段名,cast(ep.[value] 
+                                                    as varchar(100)) AS [字段说明] 
+                                                    FROM sys.tables AS t
+                                                    INNER JOIN sys.columns 
+                                                    AS c ON t.object_id = c.object_id
+                                                    LEFT JOIN sys.extended_properties AS ep 
+                                                    ON ep.major_id = c.object_id AND ep.minor_id = c.column_id WHERE ep.class =1 
+                                                    AND t.name='StuInfoBasicTran'");
+                        DataTable dt = tableInfos;
+                        if (dt.Rows.Count > 0)
+                        {
+                            if (stulist == null)
+                            {
+                                stulist = addTruan;
+                            }
+                            PropertyInfo[] properties = stulist.GetType().GetProperties();
+                            foreach (System.Reflection.PropertyInfo items in properties)
+                            {
+                                string name = items.Name;
+                                object oldValue = items.GetValue(oldEntity);
+                                object newValue = items.GetValue(stulist);
+                                if (oldValue == null || newValue == null)
+                                {
+                                    continue;
+                                }
+                                if (!oldValue.Equals(newValue))
+                                {
+                                    var columnName = "";
+                                    foreach (DataRow rows in tableInfos.Rows)
+                                    {
+                                        if (rows["字段名"].ToString() == items.Name)
+                                        {
+                                            columnName = rows["字段说明"].ToString();
+                                        }
 
-                    UpStuTran.Add(upTrua);
+                                    }
+
+                                    var NewClassName = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == upTrua.NewClassNo).ClassName;
+                                    var HisClassName = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == upTrua.ClassNo).ClassName;
+                                    var NewDeptName = db.FindEntity<CdDeptEntity>(x => x.DeptNo == upTrua.NewDeptNo).DeptName;
+                                    var HisDeptName = db.FindEntity<CdDeptEntity>(x => x.DeptNo == upTrua.DeptNo).DeptName;
+                                    var NewMajorName = db.FindEntity<CdMajorEntity>(x => x.MajorNo == upTrua.NewMajorNo).MajorName;
+                                    var HisMajorName = db.FindEntity<CdMajorEntity>(x => x.MajorNo == upTrua.MajorNo).MajorName;
+                                    if (name == "ClassNo")
+                                    {
+                                        oldValue = HisClassName;
+                                        newValue = NewClassName;
+                                    }
+                                    if (name == "DeptNo")
+                                    {
+                                        oldValue = HisDeptName;
+                                        newValue = NewDeptName;
+                                    }
+                                    if (name == "MajorNo")
+                                    {
+                                        oldValue = HisMajorName;
+                                        newValue = NewMajorName;
+                                    }
+                                    var changeEntity = new StuInfoBasic_ChangeLogEntity
+                                    {
+                                        StuID = oldEntity.StuId,
+                                        BeforeChange = oldValue.ToString(),
+                                        AfterChange = newValue.ToString(),
+                                        FieldName = columnName,
+                                        UpdateBy = LoginUserInfo.Get().userId,
+                                        UpdateTime = DateTime.Now,
+                                        StuChangeType = upTrua.AnomalousType,
+                                        StuChangeRemark = "学籍异动-学籍异动审核操作"
+                                    };
+                                    changeEntity.Create();
+                                    list.Add(changeEntity);
+                                }
+                            }
+                        }
+                        tableInfos.Clear();
+                    }
+                    else if (upTrua.AnomalousType != "04")
+                    {
+                        //学籍异动日志表
+                        var changeEntity = new StuInfoBasic_ChangeLogEntity
+                        {
+                            StuID = oldEntity.StuId,
+                            BeforeChange = null,
+                            AfterChange = null,
+                            FieldName = "学籍表主键",
+                            UpdateBy = LoginUserInfo.Get().userId,
+                            UpdateTime = DateTime.Now,
+                            StuChangeType = upTrua.AnomalousType,
+                            StuChangeRemark = "学籍异动-学籍异动审核操作"
+                        };
+                        changeEntity.Create();
+                        db.Insert(changeEntity);
+                    }
+                    if (list.Count > 0)
+                    {
+                        db.Insert(list);
+                    }
+                    #endregion
+                    db.Update(upTrua); //休学学籍异动信息
                 }
                 db.Insert(InStuinTran); //学籍异动记录
-                db.Update(UpStuTran); //修改学籍异动信息
-                db.Insert(Stulist); //学籍
-                db.Update(upStulist); //修改学籍
-
                 db.Commit();
                 db1.Commit();
             }
@@ -1123,54 +1289,60 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             //查找一个同班同学作为参考
             var referenceStuInfoBasic = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicEntity>(x => x.CheckMark == "1" && x.DeptNo == upTrua.NewDeptNo && x.MajorNo == upTrua.NewMajorNo && x.ClassNo == upTrua.NewClassNo && x.Grade == upTrua.NewGrade);
             //参考同学的课表：学年大；学年同且学期大于等于；。
-            var referenceStuSelectLessonList = this.BaseRepository("CollegeMIS").FindList<StuSelectLessonListEntity>(x => x.StuNo == referenceStuInfoBasic.StuNo && x.StuName == referenceStuInfoBasic.StuName);
-            referenceStuSelectLessonList = referenceStuSelectLessonList.Where(x => x.AcademicYearNo.ToDecimal() > nowYearSemester.AcademicYearShort.ToDecimal() || (x.AcademicYearNo == nowYearSemester.AcademicYearShort && x.Semester.ToDecimal() >= nowYearSemester.Semester.ToDecimal()));
-            var insertStuSelectLessonList = new List<StuSelectLessonListEntity>();
-            foreach (var referenceEntity in referenceStuSelectLessonList)
+            if (referenceStuInfoBasic != null)
+            {
+                var referenceStuSelectLessonList = this.BaseRepository("CollegeMIS").FindList<StuSelectLessonListEntity>(x => x.StuNo == referenceStuInfoBasic.StuNo && x.StuName == referenceStuInfoBasic.StuName);
+                referenceStuSelectLessonList = referenceStuSelectLessonList.Where(x => x.AcademicYearNo.ToDecimal() > nowYearSemester.AcademicYearShort.ToDecimal() || (x.AcademicYearNo == nowYearSemester.AcademicYearShort && x.Semester.ToDecimal() >= nowYearSemester.Semester.ToDecimal()));
+                var insertStuSelectLessonList = new List<StuSelectLessonListEntity>();
+                foreach (var referenceEntity in referenceStuSelectLessonList)
+                {
+                    var entity = new StuSelectLessonListEntity();
+                    entity.NoticeBookNo = stulist.NoticeNo;
+                    entity.StuNo = stulist.StuNo;
+                    entity.DeptNo = referenceEntity.DeptNo;
+                    entity.MajorNo = referenceEntity.MajorNo;
+                    entity.ClassNo = referenceEntity.ClassNo;
+                    entity.MajorDetailNo = referenceEntity.MajorDetailNo;
+                    entity.MajorDetailName = referenceEntity.MajorDetailName;
+                    entity.StuName = stulist.StuName;
+                    entity.GenderNo = stulist.GenderNo == true ? "1" : "0";
+                    entity.AcademicYearNo = referenceEntity.AcademicYearNo;
+                    entity.Semester = referenceEntity.Semester;
+                    entity.OpenLessonDeptNo = referenceEntity.OpenLessonDeptNo;
+                    entity.OpenLessonMajorNo = referenceEntity.OpenLessonMajorNo;
+                    entity.LessonNo = referenceEntity.LessonNo;
+                    entity.LessonName = referenceEntity.LessonName;
+                    entity.PartCode = referenceEntity.PartCode;
+                    entity.LessonNameEng = referenceEntity.LessonNameEng;
+                    entity.OrdinaryScoreScale = referenceEntity.OrdinaryScoreScale;
+                    entity.TermInScoreScale = referenceEntity.TermInScoreScale;
+                    entity.TermEndScoreScale = referenceEntity.TermEndScoreScale;
+                    entity.OtherScoreScale = referenceEntity.OtherScoreScale;
+                    entity.TeachClassNo = referenceEntity.TeachClassNo;
+                    entity.LessonSortNo = referenceEntity.LessonSortNo;
+                    entity.StuSortNo = referenceEntity.StuSortNo;
+                    entity.Grade = referenceEntity.Grade;
+                    entity.StudyScore = referenceEntity.StudyScore;
+                    entity.TotalStudyHour = referenceEntity.TotalStudyHour;
+                    entity.IsInEffect = referenceEntity.IsInEffect;
+                    entity.Remark = referenceEntity.Remark;
+                    entity.ConflictLessonNo = referenceEntity.ConflictLessonNo;
+                    entity.EmpNo = referenceEntity.EmpNo;
+                    entity.TeachPlanNo = referenceEntity.TeachPlanNo;
+                    entity.IsPitchOn = referenceEntity.IsPitchOn;
+                    entity.CheckMark = referenceEntity.CheckMark;
+                    entity.InsertTime = DateTime.Now;
+                    entity.F_SchoolId = referenceEntity.F_SchoolId;
+                    insertStuSelectLessonList.Add(entity);
+                }
+                return insertStuSelectLessonList;
+            }
+            else
             {
-                var entity = new StuSelectLessonListEntity();
-                entity.NoticeBookNo = stulist.NoticeNo;
-                entity.StuNo = stulist.StuNo;
-                entity.DeptNo = referenceEntity.DeptNo;
-                entity.MajorNo = referenceEntity.MajorNo;
-                entity.ClassNo = referenceEntity.ClassNo;
-                entity.MajorDetailNo = referenceEntity.MajorDetailNo;
-                entity.MajorDetailName = referenceEntity.MajorDetailName;
-                entity.StuName = stulist.StuName;
-                entity.GenderNo = stulist.GenderNo == true ? "1" : "0";
-                entity.AcademicYearNo = referenceEntity.AcademicYearNo;
-                entity.Semester = referenceEntity.Semester;
-                entity.OpenLessonDeptNo = referenceEntity.OpenLessonDeptNo;
-                entity.OpenLessonMajorNo = referenceEntity.OpenLessonMajorNo;
-                entity.LessonNo = referenceEntity.LessonNo;
-                entity.LessonName = referenceEntity.LessonName;
-                entity.PartCode = referenceEntity.PartCode;
-                entity.LessonNameEng = referenceEntity.LessonNameEng;
-                entity.OrdinaryScoreScale = referenceEntity.OrdinaryScoreScale;
-                entity.TermInScoreScale = referenceEntity.TermInScoreScale;
-                entity.TermEndScoreScale = referenceEntity.TermEndScoreScale;
-                entity.OtherScoreScale = referenceEntity.OtherScoreScale;
-                entity.TeachClassNo = referenceEntity.TeachClassNo;
-                entity.LessonSortNo = referenceEntity.LessonSortNo;
-                entity.StuSortNo = referenceEntity.StuSortNo;
-                entity.Grade = referenceEntity.Grade;
-                entity.StudyScore = referenceEntity.StudyScore;
-                entity.TotalStudyHour = referenceEntity.TotalStudyHour;
-                entity.IsInEffect = referenceEntity.IsInEffect;
-                entity.Remark = referenceEntity.Remark;
-                entity.ConflictLessonNo = referenceEntity.ConflictLessonNo;
-                entity.EmpNo = referenceEntity.EmpNo;
-                entity.TeachPlanNo = referenceEntity.TeachPlanNo;
-                entity.IsPitchOn = referenceEntity.IsPitchOn;
-                entity.CheckMark = referenceEntity.CheckMark;
-                entity.InsertTime = DateTime.Now;
-                entity.F_SchoolId = referenceEntity.F_SchoolId;
-                insertStuSelectLessonList.Add(entity);
+                return null;
             }
-
-            return insertStuSelectLessonList;
         }
-        
+
 
         #endregion