diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml index 66ba2d1fe..2a530e444 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml @@ -23,10 +23,6 @@
校区*
-
-
系别
-
-
名称缩写
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.js index 2c061f39d..a5dcdfee9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.js +++ b/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' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.cshtml index 860664f94..a2fc16f7e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.cshtml @@ -22,10 +22,6 @@
校区
-
-
系别
-
-
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js index eb7909c2e..3485e9afa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js +++ b/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" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Form.cshtml index ece15903d..22db719d3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Form.cshtml @@ -11,10 +11,6 @@
班级代码*
-
-
系部*
-
-
专业*
@@ -43,7 +39,7 @@
是否拆分班*
-
+
班级类型
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Form.js index 222eebbcf..dfc917b70 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Form.js +++ b/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]); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Index.cshtml index c0dbc3fdb..462b0f9bc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Index.cshtml @@ -18,10 +18,6 @@
班级代码
-
-
系部
-
-
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Index.js index 3bac36860..ce9075beb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Index.js +++ b/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) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml index ef9d72447..3566346a8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml @@ -147,10 +147,6 @@
部门*
-
-
系部
-
-
岗位类别
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js index b6d9557e5..c0c473e8e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js +++ b/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' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml index d50374b93..6c89c1287 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml @@ -11,10 +11,6 @@
部门
-
-
系部
-
-
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js index 9f1bb64ba..2a087b5f3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js +++ b/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) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml index 1bd11e5ed..8a1efd1e2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml @@ -22,10 +22,6 @@
联系电话
-
-
系部
-
-
部门
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js index 20578acca..be2be294f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js +++ b/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) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml index c7f49e031..00c2cbcb8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml @@ -36,7 +36,7 @@ 政治面貌 @Model.PartyFaceNo 入党时间 - @(Model.JoinPartyTime.HasValue ? Model.JoinPartyTime.Value.ToShortDateString().Replace("/", "-") : "") + @(Model.JoinPartyTime != "" && Model.JoinPartyTime != null ? Model.JoinPartyTime.Replace("/", "-") : "") 最高学历（学位） @Model.HighestRecord diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml index d4446dd96..12c2c3373 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml @@ -15,10 +15,6 @@
校区*
-
-
系部
-
-
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.js index 80607a514..5148e99dd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.js +++ b/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) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.cshtml index 99262747c..34d58658d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.cshtml @@ -31,10 +31,6 @@
校区
-
-
系部
-
-
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js index 4d1f4d643..185de36b1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js +++ b/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) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml index cca53fdce..5ae58f03b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml @@ -147,10 +147,6 @@
毕业日期
-
-
系所*
-
-
专业*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js index 481635b8f..86ccd5a97 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js +++ b/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('请先选择专业'); } }); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml index 85395fd68..d23a172ee 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml @@ -74,7 +74,6 @@
-
-
系部
-
-
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index 367bc0204..96a560242 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/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) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Print.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Print.cshtml index ca74ee8ab..5e029073f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Print.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Print.cshtml @@ -41,12 +41,12 @@ @Model.Grade - 系 - @Model.DeptNo 专业 @Model.MajorNo 班级 @Model.ClassNo + + 身份证号 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorService.cs index 50ebe5dee..f5b585716 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorService.cs +++ b/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(strSql.ToString(), dp); } catch (Exception ex) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoService.cs index 1075e48cd..28896b6ed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoService.cs +++ b/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); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs index 6f1210b30..de5d6c926 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs +++ b/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); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs index 7b4bba303..20950a971 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs +++ b/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); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs index a1dc54122..ca89cfe05 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs +++ b/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;