From 9a8db03d49ec6967a44fffd9925b7b55fb697356 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Sat, 23 Apr 2022 10:48:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E4=BF=A1=E6=81=AF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E6=93=8D=E4=BD=9C=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml | 2 +-
 .../Areas/EducationalAdministration/Views/EmpInfo/Index.js    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml
index 3266a537a..8e8dc7d6f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml	
@@ -161,7 +161,7 @@
         </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">部门<font face="宋体">*</font></div>
-            <div id="F_DepartmentId" checkexpession="NotNull"></div>
+            <div id="F_DepartmentId" isvalid="yes"  checkexpession="NotNull"></div>
         </div>
         @*<div class="col-xs-4 lr-form-item" data-table="EmpInfo">
                 <div class="lr-form-item-title">系部</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js
index 991f8e6bb..3562594f1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js	
@@ -173,7 +173,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     var CheckMark = $('#gridtable').jfGridValue('CheckMark');
                     if (CheckMark.indexOf('true') != -1) {
-                        learun.alert.warning("选中记录中包含已启用项目！");
+                        learun.alert.warning("选中记录中包含已审核项目！");
                         return;
                     }
                     learun.layerForm({
@@ -194,7 +194,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     var CheckMark = $('#gridtable').jfGridValue('CheckMark');
                     if (CheckMark.indexOf('true') != -1) {
-                        learun.alert.warning("选中记录中包含已启用项目，已启用不能删除！");
+                        learun.alert.warning("选中记录中包含已审核项目，已审核不能删除！");
                         return;
                     }
                     //if (CheckMark === true) {