diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml
index 81f4ed518..c69810a58 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml
@@ -131,7 +131,7 @@
查看
录入实收金额
-
金额变动记录
+ @*
金额变动记录*@
打印缴费单
缴费
未缴费
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js
index a09491518..b7da2ea84 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js
@@ -283,18 +283,18 @@ var bootstrap = function ($, learun) {
});
}
},
- {
- label: "床位", name: "StuId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PlanBedInfo',
- key: value,
- keyId: 'planstudentid',
- callback: function (_data) {
- callback(_data['name']);
- }
- });
- }
- },
+ //{
+ // label: "床位", name: "StuId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+ // learun.clientdata.getAsync('custmerData', {
+ // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PlanBedInfo',
+ // key: value,
+ // keyId: 'planstudentid',
+ // callback: function (_data) {
+ // callback(_data['name']);
+ // }
+ // });
+ // }
+ //},
{
label: "民族", name: "Nationals", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js
index 976426a9a..16f043f82 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js
@@ -237,7 +237,7 @@ var bootstrap = function ($, learun) {
if (_data.text == "已缴费") {
callback('
' + _data.text + '');
} else {
- callback('
' + _data.text + '');
+ callback('
' + _data.text + '');
}
} else {
callback('
未缴费');
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js
index a1015a047..c841cc274 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js
@@ -247,7 +247,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 b1023e3e1..92e37f1dc 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
@@ -176,11 +176,11 @@ var bootstrap = function ($, learun) {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetPageList',
headData: [
- {
- label: '报名日期', name: 'SignUpTime', width: 150, align: "left", formatter: function (value) {
- return /\d{4}-\d{1,2}-\d{1,2}/g.exec(value);
- }
- },
+ //{
+ // label: '报名日期', name: 'SignUpTime', width: 150, align: "left", formatter: function (value) {
+ // return /\d{4}-\d{1,2}-\d{1,2}/g.exec(value);
+ // }
+ //},
{ label: '姓名', name: 'StuName', width: 100, align: "left" },
{
label: '性别', name: 'GenderNo', width: 80, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
@@ -216,10 +216,10 @@ var bootstrap = function ($, learun) {
}
},
{ label: '毕业学校', name: 'HighSchoolName', width: 150, align: "left" },
- { label: '中学班级', name: 'OldClassName', width: 100, align: "left" },
+ //{ label: '中学班级', name: 'OldClassName', width: 100, align: "left" },
{ label: '中考成绩', name: 'ComprehensiveScore', width: 150, align: "left" },
{ label: '家庭住址', name: 'FamilyAddress', width: 150, align: "left" },
- { label: '户口所在地', name: 'OriginAddress', width: 150, align: "left" },
+ //{ label: '户口所在地', name: 'OriginAddress', width: 150, align: "left" },
{ label: '身份证号', name: 'IdentityCardNo', width: 150, align: "left" },
{ label: '家长电话', name: 'telephone', width: 150, align: "left" },
{