From 68c1ad04ff1e26086dadb8aa6eb8b5e36a23661f Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Mon, 23 May 2022 18:03:11 +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=E5=AE=A1=E6=A0=B8=E3=80=81=E5=8E=BB=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E3=80=81=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8=E7=B3=BB?=
 =?UTF-8?q?=E9=83=A8=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=9B=E5=88=97=E8=A1=A8=E9=83=A8=E9=97=A8=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EducationalAdministration/Views/EmpInfo/Index.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 8ad0f64b7..eea0daac0 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	
@@ -199,7 +199,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({
@@ -220,7 +220,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) {
@@ -242,7 +242,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) {
@@ -264,7 +264,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     var CheckMark = $('#gridtable').jfGridValue('CheckMark');
                     if (CheckMark.indexOf('false') != -1) {
-                        learun.alert.warning("选中记录中包含已停用项目！");
+                        learun.alert.warning("选中记录中包含未审核项目！");
                         return;
                     }
                     //if (CheckMark === false) {
@@ -433,9 +433,9 @@ var bootstrap = function ($, learun) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
                                 key: value,
-                                keyId: 'f_departmentid',
+                                keyId: 'id',
                                 callback: function (_data) {
-                                    callback(_data['f_fullname']);
+                                    callback(_data['name']);
                                 }
                             });
                         }