From 45f0fbac3ef39286a26e02e7ee52366f7d94bfe6 Mon Sep 17 00:00:00 2001
From: dyy <18335927079@163.com>
Date: Wed, 13 Apr 2022 18:48:48 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=95=99?=
 =?UTF-8?q?=E5=B8=88=EF=BC=9A=E5=88=97=E8=A1=A8=EF=BC=8C=E5=A4=9A=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=BB=91=E5=AE=9A=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AD=97=E5=85=B8=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/EmpInfo/Index.js                    | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 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 19174700a..eadfc70be 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	
@@ -50,8 +50,8 @@ var bootstrap = function ($, learun) {
             //政治面貌
             $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace', allowSearch: true });
             //最高学历
-            $('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });
-
+            //$('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });
+            $('#HighestRecord').lrDataItemSelect({ code: 'RecordInSchool', allowSearch: true });
 
             //民族
             $('#NationalityNo').lrDataItemSelect({ code: 'National', allowSearch: true });
@@ -60,7 +60,7 @@ var bootstrap = function ($, learun) {
             //是否审核
             $('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' });
             //学位
-            $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree' });
+            $('#DegreeNo').lrDataItemSelect({ code: 'DegreeInSchool' });
             
             // 部门选择
             $('#F_DepartmentId').lrselect({
@@ -92,7 +92,7 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
-            $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree' });
+            $('#DegreeNo').lrDataItemSelect({ code: 'DegreeInSchool' });
             //职称
             $('#ProfessionalTitle').lrDataItemSelect({ code: 'jszc' });
             //校区
@@ -412,9 +412,9 @@ var bootstrap = function ($, learun) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
                                 key: value,
-                                keyId: 'id',
+                                keyId: 'f_departmentid',
                                 callback: function (_data) {
-                                    callback(_data['name']);
+                                    callback(_data['f_fullname']);
                                 }
                             });
                         }
@@ -494,12 +494,19 @@ var bootstrap = function ($, learun) {
                     {
                         label: "最高学历", name: "HighestRecord", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree',
+                            //learun.clientdata.getAsync('custmerData', {
+                            //    url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree',
+                            //    key: value,
+                            //    keyId: 'culturedegreeno',
+                            //    callback: function (_data) {
+                            //        callback(_data['culturedegree']);
+                            //    }
+                            //});
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'culturedegreeno',
+                                code: 'RecordInSchool',
                                 callback: function (_data) {
-                                    callback(_data['culturedegree']);
+                                    callback(_data.text);
                                 }
                             });
                         }
@@ -507,9 +514,16 @@ var bootstrap = function ($, learun) {
                     {
                         label: "最高学位", name: "DegreeNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
+                            //learun.clientdata.getAsync('dataItem', {
+                            //    key: value,
+                            //    code: 'BCdDegree',
+                            //    callback: function (_data) {
+                            //        callback(_data.text);
+                            //    }
+                            //});
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'BCdDegree',
+                                code: 'DegreeInSchool',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }