【修改】教学计划管理：增加专业部、学期课时量、等表单；

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

@@ -3,33 +3,41 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="TeachingPlan" >
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">名称<font face="宋体">*</font></div>
         <input id="Name" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeachingPlan" >
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">年级</div>
-        <div id="Grade"  ></div>
+        <div id="Grade"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeachingPlan" >
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
+        <div class="lr-form-item-title">专业部</div>
+        <div id="Dept"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">专业</div>
-        <div id="Major"  ></div>
+        <div id="Major"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeachingPlan" >
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">学制</div>
-        <input id="SchoolSystem" type="text" class="form-control"  />
+        <input id="SchoolSystem" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
+        <div class="lr-form-item-title">学期课时量</div>
+        <input id="LessonTotal" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeachingPlan" >
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">总学分</div>
-        <input id="Credit" type="text" class="form-control"  />
+        <input id="Credit" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeachingPlan" >
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">启用</div>
         <div id="Enabled"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeachingPlan" >
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">备注</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/TeachingPlan/Form.js")

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',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManage.cshtml

@@ -11,17 +11,25 @@
         <div class="lr-form-item-title">年级</div>
         <div id="Grade" readonly="readonly"></div>
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
+        <div class="lr-form-item-title">专业部</div>
+        <div id="Dept" readonly="readonly"></div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">专业</div>
         <div id="Major" readonly="readonly"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">学制</div>
-        <input id="SchoolSystem" type="text" class="form-control"  readonly="readonly"/>
+        <input id="SchoolSystem" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
+        <div class="lr-form-item-title">学期课时量</div>
+        <input id="LessonTotal" type="text" class="form-control"  readonly="readonly"/>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">总学分</div>
-        <input id="Credit" type="text" class="form-control"  readonly="readonly"/>
+        <input id="Credit" type="text" class="form-control" readonly="readonly" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">启用</div>

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',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManageView.cshtml

@@ -11,17 +11,25 @@
         <div class="lr-form-item-title">年级</div>
         <div id="Grade" readonly="readonly"></div>
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
+        <div class="lr-form-item-title">专业部</div>
+        <div id="Dept" readonly="readonly"></div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">专业</div>
         <div id="Major" readonly="readonly"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">学制</div>
-        <input id="SchoolSystem" type="text" class="form-control"  readonly="readonly"/>
+        <input id="SchoolSystem" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
+        <div class="lr-form-item-title">学期课时量</div>
+        <input id="LessonTotal" type="text" class="form-control" readonly="readonly" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">总学分</div>
-        <input id="Credit" type="text" class="form-control"  readonly="readonly"/>
+        <input id="Credit" type="text" class="form-control" readonly="readonly" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">启用</div>

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',

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",

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" },

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
         /// </summary>
         [Column("CREATETIME")]
         public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 专业部
+        /// </summary>
+        [Column("DEPT")]
+        public string Dept { get; set; }
+        /// <summary>
+        /// 学期课时量
+        /// </summary>
+        [Column("LESSONTOTAL")]
+        public string LessonTotal { get; set; }
         #endregion
 
         #region 扩展操作

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