Merge branch '西昌分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/FormYearSemester.js

@@ -36,13 +36,13 @@ var bootstrap = function ($, learun) {
         initData: function () {
             //从教室导入
             if (type == 1) {
-                $('body').find('.SeatClass').attr('display', 'block');
+                $('body').find('.SeatClass').show();
                 $('body').find('.SeatClass input').attr('isvalid', 'yes');
                 $('body').find('.SeatClass input').attr('checkexpession', 'PositiveInteger');
             } else if (type == 2) {//按条件清空
                 $('body').find('.SeatClass input').removeAttr('isvalid');
                 $('body').find('.SeatClass input').removeAttr('checkexpession');
-                $('body').find('.SeatClass').attr('display', 'none');
+                $('body').find('.SeatClass').hide();
             }
         }
     };
@@ -51,14 +51,8 @@ var bootstrap = function ($, learun) {
         if (!$('body').lrValidform()) {
             return false;
         }
-        //var postData = {
-        //    AcademicYearNo: $('#AcademicYearNo').lrselectGet(),
-        //    Semester: $('#Semester').lrselectGet()
-        //};
+        
         var postData = $('body').lrGetFormData();
-        console.log(postData);
-        //TODO：
-        return false;
 
         //从教室导入
         if (type == 1) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.cshtml

@@ -41,7 +41,6 @@
                         <a id="lr_lock" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;启用</a>
                         <a id="lr_unlock" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp;停用</a>
 
-                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                     </div>
                     <div class=" btn-group btn-group-sm">
                         <a id="lr_importByBasic" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;从教室导入</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.js

@@ -54,6 +54,11 @@ var bootstrap = function ($, learun) {
                     learun.alert.warning("只能选择一条记录进行编辑！");
                     return false;
                 }
+                var EREnabled = $('#gridtable').jfGridValue('EREnabled');
+                if (EREnabled == "true") {
+                    learun.alert.warning("选中记录已启用！");
+                    return false;
+                }
                 if (learun.checkrow(keyValue)) {
                     learun.layerForm({
                         id: 'form',
@@ -151,10 +156,7 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            // 打印
-            $('#lr_print').on('click', function () {
-                $('#gridtable').jqprintTable();
-            });
+            
         },
         // 初始化列表
         initGird: function () {