备注
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Form.js
index 1da2073ca..581997695 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Form.js
@@ -74,6 +74,7 @@ var bootstrap = function ($, learun) {
});
$('#LessonNo').lrselect();
$('#TeachDeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+ $('#ExamType').lrDataItemSelect({ code: 'ExamType' });
},
initData: function () {
if (!!keyValue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Index.js
index a27d8ba21..f1c276239 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Index.js
@@ -210,22 +210,11 @@ var bootstrap = function ($, learun) {
url: top.$.rootUrl + '/EducationalAdministration/ClassPlan/GetPageList',
headData: [
{ label: "学年", name: "AcademicYearNo", width: 80, align: "left" },
- {
- label: "学期", name: "Semester", width: 50, align: "left",
- formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('dataItem', {
- key: value,
- code: 'Semester',
- callback: function (_data) {
- callback(_data.text);
- }
- });
- }
- },
+ { label: "学期", name: "Semester", width: 50, align: "left" },
{ label: "年级", name: "Grade", width: 50, align: "left" },
- { label: "专业编码", name: "MajorNo", width: 120, align: "left" },
+ { label: "专业编码", name: "MajorNo", width: 80, align: "left" },
{
- label: "专业名称", name: "MajorNo", width: 200, align: "left" ,
+ label: "专业名称", name: "MajorNo", width: 200, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
@@ -237,10 +226,10 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: "课程编码", name: "LessonNo", width: 200, align: "left" },
+ { label: "课程编码", name: "LessonNo", width: 100, align: "left" },
{ label: "课程名称", name: "LessonName", width: 200, align: "left", },
{
- label: "课程类型", name: "LessonTypeId", width: 200, align: "left",
+ label: "课程类型", name: "LessonTypeId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdLessonType',
@@ -253,7 +242,7 @@ var bootstrap = function ($, learun) {
}
},
{
- label: "状态", name: "State", width: 100, align: "left",
+ label: "状态", name: "State", width: 80, align: "left",
formatter: function (cellvalue, row) {
if (cellvalue == 0) {
return '
未排课';
@@ -262,6 +251,19 @@ var bootstrap = function ($, learun) {
}
}
},
+ {
+ label: "考试类型", name: "StudyScore", width: 80, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'ExamType',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: "学分", name: "StudyScore", width: 80, align: "left" },
{ label: "拟开教学班数", name: "TeachClassNum", width: 100, align: "left" },
//{ label: "人数", name: "StuNum", width: 80, align: "left" },
{ label: "周课时", name: "WeekLessonHour", width: 80, align: "left" },
@@ -282,7 +284,6 @@ var bootstrap = function ($, learun) {
// });
// }
//},
- { label: "学分", name: "StudyScore", width: 80, align: "left" },
{ label: "备注", name: "Remark", width: 100, align: "left" },
],
mainId: 'ID',
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlan/OpenLessonPlanEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlan/OpenLessonPlanEntity.cs
index 7c6df67ad..b935b9974 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlan/OpenLessonPlanEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlan/OpenLessonPlanEntity.cs
@@ -275,6 +275,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
[Column("STATE")]
public int? State { get; set; }
+ ///
+ /// 考试类型
+ ///
+ [Column("EXAMTYPE")]
+ public string ExamType { get; set; }
+
#endregion
#region 扩展操作
@@ -321,7 +327,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
[NotMapped]
public string LessonTypeId { get; set; }
-
+
#endregion
}
}