Merge branch '长阳分支中职' of http://8.141.155.183:3000/bjquanjiang/DigitalScholl into 长阳分支中职

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>

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")

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({