From c0ac4471264be3c2e59697475d156f7551af6b16 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Mon, 28 Mar 2022 10:20:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E7=B1=8D=E6=94=B9=E4=B8=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuInfoBasic/FormOfDC.js                         | 2 +-
 .../Views/StuInfoBasic/IndexOfDC.js                        | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js
index 01a7ec8d8..f5203572b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js	
+++ b/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' });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.js
index 177bc229d..ac04bfee5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.js	
+++ b/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);
                                 }
                             });
                         }