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

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

@@ -632,9 +632,11 @@ var bootstrap = function ($, learun) {
             async: false,
             cache: false,
             success: function (ref) {
-                if (ref.code == "200" && ref.data === false) {
-                    CanInputFlagSemester = false;
-                    top.learun.layerConfirm('当前时间不是成绩录入时间！', function (res) { });
+                if (ref.code == "200") {
+                    CanInputFlagSemester = ref.data;
+                    if (ref.data === false) {
+                        top.learun.layerConfirm('当前时间不是成绩录入时间！', function (res) { });
+                    }
                     return false;
                 }
             },
@@ -653,7 +655,7 @@ var bootstrap = function ($, learun) {
         return query;
     };
     judgeSelectDetail = function (query) {
-        if (CanInputFlagSemester !== false) {
+        if (CanInputFlagSemester != false) {
             if (query.LessonNo == null || query.LessonNo == "") {
                 learun.alert.warning("请选择课程！");
                 return false;
@@ -662,6 +664,8 @@ var bootstrap = function ($, learun) {
                 learun.alert.warning("请选择班级！");
                 return false;
             }
+        } else {
+            return false;
         }
         return true;
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js

@@ -508,9 +508,11 @@ var bootstrap = function ($, learun) {
             async: false,
             cache: false,
             success: function (ref) {
-                if (ref.code == "200" && ref.data === false) {
-                    CanInputFlagSemester = false;
-                    top.learun.layerConfirm('当前时间不是补考成绩录入时间！', function (res) { });
+                if (ref.code == "200") {
+                    CanInputFlagSemester = ref.data;
+                    if (ref.data === false) {
+                        top.learun.layerConfirm('当前时间不是补考成绩录入时间！', function (res) { });
+                    }
                     return false;
                 }
             },
@@ -528,7 +530,7 @@ var bootstrap = function ($, learun) {
         return query;
     };
     judgeSelectDetail = function (query) {
-        if (CanInputFlagSemester !== false) {
+        if (CanInputFlagSemester != false) {
             if (query.LessonNo == null || query.LessonNo == "") {
                 learun.alert.warning("请选择课程！");
                 return false;
@@ -537,6 +539,8 @@ var bootstrap = function ($, learun) {
                 learun.alert.warning("请选择班级！");
                 return false;
             }
+        } else {
+            return false;
         }
         return true;
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js

@@ -511,9 +511,11 @@ var bootstrap = function ($, learun) {
             async: false,
             cache: false,
             success: function (ref) {
-                if (ref.code == "200" && ref.data === false) {
-                    CanInputFlagSemester = false;
-                    top.learun.layerConfirm('当前时间不是重考成绩录入时间！', function (res) { });
+                if (ref.code == "200") {
+                    CanInputFlagSemester = ref.data;
+                    if (ref.data === false) {
+                        top.learun.layerConfirm('当前时间不是重考成绩录入时间！', function (res) { });
+                    }
                     return false;
                 }
             },
@@ -529,11 +531,11 @@ var bootstrap = function ($, learun) {
         if (!judgeSelectDetail(query)) {
             return false;
         }
-        
+
         return query;
     };
     judgeSelectDetail = function (query) {
-        if (CanInputFlagSemester !== false) {
+        if (CanInputFlagSemester != false) {
             if (query.LessonNo == null || query.LessonNo == "") {
                 learun.alert.warning("请选择课程！");
                 return false;
@@ -542,6 +544,8 @@ var bootstrap = function ($, learun) {
                 learun.alert.warning("请选择班级！");
                 return false;
             }
+        } else {
+            return false;
         }
         return true;
     };