Merge branch '西昌分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js

@@ -92,7 +92,7 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
-            $('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' });
+            $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree' });
             //职称
             $('#ProfessionalTitle').lrDataItemSelect({ code: 'jszc' });
             //校区

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js

@@ -172,7 +172,7 @@ var bootstrap = function ($, learun) {
             $('#TestStuSortNo').lrDataItemSelect({ code: 'TestStuSortNo' });
             $('#EntranceWay').lrDataItemSelect({ code: 'EntranceWay' });
             $('#StudyingWay').lrDataItemSelect({ code: 'StudyWay' });
-            $('#CountryNo').lrDataSourceSelect({ code: 'BCdCountry', value: 'countryno', text: 'country' });
+            $('#CountryNo').lrDataItemSelect({ code: 'BCdCountry' });
             $('#MarriageStatus').lrDataItemSelect({ code: 'MarriageType' });
             $('#IsTrailChildren').lrDataItemSelect({ code: 'YesOrNoInt' });
             $('#StuLivePlaceType').lrDataItemSelect({ code: 'StuLivePlaceType' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.js

@@ -286,12 +286,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "国籍/地区", name: "CountryNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCountry',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'countryno',
+                                code: 'BCdCountry',
                                 callback: function (_data) {
-                                    callback(_data['country']);
+                                    callback(_data.text);
                                 }
                             });
                         }