Merge branch '塔里木分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.js

@@ -37,22 +37,23 @@ var bootstrap = function ($, learun) {
                     learun.alert.warning("请选择班级！");
                     return;
                 }
-                $.lrSetFormWithParam(top.$.rootUrl + '/EducationalAdministration/StuScore/GetLessonNoData', p,
-                    function (data) {
-                        var temparr = [];
-                        for (var i = 0; i < data.length; i++) {
-                            var item = {};
-                            item.label = data[i].text;
-                            item.name = data[i].value;
-                            item.width = 150;
-                            item.align = "left";
-                            temparr.push(item);
-                        }
-                        LessonTemp = temparr;
-
-                        page.initGird();
-                        page.search(p);
-                    });
+                //$.lrSetFormWithParam(top.$.rootUrl + '/EducationalAdministration/StuScore/GetLessonNoData', { },
+                //    function (data) {
+                //        var temparr = [];
+                //        for (var i = 0; i < data.length; i++) {
+                //            var item = {};
+                //            item.label = data[i].text;
+                //            item.name = data[i].value;
+                //            item.width = 150;
+                //            item.align = "left";
+                //            temparr.push(item);
+                //        }
+                //        LessonTemp = temparr;
+                //        page.initGird();
+                //        page.search(p);
+                //    });
+                page.initGird();
+                page.search(p);
 
             });
             // 刷新

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Interface/Form.js

@@ -89,7 +89,9 @@ var bootstrap = function ($, learun) {
         initData: function () {
             if (!!keyValue) {
                 $.lrSetForm(top.$.rootUrl + '/LR_SystemModule/Interface/GetEntity?keyValue=' + keyValue, function (data) {
-                    $('#form1').lrSetFormData(data);
+                    // $('#form1').lrSetFormData(data);
+                    $('#F_Name').val(data.F_Name);
+                    $('#F_Address').val(data.F_Address);
                     var formatdata = JSON.parse(data.F_FieldsJson);
                     $('#gridtable').jfGridSet('refreshdata', formatdata);
                 });