From d57f29aaefce20c7324ca90b27bb79488e10587c Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Wed, 14 Sep 2022 10:28:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E8=80=83=E6=88=90=E7=BB=A9=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=BD=95=E5=85=A5=E6=88=90=E7=BB=A9=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuScore/InputScoreIndexInTeacher.js | 12 ++++++++---- .../StuScoreNotPass/InputScoreIndexInTeacher.js | 12 ++++++++---- .../StuScoreNotPassTwo/InputScoreIndexInTeacher.js | 14 +++++++++----- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js index 488fa5208..923897170 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js +++ b/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; }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js index 37a22a98c..68692dae2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js +++ b/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; }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js index 2271dff8d..2f161ed8b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js +++ b/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; };