From c2eb40de65d2ac79a312e1c315c77fce495a4a67 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Fri, 6 May 2022 14:40:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=89=E6=8E=92=E8=80=83?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Exam_ExamPlanLessonController.cs          |  5 ++++
 .../FormRoomTeacher.cshtml                    |  4 +--
 .../Exam_ExamPlanLesson/FormRoomTeacher.js    | 25 +++++++++++++------
 .../Views/Exam_ExamPlanLesson/Index.cshtml    |  4 ++-
 .../Views/Exam_ExamPlanLesson/Index.js        |  3 +++
 5 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanLessonController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanLessonController.cs
index 1dc76c0f2..7fdec2ab7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanLessonController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanLessonController.cs	
@@ -257,6 +257,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             if (ELCheckMark == 1)
             {
                 var entity = exam_ExamPlanLessonIBLL.GetExam_ExamPlanLessonEntity(keyValue);
+                if (entity.ExamDate == null || entity.ExamTimeStart == null || entity.ExamTimeEnd == null)
+                {
+                    return Fail("请先设置考试时间！");
+                }
+
                 if ((entity.RealClassNum == null || entity.RealClassNum == 0) ||
                     (entity.SeatCount == null || entity.SeatCount == 0))
                 {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormRoomTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormRoomTeacher.cshtml
index b4257ae8d..8c4e3feee 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormRoomTeacher.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormRoomTeacher.cshtml	
@@ -5,8 +5,8 @@
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-12 lr-form-item" data-table="Exam_ExamPlanRoom">
         <div class="lr-form-item-title">考场名称<font face="宋体">*</font></div>
-        <input id="ClassroomName" type="text" readonly="readonly" class="form-control" isvalid="yes" checkexpession="NotNull" style="width: 85%;" />
-        <button class="btn btn-primary" id="selectRoom" style="float: right;margin-top: -28px;">选择考场</button>
+        <input id="ClassroomName" type="text" readonly="readonly" class="form-control" style="width: 85%;" />
+        <button class="btn btn-primary" id="selectRoom" style="float: right;margin-top: -28px;margin-right: 20px;">选择考场</button>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Exam_ExamPlanRoom">
         <div class="lr-form-item-title">考场编号</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormRoomTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormRoomTeacher.js
index d7680147a..244a8d55d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormRoomTeacher.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormRoomTeacher.js	
@@ -139,6 +139,11 @@ var bootstrap = function ($, learun) {
         if (!$('.lr-form-wrap').lrValidform()) {
             return false;
         }
+        var ClassroomName = $('#ClassroomName').val();
+        if (!ClassroomName) {
+            learun.alert.warning("请选择考场！");
+            return false;
+        }
         var datas = $('#Exam_ExamPlanTeacher').jfGridGet('rowdatas');
         if (datas == null || datas.length == 0) {
             learun.alert.warning("请先新增监考老师！");
@@ -159,15 +164,19 @@ var bootstrap = function ($, learun) {
             postData.strEntity = JSON.stringify(formData);
             postData.Exam_ExamPlanTeacherList = JSON.stringify($('#Exam_ExamPlanTeacher').jfGridGet('rowdatas'));
 
-            $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlanLesson/SaveRoomAndTeacher?keyValue=' + keyValue, postData, function (res) {
-                
-                // 保存成功后才回调
-                if (!!callBack) {
-                    callBack(res, formData, i);
-                }
-            });
-        }
+            $.lrSaveForm(
+                top.$.rootUrl +
+                '/EducationalAdministration/Exam_ExamPlanLesson/SaveRoomAndTeacher?keyValue=' +
+                keyValue,
+                postData,
+                function(res) {
 
+                    // 保存成功后才回调
+                    if (!!callBack) {
+                        callBack(res, formData, i);
+                    }
+                });
+        } 
     };
     page.init();
 }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/Index.cshtml
index dade667f4..9af6aae3b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/Index.cshtml	
@@ -6,11 +6,13 @@
     #div_gridtable_Class {
         float: left;
         width: 50%;
+        height: 50%;
     }
 
     #div_gridtable_Room {
         float: right;
         width: 50%;
+        height: 50%;
         padding-left: 10px;
     }
 
@@ -43,7 +45,7 @@
                 <div class="lr-layout-tool-left">
                     <span class="examTimeShow">考试日期：<span id="examDate"></span></span>
                     <span class="examTimeShow"> 考试时间：<span id="examTime"></span></span>
-                    <span id="checkspan" style="color: red;" ></span>
+                    <span id="checkspan" style="color: red;"></span>
                 </div>
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/Index.js
index 150dea956..79cddea67 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/Index.js	
@@ -38,6 +38,9 @@ var bootstrap = function ($, learun) {
             //设置考试时间 
             $('#lr_ExamTime').on('click', function () {
                 if (!!EPLId) {
+                    if (ELCheckMark == 1) {
+                        return learun.alert.warning('该项已审核！');
+                    }
                     learun.layerForm({
                         id: 'form',
                         title: '设置考试时间',