From 03c98d6ea1b02fc1cf3208a6e3738c0c0df6611f Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Fri, 11 Oct 2024 15:57:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=8E=92=E6=9F=A5=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E6=8F=90=E4=BA=A4=E9=99=90=E5=88=B6=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/SafetyCheck/FormCheck.cshtml              |  4 ++--
 .../Views/SafetyCheck/FormLeader.cshtml             |  4 ++--
 .../Views/SafetyCheck/Index.js                      | 13 +++++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/FormCheck.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/FormCheck.cshtml
index 04d86ecac..31a8e4906 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/FormCheck.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/FormCheck.cshtml	
@@ -36,8 +36,8 @@
         <textarea id="Remark" class="form-control" style="height:100px;" readonly="readonly"></textarea>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="SafetyCheck">
-        <div class="lr-form-item-title">继续上报</div>
-        <div id="Status"></div>
+        <div class="lr-form-item-title">继续上报<font face="宋体">*</font></div>
+        <div id="Status" isvalid="yes" checkexpession="NotNull" ></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="SafetyCheck">
         <div class="lr-form-item-title">审验提醒</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/FormLeader.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/FormLeader.cshtml
index 762a674a1..124a6686c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/FormLeader.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/FormLeader.cshtml	
@@ -40,8 +40,8 @@
         <textarea id="DepartmentRemark" readonly class="form-control" style="height:100px;"></textarea>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="SafetyCheck">
-        <div class="lr-form-item-title">继续上报</div>
-        <div id="Status"></div>
+        <div class="lr-form-item-title">继续上报<font face="宋体">*</font></div>
+        <div id="Status" isvalid="yes" checkexpession="NotNull"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/SafetyCheck/FormLeader.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/Index.js
index 65b19fda1..e93f64fdc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/Index.js	
@@ -161,6 +161,15 @@ var bootstrap = function ($, learun) {
             // 部门审查
             $('#lr_department').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
+                var Status = $('#gridtable').jfGridValue('Status');
+                if (Status != 1) {
+                    learun.alert.warning("当前项目操作项不允许！");
+                    return;
+                }
+                if (Status == 2) {
+                    learun.alert.warning("当前项目操作项不允许！");
+                    return;
+                }
                 if (learun.checkrow(keyValue)) {
                     learun.layerForm({
                         id: 'formformcheck',
@@ -181,6 +190,10 @@ var bootstrap = function ($, learun) {
                     learun.alert.warning("当前项目操作项不允许！");
                     return;
                 }
+                if (Status == 3) {
+                    learun.alert.warning("当前项目操作项不允许！");
+                    return;
+                }
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
                     learun.layerForm({