diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.js
index 9a7a69de9..7e505c382 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.js
@@ -136,7 +136,7 @@ var bootstrap = function ($, learun) {
label: '考生类别', name: 'FamilyOriginNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
- code: 'ExamineeCategory',
+ code: 'stuType',
callback: function (_data) {
callback(_data.text);
}
@@ -184,7 +184,7 @@ var bootstrap = function ($, learun) {
label: '录取方式', name: 'MatriculateSort', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
- code: 'EnrollStyle',
+ code: 'enrollType',
callback: function (_data) {
callback(_data.text);
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml
index 9cfc81e3f..9ca74af75 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml
@@ -60,10 +60,10 @@
户口类别
- *@
- *@
第几志愿 *
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js
index 908a103bd..bb03e97f1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js
@@ -17,12 +17,12 @@ var bootstrap = function ($, learun) {
bind: function () {
$("#GenderNo").lrDataItemSelect({ code: 'usersex' });
$("#PartyFaceNo").lrDataItemSelect({ code: 'PolityStatus' });
- $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' });
+ $("#FamilyOriginNo").lrDataItemSelect({ code: 'stuType' });
$("#NationalityNo").lrDataItemSelect({ code: 'National' });
$("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' });
$("#TestStuSubjectNo").lrDataItemSelect({ code: 'SubjectType' });
$("#HighTestSortNo").lrDataItemSelect({ code: 'GraduateCategory' });
- $("#MatriculateSort").lrDataItemSelect({ code: 'EnrollStyle' });
+ $("#MatriculateSort").lrDataItemSelect({ code: 'enrollType' });
$('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' });
$('#IsPoor').lrDataItemSelect({ code: 'YesOrNoInt' });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js
index c8c3684b6..f95c10f6a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js
@@ -261,24 +261,24 @@ var bootstrap = function ($, learun) {
label: '考生类别', name: 'FamilyOriginNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
- code: 'ExamineeCategory',
- callback: function (_data) {
- callback(_data.text);
- }
- });
- }
- },
- {
- label: '考生类型', name: 'TestStuSortNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('dataItem', {
- key: value,
- code: 'ExamineeType',
+ code: 'stuType',
callback: function (_data) {
callback(_data.text);
}
});
}
},
+ //{
+ // label: '考生类型', name: 'TestStuSortNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+ // learun.clientdata.getAsync('dataItem', {
+ // key: value,
+ // code: 'ExamineeType',
+ // callback: function (_data) {
+ // callback(_data.text);
+ // }
+ // });
+ // }
+ //},
{
label: '科类', name: 'TestStuSubjectNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
@@ -309,7 +309,7 @@ var bootstrap = function ($, learun) {
label: '录取方式', name: 'MatriculateSort', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
- code: 'EnrollStyle',
+ code: 'enrollType',
callback: function (_data) {
callback(_data.text);
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/SchoolUniform.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/SchoolUniform.js
index 915bcc5d3..b1023e3e1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/SchoolUniform.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/SchoolUniform.js
@@ -166,7 +166,8 @@ var bootstrap = function ($, learun) {
height: '80%',
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
- }
+ },
+ btn: null
});
}
})