Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.cshtml

@@ -2,7 +2,7 @@
     ViewBag.Title = "学业成绩考核记录表";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
-<div class="lr-form-wrap" id="form">
+<div class="lr-form-wrap">
     <div class="col-xs-12 lr-form-item" data-table="ScoreCheckInfo">
         <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
         <div id="AcademicYearNo" isvalid="yes" checkexpession="NotNull"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Form.js

@@ -41,7 +41,7 @@ var bootstrap = function ($, learun) {
                 text: 'stuname',
                 headData:
                 [
-                    { label: "学号", name: "stuno", width: 100, align: "left" },
+                    { label: "学号", name: "stuno", width: 140, align: "left" },
                     { label: "姓名", name: "stuname", width: 100, align: "left" },
                     {
                         label: "班级", name: "classno", width: 100, align: "left",
@@ -110,19 +110,20 @@ var bootstrap = function ($, learun) {
     };
     // 保存数据
     acceptClick = function (callBack) {
-        if (!$('body').lrValidform()) {
+        if (!$('form').lrValidform()) {
             return false;
         }
         var postData = {
-            strEntity: JSON.stringify($('body').lrGetFormData())
+            //postData.StuName=
+            strEntity: JSON.stringify($('form').lrGetFormData())
         };
         console.log(postData,"postData")
-        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
-            // 保存成功后才回调
-            if (!!callBack) {
-                callBack();
-            }
-        });
+        //$.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
+        //    // 保存成功后才回调
+        //    if (!!callBack) {
+        //        callBack();
+        //    }
+        //});
     };
     page.init();
 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml

@@ -9,7 +9,7 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="ScoreCheckInfo">
         <div class="lr-form-item-title">备注</div>
-        <textarea id="CheckOpinion" type="text" class="form-control" style="height:100px;"></textarea>
+        <textarea id="CheckOpinion" type="text" class="form-control" style="height:80px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.cshtml

@@ -50,14 +50,14 @@
                         <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_generate" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 一键生成</a>
                         <a id="lr_Coordinator" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 教师评语</a>
                         <a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 提交</a>
                         <a id="lr_lock" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 审核</a>
-                        <a id="lr_unlock" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 去审核</a>
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                        @*<a id="lr_unlock" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 去审核</a>*@
                     </div>
                 </div>
             </div>

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

@@ -131,7 +131,7 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
                     var CheckMark = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckMark.indexOf('1') != -1) {
+                    if (CheckMark.indexOf(',') != -1) {
                         learun.alert.warning("选中记录中包含已审核项目，已审核不能删除！");
                         return;
                     }
@@ -152,13 +152,9 @@ var bootstrap = function ($, learun) {
             $('#lr_lock').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
-                    //if (keyValue.indexOf(',') != -1) {
-                    //    learun.alert.warning("只能选择一条记录进行编辑！");
-                    //    return;
-                    //}
                     var CheckMark = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckMark != "1") {
-                        learun.alert.warning("当前项不可审核！");
+                    if (CheckMark.indexOf(',') != "-1") {
+                        learun.alert.warning("选中项不可审核！");
                         return;
                     }
                     learun.layerForm({

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs

@@ -114,7 +114,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindEntity<ScoreCheckInfoEntity>(x => x.StuName == keyValue && x.Semester == Semester && x.AcademicYearNo == AcademicYearNo);
+                return this.BaseRepository("CollegeMIS").FindEntity<ScoreCheckInfoEntity>(x => x.StuNo == keyValue && x.Semester == Semester && x.AcademicYearNo == AcademicYearNo);
             }
             catch (Exception ex)
             {
@@ -270,7 +270,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 foreach (var item in keyValueArr)
                 {
                     var model = db.FindEntity<ScoreCheckInfoEntity>(x => x.ID == item);
-                    model.CheckStatus = "2";
+                    model.CheckStatus = entity.CheckStatus;
                     model.CheckTime = DateTime.Now;
                     model.CheckUser = userlogin.userId;
                     model.UpdateTime = DateTime.Now;