【修改】招生信息管理菜单下的功能取消系部；

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/Views/SignUpAboutOnline/Index.js

@@ -122,7 +122,7 @@ var bootstrap = function ($, learun) {
                     },
                     {
                         label: "报名日期", name: "SignUpTime", width: 130, align: "left", formatter: function (cellvalue) {
-                            return cellvalue == "0001-01-01 00:00:00" ? "" : cellvalue.slice(0,10);
+                            return cellvalue == "0001-01-01 00:00:00" || cellvalue == null || cellvalue == "" || cellvalue == undefined ? "" : cellvalue.slice(0, 10);
                         }
                     },
                     { label: "姓名", name: "RealName", width: 100, align: "left" },

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

@@ -39,10 +39,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="StuInfoBasic">
-        <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="StuInfoBasic">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js

@@ -32,7 +32,6 @@ var bootstrap = function ($, learun) {
                 $("#ResidenceNo").parent().hide();
                 $("#F_ProvinceId").parent().parent().hide();
                 $("#Photo").parent().hide();
-                $("#DeptNo").parent().hide();
                 $("#FamilyOriginNo").parent().hide();
                 $("#OverseasChineseNo").parent().hide();
                 $("#Grade").parent().hide();
@@ -115,57 +114,26 @@ var bootstrap = function ($, learun) {
             $('#EduSystem').lrDataItemSelect({ code: 'EduSystem' });
             $('#StudyModality').lrDataItemSelect({ code: 'StudyModality' });
             $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' });
-            $('#DeptNo').lrselect({
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                select: function (item) {
-                    if (item) {
-                        $('#MajorNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
-                            param: { code: "CdMajorInfo", strWhere: "DeptNo='" + item.deptno + "'" }
-                        });
-                    }
-                    else {
-                        $('#MajorNo').lrselectRefresh({
-                            url: "",
-                            data: []
-                        });
-                    }
-                    $('#ClassNo').lrselectRefresh({
-                        url: "",
-                        data: []
-                    });
-                }
-            });
             $('#MajorNo').lrselect({
                 value: "majorno",
                 text: "majorname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
                 select: function (item) {
                     if (item) {
                         $('#ClassNo').lrselectRefresh({
                             url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
-                            param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "'" }
+                            param: { code: "bjsj", strWhere: "majorno='" + item.majorno + "'" }
                         });
                     }
 
                 }
             });
 
-
-            $('#MajorNo').on("click",
-                function () {
-                    var data = $('#DeptNo').lrselectGet();
-                    if (!data) {
-                        learun.alert.error('请先选择系');
-                    }
-                });
             $('#ClassNo').on("click",
                 function () {
-                    var data1 = $('#DeptNo').lrselectGet();
                     var data2 = $('#MajorNo').lrselectGet();
-                    if (!data1 || !data2) {
-                        learun.alert.error('请先选择系和专业');
+                    if (!data2) {
+                        learun.alert.error('请先选择专业');
                     }
                 });
             $('#IdCardType').lrDataItemSelect({ code: 'IdCardType' });

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

@@ -18,10 +18,6 @@
                                     <div class="lr-form-item-title">姓名</div>
                                     <input id="StuName" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>

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

@@ -11,7 +11,6 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 300, 400);
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             // 刷新
@@ -662,19 +661,6 @@ var bootstrap = function ($, learun) {
 
 
                     //{ label: "学籍号", name: "StuCode", 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: "Grade", width: 100, align: "left" },
                     //{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
                     //{ label: "余额", name: "Balance", width: 100, align: "left" },

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

@@ -2,17 +2,18 @@
     ViewBag.Title = "新生信息管理";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
+<style>
+    .lr-layout-tool-right .lr-layout-tool-item{
+        position:relative;
+        float:right;
+        padding-left:5px;
+    }
+</style>
 <div class="lr-layout ">
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
-                    <div class="lr-layout-tool-item">
-                        <div style="width:200px;" class="lr-form-item">
-                            <div class="lr-form-item-title">系部</div>
-                            <div id="DeptNo"></div>
-                        </div>
-                    </div>
                     <div class="lr-layout-tool-item">
                         <div style="width:200px;" class="lr-form-item">
                             <div class="lr-form-item-title">专业</div>
@@ -34,18 +35,19 @@
                     <div class="lr-layout-tool-item">
                         <a id="btn_search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span>查询</span></a>
                     </div>
-                    <div class="lr-layout-tool-item">
-                        <div style="width:200px;" class="lr-form-item">
-                            <div class="lr-form-item-title">班级</div>
-                            <div id="ClassNo"></div>
-                        </div>
-                    </div>
+                    
                 </div>
                 
                 <div class="lr-layout-tool-right">
                     <div class="lr-layout-tool-item">
                         <a id="btn_Apply" class="btn btn-primary btn-sm"><i class="fa fa-check"></i>&nbsp;<span class="lrlt">确认分配</span></a>
                     </div>
+                    <div class="lr-layout-tool-item">
+                        <div style="width:200px;" class="lr-form-item">
+                            <div class="lr-form-item-title">班级</div>
+                            <div id="ClassNo"></div>
+                        </div>
+                    </div>
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.js

@@ -22,13 +22,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-
-            $('#DeptNo').lrselect({
-                allowSearch: true,
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-            });
+            
             $('#MajorNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -42,22 +36,6 @@ var bootstrap = function ($, learun) {
                 text: "classname"
             });
 
-
-            //$('#MajorNo').on("click",
-            //    function () {
-            //        var data = $('#DeptNo').lrselectGet();
-            //        if (!data) {
-            //            learun.alert.error('请先选择系');
-            //        }
-            //    });
-            //$('#ClassNo').on("click",
-            //    function () {
-            //        var data1 = $('#DeptNo').lrselectGet();
-            //        var data2 = $('#MajorNo').lrselectGet();
-            //        if (!data1 || !data2) {
-            //            learun.alert.error('请先选择系和专业');
-            //        }
-            //    });
             $("#btn_search").on("click", function () {
                 page.search(getParam());
             });

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

@@ -2,17 +2,19 @@
     ViewBag.Title = "新生信息管理";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
+
+<style>
+    .lr-layout-tool-right .lr-layout-tool-item {
+        position: relative;
+        float: right;
+        padding-left: 5px;
+    }
+</style>
 <div class="lr-layout ">
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
-                    <div class="lr-layout-tool-item">
-                        <div style="width:200px;" class="lr-form-item">
-                            <div class="lr-form-item-title">系部</div>
-                            <div id="DeptNo"></div>
-                        </div>
-                    </div>
                     <div class="lr-layout-tool-item">
                         <div style="width:200px;" class="lr-form-item">
                             <div class="lr-form-item-title">专业</div>
@@ -40,6 +42,13 @@
                     <div class="lr-layout-tool-item">
                         <a id="btn_search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span>查询</span></a>
                     </div>
+
+                </div>
+
+                <div class="lr-layout-tool-right">
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Apply" class="btn btn-primary btn-sm"><i class="fa fa-check"></i>&nbsp;<span class="lrlt">确认分配</span></a>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <div style="width:200px;" class="lr-form-item">
                             <div class="lr-form-item-title">班级</div>
@@ -47,12 +56,6 @@
                         </div>
                     </div>
                 </div>
-                
-                <div class="lr-layout-tool-right">
-                    <div class="lr-layout-tool-item">
-                        <a id="btn_Apply" class="btn btn-primary btn-sm"><i class="fa fa-check"></i>&nbsp;<span class="lrlt">确认分配</span></a>
-                    </div>
-                </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>
         </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClassDC.js

@@ -22,13 +22,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-
-            $('#DeptNo').lrselect({
-                allowSearch: true,
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-            });
+            
             $('#MajorNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -42,22 +36,6 @@ var bootstrap = function ($, learun) {
                 text: "classname"
             });
 
-
-            //$('#MajorNo').on("click",
-            //    function () {
-            //        var data = $('#DeptNo').lrselectGet();
-            //        if (!data) {
-            //            learun.alert.error('请先选择系');
-            //        }
-            //    });
-            //$('#ClassNo').on("click",
-            //    function () {
-            //        var data1 = $('#DeptNo').lrselectGet();
-            //        var data2 = $('#MajorNo').lrselectGet();
-            //        if (!data1 || !data2) {
-            //            learun.alert.error('请先选择系和专业');
-            //        }
-            //    });
             $("#btn_search").on("click", function () {
                 page.search(getParam());
             });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/CollectFileIndex.js

@@ -89,18 +89,6 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: '收取档案时间', name: 'CollectFileDate', width: 130, align: "left" },
-                    {
-                        label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-                                key: value,
-                                keyId: 'deptno',
-                                callback: function (_data) {
-                                    callback(_data['deptname']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: '专业', name: 'MajorNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

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

@@ -8,10 +8,6 @@
     }
 </style>
 <div class="lr-form-wrap" id="form">
-    <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>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/ExportBedForm.js

@@ -15,41 +15,17 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            //系
-            $('#DeptNo').lrselect({
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                allowSearch: true,
-                select: function (item) {
-                    if (item) {
-                        $('#MajorNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
-                            param: { code: "CdMajorInfo", strWhere: "DeptNo='" + item.deptno + "'" },
-                        });
-                    }
-                    else {
-                        $('#MajorNo').lrselectRefresh({
-                            url: "",
-                            data: []
-                        });
-                    }
-                    $('#ClassNo').lrselectRefresh({
-                        url: "",
-                        data: []
-                    });
-                }
-            });
             //专业
             $('#MajorNo').lrselect({
                 value: "majorno",
                 text: "majorname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
                 allowSearch: true,
                 select: function (item) {
                     if (item) {
                         $('#ClassNo').lrselectRefresh({
                             url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
-                            param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "'" }
+                            param: { code: "bjsj", strWhere: "majorno='" + item.majorno + "'" }
                         });
                     }
 
@@ -62,30 +38,19 @@ var bootstrap = function ($, learun) {
                 allowSearch: true,
             });
 
-
-            $('#MajorNo').on("click", function () {
-                var data = $('#DeptNo').lrselectGet();
-                if (!data) {
-                    learun.alert.error('请先选择系');
-                    return false;
-                }
-            });
-
             $('#ClassNo').on("click", function () {
-                var data1 = $('#DeptNo').lrselectGet();
                 var data2 = $('#MajorNo').lrselectGet();
-                if (!data1 || !data2) {
-                    learun.alert.error('请先选择系和专业');
+                if (!data2) {
+                    learun.alert.error('请先选择专业');
                     return false;
                 }
             });
 
             //点击导出按钮
             $('#exportBtn').click(function () {
-                var DeptNo = $('#DeptNo').lrselectGet();
                 var MajorNo = $('#MajorNo').lrselectGet();
                 var ClassNo = $('#ClassNo').lrselectGet();
-                var postData = { DeptNo: DeptNo, MajorNo: MajorNo, ClassNo: ClassNo };
+                var postData = { MajorNo: MajorNo, ClassNo: ClassNo };
                 location.href = '/StuInfoFresh/ExportBed?queryJson=' + JSON.stringify(postData);
             });
 

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

@@ -32,10 +32,6 @@
         <div class="lr-form-item-title">性别 <font face="宋体">*</font></div>
         <div id="GenderNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
-        <div class="lr-form-item-title">系所号 </div>
-        <input id="DeptNo" type="text" class="form-control" />
-    </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
         <div class="lr-form-item-title">专业号 </div>
         <input id="MajorNo" type="text" class="form-control" />

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

@@ -38,10 +38,6 @@
         <div class="lr-form-item-title">毕业学校  <font face="宋体">*</font></div>
         <input id="HighSchoolName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
-        <div class="lr-form-item-title">系所号 </div>
-        <div id="DeptNo" class="form-control"></div>
-    </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
         <div class="lr-form-item-title">选报专业 </div>
         <div id="MajorNo" class="form-control"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormDC.js

@@ -26,20 +26,6 @@ var bootstrap = function ($, learun) {
             $("#MatriculateSort").lrDataItemSelect({ code: 'EnrollStyle' });
             $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' });
             $('#EducationalSystem').lrDataItemSelect({ code: 'EduSystem' });
-           
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
-                    }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
-                }
-            });
             $('#MajorNo').lrDataSourceSelect({
                 code: 'CdMajorInfo', value: 'majorno', text: 'majorname'
             });

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

@@ -38,10 +38,6 @@
             <div class="lr-form-item-title">性别 <font face="宋体">*</font></div>
             <div id="GenderNo" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
         </div>
-        <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
-            <div class="lr-form-item-title">系所号 </div>
-            <input id="DeptNo" type="text" class="form-control" readonly="readonly" />
-        </div>
         <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
             <div class="lr-form-item-title">专业号 </div>
             <input id="MajorNo" type="text" class="form-control" readonly="readonly" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js

@@ -209,18 +209,6 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: '领取校园卡时间', name: 'GetCardDate', width: 130, align: "left" },
-                    {
-                        label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-                                key: value,
-                                keyId: 'deptno',
-                                callback: function (_data) {
-                                    callback(_data['deptname']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: '专业', name: 'MajorNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

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

@@ -198,18 +198,6 @@ var bootstrap = function ($, learun) {
                             return cellvalue == true ? "<span class=\"label label-success\">是</span>" : "<span class=\"label label-warning\">否</span>";
                         }
                     },
-                    {
-                        label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-                                key: value,
-                                keyId: 'deptno',
-                                callback: function (_data) {
-                                    callback(_data['deptname']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: '专业', name: 'MajorNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js

@@ -252,18 +252,6 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: '其他费用缴费时间', name: 'OtherPayFeeDate', width: 130, align: "left" },
-                    {
-                        label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-                                key: value,
-                                keyId: 'deptno',
-                                callback: function (_data) {
-                                    callback(_data['deptname']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: '专业', name: 'MajorNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js

@@ -135,18 +135,6 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: '报到时间', name: 'ArriveDate', width: 130, align: "left" },
-                    {
-                        label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-                                key: value,
-                                keyId: 'deptno',
-                                callback: function (_data) {
-                                    callback(_data['deptname']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: '专业', name: 'MajorNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js

@@ -135,18 +135,6 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: '领取校园卡时间', name: 'GetCardDate', width: 130, align: "left" },
-                    {
-                        label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-                                key: value,
-                                keyId: 'deptno',
-                                callback: function (_data) {
-                                    callback(_data['deptname']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: '专业', name: 'MajorNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml

@@ -130,19 +130,6 @@
                         this.getData();
                     }.bind(this), 1000);
                 },
-                filter_Dept: function (value) {
-                    var result;
-                    top.learun.clientdata.getAsync('custmerData', {
-                        sync: true,
-                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-                        key: value,
-                        keyId: 'deptno',
-                        callback: function (_data) {
-                            result = _data.deptname;
-                        }
-                    });
-                    return result;
-                },
                 filter_Major: function (value) {
                     var result;
                     top.learun.clientdata.getAsync('custmerData', {
@@ -260,7 +247,6 @@
                             '<li><span>楼&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;层</span>' + floor.floorNum + ' <i>层</i></li>' +
                             '<li><span>空&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;床</span>' + floor.NoStudentNum + ' <i>床</i></li>' +
                             '<li><span>房&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间</span>' + floor.RoomNum + ' <i>间</i></li>' +
-                            '<li><span>涉及院系</span>' + this.filter_Dept(floor.dormitory.Dept) + '</li>' +
                             '<li><span>床&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位</span>' + floor.UnitNum + ' <i>个</i></li>' +
                             '<li><span>涉及专业</span>' + this.filter_Major(floor.dormitory.Major) + '</li>' +
                             '</ul>' +

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.cshtml

@@ -34,10 +34,6 @@
         <div class="lr-form-item-title">校区</div>
         <div id="Campus"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
-        <div class="lr-form-item-title">系</div>
-        <div id="Dept"></div>
-    </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryBuild">
         <div class="lr-form-item-title">专业</div>
         <div id="Major"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.js

@@ -31,65 +31,34 @@ var bootstrap = function ($, learun) {
                 value: "stuid",
                 text: "stuname",
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
-                
+
             });
-            
+
             $('#Class').lrselect({
                 value: "classno",
                 text: "classname"
             });
 
-            $('#Dept').lrselect({
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                select: function (item) {
-                    if (item) {
-                        $('#Major').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
-                            param: { code: "CdMajorInfo", strWhere: "DeptNo='" + item.deptno + "'" }
-                        });
-                    }
-                    else {
-                        $('#Major').lrselectRefresh({
-                            url: "",
-                            data: []
-                        });
-                    }
-                    $('#Class').lrselectRefresh({
-                        url: "",
-                        data: []
-                    });
-                }
-            });
             $('#Major').lrselect({
                 value: "majorno",
                 text: "majorname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
                 select: function (item) {
                     if (item) {
                         $('#Class').lrselectRefresh({
                             url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
-                            param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "'" }
+                            param: { code: "bjsj", strWhere: "majorno='" + item.majorno + "'" }
                         });
                     }
 
                 }
             });
 
-
-            $('#Major').on("click",
-                function () {
-                    var data = $('#Dept').lrselectGet();
-                    if (!data) {
-                        learun.alert.error('请先选择系');
-                    }
-                });
             $('#Class').on("click",
                 function () {
-                    var data1 = $('#Dept').lrselectGet();
                     var data2 = $('#Major').lrselectGet();
-                    if (!data1 || !data2) {
-                        learun.alert.error('请先选择系和专业');
+                    if (!data2) {
+                        learun.alert.error('请先选择专业');
                     }
                 });
         },

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs

@@ -35,7 +35,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.zkzh,
                 t.StuNo,
                 t.StuName,
-                t.DeptNo,
                 t.GenderNo,
                 t.MajorNo,
                 t.MajorDetailNok,
@@ -126,9 +125,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var dp = new DynamicParameters(new { });
 
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT t.*,d.DeptName,m.MajorName,c.ClassName,b.Name as Bed,r.Name as Room,f.Name as floor,u.Name as Unit,build.Name as Build ");
+                strSql.Append("SELECT t.*,m.MajorName,c.ClassName,b.Name as Bed,r.Name as Room,f.Name as floor,u.Name as Unit,build.Name as Build ");
                 strSql.Append(" FROM StuInfoFresh t ");
-                strSql.Append(" left join CdDept d on t.DeptNo=d.DeptNo ");
                 strSql.Append(" left join CdMajor m on t.MajorNo=m.MajorNo ");
                 strSql.Append(" left join ClassInfo c on t.ClassNo=c.ClassNo ");
                 strSql.Append(" left join Acc_DormitoryBuild b on t.DormitoryNo=b.ID ");
@@ -137,12 +135,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 strSql.Append(" left join Acc_DormitoryBuild u on f.ParentID=u.ID ");
                 strSql.Append(" left join Acc_DormitoryBuild build on u.ParentID=build.ID ");
                 strSql.Append(" where 1=1 ");
-
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    strSql.Append(" and t.DeptNo = @DeptNo ");
-                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
-                }
+                
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
                     strSql.Append(" and t.MajorNo = @MajorNo ");
@@ -190,18 +183,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var dp = new DynamicParameters(new { });
 
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT t.*,d.DeptName,m.MajorName,c.ClassName ");
+                strSql.Append("SELECT t.*,m.MajorName,c.ClassName ");
                 strSql.Append(" FROM StuInfoFresh t ");
-                strSql.Append(" left join CdDept d on t.DeptNo=d.DeptNo ");
                 strSql.Append(" left join CdMajor m on t.MajorNo=m.MajorNo ");
                 strSql.Append(" left join ClassInfo c on t.ClassNo=c.ClassNo ");
                 strSql.Append(" where 1=1 ");
-
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    strSql.Append(" and t.DeptNo = @DeptNo ");
-                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
-                }
+                
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
                     strSql.Append(" and t.MajorNo = @MajorNo ");
@@ -1214,8 +1201,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             F_EnabledMark = 1,
                             F_Mobile = entity.telephone,
                             F_Description = "学生",
-                            F_CompanyId = this.BaseRepository("CollegeMIS").FindEntity<CdMajorEntity>(x => x.MajorNo == entity.MajorNo)?.F_SchoolId,
-                            F_DepartmentId = entity.DeptNo
+                            F_CompanyId = this.BaseRepository("CollegeMIS").FindEntity<CdMajorEntity>(x => x.MajorNo == entity.MajorNo)?.F_SchoolId
                         };
                         userIBLL.SaveEntity(null, userEntity);
 
@@ -1589,7 +1575,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             .FindEntity<StuInfoBasicEntity>(a => a.StuNo == stuFreshInfo.StuNo);
                         if (stuInfo != null)
                         {
-                            bed.Dept = stuInfo.DeptNo;
                             bed.Major = stuInfo.MajorNo;
                             bed.Class = stuInfo.ClassNo;
                             bed.StudentID = stuInfo.StuId;
@@ -1627,7 +1612,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             .FindEntity<StuInfoBasicEntity>(a => a.StuNo == stuFreshInfo.StuNo);
                         if (stuInfo != null)
                         {
-                            bed.Dept = stuInfo.DeptNo;
                             bed.Major = stuInfo.MajorNo;
                             bed.Class = stuInfo.ClassNo;
                             bed.StudentID = stuInfo.StuId;
@@ -1718,7 +1702,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 //学籍表增加数据
                 var strSql = new StringBuilder();
                 strSql.Append(@"insert into StuInfoBasic 
-(StuId, StuNo, StuCode, NoticeNo, GraduateYear, ksh, DeptNo, MajorNo, MajorDetailNo, MajorDetailName, 
+(StuId, StuNo, StuCode, NoticeNo, GraduateYear, ksh, MajorNo, MajorDetailNo, MajorDetailName, 
                 Grade, ClassNo, StuName, SpellFull, SpellBrief, GenderNo, Birthday, PartyFaceNo, FamilyOriginNo, NationalityNo, 
                 ProvinceNo, RegionNo, ResidenceNo, TestStuSortNo, HealthStatusNo, WillNo, TestStuSubjectNo, GraduateNo, 
                 PlanFormNo, IsThreeGood, IsExcellent, IsNormalCadre, IsProvinceFirstThree, OverseasChineseNo, MatriculateSort, 
@@ -1729,7 +1713,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 MatherUnit, MatherPhone, username, password, MailAddress, PostalCode, InSchoolStatus, TransMark, ClassTutorNo, 
                 ResumeCheck, PracStatus, RegisterStatus, PunishmentDate, F_CityId, F_CountyId, F_ProvinceId, F_SchoolId, 
                 EduSystem, StudyModality, SyncFlag)
-select NEWID(),StuNo,null,NoticeNo,null,ksh,DeptNo,MajorNo,MajorDetailNok as MajorDetailNo,MajorDetailName,Grade,ClassNo,StuName,null,null,case when GenderNo ='1' then 1 else 0 end,Birthday,PartyFaceNo,FamilyOriginNo,NationalityNo,ProvinceNo,RegionNo,ResidenceNo,TestStuSortNo,HealthStatusNo,WillNo,TestStuSubjectNo,GraduateNo,PlanFormNo,IsThreeGood,IsExcellent,IsNormalCadre,IsProvinceFirstThree,OverseasChineseNo,MatriculateSort,null,HighSchoolNo,HighSchoolName,null,null,GoodAt,IdentityCardNo,null,null,null,null,null,null,null,null,null,null,null,null,null,null,Remark,ArriveDate as RegisterDate,Photo,null,null,telephone as mobile,null,null,null,null,null,null,null,null,StuNo as username,null,MailAddress,PostalCode,null,TransMark,null,null,null,RegisterStatus,null,null,null,null,F_SchoolId,null,null,0 from
+select NEWID(),StuNo,null,NoticeNo,null,ksh,MajorNo,MajorDetailNok as MajorDetailNo,MajorDetailName,Grade,ClassNo,StuName,null,null,case when GenderNo ='1' then 1 else 0 end,Birthday,PartyFaceNo,FamilyOriginNo,NationalityNo,ProvinceNo,RegionNo,ResidenceNo,TestStuSortNo,HealthStatusNo,WillNo,TestStuSubjectNo,GraduateNo,PlanFormNo,IsThreeGood,IsExcellent,IsNormalCadre,IsProvinceFirstThree,OverseasChineseNo,MatriculateSort,null,HighSchoolNo,HighSchoolName,null,null,GoodAt,IdentityCardNo,null,null,null,null,null,null,null,null,null,null,null,null,null,null,Remark,ArriveDate as RegisterDate,Photo,null,null,telephone as mobile,null,null,null,null,null,null,null,null,StuNo as username,null,MailAddress,PostalCode,null,TransMark,null,null,null,RegisterStatus,null,null,null,null,F_SchoolId,null,null,0 from
 (select f.*,m.F_SchoolId from StuInfoFresh f left join CdMajor m on f.MajorNo=m.MajorNo where f.StuNo is not null ) as bb
 where bb.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=bb.StuNo) ");