【修改】实训课成绩录入优化；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreExperiment/InputScoreIndex.js

@@ -34,6 +34,17 @@ var bootstrap = function ($, learun) {
                         return cellvalue == true ? "男" : "女";
                     }
                 },
+                {
+                    label: "学习形式", name: "StudyModality", width: 75, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                        learun.clientdata.getAsync('dataItem', {
+                            key: value,
+                            code: 'StudyModality',
+                            callback: function (_data) {
+                                callback(_data.text);
+                            }
+                        });
+                    }
+                },
                 {
                     label: "校区", name: "F_SchoolId", width: 100, align: "left",
                     formatterAsync: function (callback, value, row, op, $cell) {
@@ -105,7 +116,7 @@ var bootstrap = function ($, learun) {
             ];
             headDataEdit = [
                 {
-                    label: '期末成绩', name: 'TermEndScore', width: 80, align: "left",
+                    label: '专业课成绩', name: 'TermEndScore', width: 80, align: "left",
                     edit: {
                         type: 'input',
                         inputType: 'number',
@@ -125,7 +136,7 @@ var bootstrap = function ($, learun) {
             ];
             headDataNoEdit = [
                 {
-                    label: '期末成绩', name: 'TermEndScore', width: 80, align: "left"
+                    label: '专业课成绩', name: 'TermEndScore', width: 80, align: "left"
                 },
                 { label: '总成绩', name: 'Score', width: 80, align: "left" },
                 {
@@ -400,7 +411,7 @@ var bootstrap = function ($, learun) {
             }.bind(this), "json");
         },
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuScoreExperiment/GetList',
                 headData: headDataFinally,
                 mainId: 'ScoreId',

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreExperiment/StuScoreExperimentEntity.cs

@@ -338,8 +338,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             this.ScoreId = keyValue;
         }
         #endregion
+        #region 扩展字段
+        /// <summary>
+        /// 学习形式
+        /// </summary>
+        /// <returns></returns>
+        [NotMapped]
+        public string StudyModality { get; set; }
+
+        #endregion
 
-        
 
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreExperiment/StuScoreExperimentService.cs

@@ -40,7 +40,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT t.* FROM StuScoreExperiment t where 1=1 ");
+                strSql.Append("SELECT t.*,sb.StudyModality FROM StuScoreExperiment t ");
+                strSql.Append(" left join StuInfoBasic sb on t.StuNo=sb.StuNo ");
+                strSql.Append(" where 1=1 ");
 
                 //学籍异动的学生不显示
                 strSql.Append(" and t.StuNo not in (select StuNo from StuInfoBasic where ChangeStatus=1) ");