diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Form.cshtml index 209487325..a3f28e6e2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Form.cshtml @@ -3,33 +3,41 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+
名称*
-
+
年级
-
+
-
+
+
专业部
+
+
+
专业
-
+
-
+
学制
- + +
+
+
学期课时量
+
-
+
总学分
- +
-
+
启用
-
+
备注
- +
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TeachingPlan/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Form.js index 55eccfa94..2c48d88d4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Form.js @@ -23,6 +23,7 @@ var bootstrap = function ($, learun) { maxHeight: 200 }); + $('#Dept').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno',text: 'deptname' }); $('#Major').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno',text: 'majorname' }); $('#Enabled').lrRadioCheckbox({ type: 'radio', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManage.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManage.cshtml index f01bfbe15..6cc893c85 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManage.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManage.cshtml @@ -11,17 +11,25 @@
年级
+
+
专业部
+
+
专业
学制
- + +
+
+
学期课时量
+
总学分
- +
启用
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManage.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManage.js index 4ef2c76d7..d00a6b441 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManage.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManage.js @@ -48,6 +48,7 @@ var bootstrap = function ($, learun) { maxHeight: 200 }); + $('#Dept').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#Major').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); $('#Enabled').lrRadioCheckbox({ type: 'radio', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManageView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManageView.cshtml index c6a2c9082..1e8c38a97 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManageView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManageView.cshtml @@ -11,17 +11,25 @@
年级
+
+
专业部
+
+
专业
学制
- + +
+
+
学期课时量
+
总学分
- +
启用
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManageView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManageView.js index 4ef2c76d7..d00a6b441 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManageView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManageView.js @@ -48,6 +48,7 @@ var bootstrap = function ($, learun) { maxHeight: 200 }); + $('#Dept').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#Major').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); $('#Enabled').lrRadioCheckbox({ type: 'radio', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Index.js index 743306daa..601efff9a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Index.js @@ -26,8 +26,8 @@ var bootstrap = function ($, learun) { id: 'form', title: '新增', url: top.$.rootUrl + '/EducationalAdministration/TeachingPlan/Form', - width: 600, - height: 400, + width: 800, + height: 600, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -41,8 +41,8 @@ var bootstrap = function ($, learun) { id: 'form', title: '编辑', url: top.$.rootUrl + '/EducationalAdministration/TeachingPlan/Form?keyValue=' + keyValue, - width: 600, - height: 400, + width: 800, + height: 600, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -74,6 +74,19 @@ var bootstrap = function ($, learun) { headData: [ { label: "名称", name: "Name", width: 100, align: "left" }, { label: "年级", name: "Grade", width: 100, align: "left" }, + { + label: "专业部", name: "Dept", 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: "Major", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -88,6 +101,7 @@ var bootstrap = function ($, learun) { } }, { label: "学制", name: "SchoolSystem", width: 100, align: "left" }, + { label: "学期课时量", name: "LessonTotal", width: 100, align: "left" }, { label: "总学分", name: "Credit", width: 100, align: "left" }, { label: "状态", name: "Enabled", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/IndexManage.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/IndexManage.js index e6436c59d..884134b97 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/IndexManage.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/IndexManage.js @@ -30,8 +30,8 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/TeachingPlan/FormManageView?keyValue=' + keyValue, - width: 600, - height: 400, + width: 800, + height: 600, btn: null, callBack: function (id) { //return top[id].acceptClick(refreshGirdData); @@ -77,6 +77,19 @@ var bootstrap = function ($, learun) { headData: [ { label: "名称", name: "Name", width: 100, align: "left" }, { label: "年级", name: "Grade", width: 100, align: "left" }, + { + label: "专业部", name: "Dept", 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: "Major", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -91,6 +104,7 @@ var bootstrap = function ($, learun) { } }, { label: "学制", name: "SchoolSystem", width: 100, align: "left" }, + { label: "学期课时量", name: "LessonTotal", width: 100, align: "left" }, { label: "总学分", name: "Credit", width: 100, align: "left" }, { label: "公开课", name: "Zyknum", width: 100, align: "left" }, { label: "专业课", name: "Ggknum", width: 100, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanEntity.cs index bf826840a..bea4bf427 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanEntity.cs @@ -65,6 +65,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("CREATETIME")] public DateTime? CreateTime { get; set; } + /// + /// 专业部 + /// + [Column("DEPT")] + public string Dept { get; set; } + /// + /// 学期课时量 + /// + [Column("LESSONTOTAL")] + public string LessonTotal { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanService.cs index 7641566ea..82c4ebd57 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanService.cs @@ -31,17 +31,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(@" - t.Id, - t.Name, - t.Grade, - t.Major, - t.SchoolSystem, - t.Credit, - t.Enabled, - t.Remark - "); + strSql.Append("SELECT t.* "); strSql.Append(" FROM TeachingPlan t "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject();