diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Form.cshtml
index 4cfc3f715..7d78c2b4e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Form.cshtml	
@@ -4,11 +4,11 @@
 }
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-12 lr-form-item" data-table="AwardAndPunishment">
-        <div class="lr-form-item-title">奖励名称<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">惩罚名称<font face="宋体">*</font></div>
         <input id="AwardName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="AwardAndPunishment">
-        <div class="lr-form-item-title">奖励代码<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">惩罚代码<font face="宋体">*</font></div>
         <input id="CodePrize" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="AwardAndPunishment">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Index.cshtml
index 5b8f33257..12428a695 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Index.cshtml	
@@ -11,11 +11,11 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">奖励名称</div>
+                                    <div class="lr-form-item-title">惩罚名称</div>
                                     <input id="AwardName" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">奖励级别</div>
+                                    <div class="lr-form-item-title">惩罚级别</div>
                                     <div id="AwardType"></div>
                                 </div>
                             </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.cshtml
index 1a4d1170e..20b47b916 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.cshtml	
@@ -11,11 +11,11 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">奖励名称</div>
+                                    <div class="lr-form-item-title">惩罚名称</div>
                                     <input id="AwardName" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">奖励级别</div>
+                                    <div class="lr-form-item-title">惩罚级别</div>
                                     <div id="AwardType"></div>
                                 </div>
                             </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.js
index f371cf90c..29e51a7ec 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.js	
@@ -79,7 +79,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认启用选择项！', function (res) {
                         if (res) {
-                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/EnableDisable', { keyValue: keyValue, status: "1" }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/EnableDisable', { keyValue: keyValue, status: "0" }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -88,11 +88,11 @@ var bootstrap = function ($, learun) {
             });
             //禁用
             $('#lr_disabled').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('StuId');
+                var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认禁用选择项！', function (res) {
                         if (res) {
-                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/EnableDisable', { keyValue: keyValue, status: "0" }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/EnableDisable', { keyValue: keyValue, status: "1" }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -105,8 +105,8 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/AwardAndPunishment/GetPageList',
                 headData: [
-                    { label: "奖励名称", name: "AwardName", width: 100, align: "left" },
-                    { label: "奖励代码", name: "CodePrize", width: 100, align: "left" },
+                    { label: "惩罚名称", name: "AwardName", width: 100, align: "left" },
+                    { label: "惩罚代码", name: "CodePrize", width: 100, align: "left" },
                     {
                         label: '状态', name: 'IsValid', width: 100, align: "left",
                         formatter: function (cellvalue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardForm.js
index 7f1d1a0a2..d8a4d3a73 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardForm.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardForm.js	
@@ -56,7 +56,19 @@ var bootstrap = function ($, learun) {
                 [
                     { label: "学号", name: "stuno", width: 100, align: "left" },
                     { label: "姓名", name: "stuname", width: 100, align: "left" },
-                    { label: "班级", name: "classno", width: 100, align: "left" },
+                    {
+                        label: "班级", name: "classno", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
                 ],
                 select: function (item) {
                     $("#StuId").val(item.stuno);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/Form.js
index 7a7069aa8..6b2e53c34 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/Form.js	
@@ -27,7 +27,19 @@ var bootstrap = function ($, learun) {
                     [
                         { label: "学号", name: "stuno", width: 100, align: "left"},
                         { label: "姓名", name: "stuname", width: 100, align: "left" },
-                        { label: "班级", name: "classno", width: 100, align: "left" },
+                        {
+                            label: "班级", name: "classno", width: 100, align: "left",
+                            formatterAsync: function (callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('custmerData', {
+                                    url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                    key: value,
+                                    keyId: 'classno',
+                                    callback: function (_data) {
+                                        callback(_data['classname']);
+                                    }
+                                });
+                            }
+                        },
                     ],
                 select: function (item) {
                     $("#StuId").val(item.stuno);