diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.cshtml index 0b74ad44d..571320f73 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.cshtml @@ -59,10 +59,6 @@
学期*
-
-
系部*
-
-
专业*
@@ -100,10 +96,6 @@
学期*
-
-
系部*
-
-
专业*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js index 3bbd0b3b6..48f3bd3c6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js @@ -35,14 +35,13 @@ var bootstrap = function ($, learun) { //p.F_SchoolId = $('#F_SchoolId').lrselectGet(); p.AcademicYearNo = $('#AcademicYearNo').lrselectGet(); p.Semester = $('#Semester').lrselectGet(); - p.DeptNo = $('#DeptNo').lrselectGet(); p.MajorNo = $('#MajorNo').lrselectGet(); p.LessonNo = $('#LessonNo').lrselectGet(); p.TeachClassNo = $('#TeachClassNo').lrselectGet(); p.EmpNo = $('#EmpNo').lrselectGet(); p.ClassroomNo = $('#ClassroomNo').lrselectGet(); - //if (!!p.F_SchoolId && !!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) { - if (!!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) { + //if (!!p.F_SchoolId && !!p.AcademicYearNo && !!p.Semester && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) { + if (!!p.AcademicYearNo && !!p.Semester && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) { //调度开始时间 $('#AttemperStartTime').lrselectRefresh({ allowSearch: true, @@ -157,8 +156,6 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); - $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); - $('#NewDeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); $('#NewMajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); $('#LessonNo').lrselect({ @@ -245,7 +242,6 @@ var bootstrap = function ($, learun) { //$('#F_SchoolId').lrselectSet(temprow.schooldId); $('#AcademicYearNo').lrselectSet(temprow.academicyear); $('#Semester').lrselectSet(temprow.semester); - $('#DeptNo').lrselectSet(temprow.deptNo); $('#MajorNo').lrselectSet(temprow.majorNo); $('#LessonNo').lrselectSet(temprow.lessonNo); $('#TeachClassNo').lrselectSet(temprow.teachClassNo); @@ -259,7 +255,6 @@ var bootstrap = function ($, learun) { //$('#NewF_SchoolId').lrselectSet(temprow.schooldId); $('#NewAcademicYearNo').lrselectSet(temprow.academicyear); $('#NewSemester').lrselectSet(temprow.semester); - $('#NewDeptNo').lrselectSet(temprow.deptNo); $('#NewMajorNo').lrselectSet(temprow.majorNo); $('#NewLessonNo').lrselectSet(temprow.lessonNo); $('#NewTeachClassNo').lrselectSet(temprow.teachClassNo); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml index d7c970c4e..e1014df92 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml @@ -59,10 +59,6 @@
学期*
-
-
系部*
-
-
专业*
@@ -100,10 +96,6 @@
学期*
-
-
系部*
-
-
专业*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js index fb37b83ac..067bfb059 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js @@ -35,14 +35,13 @@ var bootstrap = function ($, learun) { //p.F_SchoolId = $('#F_SchoolId').lrselectGet(); p.AcademicYearNo = $('#AcademicYearNo').lrselectGet(); p.Semester = $('#Semester').lrselectGet(); - p.DeptNo = $('#DeptNo').lrselectGet(); p.MajorNo = $('#MajorNo').lrselectGet(); p.LessonNo = $('#LessonNo').lrselectGet(); p.TeachClassNo = $('#TeachClassNo').lrselectGet(); p.EmpNo = $('#EmpNo').lrselectGet(); p.ClassroomNo = $('#ClassroomNo').lrselectGet(); - //if (!!p.F_SchoolId && !!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) { - if (!!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) { + //if (!!p.F_SchoolId && !!p.AcademicYearNo && !!p.Semester && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) { + if (!!p.AcademicYearNo && !!p.Semester && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) { //调度开始时间 $('#AttemperStartTime').lrselectRefresh({ allowSearch: true, @@ -157,8 +156,6 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); - $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); - $('#NewDeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); $('#NewMajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); $('#LessonNo').lrselect({ @@ -247,7 +244,6 @@ var bootstrap = function ($, learun) { //$('#F_SchoolId').lrselectSet(temprow.schooldId); $('#AcademicYearNo').lrselectSet(temprow.academicyear); $('#Semester').lrselectSet(temprow.semester); - $('#DeptNo').lrselectSet(temprow.deptNo); $('#MajorNo').lrselectSet(temprow.majorNo); $('#LessonNo').lrselectSet(temprow.lessonNo); $('#TeachClassNo').lrselectSet(temprow.teachClassNo); @@ -261,7 +257,6 @@ var bootstrap = function ($, learun) { //$('#NewF_SchoolId').lrselectSet(temprow.schooldId); $('#NewAcademicYearNo').lrselectSet(temprow.academicyear); $('#NewSemester').lrselectSet(temprow.semester); - $('#NewDeptNo').lrselectSet(temprow.deptNo); $('#NewMajorNo').lrselectSet(temprow.majorNo); $('#NewLessonNo').lrselectSet(temprow.lessonNo); $('#NewTeachClassNo').lrselectSet(temprow.teachClassNo); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.cshtml index a5960c738..77403f136 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.cshtml @@ -30,10 +30,6 @@
学期
-
-
系部
-
-
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js index b390431e8..f5d9464aa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js @@ -33,7 +33,6 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); - $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname' }); $('#TeachClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); @@ -199,19 +198,6 @@ var bootstrap = function ($, learun) { //}, { label: "学年", name: "AcademicYearNo", width: 100, align: "left" }, { label: "学期", name: "Semester", width: 100, align: "left" }, - { - label: "系部", name: "DeptNo", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', - key: value, - keyId: 'deptno', - callback: function (_data) { - callback(_data['deptname']); - } - }); - } - }, { label: "专业", name: "MajorNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -277,20 +263,7 @@ var bootstrap = function ($, learun) { }); } }, - - { - label: "新系部", name: "NewDeptNo", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', - key: value, - keyId: 'deptno', - callback: function (_data) { - callback(_data['deptname']); - } - }); - } - }, + { label: "新专业", name: "NewMajorNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml index 14626a53b..6d8344e38 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml @@ -27,10 +27,6 @@
学籍原安排
-
-
系部*
-
-
专业*
@@ -42,10 +38,6 @@
学籍新安排