Merge branch '中职版本' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 中职版本

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemper.js

@@ -78,13 +78,6 @@
             }));
             _$item.append($('<p class="lr-ellipsis"><span>调度时间：</span></p>').dataFormatter({ value: (_item.AttemperStartTime == null ? "-" : _item.AttemperStartTime) + "到" + (_item.AttemperEndTime == null ? "-" : _item.AttemperEndTime) }));
             _$item.append($('<p class="lr-ellipsis"><span>学年学期：</span></p>').dataFormatter({ value: _item.AcademicYearNo + "学年第" + _item.Semester + "学期" }));
-            _$item.append($('<p class="lr-ellipsis"><span>系部：</span></p>').dataFormatter({
-                value: _item.DeptNo,
-                type: 'dataSource',
-                code: 'CdDeptInfo',
-                keyId: 'deptno',
-                text: 'deptname'
-            }));
             _$item.append($('<p class="lr-ellipsis"><span>专业：</span></p>').dataFormatter({
                 value: _item.MajorNo,
                 type: 'dataSource',
@@ -121,13 +114,6 @@
                 text: 'classroomname'
             }));
             if (_item.AttemperType != "02") {
-                _$item.append($('<p class="lr-ellipsis"><span>新系部：</span></p>').dataFormatter({
-                    value: _item.NewDeptNo,
-                    type: 'dataSource',
-                    code: 'CdDeptInfo',
-                    keyId: 'deptno',
-                    text: 'deptname'
-                }));
                 _$item.append($('<p class="lr-ellipsis"><span>新专业：</span></p>').dataFormatter({
                     value: _item.NewMajorNo,
                     type: 'dataSource',

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpRegister/EmpRegister.html

@@ -19,11 +19,6 @@
         <label>部门</label>
         <div id="F_DepartmentId" isvalid="yes" checkexpession="NotNull" errormsg="部门"></div>
     </div>
-    <div class="lr-form-row  " data-table="EmpInfo">
-
-        <label>系部</label>
-        <div id="DeptNo"></div>
-    </div>
     <div class="lr-form-row  " data-table="EmpInfo">
         <font face="宋体">*</font>
         <label>性别</label>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpRegister/EmpRegister.js

@@ -105,13 +105,6 @@
                 itext: 'f_fullname',
                 firstRead: '1'
             });
-            $page.find('#DeptNo').lrpickerex({
-                type: 'sourceData',
-                code: 'CdDeptInfo',
-                ivalue: 'deptid',
-                itext: 'deptname',
-                firstRead: '1'
-            });
             $page.find('#GenderNo').lrpickerex({
                 code: 'usersexbit',
                 type: 'dataItem',

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeave.js

@@ -74,8 +74,6 @@
             _$item.append($('<p class="lr-ellipsis"><span>学号:</span></p>').dataFormatter({ value: _item.StuNo }));
             _$item.append($('<p class="lr-ellipsis"><span>姓名:</span></p>').dataFormatter({ value: _item.StuName }));
             _$item.append($('<p class="lr-ellipsis"><span>年级:</span></p>').dataFormatter({ value: _item.Grade }));
-            _$item.append($('<p class="lr-ellipsis"><span>系所码:</span></p>').dataFormatter({ value: _item.DeptNo }));
-            _$item.append($('<p class="lr-ellipsis"><span>系名:</span></p>').dataFormatter({ value: _item.DeptName }));
             _$item.append($('<p class="lr-ellipsis"><span>专业码:</span></p>').dataFormatter({ value: _item.MajorNo }));
             _$item.append($('<p class="lr-ellipsis"><span>专业名:</span></p>').dataFormatter({ value: _item.MajorName }));
             _$item.append($('<p class="lr-ellipsis"><span>所在行政班号 :</span></p>').dataFormatter({ value: _item.ClassNo }));

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuAttendanceLeave/form/form.html

@@ -29,16 +29,6 @@
         <label>教师号</label>
         <input id="EmpNo" readonly type="text" />
     </div>
-    <div class="lr-form-row  " data-table="StuAttendanceLeave">
-
-        <label>系所码</label>
-        <input id="DeptNo" readonly type="text" />
-    </div>
-    <div class="lr-form-row  " data-table="StuAttendanceLeave">
-
-        <label>系名</label>
-        <input id="DeptName" readonly type="text" />
-    </div>
     <div class="lr-form-row  " data-table="StuAttendanceLeave">
 
         <label>专业码</label>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html

@@ -13,7 +13,6 @@
             <div class="sQrT">新生报到二维码</div>
             <div class="sQrList">
                 <div><span>姓名</span><strong></strong></div>
-                <div><span>系别</span><strong></strong></div>
                 <div><span>专业</span><strong></strong></div>
                 <div><span>班级</span><strong></strong></div>
                 <div><span>教室</span><strong></strong></div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js

@@ -38,10 +38,9 @@
 
                     //学生
                     $('.sQrList strong').eq(0).html(data.StuInfoFreshEntity.StuName);
-                    $('.sQrList strong').eq(1).html(data.StuInfoFreshEntity.DeptNo);
-                    $('.sQrList strong').eq(2).html(data.StuInfoFreshEntity.MajorNo);
-                    $('.sQrList strong').eq(3).html(data.StuInfoFreshEntity.ClassNo);
-                    $('.sQrList strong').eq(4).html(data.StuInfoFreshEntity.DefaultClassRoomName);
+                    $('.sQrList strong').eq(1).html(data.StuInfoFreshEntity.MajorNo);
+                    $('.sQrList strong').eq(2).html(data.StuInfoFreshEntity.ClassNo);
+                    $('.sQrList strong').eq(3).html(data.StuInfoFreshEntity.DefaultClassRoomName);
                     //班主任
                     $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : "");
                     $('.sQrText span').eq(1).html(data.StuInfoFreshEntity.ClassDiredctorMobile);

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/TeachPlan/TeachPlan.html

@@ -15,10 +15,6 @@
                         <label>版本号</label>
                         <input id="VersionNo" type="text">
                     </div>
-                    <div class="lr-form-row">
-                        <label>系部</label>
-                        <div id="DeptNo"></div>
-                    </div>
                     <div class="lr-form-row">
                         <label>专业</label>
                         <div id="MajorNo"></div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/TeachPlan/TeachPlan.js

@@ -42,11 +42,6 @@
                     page.grid.reload();
                 }
             });
-            $multiple.find('#DeptNo').lrpickerex({
-                type: 'sourceData',
-                code: 'CdDeptInfo',
-                ivalue:'deptno',
-                itext:'deptname'            });
             $multiple.find('#MajorNo').lrpickerex({
                 type: 'sourceData',
                 code: 'CdMajorInfo',
@@ -88,12 +83,6 @@
             _$item.addClass('lr-list-item lr-list-item-multi');
             _$item.append($('<p class="lr-ellipsis"><span>计划号:</span></p>').dataFormatter({ value: _item.PlanNo            }));
             _$item.append($('<p class="lr-ellipsis"><span>版本号:</span></p>').dataFormatter({ value: _item.VersionNo            }));
-            _$item.append($('<p class="lr-ellipsis"><span>系部:</span></p>').dataFormatter({ value: _item.DeptNo,
-                type: 'dataSource',
-                code: 'CdDeptInfo',
-                keyId: 'deptno',
-                text: 'deptname'
-            }));
             _$item.append($('<p class="lr-ellipsis"><span>专业:</span></p>').dataFormatter({ value: _item.MajorNo,
                 type: 'dataSource',
                 code: 'CdMajorInfo',

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/TeachPlan/form/form.html

@@ -9,11 +9,6 @@
         <label>版本号</label>
         <input id="VersionNo"  type="text"   />
     </div>
-    <div class="lr-form-row  " data-table="TeachPlan">
-        
-        <label>系部</label>
-        <div id="DeptNo"  ></div>
-    </div>
     <div class="lr-form-row  " data-table="TeachPlan">
         
         <label>专业</label>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/TeachPlan/form/form.js

@@ -135,12 +135,6 @@
             }
         },
         bind: function ($page, param) {
-            $page.find('#DeptNo').lrpickerex({
-                type: 'sourceData',
-                code: 'CdDeptInfo',
-                ivalue: 'deptno',
-                itext: 'deptname'
-            });
             $page.find('#MajorNo').lrpickerex({
                 type: 'sourceData',
                 code: 'CdMajorInfo',

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/ListenClassRecord.html

@@ -7,10 +7,6 @@
             <div class="lr-tool-right-btn lr_multiple_search"> 
                 <i class="iconfont icon-searchlist"></i> 
                 <div class="lr-tool-right-btn-content lr-form-container"> 
-                    <div class="lr-form-row"> 
-                        <label>系部</label> 
-                        <div id="DeptNo"></div> 
-                    </div> 
                     <div class="lr-form-row"> 
                         <label>专业</label> 
                         <div id="MajorNo"></div> 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/ListenClassRecord.js

@@ -42,10 +42,6 @@
                     page.grid.reload(); 
                 } 
             }); 
-            $multiple.find('#DeptNo').lrpickerex({ 
-                type: 'dataItem', 
-                code: ''
-            }); 
             $multiple.find('#MajorNo').lrpickerex({ 
                 type: 'dataItem', 
                 code: ''

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/form/form.html

@@ -5,11 +5,6 @@
     }
 </style>
 <div class="lr-form-container">
-    <div class="lr-form-row  " data-table="ListenClassRecord">
-
-        <label>系部</label>
-        <div id="DeptNo"></div>
-    </div>
     <div class="lr-form-row  " data-table="ListenClassRecord">
 
         <label>专业</label>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/form/form.js

@@ -135,22 +135,9 @@
             } 
         }, 
         bind: function ($page, param) { 
-            $page.find('#DeptNo').lrpickerex({ 
-                type: 'sourceData', 
-                code: 'CdDeptInfo', 
-                ivalue: 'deptno', 
-                itext: 'deptname',
-                change:function(val) {
-                    if (val != null) {
-                        learun.httpget(config.webapi+'learun/adms/dept/majorbydept',val,(data) => {
-                            if (data) {
-                                $page.find('#MajorNo').lrpickerSetData(data); 
-                            }
-                        })
-                    }
-                }
-            }); 
-            $page.find('#MajorNo').lrpickerex({ 
+            $page.find('#MajorNo').lrpickerex({
+                type: 'sourceData',
+                code: 'CdMajorInfo', 
                 ivalue: 'MajorNo', 
                 itext: 'MajorName',
                 change:function(val) {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/WelcomNewStudents/ConfirmStudentsCheckIn/form/form.html

@@ -21,10 +21,6 @@
             性别
             <span id="GenderNo"></span>
         </div>
-        <div class="welText">
-            系别
-            <span id="DeptNo"></span>
-        </div>
         <div class="welText">
             专业
             <span id="MajorNo"></span>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.html

@@ -11,9 +11,6 @@
 		<div class="noticeTxt">
 			<span>学号：</span><span id="StuNo"></span>
 		</div>
-		<div class="noticeTxt">
-			<span>系：</span><span id="DeptNo"></span>
-		</div>
 		<div class="noticeTxt">
 			<span>专业：</span><span id="MajorNo"></span>
 		</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js

@@ -13,7 +13,6 @@
                     if (entity != null) {
                         $('#StuName').html(entity.StuName);
                         $('#StuNo').html(entity.StuNo);
-                        $('#DeptNo').html(entity.DeptNo);
                         $('#MajorNo').html(entity.MajorNo);
                         $('#ClassNo').html(entity.ClassNo);
                         $('#ClassTutorName').html(entity.ClassTutorName);

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.html

@@ -29,16 +29,6 @@
         <label>教师号</label>
         <input id="EmpNo" readonly type="text" />
     </div>
-    <div class="lr-form-row  " hidden data-table="StuAttendanceLeave">
-
-        <label>系所码</label>
-        <input id="DeptNo" readonly type="text" />
-    </div>
-    <div class="lr-form-row  " data-table="StuAttendanceLeave">
-
-        <label>系名</label>
-        <input id="DeptName" readonly type="text" />
-    </div>
     <div class="lr-form-row  " hidden data-table="StuAttendanceLeave">
 
         <label>专业码</label>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.js

@@ -109,14 +109,6 @@
                     }
                     
                 }
-                learun.clientdata.get('sourceData', {
-                    key: $("#DeptNo").val(),
-                    keyId: "deptno",
-                    code: "CdDeptInfo",
-                    callback: function (_data) {
-                        $("#DeptName").val(_data.deptname);
-                    }
-                });
                 learun.clientdata.get('sourceData', {
                     key: $("#MajorNo").val(),
                     keyId: "majorno",

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html

@@ -21,10 +21,6 @@
             性别
             <span id="GenderNo"></span>
         </div>
-        <div class="welText">
-            系别
-            <span id="DeptNo"></span>
-        </div>
         <div class="welText">
             专业
             <span id="MajorNo"></span>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_Main/AnswerIndex.js

@@ -48,18 +48,6 @@ var bootstrap = function ($, learun) {
                             return cellvalue === true ? "男" : "女";
                         }
                     },
-                    {
-                        label: "考核系部", name: "DeptNo", width: 150, 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: 150, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_Main/AnswerQuery.js

@@ -183,9 +183,6 @@ var bootstrap = function ($, learun) {
                     { label: "结束时间", name: "VStopTime", width: 100, align: "left" },
                     { label: "考核学年", name: "AcademicYearNo", width: 80, align: "left" },
                     { label: "考核学期", name: "Semester", width: 80, align: "left" },
-                    {
-                        label: "考核系部", name: "DeptNosName", width: 150, align: "left"
-                    },
                     {
                         label: "考核专业", name: "MajorNosName", width: 150, align: "left"
                     },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_Main/Form.cshtml

@@ -41,11 +41,6 @@
         <div class="lr-form-item-title">考核学期<font face="宋体">*</font></div>
         <div id="Semester" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ask_Main">
-        <div class="lr-form-item-title">考核系部</div>
-        <div id="DeptNos"></div>
-        <input id="DeptNosName" type="hidden" />
-    </div>
     <div class="col-xs-6 lr-form-item" data-table="Ask_Main">
         <div class="lr-form-item-title">考核专业</div>
         <div id="MajorNos"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_Main/Form.js

@@ -34,7 +34,6 @@ var bootstrap = function ($, learun) {
                 $('#ATId').lrselectSet(pATId);
             }
             $("#Semester").lrDataItemSelect({ code: 'Semester' });
-            $('#DeptNos').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname', type: 'multiple' });
             $('#MajorNos').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname', type: 'multiple' });
             $('#LessonNos').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname', type: 'multiple' });
             $('#ClassNos').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname', type: 'multiple' });
@@ -71,7 +70,6 @@ var bootstrap = function ($, learun) {
         if (!$('body').lrValidform()) {
             return false;
         }
-        $("#DeptNosName").val($("#DeptNos").find(".lr-select-placeholder").text());
         $("#MajorNosName").val($("#MajorNos").find(".lr-select-placeholder").text());
         $("#ClassNosName").val($("#ClassNos").find(".lr-select-placeholder").text());
         $("#GradeNosName").val($("#GradeNos").find(".lr-select-placeholder").text());

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_Main/Index.js

@@ -203,9 +203,6 @@ var bootstrap = function ($, learun) {
                     { label: "结束时间", name: "VStopTime", width: 100, align: "left" },
                     { label: "考核学年", name: "AcademicYearNo", width: 80, align: "left" },
                     { label: "考核学期", name: "Semester", width: 80, align: "left" },
-                    {
-                        label: "考核系部", name: "DeptNosName", width: 150, align: "left"
-                    },
                     {
                         label: "考核专业", name: "MajorNosName", width: 150, align: "left"
                     },

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

@@ -87,7 +87,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult GetList(string queryJson)
         {
             var data = arrangeLessonTermIBLL.GetList(queryJson).ToList()
-                .OrderBy(x => x.AcademicYearNo).ThenBy(x => x.Semester).ThenBy(x => x.DeptNo).ThenBy(x => x.MajorNo).ThenBy(x => x.LessonNo).ThenBy(x => x.TeachClassNo.Replace(x.LessonName, "")).ThenBy(x => x.EmpNo).ThenBy(x => x.ClassroomNo).ThenBy(x => x.LessonDate);
+                .OrderBy(x => x.AcademicYearNo).ThenBy(x => x.Semester).ThenBy(x => x.MajorNo).ThenBy(x => x.LessonNo).ThenBy(x => x.TeachClassNo.Replace(x.LessonName, "")).ThenBy(x => x.EmpNo).ThenBy(x => x.ClassroomNo).ThenBy(x => x.LessonDate);
             return Success(data);
         }
         /// <summary>

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

@@ -0,0 +1,154 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-09-24 10:33
+    /// 描 述：AwardAndPunishment
+    /// </summary>
+    public class AwardAndPunishmentController : MvcControllerBase
+    {
+        private AwardAndPunishmentIBLL awardAndPunishmentIBLL = new AwardAndPunishmentBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexPunishment()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult AwardForm()
+        {
+            return View();
+        }
+        
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = awardAndPunishmentIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var AwardAndPunishmentData = awardAndPunishmentIBLL.GetAwardAndPunishmentEntity( keyValue );
+            var jsonData = new {
+                AwardAndPunishment = AwardAndPunishmentData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            awardAndPunishmentIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            AwardAndPunishmentEntity entity = strEntity.ToObject<AwardAndPunishmentEntity>();
+            awardAndPunishmentIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+
+        #region 扩展数据
+        /// <summary>
+        /// 启用/禁用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="status"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+
+        public ActionResult EnableDisable(string keyValue, string status)
+        {
+            awardAndPunishmentIBLL.EnableDisable(keyValue, status);
+            return Success("操作成功！");
+        }
+        #endregion
+    }
+}

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

@@ -0,0 +1,135 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-09-24 17:38
+    /// 描 述：奖励惩罚管理
+    /// </summary>
+    public class AwardPunishInfoController : MvcControllerBase
+    {
+        private AwardPunishInfoIBLL awardPunishInfoIBLL = new AwardPunishInfoBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult AwardIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult AwardForm()
+        {
+            return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = awardPunishInfoIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var AwardPunishInfoData = awardPunishInfoIBLL.GetAwardPunishInfoEntity( keyValue );
+            var jsonData = new {
+                AwardPunishInfo = AwardPunishInfoData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            awardPunishInfoIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            AwardPunishInfoEntity entity = strEntity.ToObject<AwardPunishInfoEntity>();
+            awardPunishInfoIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -111,6 +111,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             }
             return Success("保存成功！");
         }
+        /// <summary>
+        /// 修改状态
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult UpdateStatus(string keyValue,int Status)
+        {
+            eATalentTrainIBLL.UpdateStatus(keyValue, Status);
+            return Success("操作成功！");
+        }
         #endregion
 
     }

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

@@ -364,7 +364,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 OLPEId = olpeEntity.Id,
                 NoticeBookNo = stuInfoBasicEntity.NoticeNo,
                 StuNo = stuInfoBasicEntity.StuNo,
-                DeptNo = stuInfoBasicEntity.DeptNo,
                 MajorNo = stuInfoBasicEntity.MajorNo,
                 ClassNo = stuInfoBasicEntity.ClassNo,
                 MajorDetailNo = stuInfoBasicEntity.MajorDetailNo,
@@ -653,7 +652,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 OLPEId = olpeEntity.Id,
                 NoticeBookNo = stuInfoBasicEntity.NoticeNo,
                 StuNo = stuInfoBasicEntity.StuNo,
-                DeptNo = stuInfoBasicEntity.DeptNo,
                 MajorNo = stuInfoBasicEntity.MajorNo,
                 ClassNo = stuInfoBasicEntity.ClassNo,
                 MajorDetailNo = stuInfoBasicEntity.MajorDetailNo,

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

@@ -0,0 +1,167 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-09-27 10:33
+    /// 描 述：学金类型
+    /// </summary>
+    public class ScholarshipController : MvcControllerBase
+    {
+        private ScholarshipIBLL scholarshipIBLL = new ScholarshipBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Indexzxj()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Formzxj()
+        {
+            return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = scholarshipIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var ScholarshipData = scholarshipIBLL.GetScholarshipEntity(keyValue);
+            var jsonData = new
+            {
+                Scholarship = ScholarshipData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            scholarshipIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            ScholarshipEntity entity = strEntity.ToObject<ScholarshipEntity>();
+            var Lists = scholarshipIBLL.NameOrCode(entity.ItemName, entity.ItemCode, entity.IsValid);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                if (Lists != null)
+                {
+                    return Fail("添加失败!名称或编码已存在");
+                }
+            }
+            else
+            {
+                if (!Lists.Id.Contains(keyValue))
+                {
+                    return Fail("添加失败!名称或编码已存在");
+                }
+            }
+            scholarshipIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+        #region 扩展数据
+        /// <summary>
+        /// 启用/禁用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="status"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+
+        public ActionResult EnableDisable(string keyValue, string status)
+        {
+            scholarshipIBLL.EnableDisable(keyValue, status);
+            return Success("操作成功！");
+        }
+        #endregion
+    }
+}

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

@@ -0,0 +1,177 @@
+using System;
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-10-11 16:46
+    /// 描 述：助学金及审核
+    /// </summary>
+    public class ScholarshipxjController : MvcControllerBase
+    {
+        private ScholarshipxjIBLL scholarshipxjIBLL = new ScholarshipxjBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 助学金
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Indexzxj()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 助学金
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Formzxj()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 审核
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexAudit()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 审核
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormAudit()
+        {
+            return View();
+        }
+
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = scholarshipxjIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var ScholarshipxjData = scholarshipxjIBLL.GetScholarshipxjEntity(keyValue);
+            var jsonData = new
+            {
+                Scholarshipxj = ScholarshipxjData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            scholarshipxjIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            var LogUserinfo = LoginUserInfo.Get();
+            ScholarshipxjEntity entity = strEntity.ToObject<ScholarshipxjEntity>();
+            if (entity.State != "0")
+            {
+                entity.AuditPeople = LogUserinfo.userId;
+                entity.AuditTime = DateTime.Today;
+            }
+            scholarshipxjIBLL.SaveEntity(keyValue, entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+        #region 扩展数据
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult AduitForm(string keyValue)
+        {
+            var logUser = LoginUserInfo.Get();
+            scholarshipxjIBLL.AuditEntity(keyValue, logUser.userId);
+            return Success("审核成功！");
+        }
+        #endregion
+    }
+}

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

@@ -146,8 +146,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                     stuAttendanceEntity.AcademicYearNo = entity.AcademicYearNo;
                     stuAttendanceEntity.ClassName = entity.ClassName;
                     stuAttendanceEntity.ClassNo = entity.ClassNo;
-                    stuAttendanceEntity.DeptName = entity.DeptName;
-                    stuAttendanceEntity.DeptNo = entity.DeptNo;
                     stuAttendanceEntity.EmpNo = entity.EmpNo;
                     stuAttendanceEntity.Grade = entity.Grade;
                     stuAttendanceEntity.InertDate = DateTime.Now;

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

@@ -314,13 +314,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 if (string.IsNullOrEmpty(student.PhotoUrl))
                 {
                     student.PhotoUrl = Guid.NewGuid().ToString();
-                    stuEnrollIBLL.SaveEntity(student.StuId,student);
+                    stuEnrollIBLL.SaveEntity(student.StuId, student);
                 }
 
                 var annexEntity = annexesFileIBLL.GetEntityByFolderId(student.PhotoUrl);
                 if (annexEntity == null)
                 {
-                    annexEntity=new AnnexesFileEntity();
+                    annexEntity = new AnnexesFileEntity();
                     annexEntity.Create();
                     annexEntity.F_Id = Guid.NewGuid().ToString();
                 }
@@ -344,11 +344,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult GetYearListByClass()
         {
             var classList = classInfoIBLL.GetAllClass().ToList();
-            var result = classList.GroupBy(a => a.Grade).Select(m=>m.Key).ToList();
-            List<object> list=new List<object>();
+            var result = classList.GroupBy(a => a.Grade).Select(m => m.Key).ToList();
+            List<object> list = new List<object>();
             foreach (var item in result)
             {
-                list.Add(new{year=item});
+                list.Add(new { year = item });
             }
 
             return Success(list);
@@ -375,9 +375,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 
         [HttpPost]
         [AjaxOnly]
-        public ActionResult GetCheckInStatistics(string DeptNo, string MajorNo, string ClassNo)
+        public ActionResult GetCheckInStatistics(string MajorNo, string ClassNo)
         {
-            var result = stuEnrollIBLL.GetCheckInStatistics(DeptNo, MajorNo, ClassNo);
+            var result = stuEnrollIBLL.GetCheckInStatistics(MajorNo, ClassNo);
             return Success(result);
 
         }
@@ -385,18 +385,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 
         [HttpPost]
         [AjaxOnly]
-        public ActionResult GetHelpStatistics(string DeptNo, string MajorNo, string ClassNo)
+        public ActionResult GetHelpStatistics(string MajorNo, string ClassNo)
         {
-            var result = stuEnrollIBLL.GetHelpStatistics(DeptNo, MajorNo, ClassNo);
+            var result = stuEnrollIBLL.GetHelpStatistics(MajorNo, ClassNo);
             return Success(result);
 
         }
 
         [HttpPost]
         [AjaxOnly]
-        public ActionResult GetMilitaryStatistics(string DeptNo, string MajorNo, string ClassNo)
+        public ActionResult GetMilitaryStatistics(string MajorNo, string ClassNo)
         {
-            var result = stuEnrollIBLL.GetMilitaryStatistics(DeptNo, MajorNo, ClassNo);
+            var result = stuEnrollIBLL.GetMilitaryStatistics(MajorNo, ClassNo);
             return Success(result);
 
         }
@@ -519,13 +519,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success("分配成功！");
 
         }
-        [HttpPost]
-        [AjaxOnly]
-        public ActionResult SyncDept()
-        {
-            stuEnrollIBLL.SyncDept();
-            return Success("同步成功");
-        }
+       
         [HttpPost]
         [AjaxOnly]
         public ActionResult SyncMajor()

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

@@ -33,7 +33,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         private FinaChargesStandardIBLL finaChargesStandardIBLL = new FinaChargesStandardBLL();
         private AccommodationIBLL accommodationIBLL = new AccommodationBLL();
         private CdMajorIBLL cdMajorIBLL = new CdMajorBLL();
-        private CdDeptIBLL cdDeptIBLL = new CdDeptBLL();
 
         #region  视图功能
 
@@ -649,7 +648,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 {
                     tempLength++;
                     item.ClassNo = classNo;
-                    item.DeptNo = ClassInfoEntity.DeptNo;
                     item.MajorNo = ClassInfoEntity.MajorNo;
                     item.Grade = ClassInfoEntity.Grade;
                     item.StuNo = string.Format("{0}{1}", classNo, tempLength < 10 ? "0" + tempLength : tempLength.ToString());
@@ -946,11 +944,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 var majorEntity = cdMajorIBLL.GetCdMajorEntityByMajorNo(postData.MajorNo);
                 fileHead = majorEntity?.MajorName + fileHead;
             }
-            else if (!string.IsNullOrEmpty(postData.DeptNo))
-            {
-                var deptEntity = cdDeptIBLL.GetCdDeptEntityByNo(postData.DeptNo);
-                fileHead = deptEntity?.DeptName + fileHead;
-            }
 
             FileStreamResult result = null;
 
@@ -966,14 +959,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             IRow cellrow = sheet.CreateRow(1);
             cellrow.CreateCell(0).SetCellValue("姓名");
             cellrow.CreateCell(1).SetCellValue("学号");
-            cellrow.CreateCell(2).SetCellValue("系");
-            cellrow.CreateCell(3).SetCellValue("专业");
-            cellrow.CreateCell(4).SetCellValue("班级");
-            cellrow.CreateCell(5).SetCellValue("宿舍楼");
-            cellrow.CreateCell(6).SetCellValue("单元");
-            cellrow.CreateCell(7).SetCellValue("楼层");
-            cellrow.CreateCell(8).SetCellValue("房间");
-            cellrow.CreateCell(9).SetCellValue("床位");
+            cellrow.CreateCell(2).SetCellValue("专业");
+            cellrow.CreateCell(3).SetCellValue("班级");
+            cellrow.CreateCell(4).SetCellValue("宿舍楼");
+            cellrow.CreateCell(5).SetCellValue("单元");
+            cellrow.CreateCell(6).SetCellValue("楼层");
+            cellrow.CreateCell(7).SetCellValue("房间");
+            cellrow.CreateCell(8).SetCellValue("床位");
 
             //获取数据源
             var data = stuInfoFreshIBLL.GetList(queryJson).ToList();
@@ -983,14 +975,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 IRow row = sheet.CreateRow(2 + i);
                 row.CreateCell(0).SetCellValue(item.StuName);
                 row.CreateCell(1).SetCellValue(item.StuNo);
-                row.CreateCell(2).SetCellValue(item.DeptName);
-                row.CreateCell(3).SetCellValue(item.MajorName);
-                row.CreateCell(4).SetCellValue(item.ClassName);
-                row.CreateCell(5).SetCellValue(item.Build);
-                row.CreateCell(6).SetCellValue(item.Unit);
-                row.CreateCell(7).SetCellValue(item.floor);
-                row.CreateCell(8).SetCellValue(item.Room);
-                row.CreateCell(9).SetCellValue(item.Bed);
+                row.CreateCell(2).SetCellValue(item.MajorName);
+                row.CreateCell(3).SetCellValue(item.ClassName);
+                row.CreateCell(4).SetCellValue(item.Build);
+                row.CreateCell(5).SetCellValue(item.Unit);
+                row.CreateCell(6).SetCellValue(item.floor);
+                row.CreateCell(7).SetCellValue(item.Room);
+                row.CreateCell(8).SetCellValue(item.Bed);
             }
 
             var fileguid = Guid.NewGuid().ToString();

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

@@ -0,0 +1,133 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Util;
+using System.Data;
+using System.Web.Mvc;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-09-17 11:30
+    /// 描 述：学生学期注册
+    /// </summary>
+    public class StuInfoSemsterController : MvcControllerBase
+    {
+        private StuInfoSemsterIBLL stuInfoSemsterIBLL = new StuInfoSemsterBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList( string queryJson )
+        {
+            var data = stuInfoSemsterIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuInfoSemsterIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var data = stuInfoSemsterIBLL.GetEntity(keyValue);
+            return Success(data);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            stuInfoSemsterIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue,StuInfoSemsterEntity entity)
+        {
+            stuInfoSemsterIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+        #region 扩展数据
+
+        [HttpPost]
+        [AjaxOnly]
+
+        public ActionResult ZhuCe(string keyValue,string status)
+        {
+            stuInfoSemsterIBLL.ZhuCe(keyValue, status);
+            return Success("操作成功！");
+        }
+
+        #endregion
+    }
+}

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

@@ -0,0 +1,173 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-10-14 10:09
+    /// 描 述：教学计划
+    /// </summary>
+    public class TeachingPlanController : MvcControllerBase
+    {
+        private TeachingPlanIBLL teachingPlanIBLL = new TeachingPlanBLL();
+        private TeachingPlanItemIBLL teachingPlanItemIBLL = new TeachingPlanItemBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 教学计划和课程设置--列表
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexManage()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 教学计划和课程设置--编辑
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormManage()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 教学计划和课程设置--查看
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormManageView()
+        {
+            return View();
+        }
+        
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teachingPlanIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListForManage(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teachingPlanIBLL.GetPageListForManage(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeachingPlanData = teachingPlanIBLL.GetTeachingPlanEntity(keyValue);
+            var TeachingPlanItemData = teachingPlanItemIBLL.GetListByPlanId(TeachingPlanData.Id);
+
+            var jsonData = new
+            {
+                TeachingPlan = TeachingPlanData,
+                TeachingPlanItem = TeachingPlanItemData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teachingPlanIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity,string TeachingPlanItemList)
+        {
+            TeachingPlanEntity entity = strEntity.ToObject<TeachingPlanEntity>();
+            List<TeachingPlanItemEntity> teachingPlanItemList = TeachingPlanItemList.ToObject<List<TeachingPlanItemEntity>>();
+            teachingPlanIBLL.SaveEntity(keyValue, entity, teachingPlanItemList);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,117 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-10-15 10:08
+    /// 描 述：教学计划--课程子表
+    /// </summary>
+    public class TeachingPlanItemController : MvcControllerBase
+    {
+        private TeachingPlanItemIBLL teachingPlanItemIBLL = new TeachingPlanItemBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teachingPlanItemIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeachingPlanItemData = teachingPlanItemIBLL.GetTeachingPlanItemEntity( keyValue );
+            var jsonData = new {
+                TeachingPlanItem = TeachingPlanItemData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teachingPlanItemIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TeachingPlanItemEntity entity = strEntity.ToObject<TeachingPlanItemEntity>();
+            teachingPlanItemIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -19,10 +19,6 @@
         <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
         <input id="Semester" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">系所码<font face="宋体">*</font></div>
-        <input id="DeptNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">专业码<font face="宋体">*</font></div>
         <input id="MajorNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />

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

@@ -123,7 +123,6 @@ var bootstrap = function ($, learun) {
                         { label: '上课日期', name: 'LessonDate', width: 200, align: "left" },
                         { label: '学年度', name: 'AcademicYearNo', width: 200, align: "left" },
                         { label: '学期', name: 'Semester', width: 200, align: "left" },
-                        { label: '系所码', name: 'DeptNo', width: 200, align: "left" },
                         { label: '专业码', name: 'MajorNo', width: 200, align: "left" },
                         { label: '课程号', name: 'LessonNo', width: 200, align: "left" },
                         { label: '课程名称', name: 'LessonName', width: 200, align: "left" },

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

@@ -59,10 +59,6 @@
         <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
         <div id="Semester" readonly isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="ArrangeLessonTermAttemper">
-        <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
-        <div id="DeptNo" readonly isvalid="yes" checkexpession="NotNull"></div>
-    </div>
     <div class="col-xs-4 lr-form-item" data-table="ArrangeLessonTermAttemper">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <div id="MajorNo" readonly isvalid="yes" checkexpession="NotNull"></div>
@@ -100,10 +96,6 @@
         <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
         <div id="NewSemester" class="contentDiv" readonly></div>
     </div>
-    <div class="col-xs-4 lr-form-item AttemperType AttemperTypeDuiDiao" data-table="ArrangeLessonTermAttemper">
-        <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
-        <div id="NewDeptNo" class="contentDiv" readonly></div>
-    </div>
     <div class="col-xs-4 lr-form-item AttemperType AttemperTypeDuiDiao" data-table="ArrangeLessonTermAttemper">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <div id="NewMajorNo" class="contentDiv" readonly></div>

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

@@ -35,14 +35,13 @@ var bootstrap = function ($, learun) {
             //p.F_SchoolId = $('#F_SchoolId').lrselectGet();
             p.AcademicYearNo = $('#AcademicYearNo').lrselectGet();
             p.Semester = $('#Semester').lrselectGet();
-            p.DeptNo = $('#DeptNo').lrselectGet();
             p.MajorNo = $('#MajorNo').lrselectGet();
             p.LessonNo = $('#LessonNo').lrselectGet();
             p.TeachClassNo = $('#TeachClassNo').lrselectGet();
             p.EmpNo = $('#EmpNo').lrselectGet();
             p.ClassroomNo = $('#ClassroomNo').lrselectGet();
-            //if (!!p.F_SchoolId && !!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) {
-            if (!!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) {
+            //if (!!p.F_SchoolId && !!p.AcademicYearNo && !!p.Semester && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) {
+            if (!!p.AcademicYearNo && !!p.Semester && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) {
                 //调度开始时间
                 $('#AttemperStartTime').lrselectRefresh({
                     allowSearch: true,
@@ -157,8 +156,6 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
-            $('#NewDeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#NewMajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#LessonNo').lrselect({
@@ -245,7 +242,6 @@ var bootstrap = function ($, learun) {
             //$('#F_SchoolId').lrselectSet(temprow.schooldId);
             $('#AcademicYearNo').lrselectSet(temprow.academicyear);
             $('#Semester').lrselectSet(temprow.semester);
-            $('#DeptNo').lrselectSet(temprow.deptNo);
             $('#MajorNo').lrselectSet(temprow.majorNo);
             $('#LessonNo').lrselectSet(temprow.lessonNo);
             $('#TeachClassNo').lrselectSet(temprow.teachClassNo);
@@ -259,7 +255,6 @@ var bootstrap = function ($, learun) {
             //$('#NewF_SchoolId').lrselectSet(temprow.schooldId);
             $('#NewAcademicYearNo').lrselectSet(temprow.academicyear);
             $('#NewSemester').lrselectSet(temprow.semester);
-            $('#NewDeptNo').lrselectSet(temprow.deptNo);
             $('#NewMajorNo').lrselectSet(temprow.majorNo);
             $('#NewLessonNo').lrselectSet(temprow.lessonNo);
             $('#NewTeachClassNo').lrselectSet(temprow.teachClassNo);

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

@@ -59,10 +59,6 @@
         <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
         <div id="Semester" readonly isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="ArrangeLessonTermAttemper">
-        <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
-        <div id="DeptNo" readonly isvalid="yes" checkexpession="NotNull"></div>
-    </div>
     <div class="col-xs-4 lr-form-item" data-table="ArrangeLessonTermAttemper">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <div id="MajorNo" readonly isvalid="yes" checkexpession="NotNull"></div>
@@ -100,10 +96,6 @@
         <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
         <div id="NewSemester" class="contentDiv" readonly></div>
     </div>
-    <div class="col-xs-4 lr-form-item AttemperType AttemperTypeDuiDiao" data-table="ArrangeLessonTermAttemper">
-        <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
-        <div id="NewDeptNo" class="contentDiv" readonly></div>
-    </div>
     <div class="col-xs-4 lr-form-item AttemperType AttemperTypeDuiDiao" data-table="ArrangeLessonTermAttemper">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <div id="NewMajorNo" class="contentDiv" readonly></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js

@@ -35,14 +35,13 @@ var bootstrap = function ($, learun) {
             //p.F_SchoolId = $('#F_SchoolId').lrselectGet();
             p.AcademicYearNo = $('#AcademicYearNo').lrselectGet();
             p.Semester = $('#Semester').lrselectGet();
-            p.DeptNo = $('#DeptNo').lrselectGet();
             p.MajorNo = $('#MajorNo').lrselectGet();
             p.LessonNo = $('#LessonNo').lrselectGet();
             p.TeachClassNo = $('#TeachClassNo').lrselectGet();
             p.EmpNo = $('#EmpNo').lrselectGet();
             p.ClassroomNo = $('#ClassroomNo').lrselectGet();
-            //if (!!p.F_SchoolId && !!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) {
-            if (!!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) {
+            //if (!!p.F_SchoolId && !!p.AcademicYearNo && !!p.Semester && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) {
+            if (!!p.AcademicYearNo && !!p.Semester && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) {
                 //调度开始时间
                 $('#AttemperStartTime').lrselectRefresh({
                     allowSearch: true,
@@ -157,8 +156,6 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
-            $('#NewDeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#NewMajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#LessonNo').lrselect({
@@ -247,7 +244,6 @@ var bootstrap = function ($, learun) {
             //$('#F_SchoolId').lrselectSet(temprow.schooldId);
             $('#AcademicYearNo').lrselectSet(temprow.academicyear);
             $('#Semester').lrselectSet(temprow.semester);
-            $('#DeptNo').lrselectSet(temprow.deptNo);
             $('#MajorNo').lrselectSet(temprow.majorNo);
             $('#LessonNo').lrselectSet(temprow.lessonNo);
             $('#TeachClassNo').lrselectSet(temprow.teachClassNo);
@@ -261,7 +257,6 @@ var bootstrap = function ($, learun) {
             //$('#NewF_SchoolId').lrselectSet(temprow.schooldId);
             $('#NewAcademicYearNo').lrselectSet(temprow.academicyear);
             $('#NewSemester').lrselectSet(temprow.semester);
-            $('#NewDeptNo').lrselectSet(temprow.deptNo);
             $('#NewMajorNo').lrselectSet(temprow.majorNo);
             $('#NewLessonNo').lrselectSet(temprow.lessonNo);
             $('#NewTeachClassNo').lrselectSet(temprow.teachClassNo);

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

@@ -30,10 +30,6 @@
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="Semester"></div>
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>

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

@@ -33,7 +33,6 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname' });
             $('#TeachClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
@@ -199,19 +198,6 @@ var bootstrap = function ($, learun) {
                     //},
                     { label: "学年", name: "AcademicYearNo", width: 100, align: "left" },
                     { label: "学期", name: "Semester", 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) {
@@ -277,20 +263,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-
-                    {
-                        label: "新系部", name: "NewDeptNo", 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: "NewMajorNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/AwardForm.cshtml

@@ -0,0 +1,31 @@
+@{
+    ViewBag.Title = "AwardAndPunishment";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="AwardAndPunishment">
+        <div class="lr-form-item-title">奖励名称<font face="宋体">*</font></div>
+        <input id="AwardName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="AwardAndPunishment">
+        <div class="lr-form-item-title">奖励代码<font face="宋体">*</font></div>
+        <input id="CodePrize" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="AwardAndPunishment">
+        <div class="lr-form-item-title">奖励级别<font face="宋体">*</font></div>
+        <div id="AwardType" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="AwardAndPunishment">
+        <div class="lr-form-item-title">奖励属性<font face="宋体">*</font></div>
+        <div id="NatureType"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="AwardAndPunishment">
+        <div class="lr-form-item-title">状态</div>
+        <div id="IsValid"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="AwardAndPunishment" style="display: none; ">
+        <div class="lr-form-item-title">类型<font face="宋体">*</font></div>
+        <input id="IsAward" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/AwardAndPunishment/AwardForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/AwardForm.js

@@ -0,0 +1,62 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-09-24 10:33
+ * 描  述：AwardAndPunishment
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#AwardType').lrDataItemSelect({ code: 'AwardType' });
+            $('#NatureType').lrselect({
+                data: [{ text: "集体", value: "0" }, { text: "个人", value: "1" }],
+                text: "text",
+                value: "value"
+            })
+            $('#IsValid').lrselect({
+                data: [{ text: "启用", value: "0" }, { text: "禁用", value: "1" }],
+                text: "text",
+                value: "value"
+            })
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+           $('#IsAward').val('0');
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,23 @@
+@{
+    ViewBag.Title = "AwardAndPunishment";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="AwardAndPunishment">
+        <div class="lr-form-item-title">奖励名称<font face="宋体">*</font></div>
+        <input id="AwardName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="AwardAndPunishment">
+        <div class="lr-form-item-title">奖励代码<font face="宋体">*</font></div>
+        <input id="CodePrize" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="AwardAndPunishment">
+        <div class="lr-form-item-title">状态</div>
+        <div id="IsValid"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="AwardAndPunishment" style="display: none; ">
+        <div class="lr-form-item-title">类型<font face="宋体">*</font></div>
+        <input id="IsAward" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/AwardAndPunishment/Form.js")

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

@@ -0,0 +1,62 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-09-24 10:33
+ * 描  述：AwardAndPunishment
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#AwardType').lrDataItemSelect({ code: 'AwardType' });
+            $('#NatureType').lrselect({
+                data: [{ text: "集体", value: "0" }, { text: "个人", value: "1" }],
+                text: "text",
+                value: "value"
+            })
+            $('#IsValid').lrselect({
+                data: [{ text: "启用", value: "0" }, { text: "禁用", value: "1" }],
+                text: "text",
+                value: "value"
+            })
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+           $('#IsAward').val('1');
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,42 @@
+@{
+    ViewBag.Title = "AwardAndPunishment";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">奖励名称</div>
+                                    <input id="AwardName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">奖励级别</div>
+                                    <div id="AwardType"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_enabled" class="btn btn-default"><i class="fa fa-lrlt"></i>&nbsp;启用</a>
+                        <a id="lr_disabled" class="btn btn-default"><i class="fa fa-lrlt"></i>&nbsp;禁用</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/AwardAndPunishment/Index.js")

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

@@ -0,0 +1,158 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-09-24 10:33
+ * 描  述：AwardAndPunishment
+ */
+var refreshGirdData;
+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);
+            }, 220, 400);
+            $('#AwardType').lrDataItemSelect({ code: 'AwardType' });
+            $('#NatureType').lrselect({
+                data: [{ text: "集体", value: "0" }, { text: "个人", value: "1" }],
+                text: "text",
+                value: "value"
+            })
+            $('#IsValid').lrselect({
+                data: [{ text: "启用", value: "0" }, { text: "禁用", value: "1" }],
+                text: "text",
+                value: "value"
+            })
+            //$('#IsValid').lrDataItemSelect({ code: 'YesOrNoInt' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/AwardForm',
+                    width: 400,
+                    height: 300,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/AwardForm?keyValue=' + keyValue,
+                        width: 400,
+                        height: 300,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //启用
+            $('#lr_enabled').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认启用选择项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/EnableDisable', { keyValue: keyValue, status: "0" }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //禁用
+            $('#lr_disabled').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认禁用选择项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/EnableDisable', { keyValue: keyValue, status: "1" }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/GetPageList',
+                headData: [
+                    { label: "奖励名称", name: "AwardName", width: 100, align: "left" },
+                    { label: "奖励代码", name: "CodePrize", width: 100, align: "left" },
+                    {
+                        label: "奖励级别", name: "AwardType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'AwardType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '奖励属性', name: 'NatureType', width: 100, align: "left",
+                        formatter: function (val) {
+                            if (val == '0') {
+                                return '集体';
+                            } else {
+                                return '个人';
+                            }
+                        }
+                    },
+                    {
+                        label: '状态', name: 'IsValid', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == "0" ? "<span class=\"label label-success\">启用</span>" :
+                                "<span class=\"label label-danger\">禁用</span>";
+                        }
+                    },
+                ],
+                mainId: 'Id',
+                isMultiselect: true,
+                isPage: true,
+                sord: 'asc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.IsAward = '0'
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.cshtml

@@ -0,0 +1,43 @@
+@{
+    ViewBag.Title = "AwardAndPunishment";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">奖励名称</div>
+                                    <input id="AwardName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">奖励级别</div>
+                                    <div id="AwardType"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                        <a id="lr_enabled" class="btn btn-default"><i class="fa fa-lrlt"></i>&nbsp;启用</a>
+                        <a id="lr_disabled" class="btn btn-default"><i class="fa fa-lrlt"></i>&nbsp;禁用</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.js

@@ -0,0 +1,135 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-09-24 10:33
+ * 描  述：AwardAndPunishment
+ */
+var refreshGirdData;
+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);
+            }, 220, 400);
+            $('#AwardType').lrDataItemSelect({ code: 'AwardType' });
+            $('#NatureType').lrselect({
+                data: [{ text: "集体", value: "0" }, { text: "个人", value: "1" }],
+                text: "text",
+                value: "value"
+            })
+            $('#IsValid').lrselect({
+                data: [{ text: "启用", value: "0" }, { text: "禁用", value: "1" }],
+                text: "text",
+                value: "value"
+            })
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/Form',
+                    width: 400,
+                    height: 250,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/Form?keyValue=' + keyValue,
+                        width: 400,
+                        height: 250,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //启用
+            $('#lr_enabled').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认启用选择项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/EnableDisable', { keyValue: keyValue, status: "1" }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //禁用
+            $('#lr_disabled').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('StuId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认禁用选择项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/EnableDisable', { keyValue: keyValue, status: "0" }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/GetPageList',
+                headData: [
+                    { label: "奖励名称", name: "AwardName", width: 100, align: "left" },
+                    { label: "奖励代码", name: "CodePrize", width: 100, align: "left" },
+                    {
+                        label: '状态', name: 'IsValid', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == "0" ? "<span class=\"label label-success\">启用</span>" :
+                                "<span class=\"label label-danger\">禁用</span>";
+                        }
+                    },
+                ],
+                mainId: 'Id',
+                isMultiselect: true,
+                isPage: true,
+                sord: 'desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.IsAward = '1'
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardForm.cshtml

@@ -0,0 +1,43 @@
+@{
+    ViewBag.Title = "奖励惩罚管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="AwardPunishInfo">
+        <div class="lr-form-item-title">奖励类型<font face="宋体">*</font></div>
+        <div id="NatureType" isvalid="yes" checkexpession="NotNull"></div>
+        <input id="shuxing" type="text" style="display: none; " />
+        <input id="awardtype" type="text" style="display: none; " />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="AwardPunishInfo">
+        <div class="lr-form-item-title">奖励对象</div>
+        <div id="RewardObjects"></div>
+        <input id="StuId" type="text" style="display: none; " />
+        <input id="ClassNo" type="text" style="display: none; " />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="AwardPunishInfo">
+        <div class="lr-form-item-title">附件上传</div>
+        <div id="FileAddress"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="AwardPunishInfo">
+        <div class="lr-form-item-title">获奖时间<font face="宋体">*</font></div>
+        <input id="WinningTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#WinningTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="AwardPunishInfo">
+        <div class="lr-form-item-title">获奖描述</div>
+        <textarea id="Remark" class="form-control" style="height:50px;"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="AwardPunishInfo" style="display: none; ">
+        <div class="lr-form-item-title">录入时间</div>
+        <input id="Adddate" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="AwardPunishInfo" style="display: none; ">
+        <div class="lr-form-item-title">录入人</div>
+        <input id="AddUser" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="AwardPunishInfo" style="display: none; ">
+        <div class="lr-form-item-title">奖惩</div>
+        <input id="IsVaild" type="text" class="form-control" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardForm.js")

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

@@ -0,0 +1,104 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-09-24 17:38
+ * 描  述：奖励惩罚管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#NatureType').lrGirdSelect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=AwardSource',
+                selectWord: 'id',
+                value: 'id',
+                text: 'awardname',
+                headData:
+                [
+                    { label: "奖励类型", name: "awardname", width: 100, align: "left" },
+                    {
+                        label: '奖励属性', name: 'naturetype', width: 100, align: "left",
+                        formatter: function (val) {
+                            if (val == '0') { return '集体'; }
+                            else { return '个人'; }
+                        }
+                    },
+                    {
+                        label: "奖励级别", name: "awardtype", width: 100, align: "left",
+                        formatterAsync: function (callback, value) {
+                            learun.clientdata.getAsync('dataItem',
+                                {
+                                    key: value,code: 'AwardType',
+                                    callback: function (_data) {callback(_data.text);}
+                                });
+                        },
+                    }
+                ],
+                select: function (item) {
+                    $("#NatureType").val(item.awardname);
+                    $("#shuxing").val(item.naturetype);
+                    $("#awardtype").val(item.awardtype);
+                }
+            });
+            $('#RewardObjects').lrGirdSelect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
+                selectWord: 'stuno',
+                value: 'stuno',
+                text: 'stuname',
+                headData:
+                [
+                    { label: "学号", name: "stuno", width: 100, align: "left" },
+                    { label: "姓名", name: "stuname", width: 100, align: "left" },
+                    { label: "班级", name: "classno", width: 100, align: "left" },
+                ],
+                select: function (item) {
+                    $("#StuId").val(item.stuno);
+                    $("#RewardObjects").val(item.stuname);
+                    $("#ClassNo").val(item.classno);
+                }
+            });
+            $('#FileAddress').lrUploader();
+            $('#Adddate').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
+            $('#AddUser')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            $('#AddUser').val(learun.clientdata.get(['userinfo']).realName);
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/AwardPunishInfo/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+           $('#IsVaild').val('0');
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/AwardPunishInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,40 @@
+@{
+    ViewBag.Title = "奖励惩罚管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">奖励类型</div>
+                                    <div id="NatureType"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">奖励对象</div>
+                                    <div id="StuName"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardIndex.js")

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

@@ -0,0 +1,207 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-09-24 17:38
+ * 描  述：奖励惩罚管理
+ */
+var refreshGirdData;
+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);
+            }, 220, 400);
+            $('#NatureType').lrGirdSelect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=AwardSource',
+                selectWord: 'id',
+                value: 'id',
+                text: 'awardname',
+                headData:
+                    [
+                        { label: "奖励类型", name: "awardname", width: 100, align: "left" },
+                        {
+                            label: '奖励属性', name: 'naturetype', width: 100, align: "left",
+                            formatter: function (val) {
+                                if (val == '0') {
+                                    return '集体';
+                                } else {
+                                    return '个人';
+                                }
+                            }
+                        },
+                        {
+                            label: "奖励级别",name: "awardtype",width: 100,align: "left",
+                            formatterAsync: function(callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('dataItem',
+                                    {
+                                        key: value,
+                                        code: 'AwardType',
+                                        callback: function(_data) {
+                                            callback(_data.text);
+                                        }
+                                    });
+                            },
+                        }
+                    ],
+                select: function (item) {
+                    $("#NatureType").val(item.awardname);
+                    $("#shuxing").val(item.naturetype);
+                    $("#awardtype").val(item.awardtype);
+                }
+            });
+            $('#RewardObjects').lrGirdSelect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
+                selectWord: 'stuno',
+                value: 'stuno',
+                text: 'stuname',
+                headData:
+                    [
+                        { label: "学号", name: "stuno", width: 100, align: "left" },
+                        { label: "姓名", name: "stuname", width: 100, align: "left" },
+                        { label: "班级", name: "classno", width: 100, align: "left" },
+                    ],
+                select: function (item) {
+                    $("#StuId").val(item.stuno);
+                    $("#RewardObjects").val(item.stuname);
+                    $("#ClassNo").val(item.classno);
+                }
+            });
+            //$('#FileAddress').lrUploader();
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/AwardPunishInfo/AwardForm',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/AwardPunishInfo/AwardForm?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/AwardPunishInfo/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/AwardPunishInfo/GetPageList',
+                headData: [
+                    {
+                        label: "获奖对象", name: "RewardObjects", 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: "ClassNo", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "奖励类型", name: "NatureType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'AwardSource',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['awardname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '奖励属性', name: 'NatureType', width: 100, align: "left",
+                        formatter: function (val) {
+                            if (val == '0') {
+                                return '集体';
+                            } else {
+                                return '个人';
+                            }
+                        }
+                    },
+                    { label: "获奖时间", name: "WinningTime", width: 100, align: "left" },
+                ],
+                mainId: 'Id',
+                isMultiselect: true,
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.IsVaild = '0'
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        },
+        downLoad: function (fileId) {
+            top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: top.$.lrToken }, method: 'POST' });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}
+
+function downLoad(fileId, fileTwo) {
+    if (fileTwo) {
+
+        top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () {
+
+        });
+    }
+    top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' });
+}

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

@@ -0,0 +1,37 @@
+@{
+    ViewBag.Title = "奖励惩罚管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="AwardPunishInfo" >
+        <div class="lr-form-item-title">惩罚类型<font face="宋体">*</font></div>
+        <div id="NatureType" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="AwardPunishInfo">
+        <div class="lr-form-item-title">惩罚对象</div>
+        <div id="StuName"></div>
+        <input id="StuId" type="text" style="display: none; " />
+        <input id="ClassNo" type="text" style="display: none; " />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="AwardPunishInfo" >
+        <div class="lr-form-item-title">惩罚时间<font face="宋体">*</font></div>
+        <input id="WinningTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#WinningTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="AwardPunishInfo" >
+        <div class="lr-form-item-title">惩罚描述</div>
+        <textarea id="Remark" class="form-control" style="height:50px;"  ></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="AwardPunishInfo" style="display: none; " >
+        <div class="lr-form-item-title">录入时间</div>
+        <input id="Adddate" type="text" readonly class="form-control currentInfo lr-currentInfo-time"  />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="AwardPunishInfo" style="display: none; " >
+        <div class="lr-form-item-title">录入人</div>
+        <input id="AddUser" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="AwardPunishInfo" style="display: none; " >
+        <div class="lr-form-item-title">奖惩</div>
+        <input id="IsVaild" type="text" class="form-control"  />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/AwardPunishInfo/Form.js")

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

@@ -0,0 +1,74 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-09-24 17:38
+ * 描  述：奖励惩罚管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#NatureType').lrDataSourceSelect({
+                code: 'PunishmentSource', value: 'id', text: 'awardname',
+            });
+            //$('#AttachmentName').lrUploader();
+            $('#StuName').lrGirdSelect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
+                selectWord: 'stuno',
+                value: 'stuno',
+                text: 'stuname',
+                headData:
+                    [
+                        { label: "学号", name: "stuno", width: 100, align: "left"},
+                        { label: "姓名", name: "stuname", width: 100, align: "left" },
+                        { label: "班级", name: "classno", width: 100, align: "left" },
+                    ],
+                select: function (item) {
+                    $("#StuId").val(item.stuno);
+                    $("#StuName").val(item.stuname);
+                    $("#ClassNo").val(item.classno);
+                }
+            });
+            $('#Adddate').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
+            $('#AddUser')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            $('#AddUser').val(learun.clientdata.get(['userinfo']).realName);
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/AwardPunishInfo/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+            $('#IsVaild').val('1');
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/AwardPunishInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,40 @@
+@{
+    ViewBag.Title = "奖励惩罚管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">惩罚类型</div>
+                                    <div id="NatureType"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">惩罚对象</div>
+                                    <div id="StuName"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/AwardPunishInfo/Index.js")

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

@@ -0,0 +1,149 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-09-24 17:38
+ * 描  述：奖励惩罚管理
+ */
+var refreshGirdData;
+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);
+            }, 220, 400);
+            $('#NatureType').lrDataSourceSelect({
+                code: 'PunishmentSource', value: 'id', text: 'awardname',
+            });
+            $('#StuName').lrGirdSelect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
+                selectWord: 'stuno',
+                value: 'id',
+                text: 'name',
+                headData:
+                    [
+                        { label: "学号", name: "stuno", width: 100, align: "left" },
+                        { label: "姓名", name: "stuname", width: 100, align: "left" },
+                        { label: "班级", name: "classno", width: 100, align: "left" },
+                    ],
+                select: function (item) {
+                    $("#StuId").val(item.stuno);
+                    $("#StuName").val(item.stuname);
+                    $("#ClassNo").val(item.classno);
+                }
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/AwardPunishInfo/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/AwardPunishInfo/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/AwardPunishInfo/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/AwardPunishInfo/GetPageList',
+                headData: [
+                    {
+                        label: "姓名", name: "StuName", width: 200, 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: "StuId", width: 200, align: "left" },
+                    {
+                        label: "班级", name: "ClassNo", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "惩罚类型", name: "NatureType", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PunishmentSource',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['awardname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "惩罚时间", name: "WinningTime", width: 200, align: "left" },
+                ],
+                mainId: 'Id',
+                isMultiselect: true,
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.IsVaild = '1'
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -27,10 +27,6 @@
         <div class="lr-form-item-title">校区名称</div>
         <div id="CompanyID"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Book_card">
-        <div class="lr-form-item-title">系部名称</div>
-        <div id="DeptNo"></div>
-    </div>
     <div class="col-xs-12 lr-form-item" data-table="Book_card">
         <div class="lr-form-item-title">审核标志</div>
         <input id="CheckMark" type="text" class="form-control" />

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

@@ -16,18 +16,8 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $('#CompanyID').lrDataSourceSelect({
-                code: 'company', value: 'f_companyid', text: 'f_fullname', select: function (item) {
-                    if (!!item) {
-                        $('#DeptNo').lrselectRefresh({
-                            url: "/CdDept/GetListBySchoolId",
-                            param: { F_SchoolId: item.f_companyid },
-                            value: 'DeptNo',
-                            text: 'DeptName'
-                        });
-                    }
-                }
+                code: 'company', value: 'f_companyid', text: 'f_fullname'
             });
-            $('#DeptNo').lrselect();
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -77,7 +77,6 @@ var bootstrap = function ($, learun) {
                     { label: "借书数量", name: "AllowNum", width: 100, align: "left"},
                     { label: "借书人类型", name: "BorrowerType", width: 100, align: "left"},
                     { label: "办证时间", name: "RegistrationTime", width: 100, align: "left"},
-                    { label: "系部名称", name: "DeptNo", width: 100, align: "left"},
                     { label: "校区名称", name: "CompanyID", width: 100, align: "left"},
                     { label: "审核标志", name: "CheckMark", width: 100, align: "left"},
                 ],

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

@@ -16,17 +16,13 @@
         <input id="LengthOfSchooling" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="CdMajor">
-        <div class="lr-form-item-title">学科门类</div>
+        <div class="lr-form-item-title">专业类别</div>
         <div id="SubjectSpeciesNo"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="CdMajor">
         <div class="lr-form-item-title">校区<font face="宋体">*</font></div>
         <div id="F_SchoolId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="CdMajor">
-        <div class="lr-form-item-title">系别</div>
-        <div id="DeptNo"></div>
-    </div>
     <div class="col-xs-6 lr-form-item" data-table="CdMajor">
         <div class="lr-form-item-title">名称缩写</div>
         <input id="MajorNameBrief" type="text" class="form-control" />
@@ -36,7 +32,7 @@
         <input id="MajorNameEn" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="CdMajor">
-        <div class="lr-form-item-title">教委专业代码</div>
+        <div class="lr-form-item-title">专业代码</div>
         <input id="GovMajorNo" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="CdMajor">

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

@@ -16,19 +16,7 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $('#SubjectSpeciesNo').lrDataItemSelect({ code: 'SubjectSpecies' });
-            $('#F_SchoolId').lrDataSourceSelect({
-                code: 'company', value: 'f_companyid', text: 'f_fullname', select: function (item) {
-                    if (!!item) {
-                        $('#DeptNo').lrselectRefresh({
-                            url: "/CdDept/GetListBySchoolId",
-                            param: { F_SchoolId: item.f_companyid },
-                            value: 'DeptNo',
-                            text: 'DeptName'
-                        });
-                    }
-                }
-            });
-            $('#DeptNo').lrselect();
+            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#GraduateNo').lrDataItemSelect({ code: 'CollegeType' });
             $('#MajorDirector').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_encode', text: 'f_realname' });
             $('#RecruitObject').lrDataItemSelect({ code: 'RecruitObject' });

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

@@ -22,10 +22,6 @@
                                     <div class="lr-form-item-title">校区</div>
                                     <div id="F_SchoolId"></div>
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">系别</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                             </div>
                         </div>
                     </div>

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

@@ -17,7 +17,6 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -136,7 +135,7 @@ var bootstrap = function ($, learun) {
                     { label: "专业编号", name: "MajorNo", width: 100, align: "left" },
                     { label: "学制", name: "LengthOfSchooling", width: 100, align: "left" },
                     {
-                        label: "学科门类", name: "SubjectSpeciesNo", width: 150, align: "left",
+                        label: "专业类别", name: "SubjectSpeciesNo", width: 150, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -160,22 +159,9 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        label: "系别", name: "DeptNo", width: 200, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-                                key: value,
-                                keyId: 'deptno',
-                                callback: function (_data) {
-                                    callback(_data['deptname']);
-                                }
-                            });
-                        }
-                    },
                     { label: "名称缩写", name: "MajorNameBrief", width: 100, align: "left" },
                     { label: "英文名称", name: "MajorNameEn", width: 100, align: "left" },
-                    { label: "教委专业代码", name: "GovMajorNo", width: 100, align: "left" },
+                    { label: "专业代码", name: "GovMajorNo", width: 100, align: "left" },
                     { label: "教委专业名称", name: "GovMajorName", width: 200, align: "left" },
                     {
                         label: "本专科", name: "GraduateNo", width: 100, align: "left",

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/IndexOfElective.cshtml

@@ -22,10 +22,6 @@
                                     <div class="lr-form-item-title">校区</div>
                                     <div id="F_SchoolId"></div>
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">系别</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">年级</div>
                                     <div id="Grade"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/IndexOfElective.js

@@ -19,7 +19,6 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#Grade').lrselect({
                 url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
                 value: 'value',
@@ -64,19 +63,6 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        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: "GraduateNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -11,10 +11,6 @@
         <div class="lr-form-item-title">班级代码<font face="宋体">*</font></div>
         <input id="ClassNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="ClassInfo">
-        <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
-        <div id="DeptNo" isvalid="yes" checkexpession="NotNull"></div>
-    </div>
     <div class="col-xs-6 lr-form-item" data-table="ClassInfo">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
@@ -43,7 +39,7 @@
         <div class="lr-form-item-title">是否拆分班<font face="宋体">*</font></div>
         <div id="IsSeparate" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="ClassInfo">
+    <div class="col-xs-6 lr-form-item" data-table="ClassInfo">
         <div class="lr-form-item-title">班级类型</div>
         <div id="ClassType"></div>
     </div>

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

@@ -15,37 +15,24 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname',
-                select: function (item) {
-                    if (!!item) {
-                        $('#MajorNo').lrselectRefresh({
-                            url: "/CdMajor/GetListByDeptNo",
-                            param: { DeptNo: item.deptno },
-                            value: 'MajorNo',
-                            text: 'MajorName'
-                        });
-                    }
-                }
-            });
-            $('#MajorNo').lrselect();
+            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#Grade').lrselect({
                 url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
                 value: 'value',
                 text: 'text',
                 maxHeight: 200
             });
-            $('#ClassDiredctorNo').lrDataSourceSelect({ code: 'teacheruserdata',value: 'f_encode',text: 'f_realname' });
+            $('#ClassDiredctorNo').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
             $('#ClassTutorNo').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
             $('#IsSeparate').lrDataItemSelect({ code: 'YesOrNoBit' });
-            $('#ClassType').lrDataItemSelect({ code: 'ClassType' }); 
+            $('#ClassType').lrDataItemSelect({ code: 'ClassType' });
         },
         initData: function () {
             if (!!keyValue) {
                 $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetFormData?keyValue=' + keyValue, function (data) {
                     for (var id in data) {
                         if (!!data[id].length && data[id].length > 0) {
-                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
                         }
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);

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

@@ -18,10 +18,6 @@
                                     <div class="lr-form-item-title">班级代码</div>
                                     <input id="ClassNo" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>

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

@@ -16,7 +16,6 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -182,19 +181,6 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "班级名称", name: "ClassName", width: 200, align: "left" },
                     { label: "班级代码", name: "ClassNo", width: 100, align: "left" },
-                    {
-                        label: "系部", name: "DeptNo", width: 200, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-                                key: value,
-                                keyId: 'deptno',
-                                callback: function (_data) {
-                                    callback(_data['deptname']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: "专业", name: "MajorNo", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -3,37 +3,61 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="EATalentTrain" >
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
+        <div class="lr-form-item-title">方案名称<font face="宋体">*</font></div>
+        <input id="Name" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"/>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
         <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
-        <div id="AcademicYearNo" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="AcademicYearNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EATalentTrain" >
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
         <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
-        <div id="Semester" isvalid="yes" checkexpession="NotNull" ></div>
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EATalentTrain" >
-        <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
-        <div id="DeptNo" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="Semester" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EATalentTrain" >
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
-        <div id="MajorNo" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EATalentTrain" >
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
         <div class="lr-form-item-title">入学要求</div>
-        <input id="EntranceRequire" type="text" class="form-control"  />
+        <input id="EntranceRequire" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EATalentTrain" >
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
         <div class="lr-form-item-title">修业年限</div>
-        <input id="YearLimit" type="text" class="form-control"  />
+        <input id="YearLimit" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EATalentTrain" >
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
         <div class="lr-form-item-title">培训方案</div>
-        <div id="ProgramFile"  ></div>
+        <div id="ProgramFile"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
+        <div class="lr-form-item-title">计划招生人数</div>
+        <input id="PlannedNum" type="number" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
+        <div class="lr-form-item-title">计划教学课程</div>
+        <div id="PlannedCourse"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
+        <div class="lr-form-item-title">就业领域</div>
+        <input id="EmploymentField" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
+        <div class="lr-form-item-title">教学条件</div>
+        <input id="TeachingCondition" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
+        <div class="lr-form-item-title">教学资源</div>
+        <input id="TeachingResource" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
+        <div class="lr-form-item-title">培养目标</div>
+        <input id="TrainingObjectives" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EATalentTrain" >
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
         <div class="lr-form-item-title">备注</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/EATalentTrain/Form.js")

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

@@ -31,24 +31,9 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', 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: "CheckMark=1" }
-                        });
-                    }
-                }
-            });
-            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'majorno',text: 'majorname' });
+            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
+            $('#PlannedCourse').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname', type: 'multiple' });
+            
             $('#ProgramFile').lrUploader();
         },
         initData: function () {

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

@@ -18,10 +18,6 @@
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="Semester"></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>
@@ -35,9 +31,12 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
-                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;提交</a>
+                        <a id="lr_check" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;审核通过</a>
+                        <a id="lr_nocheck" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;未通过</a>
                     </div>
                 </div>
             </div>

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

@@ -32,23 +32,6 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', 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: "CheckMark=1" }
-                        });
-                    }
-                }
-            });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -96,42 +79,115 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+
+            //提交
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != 0) {
+                        return learun.alert.warning('只有草稿状态才可提交！');
+                    }
+                    learun.layerConfirm('是否确认提交该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/EATalentTrain/UpdateStatus', { keyValue: keyValue, Status: 1 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //审核通过
+            $('#lr_check').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status == 0) {
+                        return learun.alert.warning('请先提交！');
+                    }
+                    learun.layerConfirm('是否确认审核通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/EATalentTrain/UpdateStatus', { keyValue: keyValue, Status: 2 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //审核不通过
+            $('#lr_nocheck').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status == 0) {
+                        return learun.alert.warning('请先提交！');
+                    }
+                    learun.layerConfirm('是否确认审核不通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/EATalentTrain/UpdateStatus', { keyValue: keyValue, Status: 3 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/EATalentTrain/GetPageList',
                 headData: [
+                    { label: "方案名称", name: "Name", width: 150, align: "left" },
+                    {
+                        label: "状态", name: "Status", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue == 0) {
+                                return '<span class=\"label label-default\">草稿</span>';
+                            } else if (cellvalue == 1) {
+                                return "<span class=\"label label-warning\">待审核</span>";
+                            } else if (cellvalue == 2) {
+                                return "<span class=\"label label-success\">审核通过</span>";
+                            } else {
+                                return "<span class=\"label label-danger\">未通过</span>";
+                            }
+
+                        }
+                    },
                     { label: "学年", name: "AcademicYearNo", width: 100, align: "left" },
                     { label: "学期", name: "Semester", width: 100, align: "left" },
                     {
-                        label: "系部", name: "DeptNo", 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=' + 'CdDeptInfo',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
                                 key: value,
-                                keyId: 'deptno',
+                                keyId: 'majorno',
                                 callback: function (_data) {
-                                    callback(_data['deptname']);
+                                    callback(_data['majorname']);
                                 }
                             });
                         }
                     },
+                    { label: "入学要求", name: "EntranceRequire", width: 150, align: "left" },
+                    { label: "修业年限", name: "YearLimit", width: 100, align: "left" },
+                    { label: "计划招生人数", name: "PlannedNum", width: 100, align: "left" },
                     {
-                        label: "专业", name: "MajorNo", width: 100, align: "left",
+                        label: "计划教学课程", name: "PlannedCourse", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
                                 key: value,
-                                keyId: 'majorno',
+                                keyId: 'lessonid',
                                 callback: function (_data) {
-                                    callback(_data['majorname']);
+                                    callback(_data['lessonname']);
                                 }
                             });
                         }
                     },
-                    { label: "入学要求", name: "EntranceRequire", width: 150, align: "left" },
-                    { label: "修业年限", name: "YearLimit", width: 100, align: "left" },
+                    { label: "就业领域", name: "EmploymentField", width: 100, align: "left" },
+                    { label: "教学条件", name: "TeachingCondition", width: 100, align: "left" },
+                    { label: "教学资源", name: "TeachingResource", width: 100, align: "left" },
+                    { label: "培养目标", name: "TrainingObjectives", width: 100, align: "left" },
                 ],
                 mainId: 'Id',
                 isPage: true

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

@@ -22,10 +22,6 @@
                                     <div class="lr-form-item-title">校区</div>
                                     <div id="F_SchoolId"></div>
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">系别</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">年级</div>
                                     <div id="Grade"></div>

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

@@ -18,7 +18,6 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#Grade').lrselect({
                 url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
                 value: 'value',
@@ -89,19 +88,6 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        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: "GraduateNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -147,10 +147,6 @@
             <div class="lr-form-item-title">部门<font face="宋体">*</font></div>
             <div id="F_DepartmentId" checkexpession="NotNull"></div>
         </div>
-        @*<div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-            <div class="lr-form-item-title">系部</div>
-            <div id="DeptNo"></div>
-        </div>*@
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">岗位类别</div>
             <div id="EmpSortNo"></div>

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

@@ -48,7 +48,6 @@ var bootstrap = function ($, learun) {
                 $("#ForeignLanguageNo").parent().hide();
                 $("#EmpSortNo").parent().hide();
                 $("#EmpFullTimeNo").parent().hide();
-                //$("#DeptNo").parent().hide();
                 $("#TitleOfTechPostNo").parent().hide();
                 $("#InSchoolDate").parent().hide();
                 $("#resume").parent().hide();
@@ -75,7 +74,7 @@ var bootstrap = function ($, learun) {
                             // 是否允许搜索
                             allowSearch: true,
                             // 访问数据接口地址
-                            url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck',
+                            url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
                             // 访问数据接口参数
                             param: { companyId: item.f_companyid, parentId: '0' }
                         });
@@ -127,7 +126,6 @@ var bootstrap = function ($, learun) {
             $('#EmpSortNo').lrDataItemSelect({ code: 'jsgw' });
             $('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' });
             $('#ObtainWay').lrDataItemSelect({ code: 'ObtainWay' });
-            //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#PostRank').lrDataSourceSelect({ code: 'BCdTitleOfTechPost', value: 'titleoftechpostno', text: 'titleoftechpost' });
             $('#Photo').lrUploader();
             $('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormAdd.cshtml

@@ -62,17 +62,6 @@
                             </div>
                         </div>
 
-                        <div class="chickInput">
-                            <span class="chickInputLable"><span>*</span> 系部</span>
-                            <div class="chickInputBox chickInputBoxs">
-                                <select id="DeptNo" name="DeptNo" lay-verify="">
-                                    <option value="">请选择</option>
-                                    <option value="96">系部2</option>
-                                    <option value="87">系部13</option>
-                                </select>
-                            </div>
-                        </div>
-
                         <div class="chickInput">
                             <span class="chickInputLable"><span>*</span> 性别</span>
                             <div class="chickInputBox chickInputBoxs">
@@ -259,19 +248,6 @@
                 },
             });
 
-            $.ajax({
-                url: "/LR_SystemModule/DataSource/GetMap?code=" + "CdDeptInfo",
-                async: false,
-                success: function (msg) {
-                    var companys = $.parseJSON(msg).data.data;
-                    var str = '<option value="">请选择</option>';
-                    $.each(companys, function (i, item) {
-                        str += '<option value="' + item.deptno + '">' + item.deptname + '</option>'
-                    })
-                    $("#DeptNo").html(str);
-                },
-            });
-
             $.ajax({
                 url: "/LR_SystemModule/DataSource/GetMap?code=" + "classdata",
                 async: false,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml

@@ -11,10 +11,6 @@
         <div class="lr-form-item-title">部门</div>
         <div id="F_DepartmentId"></div>
     </div>
-    @*<div class="col-xs-12 lr-form-item" data-table="EmpInfo">
-        <div class="lr-form-item-title">系部</div>
-        <div id="DeptNo"></div>
-    </div>*@
 </div>
 
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js

@@ -27,7 +27,7 @@ var bootstrap = function ($, learun) {
                             // 是否允许搜索
                             allowSearch: true,
                             // 访问数据接口地址
-                            url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck',
+                            url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
                             // 访问数据接口参数
                             param: { companyId: item.f_companyid, parentId: '0' }
                         });
@@ -35,7 +35,6 @@ var bootstrap = function ($, learun) {
                 }
             });
             $('#F_DepartmentId').lrselect();
-            //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.cshtml

@@ -232,10 +232,6 @@
                     </div>
                 </div>
                 <div class="rowx">
-                    <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-                        <div class="lr-form-item-titles">系部：</div>
-                        <span id="DeptNo"></span>
-                    </div>
                     <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
                         <div class="lr-form-item-titles">岗位类别：</div>
                         <span id="EmpSortNo"></span>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.js

@@ -9,10 +9,10 @@ var keyValue = request('keyValue');
 var isTeacher = request('isTeacher');
 var colDataItemArr = ['GenderNo', 'IsInActiveStatus', 'EmpSortNo', 'PositionLevel', 'CompilationCategory', 'ObtainWayOfHighestRecord', 'ObtainWay', 'ObtainWayOfHighestDegree', 'ObtainWayOfInitialDegree', 'JobRank', 'WorkLevel', 'EmpFullTimeNo', 'IsHasLesson'];
 var colDataItemCode = ['usersexbit', 'JobStatus', 'jsgw', 'PositionLevel', 'CompilationCategory', 'ObtainWay', 'ObtainWay', 'ObtainWayOfDegree', 'ObtainWayOfDegree', 'TechnicalPost', 'TechnicalLevelOfWorker', 'EmpFullTime', 'YesOrNoBit'];
-var colDataSourceArr = ['PartyFaceNo', 'NationalityNo', 'HealthStatusNo', 'FamilyOriginNo', 'OverseasChineseNo', 'F_CompanyId', 'F_DepartmentId', 'DeptNo', 'PostRank', 'HighestRecord', 'CultureDegreeNo', 'DegreeNo', 'InitialDegree', 'SubjectSpeciesNo', 'ForeignLanguageNo'];
-var colDataSourceCode = ['BCdPartyFace', 'BCdNationality', 'BCdHealthStatus', 'BCdFamilyOrigin', 'BCdOverseasChinese', 'company', 'classdata', 'CdDeptInfo', 'BCdTitleOfTechPost', 'BCdCultureDegree', 'BCdCultureDegree', 'BCdDegree', 'BCdDegree', 'BCdSubjectSpecies', 'BCdForeignLanguage'];
-var colDataSourceValue = ['partyfaceno', 'nationalityno', 'healthstatusno', 'familyoriginno', 'overseaschineseno', 'f_companyid', 'f_departmentid', 'deptno', 'titleoftechpostno', 'culturedegreeno', 'culturedegreeno', 'degreeno', 'degreeno', 'subjectspeciesno', 'foreignlanguageno'];
-var colDataSourceText = ['partyface', 'nationality', 'healthstatus', 'familyorigin', 'overseaschinesename', 'f_fullname', 'f_fullname', 'deptname', 'titleoftechpost', 'culturedegree', 'culturedegree', 'degreename', 'degreename', 'subjectspecies', 'foreignlanguagename'];
+var colDataSourceArr = ['PartyFaceNo', 'NationalityNo', 'HealthStatusNo', 'FamilyOriginNo', 'OverseasChineseNo', 'F_CompanyId', 'F_DepartmentId', 'PostRank', 'HighestRecord', 'CultureDegreeNo', 'DegreeNo', 'InitialDegree', 'SubjectSpeciesNo', 'ForeignLanguageNo'];
+var colDataSourceCode = ['BCdPartyFace', 'BCdNationality', 'BCdHealthStatus', 'BCdFamilyOrigin', 'BCdOverseasChinese', 'company', 'classdata', 'BCdTitleOfTechPost', 'BCdCultureDegree', 'BCdCultureDegree', 'BCdDegree', 'BCdDegree', 'BCdSubjectSpecies', 'BCdForeignLanguage'];
+var colDataSourceValue = ['partyfaceno', 'nationalityno', 'healthstatusno', 'familyoriginno', 'overseaschineseno', 'f_companyid', 'f_departmentid', 'titleoftechpostno', 'culturedegreeno', 'culturedegreeno', 'degreeno', 'degreeno', 'subjectspeciesno', 'foreignlanguageno'];
+var colDataSourceText = ['partyface', 'nationality', 'healthstatus', 'familyorigin', 'overseaschinesename', 'f_fullname', 'f_fullname', 'titleoftechpost', 'culturedegree', 'culturedegree', 'degreename', 'degreename', 'subjectspecies', 'foreignlanguagename'];
 var bootstrap = function ($, learun) {
     "use strict";
     var ue;
@@ -45,7 +45,6 @@ var bootstrap = function ($, learun) {
                 $("#ForeignLanguageNo").parent().hide();
                 $("#EmpSortNo").parent().hide();
                 $("#EmpFullTimeNo").parent().hide();
-                $("#DeptNo").parent().hide();
                 $("#TitleOfTechPostNo").parent().hide();
                 $("#InSchoolDate").parent().hide();
                 $("#resume").parent().hide();
@@ -119,7 +118,6 @@ var bootstrap = function ($, learun) {
             //$('#EmpSortNo').lrDataItemSelect({ code: 'jsgw' });
             //$('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' });
             //$('#ObtainWay').lrDataItemSelect({ code: 'ObtainWay' });
-            //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             //$('#PostRank').lrDataSourceSelect({ code: 'BCdTitleOfTechPost', value: 'titleoftechpostno', text: 'titleoftechpost' });
             $('#Photo').lrUploader();
             //$('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });

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

@@ -72,7 +72,6 @@
                     <ul class="userSec2List">
                         <li>学科门 : {{teacherInfo.SubjectSpeciesNo | subjectSpeciesNo}}</li>
                         <li>现任职务: {{teacherInfo.Title}}</li>
-                        <li>所在系部 : {{teacherInfo.DeptNo | deptNo}}  </li>
                         <li>文化程度 : {{teacherInfo.CultureDegreeNo | cultureDegreeNo}}   </li>
                         <li>毕业学校 : {{teacherInfo.GraduateSchoolName}} </li>
                         <li>最高学位 : {{teacherInfo.DegreeNo | degreeNo}}</li>
@@ -195,18 +194,6 @@
 
                     return result;
                 },
-                deptNo: function (value) {
-                    var result;
-                    top.learun.clientdata.getAsync('custmerData', {
-                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-                        key: value,
-                        keyId: 'deptno',
-                        callback: function (_data) {
-                            result = _data.deptname;
-                        }.bind(this)
-                    });
-                    return result;
-                },
                 subjectSpeciesNo: function (value) {
                     var result;
                     top.learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.js

@@ -76,7 +76,6 @@ var bootstrap = function ($, learun) {
             $('#ForeignLanguageNo').lrDataSourceSelect({ code: 'BCdForeignLanguage',value: 'foreignlanguageno',text: 'foreignlanguagename' });
             $('#EmpSortNo').lrDataItemSelect({ code: 'EmpSort' });
             $('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' });
             $('#TitleOfTechPostNo').lrDataSourceSelect({ code: 'BCdTitleOfTechPost',value: 'titleoftechpostno',text: 'titleoftechpost' });
             $('#Photo').lrUploader();
             $("#lrUploader_uploadBtn_Photo").hide();

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

@@ -22,10 +22,6 @@
                                     <div class="lr-form-item-title">联系电话</div>
                                     <input id="mobile" type="text" class="form-control" />
                                 </div>
-                                @*<div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>*@
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">部门</div>
                                     <div id="F_DepartmentId"></div>
@@ -51,12 +47,8 @@
                                     <div id="PartyFaceNo"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">最高学历</div>
-                                    <div id="HighestRecord"></div>
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">是否审核</div>
-                                    <div id="CheckMark"></div>
+                                    <div class="lr-form-item-title">文化程度</div>
+                                    <div id="CultureDegreeNo"></div>
                                 </div>
                             </div>
                         </div>

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

@@ -15,8 +15,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 280, 400);
-            //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            }, 250, 400);
             $('#ProvinceNo').lrDataSourceSelect({
                 code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
                 select: function (item) {
@@ -49,29 +48,20 @@ var bootstrap = function ($, learun) {
             $('#RegionNo').lrselect();
             //政治面貌
             $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
-            //最高学历
-            $('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });
+            //文化程度
+            $('#CultureDegreeNo').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });
 
 
             //民族
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
             //性别
             $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
-            //是否审核
-            $('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' });
             //学位
             $('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' });
             //职称
             $('#ProfessionalTitle').lrDataItemSelect({ code: 'jszc' });
             // 部门选择
-            $('#F_DepartmentId').lrselect({
-                type: 'tree',
-                // 是否允许搜索
-                allowSearch: true,
-                // 访问数据接口地址
-                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck',
-                // 访问数据接口参数
-            });
+            $('#F_DepartmentId').lrselect();
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -371,19 +361,6 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    //{
-                    //    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: "GenderNo", width: 80, align: "left",
                         formatter: function (cellvalue) {
@@ -421,7 +398,7 @@ var bootstrap = function ($, learun) {
                     { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
 
                     {
-                        label: "最高学历", name: "HighestRecord", width: 100, align: "left",
+                        label: "文化程度", name: "CultureDegreeNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/IndexOfDC.cshtml

@@ -22,10 +22,6 @@
                                     <div class="lr-form-item-title">联系电话</div>
                                     <input id="mobile" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">校区</div>
                                     <div id="F_CompanyId"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/IndexOfDC.js

@@ -16,7 +16,6 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 250, 400);
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#ProvinceNo').lrDataSourceSelect({
                 code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
                 select: function (item) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml

@@ -66,17 +66,6 @@
                             </div>
                         </div>
 
-                        <div class="chickInput">
-                            <span class="chickInputLable"><span>*</span> 系部</span>
-                            <div class="chickInputBox chickInputBoxs">
-                                <select id="DeptNo" name="DeptNo" lay-verify="">
-                                    <option value="">请选择</option>
-                                    <option value="96">系部2</option>
-                                    <option value="87">系部13</option>
-                                </select>
-                            </div>
-                        </div>
-
                         <div class="chickInput">
                             <span class="chickInputLable"><span>*</span> 性别</span>
                             <div class="chickInputBox chickInputBoxs">
@@ -286,19 +275,6 @@
                 },
             });
 
-            $.ajax({
-                url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "CdDeptInfo",
-                async: false,
-                success: function (msg) {
-                    var companys = $.parseJSON(msg).data.data;
-                    var str = '<option value="">请选择</option>';
-                    $.each(companys, function (i, item) {
-                        str += '<option value="' + item.deptno + '">' + item.deptname + '</option>'
-                    })
-                    $("#DeptNo").html(str);
-                },
-            });
-
             $.ajax({
                 url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "classdata",
                 async: false,

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

@@ -15,10 +15,6 @@
         <div class="lr-form-item-title">校区<font face="宋体">*</font></div>
         <div id="F_SchoolId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
-        <div class="lr-form-item-title">系部</div>
-        <div id="TeachDeptNo"></div>
-    </div>
     <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
         <div class="lr-form-item-title">专业</div>
         <div id="TeachMajorNo"></div>

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

@@ -16,26 +16,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#F_SchoolId').lrDataSourceSelect({
-                code: 'company', value: 'f_companyid', text: 'f_fullname', select: function (item) {
-                    if (!!item) {
-                        $('#TeachDeptNo').lrselectRefresh({
-                            url: "/CdDept/GetListBySchoolId",
-                            param: { F_SchoolId: item.f_companyid },
-                            value: 'DeptNo',
-                            text: 'DeptName'
-                        });
-                    } else {
-                        $('#TeachDeptNo').lrselectRefresh({
-                            url: "",
-                            data: []
-                        });
-                    }
-                }
-            });
-            $('#TeachDeptNo').lrselect({
-                value: 'deptno', text: 'deptname'
-            });
+            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#TeachMajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#LessonTypeId').lrDataSourceSelect({
                 code: 'CdLessonType', value: 'ltid', text: 'lessontypename', select: function (item) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/FormNoMajor.cshtml

@@ -16,10 +16,6 @@
         <div id="F_SchoolId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     @*<div class="col-xs-6 lr-form-item" data-table="LessonInfo">
-        <div class="lr-form-item-title">系部</div>
-        <div id="TeachDeptNo"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
         <div class="lr-form-item-title">专业<font face="宋体">*专业课</font></div>
         <div id="TeachMajorNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>

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

@@ -31,10 +31,6 @@
                                     <div class="lr-form-item-title">校区</div>
                                     <div id="F_SchoolId"></div>
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="TeachDeptNo"></div>
-                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="TeachMajorNo"></div>