【修改】教务-基本信息管理：专业、课程、班级、学籍、教师：去掉系的内容；

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

@@ -23,10 +23,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="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" />

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();
@@ -160,19 +159,6 @@ 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" },

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/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();
@@ -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/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

@@ -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/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>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.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) {
@@ -362,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) {

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

@@ -36,7 +36,7 @@
                     <td>政治面貌</td>
                     <td>@Model.PartyFaceNo</td>
                     <td>入党时间</td>
-                    <td>@(Model.JoinPartyTime.HasValue ? Model.JoinPartyTime.Value.ToShortDateString().Replace("/", "-") : "")</td>
+                    <td>@(Model.JoinPartyTime != "" && Model.JoinPartyTime != null ? Model.JoinPartyTime.Replace("/", "-") : "")</td>
                     <td>最高学历（学位）</td>
                     <td>@Model.HighestRecord</td>
                 </tr>

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/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>

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

@@ -20,7 +20,6 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
-            $('#TeachDeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#TeachMajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -158,19 +157,6 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "课程编号", name: "LessonNo", width: 100, align: "left" },
                     { label: "课程名称", name: "LessonName", width: 200, align: "left" },
-                    {
-                        label: "系部", name: "TeachDeptNo", 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: "TeachMajorNo", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -147,10 +147,6 @@
         <div class="lr-form-item-title">毕业日期</div>
         <input id="GraduateYear" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#GraduateYear').trigger('change'); } })" />
     </div>
-    <div class="col-xs-4 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-4 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/Form.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,32 +114,10 @@ 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({
@@ -152,20 +129,11 @@ var bootstrap = function ($, learun) {
                 }
             });
 
-
-            $('#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('请先选择专业');
                     }
                 });
         },

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

@@ -74,7 +74,6 @@
                     <ul class="userSec2List">
                         <li>通知书号 : {{studentInfo.NoticeNo}}</li>
                         <li> 考  生  号 : {{studentInfo.ksh}}</li>
-                        <li>系所 : {{studentInfo.DeptNo | deptNo}}  </li>
                         <li>专 业 : {{studentInfo.MajorNo | majorNo}}</li>
                         <li>班       级 : {{studentInfo.ClassNo | class}}   </li>
                         <li>报到日期 : {{studentInfo.RegisterDate | date}} </li>
@@ -257,18 +256,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;
-                },
                 majorNo: function (value) {
                     var result;
                     top.learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.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/Index.js

@@ -11,7 +11,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' });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             // 刷新
@@ -260,19 +259,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: "MajorNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -41,12 +41,12 @@
                     <td>@Model.Grade</td>
                 </tr>
                 <tr>
-                    <td>系</td>
-                    <td id="DeptNo">@Model.DeptNo</td>
                     <td>专业</td>
                     <td id="MajorNo">@Model.MajorNo</td>
                     <td>班级</td>
                     <td id="ClassNo">@Model.ClassNo</td>
+                    <td></td>
+                    <td></td>
                 </tr>
                 <tr>
                     <td>身份证号</td>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorService.cs

@@ -38,7 +38,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.LengthOfSchooling,
                 t.SubjectSpeciesNo,
                 t.F_SchoolId,
-                t.DeptNo,
                 t.MajorNameBrief,
                 t.MajorNameEn,
                 t.GovMajorNo,
@@ -62,11 +61,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("MajorName", "%" + queryParam["MajorName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.MajorName Like @MajorName ");
                 }
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
-                    strSql.Append(" AND t.DeptNo = @DeptNo ");
-                }
                 if (!queryParam["F_SchoolId"].IsEmpty())
                 {
                     dp.Add("F_SchoolId", queryParam["F_SchoolId"].ToString(), DbType.String);
@@ -116,11 +110,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("MajorName", "%" + queryParam["MajorName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND bb.MajorName Like @MajorName ");
                 }
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
-                    strSql.Append(" AND bb.DeptNo = @DeptNo ");
-                }
                 if (!queryParam["F_SchoolId"].IsEmpty())
                 {
                     dp.Add("F_SchoolId", queryParam["F_SchoolId"].ToString(), DbType.String);
@@ -174,11 +163,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 strSql.Append("SELECT * ");
                 strSql.Append("  FROM CdMajor t ");
                 strSql.Append("  WHERE 1=1 ");
-                if (!string.IsNullOrEmpty(DeptNo))
-                {
-                    dp.Add("DeptNo", DeptNo, DbType.String);
-                    strSql.Append(" AND t.DeptNo = @DeptNo ");
-                }
+                
                 return this.BaseRepository("CollegeMIS").FindList<CdMajorEntity>(strSql.ToString(), dp);
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoService.cs

@@ -35,7 +35,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.ClassId,
                 t.ClassName,
                 t.ClassNo,
-                t.DeptNo,
                 t.MajorNo,
                 t.SerialNum,
                 t.Grade,
@@ -60,11 +59,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("ClassNo", "%" + queryParam["ClassNo"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.ClassNo Like @ClassNo ");
                 }
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
-                    strSql.Append(" AND t.DeptNo = @DeptNo ");
-                }
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
                     dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs

@@ -57,11 +57,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("mobile", "%" + queryParam["mobile"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.mobile Like @mobile ");
                 }
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
-                    strSql.Append(" AND t.DeptNo = @DeptNo ");
-                }
                 if (!queryParam["ProvinceNo"].IsEmpty())
                 {
                     dp.Add("ProvinceNo", queryParam["ProvinceNo"].ToString(), DbType.String);
@@ -182,7 +177,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.EmpName, 
                 t.F_CompanyId, 
                 t.F_DepartmentId, 
-                t.DeptNo, 
                 t.GenderNo, 
                 t.Photo, 
                 t.Birthday, 
@@ -725,10 +719,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             {
                                 model.F_DepartmentId = entity.F_DepartmentId;
                             }
-                            if (!string.IsNullOrEmpty(entity.DeptNo))
-                            {
-                                model.DeptNo = entity.DeptNo;
-                            }
                             db.Update(model);
                         }
                     }
@@ -747,10 +737,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 {
                                     model.F_DepartmentId = entity.F_DepartmentId;
                                 }
-                                if (!string.IsNullOrEmpty(entity.DeptNo))
-                                {
-                                    model.DeptNo = entity.DeptNo;
-                                }
                                 db.Update(model);
                             }
                         }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs

@@ -35,7 +35,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.LessonId,
                 t.LessonNo,
                 t.LessonName,
-                t.TeachDeptNo,
                 t.TeachMajorNo,
                 t.EnName,
                 t.StudyScore,
@@ -65,11 +64,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("LessonName", "%" + queryParam["LessonName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.LessonName Like @LessonName ");
                 }
-                if (!queryParam["TeachDeptNo"].IsEmpty())
-                {
-                    dp.Add("TeachDeptNo", queryParam["TeachDeptNo"].ToString(), DbType.String);
-                    strSql.Append(" AND t.TeachDeptNo = @TeachDeptNo ");
-                }
                 if (!queryParam["TeachMajorNo"].IsEmpty())
                 {
                     dp.Add("TeachMajorNo", queryParam["TeachMajorNo"].ToString(), DbType.String);

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

@@ -51,11 +51,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.StuName Like @StuName ");
                 }
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    dp.Add("DeptNo", "" + queryParam["DeptNo"].ToString() + "", DbType.String);
-                    strSql.Append(" AND t.DeptNo=@DeptNo ");
-                }
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
                     dp.Add("MajorNo", "" + queryParam["MajorNo"].ToString() + "", DbType.String);
@@ -744,7 +739,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     userbase.F_Mobile = tEntity.mobile;
                     userbase.F_Description = "学生";
                     userbase.F_CompanyId = tEntity.F_SchoolId;
-                    userbase.F_DepartmentId = tEntity.DeptNo;
                     userbase.F_IdentityCardNo = tEntity.IdentityCardNo;
                     userIBLL.SaveEntity(null, userbase);
                     studentList.Add(userbase);
@@ -801,11 +795,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             baseTeacher.F_CompanyId = teacher.F_SchoolId;
                             num++;
                         }
-                        if (baseTeacher.F_DepartmentId != teacher.DeptNo)
-                        {
-                            baseTeacher.F_DepartmentId = teacher.DeptNo;
-                            num++;
-                        }
                         if (baseTeacher.F_IdentityCardNo != teacher.IdentityCardNo)
                         {
                             baseTeacher.F_IdentityCardNo = teacher.IdentityCardNo;